From b7c6c9c7844914d1d0617a24b9e3a84d691d1f64 Mon Sep 17 00:00:00 2001 From: root Date: Sat, 7 Jul 2012 00:02:03 +0000 Subject: Sat Jul 7 00:02:03 UTC 2012 --- core/libusb-compat/PKGBUILD | 15 ++++++++++----- core/libusb-compat/libusb-0.1-libusbx.patch | 17 +++++++++++++++++ 2 files changed, 27 insertions(+), 5 deletions(-) create mode 100644 core/libusb-compat/libusb-0.1-libusbx.patch (limited to 'core/libusb-compat') diff --git a/core/libusb-compat/PKGBUILD b/core/libusb-compat/PKGBUILD index fcef5d10e..76b8f05a0 100644 --- a/core/libusb-compat/PKGBUILD +++ b/core/libusb-compat/PKGBUILD @@ -1,23 +1,27 @@ -# $Id: PKGBUILD 158829 2012-05-11 22:12:35Z eric $ +# $Id: PKGBUILD 162998 2012-07-05 06:50:21Z tpowa $ # Maintainer: # Contributor: Tobias Powalowski # Contributor: arjan pkgname=libusb-compat pkgver=0.1.4 -pkgrel=1 +pkgrel=2 pkgdesc="Library to enable user space application programs to communicate with USB devices" arch=('i686' 'x86_64') url="http://libusb.sourceforge.net/" license=('LGPL') depends=('libusb' 'sh') options=('!libtool') -source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2") -md5sums=('2ca521fffadd0c28fdf174e6ec73865b') +source=("http://downloads.sourceforge.net/${pkgname%-*}/${pkgname}-${pkgver%.*}/$pkgname-$pkgver/${pkgname}-${pkgver}.tar.bz2" + "libusb-0.1-libusbx.patch") +md5sums=('2ca521fffadd0c28fdf174e6ec73865b' + '1612c3982f307da1332d6db57b16742b') build() { cd "${srcdir}/${pkgname}-${pkgver}" - ./configure --prefix=/usr + # http://libusb.org/ticket/138 can be removed with libusbx 1.0.13 + patch -Np0 -i ../libusb-0.1-libusbx.patch + ./configure --prefix=/usr --disable-static make } @@ -25,3 +29,4 @@ package() { cd "${srcdir}/${pkgname}-${pkgver}" make DESTDIR="${pkgdir}" install } + diff --git a/core/libusb-compat/libusb-0.1-libusbx.patch b/core/libusb-compat/libusb-0.1-libusbx.patch new file mode 100644 index 000000000..61563651b --- /dev/null +++ b/core/libusb-compat/libusb-0.1-libusbx.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/423135 + +--- libusb/core.c ++++ libusb/core.c +@@ -32,12 +32,6 @@ + static libusb_context *ctx = NULL; + static int usb_debug = 0; + +-enum usbi_log_level { +- LOG_LEVEL_DEBUG, +- LOG_LEVEL_INFO, +- LOG_LEVEL_WARNING, +- LOG_LEVEL_ERROR, +-}; + + #ifdef ENABLE_LOGGING + #define _usbi_log(level, fmt...) usbi_log(level, __FUNCTION__, fmt) -- cgit v1.2.3-54-g00ecf