summaryrefslogtreecommitdiff
path: root/core/libusbx/PKGBUILD
diff options
context:
space:
mode:
authorMichał Masłowski <mtjm@mtjm.eu>2013-08-17 12:10:05 +0200
committerMichał Masłowski <mtjm@mtjm.eu>2013-08-17 12:10:05 +0200
commitf5960fe27a2d814eab2ac7efacd714322c18a7b7 (patch)
tree4961d39c9af71f05b5b6ba9f4a23c47963193d37 /core/libusbx/PKGBUILD
parent1d26d40c2055019b7eb001251919aa73baae0029 (diff)
parent74952c750361d72d7b2d14179d4e88b6ce0a0c7e (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/bsdiff/PKGBUILD community/drivel/PKGBUILD community/dvdbackup/PKGBUILD community/gdlmm/PKGBUILD community/gnome-phone-manager/PKGBUILD community/highlight/PKGBUILD community/i3-wm/PKGBUILD community/linux-tools/PKGBUILD community/obconf/PKGBUILD community/perl-class-factory-util/PKGBUILD community/python-mpi4py/PKGBUILD community/qupzilla/PKGBUILD community/subtitleeditor/PKGBUILD community/synce-librapi/PKGBUILD community/synce-libsynce/PKGBUILD community/tilda/PKGBUILD core/glibc/PKGBUILD core/iputils/PKGBUILD extra/alsa-tools/PKGBUILD extra/calligra/PKGBUILD extra/imagemagick/PKGBUILD extra/kobodeluxe/PKGBUILD extra/libburn/PKGBUILD extra/libisoburn/PKGBUILD extra/libisofs/PKGBUILD extra/libsamplerate/PKGBUILD extra/mariadb/PKGBUILD extra/maxima/PKGBUILD extra/nasm/PKGBUILD extra/perl-netaddr-ip/PKGBUILD extra/perl-template-toolkit/PKGBUILD extra/putty/PKGBUILD extra/samba/PKGBUILD extra/tk/PKGBUILD extra/vim/PKGBUILD extra/xorg-xprop/PKGBUILD extra/xorg-xwd/PKGBUILD pcr/ams/PKGBUILD pcr/clalsadrv/PKGBUILD
Diffstat (limited to 'core/libusbx/PKGBUILD')
-rw-r--r--core/libusbx/PKGBUILD18
1 files changed, 14 insertions, 4 deletions
diff --git a/core/libusbx/PKGBUILD b/core/libusbx/PKGBUILD
index 31daad167..8dc78efd1 100644
--- a/core/libusbx/PKGBUILD
+++ b/core/libusbx/PKGBUILD
@@ -1,19 +1,30 @@
-# $Id: PKGBUILD 191277 2013-07-23 09:46:53Z tpowa $
+# $Id: PKGBUILD 192163 2013-08-06 15:03:05Z tpowa $
# Maintainer: Tobias Powalowski <tpowa@archlinux.org>
pkgname=libusbx
pkgver=1.0.16
-pkgrel=1
+pkgrel=2
depends=('glibc' 'systemd')
pkgdesc="Library that provides generic access to USB device"
arch=(i686 x86_64 mips64el)
url="http://libusbx.org"
license=('LGPL')
-source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+source=(http://downloads.sourceforge.net/${pkgname}/releases/${pkgver}/${pkgname}-${pkgver}.tar.bz2
+ 0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
+ 0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch)
options=(!libtool)
replaces=('libusb1' 'libusb')
provides=("libusb=$pkgver")
conflicts=("libusb")
+md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e'
+ 'dad04322621fe7cabd2fe631c6d9929f'
+ '259238c92c92f8b3df5dcad0db8aaf2f')
+prepare() {
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ # fix #36418
+ patch -Np1 -i ../0001-linux-Use-a-separate-lock-to-serialize-start-stop-vs.patch
+ patch -Np1 -i ../0002-hotplug-Remove-use-of-pthread_cancel-from-linux_udev.patch
+}
build() {
cd "${srcdir}/${pkgname}-${pkgver}"
./configure --prefix=/usr --disable-static
@@ -29,4 +40,3 @@ package () {
cd "${srcdir}/${pkgname}-${pkgver}"
make DESTDIR="${pkgdir}" install
}
-md5sums=('7f5715d624cd6c26b30a317eb6c2fe5e')