diff options
| author | Ismael Luceno | 2021-07-07 21:06:11 +0200 |
|---|---|---|
| committer | Ismael Luceno | 2021-07-07 21:06:11 +0200 |
| commit | 3841df9b3d266ca7ec174fa73f7ddef24bb95812 (patch) | |
| tree | 677eab5149304d9c6a71609232f8d9ca743cbbbf | |
| parent | 21a177945539005476818545bf271bb2a95fdedf (diff) | |
libnfc 1.8.0
| -rwxr-xr-x | libs/libnfc/BUILD | 2 | ||||
| -rwxr-xr-x | libs/libnfc/DETAILS | 16 | ||||
| -rw-r--r-- | libs/libnfc/HISTORY | 6 | ||||
| -rwxr-xr-x | libs/libnfc/PRE_BUILD | 5 | ||||
| -rw-r--r-- | libs/libnfc/patches/fix-musl.patch | 12 |
5 files changed, 31 insertions, 10 deletions
diff --git a/libs/libnfc/BUILD b/libs/libnfc/BUILD new file mode 100755 index 0000000000..0d39aba9be --- /dev/null +++ b/libs/libnfc/BUILD @@ -0,0 +1,2 @@ +CFLAGS+=' -Du_int32_t=uint32_t' && +default_build diff --git a/libs/libnfc/DETAILS b/libs/libnfc/DETAILS index c9eadbc727..77074d887f 100755 --- a/libs/libnfc/DETAILS +++ b/libs/libnfc/DETAILS @@ -2,17 +2,17 @@ SPELL=libnfc if [[ "$LIBNFC_BRANCH" == "scm" ]]; then VERSION=$(get_scm_version) - SOURCE=$SPELL-svn.tar.bz2 + SOURCE=$SPELL-git.tar.bz2 FORCE_DOWNLOAD=on -SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-svn - SOURCE_URL[0]=svn_http://libnfc.googlecode.com/svn/trunk:libnfc +SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-git + SOURCE_URL[0]=git://github.com/nfc-tools/$SPELL:$SPELL-git SOURCE_IGNORE=volatile else - VERSION=1.3.3 - SOURCE="${SPELL}-${VERSION}.tar.gz" - SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE} - SOURCE_HASH=sha512:7c6e9a26893d37e43f4e4d90ed21ed3857ed9e7869a169030daf7c90c7b27a428a9e1d8457f4aeb323caab24c7a9d9b59331e70a9b1316694449c81256199206 -SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}" + VERSION=1.8.0 + SOURCE="$SPELL-$VERSION.tar.bz2" + SOURCE_URL[0]=https://github.com/nfc-tools/$SPELL/releases/download/$SPELL-$VERSION/$SOURCE + SOURCE_HASH=sha512:aa8762ecb5b94167d20346f2c81491bb5b634bcedbf2aae3e2efdb301bca89ceb7c2e15148d0934fdc1cce6d77ee0225e28e84893232999fdc09d8a90ae2a7c5 +SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION" fi WEB_SITE="http://www.libnfc.org" LICENSE[0]=GPL diff --git a/libs/libnfc/HISTORY b/libs/libnfc/HISTORY index 36954cc646..ee035c25a2 100644 --- a/libs/libnfc/HISTORY +++ b/libs/libnfc/HISTORY @@ -1,3 +1,8 @@ +2021-07-07 Ismael Luceno <ismael@sourcemage.org> + * BUILD, DETAILS: updated spell to 1.8.0 (stable branch) + * PRE_BUILD, DETAILS: fixed scm branch + * PRE_BUILD, patches/fix-musl.patch: fixed build against musl + 2014-07-03 Ismael Luceno <ismael@sourcemage.org> * DETAILS: Use get_scm_version @@ -6,6 +11,7 @@ 2011-09-29 Ismael Luceno <ismael@sourcemage.org> * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch + 2010-04-25 Florian Franzmann <bwlf@bandrate.org> * PRE_BUILD: use autoreconf instead of autogen.sh diff --git a/libs/libnfc/PRE_BUILD b/libs/libnfc/PRE_BUILD index c9178a158d..c3f11e9487 100755 --- a/libs/libnfc/PRE_BUILD +++ b/libs/libnfc/PRE_BUILD @@ -1,5 +1,6 @@ default_pre_build && -if [[ "$LIBNFC_SVN" == "y" ]]; then - cd ${SOURCE_DIRECTORY} && +cd "$SOURCE_DIRECTORY" && +apply_patch_dir patches && +if [[ "$LIBNFC_BRANCH" == "scm" ]]; then autoreconf -vis fi diff --git a/libs/libnfc/patches/fix-musl.patch b/libs/libnfc/patches/fix-musl.patch new file mode 100644 index 0000000000..6d5858d7ca --- /dev/null +++ b/libs/libnfc/patches/fix-musl.patch @@ -0,0 +1,12 @@ +Origin: Void Linux + +--- a/libnfc/buses/spi.c 2015-09-02 23:53:39.609374047 +0200 ++++ b/libnfc/buses/spi.c 2015-09-02 23:53:44.994373644 +0200 +@@ -51,6 +51,7 @@ + #include <stdio.h> + #include <termios.h> + #include <unistd.h> ++#include <asm/ioctl.h> + + #include <nfc/nfc.h> + #include "nfc-internal.h" |