From c8d2fdbaf244111a7888b206c802970d2602e3f0 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Wed, 6 Jun 2012 22:09:18 +0200 Subject: dev-libs/libnfc: add patch to be able to query bEasyFraming --- dev-libs/libnfc/Manifest | 3 +- dev-libs/libnfc/files/add-get-easy-frameing.patch | 27 +++++++++ dev-libs/libnfc/libnfc-1.6.0_rc1-r1.ebuild | 67 ---------------------- dev-libs/libnfc/libnfc-1.6.0_rc1-r2.ebuild | 68 +++++++++++++++++++++++ 4 files changed, 97 insertions(+), 68 deletions(-) create mode 100644 dev-libs/libnfc/files/add-get-easy-frameing.patch delete mode 100644 dev-libs/libnfc/libnfc-1.6.0_rc1-r1.ebuild create mode 100644 dev-libs/libnfc/libnfc-1.6.0_rc1-r2.ebuild diff --git a/dev-libs/libnfc/Manifest b/dev-libs/libnfc/Manifest index 034b3cd..23e39d0 100644 --- a/dev-libs/libnfc/Manifest +++ b/dev-libs/libnfc/Manifest @@ -1,3 +1,4 @@ +AUX add-get-easy-frameing.patch 1098 RMD160 90b4e421bf2473ef8fe306ed2b177e4b3ac7fc68 SHA1 303084a8a252d39e7e06cd922cbf97d417074dfc SHA256 381eccb61e34c755112348f47db4131dfdf4417e5c2b0d715fe70a0635f5b6e3 AUX openpcd.patch 476 RMD160 4e2c168623001ed35c38a8714b4d305bff33d4b5 SHA1 c8f7cbc353613a4d675ae39d1ef56eb74b78ae43 SHA256 06bbc1fdf6456d2721883fa53e3c0b244e29ffdb88b1e35347c64e4c26264ed3 DIST libnfc-1.6.0-rc1.tar.gz 571772 RMD160 9f04b5f760d45548f4f5eb9474a6eea70a804531 SHA1 bbff76269120c3a531eb96b7ceb96fd36c0071a1 SHA256 f95263c9ba5e3b8fc6e366329241e1d2eaa6d2503475554f0e88dfc81fc5235f -EBUILD libnfc-1.6.0_rc1-r1.ebuild 1390 RMD160 c4f21ba9ecc46a4bfaa7efc8eb210f9bf18e9c65 SHA1 da027384ea5f22dd5982cb7954b09659acfa4605 SHA256 8432e484fc8500a9cddfb26fd88cb76c2e5be778dc473035ba465cd913d31b4f +EBUILD libnfc-1.6.0_rc1-r2.ebuild 1440 RMD160 ce25804784efb32a9fe281afec713eed53992ee6 SHA1 d737669701289b587a313c3e67e7e3b33bba46f1 SHA256 c0f6ff031c06a711940b903d76c76786fbfff4c12e3ce710e7a3efe7f870537f diff --git a/dev-libs/libnfc/files/add-get-easy-frameing.patch b/dev-libs/libnfc/files/add-get-easy-frameing.patch new file mode 100644 index 0000000..5d5bd64 --- /dev/null +++ b/dev-libs/libnfc/files/add-get-easy-frameing.patch @@ -0,0 +1,27 @@ +--- libnfc-1.6.0-rc1/include/nfc/nfc.h 2012-03-01 16:02:42.000000000 +0100 ++++ libnfc-1.6.0-rc1/include/nfc/nfc.h 2012-06-06 22:03:00.340374314 +0200 +@@ -105,6 +103,7 @@ + NFC_EXPORT const char *nfc_device_get_connstring (nfc_device *pnd); + NFC_EXPORT int nfc_device_get_supported_modulation (nfc_device *pnd, const nfc_mode mode, const nfc_modulation_type **const supported_mt); + NFC_EXPORT int nfc_device_get_supported_baud_rate (nfc_device *pnd, const nfc_modulation_type nmt, const nfc_baud_rate **const supported_br); ++ NFC_EXPORT bool nfc_device_get_easy_framing (nfc_device *pnd); + + /* Properties accessors */ + NFC_EXPORT int nfc_device_set_property_int (nfc_device *pnd, const nfc_property property, const int value); + +--- libnfc-1.6.0-rc1/libnfc/nfc.c 2012-03-01 16:02:42.000000000 +0100 ++++ libnfc-1.6.0-rc1/libnfc/nfc.c 2012-06-06 22:03:32.110977125 +0200 +@@ -1017,6 +1017,12 @@ + HAL (get_supported_baud_rate, pnd, nmt, supported_br); + } + ++bool ++nfc_device_get_easy_framing (nfc_device *pnd) ++{ ++ return pnd->bEasyFraming; ++} ++ + /* Misc. functions */ + + /** @ingroup misc + diff --git a/dev-libs/libnfc/libnfc-1.6.0_rc1-r1.ebuild b/dev-libs/libnfc/libnfc-1.6.0_rc1-r1.ebuild deleted file mode 100644 index aef964c..0000000 --- a/dev-libs/libnfc/libnfc-1.6.0_rc1-r1.ebuild +++ /dev/null @@ -1,67 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: $ - -EAPI="2" - -inherit eutils versionator - -DESCRIPTION="Near Field Communications (NFC) library" -HOMEPAGE="http://www.libnfc.org/" - -MY_P="${PN}-$(replace_version_separator 3 "-")" -SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~x86 ~amd64" -IUSE="doc serial-autoprobe" - -IUSE_DRIVERS="acr122 acr122s arygon pn532_uart pn53x_usb" -for drv in $IUSE_DRIVERS; do - IUSE="${IUSE} libnfc_drivers_${drv}" -done - -CDEPEND="sys-apps/pcsc-lite - dev-libs/libusb" -DEPEND="${CDEPEND} - doc? ( app-doc/doxygen )" -RDEPEND="${CDEPEND}" - -src_prepare() { - use libnfc_drivers_pn532_uart && epatch "${FILESDIR}/openpcd.patch" -} - -src_configure() { - driver="" - - local drv - for drv in $IUSE_DRIVERS; do - if use libnfc_drivers_${drv}; then - if [ -z "$driver" ]; then - driver="${drv}" - else - driver="${driver},${drv}" - fi - fi - done - - if [ -z "$driver" ]; then - die "You have to enable at least one driver with the LIBNFC_DRIVERS variable." - fi - - econf \ - --with-drivers="${driver}" \ - $(use_enable serial-autoprobe) -} - -src_compile() { - emake || die "Failed to compile." - use doc && doxygen -} - -src_install() { - emake install DESTDIR="${D}" || die "Failed to install properly." - use doc && dohtml "${S}"/doc/html/* -} diff --git a/dev-libs/libnfc/libnfc-1.6.0_rc1-r2.ebuild b/dev-libs/libnfc/libnfc-1.6.0_rc1-r2.ebuild new file mode 100644 index 0000000..fa60d2e --- /dev/null +++ b/dev-libs/libnfc/libnfc-1.6.0_rc1-r2.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="2" + +inherit eutils versionator + +DESCRIPTION="Near Field Communications (NFC) library" +HOMEPAGE="http://www.libnfc.org/" + +MY_P="${PN}-$(replace_version_separator 3 "-")" +SRC_URI="http://${PN}.googlecode.com/files/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~x86 ~amd64" +IUSE="doc serial-autoprobe" + +IUSE_DRIVERS="acr122 acr122s arygon pn532_uart pn53x_usb" +for drv in $IUSE_DRIVERS; do + IUSE="${IUSE} libnfc_drivers_${drv}" +done + +CDEPEND="sys-apps/pcsc-lite + dev-libs/libusb" +DEPEND="${CDEPEND} + doc? ( app-doc/doxygen )" +RDEPEND="${CDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/add-get-easy-frameing.patch" + use libnfc_drivers_pn532_uart && epatch "${FILESDIR}/openpcd.patch" +} + +src_configure() { + driver="" + + local drv + for drv in $IUSE_DRIVERS; do + if use libnfc_drivers_${drv}; then + if [ -z "$driver" ]; then + driver="${drv}" + else + driver="${driver},${drv}" + fi + fi + done + + if [ -z "$driver" ]; then + die "You have to enable at least one driver with the LIBNFC_DRIVERS variable." + fi + + econf \ + --with-drivers="${driver}" \ + $(use_enable serial-autoprobe) +} + +src_compile() { + emake || die "Failed to compile." + use doc && doxygen +} + +src_install() { + emake install DESTDIR="${D}" || die "Failed to install properly." + use doc && dohtml "${S}"/doc/html/* +} -- cgit v1.2.3