Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=da5f2c8c96f2b392942940df2109f537031b9b4f
commit da5f2c8c96f2b392942940df2109f537031b9b4f Author: bouleetbil <bouleet...@frogdev.info> Date: Sat Jan 23 18:32:34 2010 +0000 hal-0.5.14-4-i686 *fixed libusb *closed #4076 #4078 diff --git a/source/apps/hal/FrugalBuild b/source/apps/hal/FrugalBuild index 124686b..fc66aad 100644 --- a/source/apps/hal/FrugalBuild +++ b/source/apps/hal/FrugalBuild @@ -4,7 +4,7 @@ pkgname=hal pkgver=0.5.14 -pkgrel=3 +pkgrel=4 pkgdesc="Hardware Abstraction Layer" url="http://www.freedesktop.org/wiki/Software/hal"; depends=('dbus-glib>=0.74' 'udev>=132' 'util-linux-ng>=2.15' 'glib2' 'libcap' 'dbus>=1.2.12-4' \ @@ -22,22 +22,21 @@ source=(http://hal.freedesktop.org/releases/$pkgname-$pkgver.tar.gz \ rc.hald \ ntfs-3g.patch \ suspend_hibernate.patch \ - hal-performance_pci.ids_v5.diff) + hal-performance_pci.ids_v5.diff \ + fix_libusbdetection.diff) sha1sums=('95bdc8141b0bce197d0d47f5bec491b08c6e3853' \ '9b5b15a5e36d4b74e8632548f48d865d7e1f7ceb' \ '2273e77c0c3c52aca31294b2b1a829937d0a3c18' \ '2fab4fd75f1359b0838748dfae4d749eb26b64b9' \ - '654235977c83f76433f9737f37b8a18f04136b35') + '654235977c83f76433f9737f37b8a18f04136b35' \ + 'f47dcd1b596605db17ae24942d40f6210cbe6b6d') build() { Fcd Fpatchall rm hal.conf || Fdie - autoconf || return 1 - # hack to avoid automake - Fsed '@VOLUME_ID_CFLAGS@' '@BLKID_CFLAGS@' hald/linux/probing/Makefile.in - Fsed '@VOLUME_ID_LIBS@' '@BLKID_LIBS@' hald/linux/probing/Makefile.in + Fautoreconf Fconf \ --with-pid-file=/var/run/hald.pid \ --with-hal-user=hald \ diff --git a/source/apps/hal/fix_libusbdetection.diff b/source/apps/hal/fix_libusbdetection.diff new file mode 100644 index 0000000..95f0441 --- /dev/null +++ b/source/apps/hal/fix_libusbdetection.diff @@ -0,0 +1,70 @@ +From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001 +From: Joe Marcus Clarke <mar...@freebsd.org> +Date: Mon, 7 Dec 2009 19:05:27 -0500 +Subject: [PATCH 1/6] Fix libusb detection on Linux + +Adjust the FreeBSD libusb20 code so that it does not interfere with the +Linux libusb detection. + +Reported by: Robby Workman <r...@rlworkman.net> +--- + configure.in | 35 ++++++++++++++++++----------------- + 1 files changed, 18 insertions(+), 17 deletions(-) + +diff --git a/configure.in b/configure.in +index a8fda51..8363595 100644 +--- a/configure.in ++++ b/configure.in +@@ -479,9 +479,6 @@ if test "x$with_libpci" != xno ; then + fi + AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"]) + +-USE_LIBUSB20=no +-USE_LIBUSB=no +-LIBUSB20_LIBS="" + AC_ARG_WITH([backend], + AS_HELP_STRING([--with-backend=<name>], + [backend to use (linux/solaris/freebsd/dummy)]), +@@ -510,21 +507,25 @@ AM_CONDITIONAL(HALD_COMPILE_FREEBSD, [test x$HALD_BACKEND = xfreebsd], [Compilin + AM_CONDITIONAL(HALD_COMPILE_SOLARIS, [test x$HALD_BACKEND = xsolaris], [Compiling for Solaris]) + AC_SUBST(HALD_BACKEND) + if test "x$HALD_BACKEND" = "xfreebsd"; then +- AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_LIBUSB20=yes], [USE_LIBUSB20=no]) +-fi +-if test "x$USE_LIBUSB20" = "xno"; then +- AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_LIBUSB=yes], [USE_LIBUSB=no]) +-fi +-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB20" = "xyes"]) +-AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_LIBUSB" = "xyes"]) +-if test "x$USE_LIBUSB20" = "xyes"; then +- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) +- LIBUSB20_LIBS="-lusb20" +-elif test "x$USE_LIBUSB" = "xyes"; then +- AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) +- LIBUSB20_LIBS="-lusb" ++ USE_BSDLIBUSB20=no ++ USE_BSDLIBUSB=no ++ LIBUSB20_LIBS="" ++ AC_CHECK_LIB([usb20], [libusb20_dev_get_info], [USE_BSDLIBUSB20=yes], [USE_BSDLIBUSB20=no]) ++ if test "x$USE_BSDLIBUSB20" = "xno"; then ++ AC_CHECK_LIB([usb], [libusb20_dev_get_info], [USE_BSDLIBUSB=yes], [USE_BSDLIBUSB=no]) ++ fi ++ AM_CONDITIONAL([HAVE_LIBUSB20],[test "x$USE_BSDLIBUSB20" = "xyes" -o "x$USE_BSDLIBUSB" = "xyes"]) ++ if test "x$USE_BSDLIBUSB20" = "xyes"; then ++ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libusb20]) ++ LIBUSB20_LIBS="-lusb20" ++ elif test "x$USE_BSDLIBUSB" = "xyes"; then ++ AC_DEFINE(HAVE_LIBUSB20, 1, [Set if we need libsub20]) ++ LIBUSB20_LIBS="-lusb" ++ fi ++ AC_SUBST(LIBUSB20_LIBS) ++else ++ AM_CONDITIONAL([HAVE_LIBUSB20], [false]) + fi +-AC_SUBST(LIBUSB20_LIBS) + + dnl DBUS API is subject to changes + AC_DEFINE_UNQUOTED(DBUS_API_SUBJECT_TO_CHANGE, [], [DBUS API is subject to change]) +-- +1.6.5.4 + _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
