From 4032291dfd991ab3994c15da06524d1e036d0892 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Jan 2016 23:06:32 +0100 Subject: [PATCH 1/4] libaacs: fix build after $PKG_NAME-config changes Signed-off-by: Stephan Raue --- packages/multimedia/libaacs/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/multimedia/libaacs/package.mk b/packages/multimedia/libaacs/package.mk index 321a39ed57..7953002cf7 100644 --- a/packages/multimedia/libaacs/package.mk +++ b/packages/multimedia/libaacs/package.mk @@ -35,6 +35,8 @@ PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ + --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ + --with-libgpg-error-prefix=$SYSROOT_PREFIX/usr \ --with-gnu-ld" post_makeinstall_target() { From 657c54bcf9c3c91a92e0d1522ffd9170f1375971 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Jan 2016 23:53:11 +0100 Subject: [PATCH 2/4] libbdplus: fix build after $PKG_NAME-config changes Signed-off-by: Stephan Raue --- packages/multimedia/libbdplus/package.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/multimedia/libbdplus/package.mk b/packages/multimedia/libbdplus/package.mk index 2b273be434..4111baa268 100644 --- a/packages/multimedia/libbdplus/package.mk +++ b/packages/multimedia/libbdplus/package.mk @@ -35,6 +35,8 @@ PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--disable-werror \ --disable-extra-warnings \ --disable-optimizations \ + --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr \ + --with-gpg-error-prefix=$SYSROOT_PREFIX/usr \ --with-gnu-ld" if [ "$BLURAY_AACS_SUPPORT" = "yes" ]; then From 9147751260167f626ca91b5ad2960ff092f7fa83 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sat, 9 Jan 2016 23:53:32 +0100 Subject: [PATCH 3/4] libmicrohttpd: fix build after $PKG_NAME-config changes Signed-off-by: Stephan Raue --- packages/web/libmicrohttpd/package.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/web/libmicrohttpd/package.mk b/packages/web/libmicrohttpd/package.mk index 4d88c0a37f..0de4ca81c3 100644 --- a/packages/web/libmicrohttpd/package.mk +++ b/packages/web/libmicrohttpd/package.mk @@ -35,7 +35,8 @@ PKG_AUTORECONF="yes" PKG_CONFIGURE_OPTS_TARGET="--disable-shared \ --enable-static \ --disable-curl \ - --disable-https" + --disable-https \ + --with-libgcrypt-prefix=$SYSROOT_PREFIX/usr" post_makeinstall_target() { rm -rf $INSTALL/usr/bin From 28cd331e5f9abeacf7028a933879e1f3e6af9c9c Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 10 Jan 2016 00:17:59 +0100 Subject: [PATCH 4/4] libhid: add patch to use libusb-compat's pkg-config script then libusb-config Signed-off-by: Stephan Raue --- .../libhid/patches/libhid-use_pkgconfig.patch | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch diff --git a/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch b/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch new file mode 100644 index 0000000000..0d38057681 --- /dev/null +++ b/packages/sysutils/libhid/patches/libhid-use_pkgconfig.patch @@ -0,0 +1,14 @@ +diff -Naur libhid-0.2.16/m4/md_check_libusb018b.m4 libhid-0.2.16.patch/m4/md_check_libusb018b.m4 +--- libhid-0.2.16/m4/md_check_libusb018b.m4 2004-05-26 02:37:41.000000000 +0200 ++++ libhid-0.2.16.patch/m4/md_check_libusb018b.m4 2016-01-10 00:07:24.000000000 +0100 +@@ -2,8 +2,8 @@ + [ + AC_CHECK_HEADERS([usb.h]) + +- LIBUSB_CFLAGS="`libusb-config --cflags`" +- LIBUSB_LIBS="`libusb-config --libs`" ++ LIBUSB_CFLAGS="`pkg-config --cflags libusb`" ++ LIBUSB_LIBS="`pkg-config --libs libusb`" + + AC_SUBST(LIBUSB_CFLAGS) + AC_SUBST(LIBUSB_LIBS)