diff options
| author | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2011-12-19 21:00:28 +0100 |
|---|---|---|
| committer | Pawel "l0ner" Soltys <sh4dou@gmail.com> | 2011-12-19 21:00:28 +0100 |
| commit | e3bd66789d0c3afa1d9154af19f4203ada638179 (patch) | |
| tree | 140a231f1706ed1e358da1da8d9ac0d5456bce4e /arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch | |
| parent | a21d6d129f610a4964ab53d18b5a8ba6deb80b72 (diff) | |
| download | tde-packaging-e3bd66789d0c3afa1d9154af19f4203ada638179.tar.gz tde-packaging-e3bd66789d0c3afa1d9154af19f4203ada638179.zip | |
trinity-base/hal - add, trinity-extras/trinity-i18n updates
Diffstat (limited to 'arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch')
| -rw-r--r-- | arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch b/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch new file mode 100644 index 000000000..d4f966dec --- /dev/null +++ b/arch/3.5.13/trinity-base/hal/patches/fix-libusb-detection.patch @@ -0,0 +1,66 @@ +From fce91df8ba7f305c624baf1f06961c040b088ecc Mon Sep 17 00:00:00 2001 +From: Joe Marcus Clarke <marcus@FreeBSD.org> +Date: Tue, 08 Dec 2009 00:05:27 +0000 +Subject: 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 <rw@rlworkman.net> +--- +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]) +-- +cgit v0.8.3-6-g21f6 |