From patchwork Wed Jan 8 13:37:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 308252 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 BA3B82C009C for ; Thu, 9 Jan 2014 00:38:08 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B5E3B82326; Wed, 8 Jan 2014 13:38:06 +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 ZpqdV8trA-jm; Wed, 8 Jan 2014 13:38:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B10BC899AB; Wed, 8 Jan 2014 13:38:05 +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 5CCF31C2807 for ; Wed, 8 Jan 2014 13:38:04 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 55A0F82326 for ; Wed, 8 Jan 2014 13:38:04 +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 iG7cW5ZjKlIb for ; Wed, 8 Jan 2014 13:38:01 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f180.google.com (mail-we0-f180.google.com [74.125.82.180]) by whitealder.osuosl.org (Postfix) with ESMTPS id 26D7C899AB for ; Wed, 8 Jan 2014 13:38:00 +0000 (UTC) Received: by mail-we0-f180.google.com with SMTP id t61so1449899wes.11 for ; Wed, 08 Jan 2014 05:37:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id; bh=0yOpvojYCNcRwbQrZKOO8t3vQamTBw4LdUhykPtUyQU=; b=oAeIs4Gb9JgIFAwMurtfO9zB63MIJD2XtL+wpqKKpfEYQFpyhV9SYeFIy0b2n+3uid wK3ZKvZYlmrqKPbLS2BxX+9iQbGiRsZkQr71O5X+I8uW9XJdKUmXJmTrtclm9dsLVPhJ c9uuN/fS+kCZeYDe5i7aRJ98Kwc+8uHgN4cJMFMw/C94IFaaXAYpj4phNnPN3+4hYf2N N2H/d0tEv5wyvhnR2tFtePQagLncDM5bR9h37ekcWjAFtJFbSxHe4tis7Ik9LESbf/b4 5AIKyNbOiFRzyTtJHwh7MMWo3qv3GUHCjA5tyhjC+s4VhMktjMAQ8fVpPEz+C9FKUy/v 5DLg== X-Received: by 10.194.79.165 with SMTP id k5mr12754734wjx.44.1389188279604; Wed, 08 Jan 2014 05:37:59 -0800 (PST) Received: from localhost.localdomain (host109-150-80-255.range109-150.btcentralplus.com. [109.150.80.255]) by mx.google.com with ESMTPSA id ey3sm8848264wib.4.2014.01.08.05.37.57 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Jan 2014 05:37:58 -0800 (PST) From: spdawson@gmail.com To: buildroot@busybox.net Date: Wed, 8 Jan 2014 13:37:56 +0000 Message-Id: <1389188276-29818-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH] libnfc: bump version 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 From: Simon Dawson Signed-off-by: Simon Dawson --- ...build-systems-make-example-build-optional.patch | 52 ++++++++-------------- package/libnfc/libnfc.mk | 2 +- 2 files changed, 19 insertions(+), 35 deletions(-) diff --git a/package/libnfc/libnfc-build-systems-make-example-build-optional.patch b/package/libnfc/libnfc-build-systems-make-example-build-optional.patch index b0ca220..06577c5 100644 --- a/package/libnfc/libnfc-build-systems-make-example-build-optional.patch +++ b/package/libnfc/libnfc-build-systems-make-example-build-optional.patch @@ -10,28 +10,18 @@ In order to keep the former behavior, example build is enabled by default. Signed-off-by: Samuel Martin -diff --git a/CMakeLists.txt b/CMakeLists.txt -index dd7904d..0e35229 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -27,6 +27,7 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/incl - SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake/modules/") +diff -Nurp a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2013-12-08 18:51:01.000000000 +0000 ++++ b/CMakeLists.txt 2014-01-08 12:51:42.435096403 +0000 +@@ -39,6 +39,7 @@ IF(LIBNFC_ENVVARS) + ADD_DEFINITIONS(-DENVVARS) + ENDIF(LIBNFC_ENVVARS) - # Options +SET(BUILD_EXAMPLES ON CACHE BOOL "Build examples") - SET(LIBNFC_DEBUG_OUTPUT OFF CACHE BOOL "Debug output of communication with the NFC chip") - IF(LIBNFC_DEBUG_OUTPUT) - ADD_DEFINITIONS(-DDEBUG -g3) -@@ -84,7 +85,7 @@ IF(NOT WIN32) - ENDIF(LIBNFC_DRIVER_ACR122) - # CMake lists are separated by a semi colon, replace with colon - STRING(REPLACE ";" "," PKG_CONFIG_REQUIRES "${PKG_REQ}") -- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY) -+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libnfc.pc.in ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libnfc.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) - ENDIF(NOT WIN32) - -@@ -101,7 +102,10 @@ ENDIF(LIBUSB_INCLUDE_DIRS) + SET(LIBNFC_DEBUG_MODE OFF CACHE BOOL "Debug mode") + IF(LIBNFC_DEBUG_MODE) + ADD_DEFINITIONS(-DDEBUG) +@@ -155,7 +156,10 @@ ENDIF(WIN32) ADD_SUBDIRECTORY(libnfc) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(utils) @@ -43,10 +33,9 @@ index dd7904d..0e35229 100644 # Binary Package IF(WIN32) -diff --git a/Makefile.am b/Makefile.am -index 3671cb6..59fd75a 100644 ---- a/Makefile.am -+++ b/Makefile.am +diff -Nurp a/Makefile.am b/Makefile.am +--- a/Makefile.am 2013-12-08 18:51:01.000000000 +0000 ++++ b/Makefile.am 2014-01-08 12:52:12.807018593 +0000 @@ -2,7 +2,13 @@ ACLOCAL_AMFLAGS = -I m4 AM_CFLAGS = $(LIBNFC_CFLAGS) @@ -62,11 +51,10 @@ index 3671cb6..59fd75a 100644 pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libnfc.pc -diff --git a/configure.ac b/configure.ac -index 0a222a8..6988164 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -111,6 +111,14 @@ then +diff -Nurp a/configure.ac b/configure.ac +--- a/configure.ac 2013-12-08 18:51:01.000000000 +0000 ++++ b/configure.ac 2014-01-08 12:53:02.054872564 +0000 +@@ -142,6 +142,14 @@ then fi AM_CONDITIONAL(DOC_ENABLED, [test x"$enable_doc" = xyes]) @@ -81,11 +69,10 @@ index 0a222a8..6988164 100644 # Dependencies PKG_CONFIG_REQUIRES="" -@@ -129,7 +137,11 @@ if test x$ac_cv_with_cutter = xyes -a x$ac_cv_use_cutter = xno; then +@@ -160,7 +168,10 @@ if test x$ac_cv_with_cutter = xyes -a x$ fi AM_CONDITIONAL([WITH_CUTTER], [test "$ac_cv_use_cutter" != "no"]) -+ +if test x"$enable_example" = "xyes" +then AC_CHECK_READLINE @@ -93,6 +80,3 @@ index 0a222a8..6988164 100644 # Help us to write great code ;-) CFLAGS="$CFLAGS -Wall -pedantic -Wextra" --- -1.7.10.3 - diff --git a/package/libnfc/libnfc.mk b/package/libnfc/libnfc.mk index 50bfcd5..a0ea877 100644 --- a/package/libnfc/libnfc.mk +++ b/package/libnfc/libnfc.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBNFC_VERSION = fda8d60ce062409bb32c76a229f02f7502948ce8 +LIBNFC_VERSION = 7b7f5061427b5456835dd48923a8cc0563cfd1e9 LIBNFC_SITE = http://libnfc.googlecode.com/git/ LIBNFC_SITE_METHOD = git LIBNFC_LICENSE = LGPLv3+