From patchwork Sun Jul 26 20:38:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Hadjinlian X-Patchwork-Id: 500143 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 99B67140518 for ; Mon, 27 Jul 2015 06:38:57 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Pkk15id1; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id CA4B094A8A; Sun, 26 Jul 2015 20:38:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id A+M1J1ln0uTK; Sun, 26 Jul 2015 20:38:55 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 079BC949F6; Sun, 26 Jul 2015 20:38:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 93CD01C2282 for ; Sun, 26 Jul 2015 20:38:51 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8198131967 for ; Sun, 26 Jul 2015 20:38:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id HyhgKYhbuCdU for ; Sun, 26 Jul 2015 20:38:50 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f170.google.com (mail-wi0-f170.google.com [209.85.212.170]) by silver.osuosl.org (Postfix) with ESMTPS id D014030A81 for ; Sun, 26 Jul 2015 20:38:49 +0000 (UTC) Received: by wicgb10 with SMTP id gb10so86863142wic.1 for ; Sun, 26 Jul 2015 13:38:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lQ7nqf4GlYjfglY99dpLzQIZ9vQb0qO+5SP3nuOIx0o=; b=Pkk15id1VZhvgC2odrI5erVrIuDfNNV8VSgQyFqukTu5J7aWvNqkezhAJbJjER8VzP NTLQbsijR4D+Jgqvqb5rlIgM5gWYOTHT2zFE8i/+jffiJEyX2mfTNE5FT96C7XtU0Xrh 6eBohg5XDmada+/WJyw3jdpt7Sr058Y+9jpXjiL3Jz1UpSCowLo1nUsigEKZggWWcdDN EAIEb0g7yQgWjg31t7eVJrSvNmcVzee9YIi5C0XoGYK0eE+3y3MGfbz2iUuUjlszNIUK oDlkq3/I1gnfasnQqnNNPhF83wI6ILissFQ4eLwPXC4WG1+S+T6t5YV1kc2hu+zoWMBW Xetg== X-Received: by 10.180.19.102 with SMTP id d6mr17112472wie.86.1437943128533; Sun, 26 Jul 2015 13:38:48 -0700 (PDT) Received: from localhost.localdomain (mangue.f00.fr. [82.226.166.74]) by smtp.gmail.com with ESMTPSA id m4sm24156537wjb.37.2015.07.26.13.38.47 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Jul 2015 13:38:47 -0700 (PDT) From: Maxime Hadjinlian To: buildroot@buildroot.org Date: Sun, 26 Jul 2015 22:38:27 +0200 Message-Id: <1437943118-18060-2-git-send-email-maxime.hadjinlian@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1437943118-18060-1-git-send-email-maxime.hadjinlian@gmail.com> References: <1437943118-18060-1-git-send-email-maxime.hadjinlian@gmail.com> Subject: [Buildroot] [PATCH 01/12] zxing_cpp: New package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" ZXing was hosted on Google Code, which is a closing forges. The current link was already redirecting to the github repo. But upstream is no longer supporting the cpp bindings, it's now a Java library/application. A fork has been created from the latests cpp source of the original upstream. So this is a new package from an old one and a legacy option has been added. Signed-off-by: Maxime Hadjinlian --- Config.in.legacy | 8 +++++++ package/Config.in | 2 +- package/{zxing => zxing-cpp}/Config.in | 10 ++++----- package/zxing-cpp/zxing-cpp.mk | 33 ++++++++++++++++++++++++++++ package/zxing/0001-makefile.patch | 30 ------------------------- package/zxing/zxing.mk | 40 ---------------------------------- 6 files changed, 47 insertions(+), 76 deletions(-) rename package/{zxing => zxing-cpp}/Config.in (52%) create mode 100644 package/zxing-cpp/zxing-cpp.mk delete mode 100644 package/zxing/0001-makefile.patch delete mode 100644 package/zxing/zxing.mk diff --git a/Config.in.legacy b/Config.in.legacy index 4afeb83..c6cebcb 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -107,6 +107,14 @@ endif ############################################################################### comment "Legacy options removed in 2015.08" +config BR2_PACKAGE_ZXING + bool "zxing option has been renamed" + select BR2_LEGACY + select BR2_PACKAGE_ZXING_CPP + help + ZXing no longer provides the cpp bindings, it has been renamed to + BR2_PACKAGE_ZXING_CPP which uses a new upstream. + config BR2_PACKAGE_PERF bool "perf option has been renamed" select BR2_LEGACY diff --git a/package/Config.in b/package/Config.in index f029e1d..fb54323 100644 --- a/package/Config.in +++ b/package/Config.in @@ -832,7 +832,7 @@ menu "Graphics" source "package/wayland/Config.in" source "package/webkit/Config.in" source "package/webp/Config.in" - source "package/zxing/Config.in" + source "package/zxing-cpp/Config.in" endmenu menu "Hardware handling" diff --git a/package/zxing/Config.in b/package/zxing-cpp/Config.in similarity index 52% rename from package/zxing/Config.in rename to package/zxing-cpp/Config.in index 1e04635..1695d27 100644 --- a/package/zxing/Config.in +++ b/package/zxing-cpp/Config.in @@ -1,13 +1,13 @@ -comment "zxing needs a toolchain w/ C++" +comment "zxing-cpp needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP -config BR2_PACKAGE_ZXING - bool "zxing" +config BR2_PACKAGE_ZXING_CPP + bool "zxing-cpp" depends on BR2_INSTALL_LIBSTDCPP help - ZXing (pronounced "zebra crossing") is an open-source, + ZXing-cpp (pronounced "zebra crossing") is an open-source, multi-format 1D/2D barcode image processing library implemented in Java, with ports to other languages. This compiles the C++ port. - http://code.google.com/p/zxing/ + https://github.com/glassechidna/zxing-cpp diff --git a/package/zxing-cpp/zxing-cpp.mk b/package/zxing-cpp/zxing-cpp.mk new file mode 100644 index 0000000..36ba0fe --- /dev/null +++ b/package/zxing-cpp/zxing-cpp.mk @@ -0,0 +1,33 @@ +################################################################################ +# +# zxing-cpp +# +################################################################################ + +ZXING_CPP_VERSION = e7594421d240d8a79633a83c7ad3d26b670e038f +ZXING_CPP_SITE = $(call github,glassechidna,zxing-cpp,$(ZXING_CPP_VERSION)) +ZXING_CPP_LICENSE = Apache-2.0 +ZXING_CPP_LICENSE_FILES = COPYING +ZXING_CPP_INSTALL_STAGING = YES +ZXING_CPP_SUPPORTS_IN_SOURCE_BUILD = NO + +ifneq ($(BR2_ENABLE_LOCALE),y) +ifeq ($(BR2_PACKAGE_LIBICONV),y) +ZXING_CPP_DEPENDENCIES += libiconv +endif +endif + +define ZXING_CPP_INSTALL_STAGING_CMDS + for i in $$(find $(@D)/buildroot-build/core/src -iname *.h); do \ + $(INSTALL) -m 644 $$i $(TARGET_DIR)/usr/local/include; \ + done +endef + +define ZXING_CPP_INSTALL_TARGET_CMDS + for i in $$(find $(@D)/buildroot-build/ -iname *.so -o -iname *.a); do \ + $(INSTALL) -m 644 $$i $(TARGET_DIR)/usr/lib; \ + done + $(INSTALL) -m 755 $(@D)/buildroot-build/zxing $(TARGET_DIR)/usr/sbin +endef + +$(eval $(cmake-package)) diff --git a/package/zxing/0001-makefile.patch b/package/zxing/0001-makefile.patch deleted file mode 100644 index 66896bf..0000000 --- a/package/zxing/0001-makefile.patch +++ /dev/null @@ -1,30 +0,0 @@ -[PATCH] add Makefile - -The scons based build system doesn't handle cross compilation, special -compiler flags or (un)installation, so add a simple makefile instead -which does. - -Signed-off-by: Peter Korsgaard ---- - cpp/core/src/Makefile | 14 ++++++++++++++ - 1 file changed, 14 insertions(+) - -Index: zxing-2.0/cpp/core/src/Makefile -=================================================================== ---- /dev/null -+++ zxing-2.0/cpp/core/src/Makefile -@@ -0,0 +1,14 @@ -+override CXXFLAGS += -I. -+SRCS := $(shell find -name '*.cpp') -+ -+libzxing.a: $(SRCS:.cpp=.o) -+ $(AR) $(ARFLAGS) $@ $^ -+ -+install: libzxing.a -+ install -D -m 0644 $^ $(DESTDIR)/usr/lib/$^ -+ find -name '*.h' -exec install -m 0644 -D "{}" \ -+ "$(DESTDIR)/usr/include/{}" ";" -+ -+uninstall: -+ rm -f $(DESTDIR)/usr/lib/libzxing.a -+ rm -rf $(DESTDIR)/usr/include/zxing diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk deleted file mode 100644 index 94e8b1f..0000000 --- a/package/zxing/zxing.mk +++ /dev/null @@ -1,40 +0,0 @@ -################################################################################ -# -# zxing -# -################################################################################ - -ZXING_VERSION = 2.3.0 -ZXING_SITE = http://zxing.googlecode.com/files -ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip -ZXING_LICENSE = Apache-2.0 -ZXING_LICENSE_FILES = COPYING -ZXING_INSTALL_STAGING = YES - -ifneq ($(BR2_ENABLE_LOCALE),y) -ifeq ($(BR2_PACKAGE_LIBICONV),y) -ZXING_DEPENDENCIES += libiconv -else -# There is no locale support in the toolchain and libiconv -# is not available so disable iconv support in zxing -ZING_MAKE_OPTS = CXXFLAGS+="-DNO_ICONV" -endif -endif - -define ZXING_EXTRACT_CMDS - $(UNZIP) -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE) -endef - -define ZXING_BUILD_CMDS - $(MAKE) -C $(@D)/cpp/core/src $(TARGET_CONFIGURE_OPTS) $(ZING_MAKE_OPTS) -endef - -define ZXING_INSTALL_STAGING_CMDS - $(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(STAGING_DIR) install -endef - -define ZXING_INSTALL_TARGET_CMDS - $(MAKE) -C $(@D)/cpp/core/src DESTDIR=$(TARGET_DIR) install -endef - -$(eval $(generic-package))