[arch-commits] Commit in libusb-compat/repos (8 files)
Tobias Powalowski
tpowa at archlinux.org
Thu Jul 5 06:50:21 UTC 2012
Date: Thursday, July 5, 2012 @ 02:50:21
Author: tpowa
Revision: 162998
db-move: moved libusb-compat from [testing] to [core] ( i686, x86_64)
Added:
libusb-compat/repos/core-i686/PKGBUILD
(from rev 162997, libusb-compat/repos/testing-i686/PKGBUILD)
libusb-compat/repos/core-i686/libusb-0.1-libusbx.patch
(from rev 162997, libusb-compat/repos/testing-i686/libusb-0.1-libusbx.patch)
libusb-compat/repos/core-x86_64/PKGBUILD
(from rev 162997, libusb-compat/repos/testing-x86_64/PKGBUILD)
libusb-compat/repos/core-x86_64/libusb-0.1-libusbx.patch
(from rev 162997, libusb-compat/repos/testing-x86_64/libusb-0.1-libusbx.patch)
Deleted:
libusb-compat/repos/core-i686/PKGBUILD
libusb-compat/repos/core-x86_64/PKGBUILD
libusb-compat/repos/testing-i686/
libusb-compat/repos/testing-x86_64/
--------------------------------------+
core-i686/PKGBUILD | 59 +++++++++++++++++----------------
core-i686/libusb-0.1-libusbx.patch | 17 +++++++++
core-x86_64/PKGBUILD | 59 +++++++++++++++++----------------
core-x86_64/libusb-0.1-libusbx.patch | 17 +++++++++
4 files changed, 98 insertions(+), 54 deletions(-)
Deleted: core-i686/PKGBUILD
===================================================================
--- core-i686/PKGBUILD 2012-07-05 06:49:53 UTC (rev 162997)
+++ core-i686/PKGBUILD 2012-07-05 06:50:21 UTC (rev 162998)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: arjan <arjan at archlinux.org>
-
-pkgname=libusb-compat
-pkgver=0.1.4
-pkgrel=1
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: libusb-compat/repos/core-i686/PKGBUILD (from rev 162997, libusb-compat/repos/testing-i686/PKGBUILD)
===================================================================
--- core-i686/PKGBUILD (rev 0)
+++ core-i686/PKGBUILD 2012-07-05 06:50:21 UTC (rev 162998)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer:
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: arjan <arjan at archlinux.org>
+
+pkgname=libusb-compat
+pkgver=0.1.4
+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"
+ "libusb-0.1-libusbx.patch")
+md5sums=('2ca521fffadd0c28fdf174e6ec73865b'
+ '1612c3982f307da1332d6db57b16742b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
Copied: libusb-compat/repos/core-i686/libusb-0.1-libusbx.patch (from rev 162997, libusb-compat/repos/testing-i686/libusb-0.1-libusbx.patch)
===================================================================
--- core-i686/libusb-0.1-libusbx.patch (rev 0)
+++ core-i686/libusb-0.1-libusbx.patch 2012-07-05 06:50:21 UTC (rev 162998)
@@ -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)
Deleted: core-x86_64/PKGBUILD
===================================================================
--- core-x86_64/PKGBUILD 2012-07-05 06:49:53 UTC (rev 162997)
+++ core-x86_64/PKGBUILD 2012-07-05 06:50:21 UTC (rev 162998)
@@ -1,27 +0,0 @@
-# $Id$
-# Maintainer:
-# Contributor: Tobias Powalowski <tpowa at archlinux.org>
-# Contributor: arjan <arjan at archlinux.org>
-
-pkgname=libusb-compat
-pkgver=0.1.4
-pkgrel=1
-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')
-
-build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- make DESTDIR="${pkgdir}" install
-}
Copied: libusb-compat/repos/core-x86_64/PKGBUILD (from rev 162997, libusb-compat/repos/testing-x86_64/PKGBUILD)
===================================================================
--- core-x86_64/PKGBUILD (rev 0)
+++ core-x86_64/PKGBUILD 2012-07-05 06:50:21 UTC (rev 162998)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer:
+# Contributor: Tobias Powalowski <tpowa at archlinux.org>
+# Contributor: arjan <arjan at archlinux.org>
+
+pkgname=libusb-compat
+pkgver=0.1.4
+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"
+ "libusb-0.1-libusbx.patch")
+md5sums=('2ca521fffadd0c28fdf174e6ec73865b'
+ '1612c3982f307da1332d6db57b16742b')
+
+build() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # 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
+}
+
+package() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
+
Copied: libusb-compat/repos/core-x86_64/libusb-0.1-libusbx.patch (from rev 162997, libusb-compat/repos/testing-x86_64/libusb-0.1-libusbx.patch)
===================================================================
--- core-x86_64/libusb-0.1-libusbx.patch (rev 0)
+++ core-x86_64/libusb-0.1-libusbx.patch 2012-07-05 06:50:21 UTC (rev 162998)
@@ -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)
More information about the arch-commits
mailing list