From patchwork Mon Mar 26 00:15:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frank Hunleth X-Patchwork-Id: 148613 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 2474EB6EF3 for ; Mon, 26 Mar 2012 11:16:30 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 53CF08C710; Mon, 26 Mar 2012 00:16:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kRy3OUoQ36U4; Mon, 26 Mar 2012 00:16:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 637218C55A; Mon, 26 Mar 2012 00:16:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id C375A8F753 for ; Mon, 26 Mar 2012 00:16:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B5D328C55A for ; Mon, 26 Mar 2012 00:16:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5wXsOJQpdRyO for ; Mon, 26 Mar 2012 00:16:21 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qa0-f50.google.com (mail-qa0-f50.google.com [209.85.216.50]) by whitealder.osuosl.org (Postfix) with ESMTPS id 82FAB8BF1C for ; Mon, 26 Mar 2012 00:16:21 +0000 (UTC) Received: by qabg27 with SMTP id g27so2492473qab.16 for ; Sun, 25 Mar 2012 17:16:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=4Iaevds8LcROeWjA5/j1e/efYITVHLXSCWOtWyNITaA=; b=O3nlSr2LW88YAkel8+L7uR54UIByodI6p3YDFWS+WVoRnIYD7XHr3D40Un4en0jlBT deMSBCuKzqWlV+qfdauRsZrXSQWLVtwDasE+9RH4X8r/y6kLsV1fHh7d1VXpUwLSQbDa rn8GdirQjfkBO1oEsI/tdzZ5SaGaRBS4aiuQYgTGAI4q9FtewvQxh0wpBSpp1xp9P7YI vvtBRzVa3/47cRgA8OkHIWptDu+mm+c485vie0IfHFqwxDMd/FW12fA3k0v9YYy+tdrZ 5LHAJUvpyrE1oMc7FSFfIE8uwv3Qc1QPPHwXRYZlwFkBK5sMt2UGVpxdFLasGhOQ/iAE qaWQ== Received: by 10.224.105.79 with SMTP id s15mr25575383qao.35.1332720980021; Sun, 25 Mar 2012 17:16:20 -0700 (PDT) Received: from localhost.localdomain (pool-108-18-193-28.washdc.fios.verizon.net. [108.18.193.28]) by mx.google.com with ESMTPS id ha10sm27117757qab.14.2012.03.25.17.16.18 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 25 Mar 2012 17:16:19 -0700 (PDT) From: Frank Hunleth To: buildroot@busybox.net Date: Sun, 25 Mar 2012 20:15:40 -0400 Message-Id: <1332720940-28373-1-git-send-email-fhunleth@troodon-software.com> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQlgSSJFfblFQK3O/rH4BoWWdv83Qgl9CvyVK2mi7Bne3f29mMbXc9gMxgHndmNvEumnxTDf Subject: [Buildroot] [PATCH v2] New package: zxing X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 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-bounces@busybox.net Signed-off-by: Frank Hunleth --- package/Config.in | 1 + package/zxing/Config.in | 14 +++++++ package/zxing/zxing-2.0-crosscompile-support.patch | 30 +++++++++++++++ package/zxing/zxing.mk | 38 ++++++++++++++++++++ 4 files changed, 83 insertions(+), 0 deletions(-) create mode 100644 package/zxing/Config.in create mode 100644 package/zxing/zxing-2.0-crosscompile-support.patch create mode 100644 package/zxing/zxing.mk diff --git a/package/Config.in b/package/Config.in index b394f18..8bcf519 100644 --- a/package/Config.in +++ b/package/Config.in @@ -322,6 +322,7 @@ source "package/pango/Config.in" source "package/pixman/Config.in" source "package/tiff/Config.in" source "package/webkit/Config.in" +source "package/zxing/Config.in" endmenu menu "Hardware handling" diff --git a/package/zxing/Config.in b/package/zxing/Config.in new file mode 100644 index 0000000..27cdf09 --- /dev/null +++ b/package/zxing/Config.in @@ -0,0 +1,14 @@ +comment "zxing requires a toolchain with C++ support" + depends on !BR2_INSTALL_LIBSTDCPP + +config BR2_PACKAGE_ZXING + bool "zxing" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + help + ZXing (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/ diff --git a/package/zxing/zxing-2.0-crosscompile-support.patch b/package/zxing/zxing-2.0-crosscompile-support.patch new file mode 100644 index 0000000..0e863fb --- /dev/null +++ b/package/zxing/zxing-2.0-crosscompile-support.patch @@ -0,0 +1,30 @@ +From 20826bfedafcdcddd1dc441c71ace9106bb7f3d9 Mon Sep 17 00:00:00 2001 +From: Frank Hunleth +Date: Sun, 18 Mar 2012 19:28:13 -0400 +Subject: [PATCH] SConscript: Add commandline parameter to specify crosscompile toolchain + +Signed-off-by: Frank Hunleth +--- + cpp/SConscript | 6 ++++++ + 1 files changed, 6 insertions(+), 0 deletions(-) + +diff --git a/cpp/SConscript b/cpp/SConscript +index 51c191d..584ae17 100644 +--- a/cpp/SConscript ++++ b/cpp/SConscript +@@ -8,6 +8,12 @@ vars = Variables() + vars.Add(BoolVariable('DEBUG', 'Set to disable optimizations', 1)) + vars.Add(BoolVariable('PIC', 'Set to 1 for to always generate PIC code', 0)) + env = Environment(variables = vars) ++ ++TARGET_CROSS = ARGUMENTS.get('TARGET_CROSS', '') ++env.Replace(CXX = TARGET_CROSS + 'gcc') ++env.Replace(AR = TARGET_CROSS + 'ar') ++env.Replace(RANLIB = TARGET_CROSS + 'ranlib') ++ + # env.Replace(CXX = "clang++") + + debug = env['DEBUG'] +-- +1.7.0.4 + diff --git a/package/zxing/zxing.mk b/package/zxing/zxing.mk new file mode 100644 index 0000000..3a5b635 --- /dev/null +++ b/package/zxing/zxing.mk @@ -0,0 +1,38 @@ +############################################################# +# +# zxing +# +############################################################# +ZXING_VERSION = 2.0 +ZXING_SITE = http://zxing.googlecode.com/files +ZXING_SOURCE = ZXing-$(ZXING_VERSION).zip +ZXING_DEPENDENCIES = host-scons +ZXING_INSTALL_STAGING = YES +ZXING_INSTALL_TARGET = NO + +ifneq ($(BR2_ENABLE_LOCALE),y) +ZXING_DEPENDENCIES += libiconv +endif + +define ZXING_EXTRACT_CMDS + unzip -d $(BUILD_DIR) $(DL_DIR)/$(ZXING_SOURCE) +endef + +define ZXING_BUILD_CMDS + (cd $(@D)/cpp; \ + $(HOST_DIR)/usr/bin/scons TARGET_CROSS=$(TARGET_CROSS) DEBUG=0 lib) +endef + +define ZXING_INSTALL_STAGING_CMDS + (cd $(@D)/cpp/build/core/src; \ + find . -name "*.h" -exec $(INSTALL) -D "{}" "$(STAGING_DIR)/usr/include/{}" ";") + $(INSTALL) -D -m 0644 $(@D)/cpp/build/libzxing.a \ + $(STAGING_DIR)/usr/lib/libzxing.a +endef + +define ZXING_UNINSTALL_STAGING_CMDS + rm -f $(STAGING_DIR)/usr/lib/libzxing.a + rm -fr $(STAGING_DIR)/usr/include/zxing +endef + +$(eval $(call GENTARGETS))