[arch-commits] Commit in libusb-compat/trunk (PKGBUILD libusb-0.1-libusbx.patch)

[Tobias Powalowski]

    Date: Tuesday, July 3, 2012 @ 05:51:55
  Author: tpowa
Revision: 162896

upgpkg: libusb-compat 0.1.4-2

fix compile with libusbx, disable static lib

Added:
  libusb-compat/trunk/libusb-0.1-libusbx.patch
Modified:
  libusb-compat/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   13 +++++++++----
 libusb-0.1-libusbx.patch |   17 +++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-07-03 07:47:59 UTC (rev 162895)
+++ PKGBUILD	2012-07-03 09:51:55 UTC (rev 162896)
@@ -5,19 +5,23 @@
 
 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 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
+

Added: libusb-0.1-libusbx.patch
===================================================================
--- libusb-0.1-libusbx.patch	                        (rev 0)
+++ libusb-0.1-libusbx.patch	2012-07-03 09:51:55 UTC (rev 162896)
@@ -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)