X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id 7A3FFF84E00 for ; Mon, 28 Jan 2019 13:43:27 +0000 (UTC) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id D95264006B for ; Mon, 28 Jan 2019 14:43:25 +0100 (CET) Received: from faultier2go.iks.cs.ovgu.de (newgw.cs.ovgu.de [141.44.25.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id A1E1F40060; Mon, 28 Jan 2019 14:43:25 +0100 (CET) From: Marian Buschsieweke To: alpine-aports@lists.alpinelinux.org Cc: Marian Buschsieweke Subject: [alpine-aports] [PATCH] testing/hidapi: Fixed build Date: Mon, 28 Jan 2019 14:43:23 +0100 Message-Id: <20190128134323.5123-1-marian.buschsieweke@ovgu.de> X-Mailer: git-send-email 2.20.1 X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-PMX-Version: 6.4.6.2792898, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2019.1.28.133617, AntiVirus-Engine: 5.56.1, AntiVirus-Data: 2019.1.28.5561001 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, LEGITIMATE_SIGNS 0, MULTIPLE_REAL_RCPTS 0, URI_WITH_PATH_ONLY 0, __ANY_URI 0, __CC_NAME 0, __CC_NAME_DIFF_FROM_ACC 0, __CC_REAL_NAMES 0, __CP_URI_IN_BODY 0, __CTE 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FROM_DOMAIN_IN_ANY_CC1 0, __FROM_DOMAIN_IN_RCPT 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __INVOICE_MULTILINGUAL 0, __MIME_TEXT_ONLY 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_VERSION 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NO_MAILTO 0, __URI_NO_WWW 0, __URI_NS , __URI_WITH_PATH 0' X-Spam-Score: Gauge= X-PMX-consideredAsSpam: no --- testing/hidapi/APKBUILD | 10 +++++++--- testing/hidapi/libusb_include_path.patch | 12 ++++++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) create mode 100644 testing/hidapi/libusb_include_path.patch diff --git a/testing/hidapi/APKBUILD b/testing/hidapi/APKBUILD index 6397d367b7..370985f7bb 100644 --- a/testing/hidapi/APKBUILD +++ b/testing/hidapi/APKBUILD @@ -14,7 +14,8 @@ options="!check" makedepends="libusb-dev libtool eudev-dev linux-headers autoconf automake" install="" subpackages="$pkgname-dev $pkgname-doc" -source="$pkgname-$pkgver.tar.gz::https://github.com/signal11/$pkgname/archive/$pkgname-${_relver}.tar.gz" +source="$pkgname-$pkgver.tar.gz::https://github.com/signal11/$pkgname/archive/$pkgname-${_relver}.tar.gz + libusb_include_path.patch" builddir="$srcdir/$pkgname-$pkgname-$_relver" prepare() { @@ -25,7 +26,9 @@ prepare() { build() { cd "$builddir" - ./configure \ + # Linker flags generated by automake are broken. It is easier to work + # around by setting LDFLAGS env than messing with automake. + LDFLAGS="$LDFLAGS -lusb-1.0 -ludev" ./configure \ --build=$CBUILD \ --host=$CHOST \ --prefix=/usr \ @@ -44,4 +47,5 @@ package() { "$pkgdir"/usr/share/licenses/$pkgname } -sha512sums="4529d74e715c47d788b533d94bf0ef35fa773240c9a59558d30c5ecc78cf46961de368f9385f5d84d378eaf8d4e941d553341e839674e562ccfcf52726620a65 hidapi-0.8.0_rc1.tar.gz" +sha512sums="4529d74e715c47d788b533d94bf0ef35fa773240c9a59558d30c5ecc78cf46961de368f9385f5d84d378eaf8d4e941d553341e839674e562ccfcf52726620a65 hidapi-0.8.0_rc1.tar.gz +94eabf809049d82585599787768bcfab795e400593f130c98c4fdf0db53629f251e5aaa39a7a469b6ff3d240f5b1edb1b2f099bf6034a6dcfa182dc2dae851a0 libusb_include_path.patch" diff --git a/testing/hidapi/libusb_include_path.patch b/testing/hidapi/libusb_include_path.patch new file mode 100644 index 0000000000..2615d363a8 --- /dev/null +++ b/testing/hidapi/libusb_include_path.patch @@ -0,0 +1,12 @@ +diff -rupN hidapi-hidapi-0.8.0-rc1-old/libusb/hid.c hidapi-hidapi-0.8.0-rc1/libusb/hid.c +--- hidapi-hidapi-0.8.0-rc1-old/libusb/hid.c 2019-01-23 10:46:10.388569561 +0100 ++++ hidapi-hidapi-0.8.0-rc1/libusb/hid.c 2019-01-23 10:47:09.798295989 +0100 +@@ -44,7 +44,7 @@ + #include + + /* GNU / LibUSB */ +-#include "libusb.h" ++#include "libusb-1.0/libusb.h" + #include "iconv.h" + + #include "hidapi.h" -- 2.20.1 --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---