3 files changed, 7 insertions, 59 deletions
diff --git a/source/l/libusb/libusb.SlackBuild b/source/l/libusb/libusb.SlackBuild
index 26bc4b5d0..64b32c3d6 100755
--- a/source/l/libusb/libusb.SlackBuild
+++ b/source/l/libusb/libusb.SlackBuild
@@ -21,10 +21,9 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-VERSION=${VERSION:-1.0.8}	# libusb version
-USBCOMPAT=${USBCOMPAT:-0.1.3}	# libusb-compat version
+VERSION=${VERSION:-1.0.9}	# libusb version
 
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:--j6}
 
@@ -60,11 +59,9 @@ mkdir -p $TMP $PKG
 # First we'll do the main libusb stuff
 cd $TMP
 rm -rf libusb-$VERSION
-tar xvf $CWD/libusb-$VERSION.tar.bz2
+tar xvf $CWD/libusb-$VERSION.tar.xz
 cd libusb-$VERSION
 
-zcat $CWD/libusb.fix.debug.log.level.diff.gz | patch -p1 --verbose || exit 1
-
 chown -R root:root .
 find . \
   \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -101,43 +98,6 @@ if [ -r ChangeLog ]; then
   touch -r ChangeLog $DOCSDIR/ChangeLog
 fi
 
-# Now build the libusb-compat stuff
-cd $TMP
-rm -rf libusb-compat-$USBCOMPAT
-tar xvf $CWD/libusb-compat-$USBCOMPAT.tar.bz2
-cd libusb-compat-$USBCOMPAT
-chown -R root:root .
-find . \
-  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
-  -exec chmod 755 {} \; -o \
-  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-  -exec chmod 644 {} \;
-
-CFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=/usr \
-  --libdir=/usr/lib${LIBDIRSUFFIX} \
-  --mandir=/usr/man \
-  --docdir=/usr/doc/libusb-$VERSION \
-  --disable-static \
-  --build=$ARCH-slackware-linux
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG
-
-mkdir -p $PKG/usr/doc/libusb-$VERSION/libusb-compat-$USBCOMPAT
-cp -a \
-  AUTHORS COPYING INSTALL LICENSE NEWS README \
-  $PKG/usr/doc/libusb-$VERSION/libusb-compat-$USBCOMPAT
-
-# If there's a ChangeLog, installing at least part of the recent history
-# is useful, but don't let it get totally out of control:
-if [ -r ChangeLog ]; then
-  DOCSDIR=$(echo $PKG/usr/doc/libusb-compat-$USBCOMPAT)
-  cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
-  touch -r ChangeLog $DOCSDIR/ChangeLog
-fi
-
 # Now handle the package-wide stuff
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
diff --git a/source/l/libusb/libusb.fix.debug.log.level.diff b/source/l/libusb/libusb.fix.debug.log.level.diff
deleted file mode 100644
index 59af816eb..000000000
--- a/source/l/libusb/libusb.fix.debug.log.level.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- ./libusb/os/linux_usbfs.c.orig	2010-04-22 16:14:46.000000000 -0500
-+++ ./libusb/os/linux_usbfs.c	2011-03-24 18:40:38.000000000 -0500
-@@ -1055,7 +1055,8 @@
- 	hpriv->fd = open(filename, O_RDWR);
- 	if (hpriv->fd < 0) {
- 		if (errno == EACCES) {
--			fprintf(stderr, "libusb couldn't open USB device %s: "
-+                        usbi_err(HANDLE_CTX(handle),
-+			        "libusb couldn't open USB device %s: "
- 				"Permission denied.\n"
- 				"libusb requires write access to USB device nodes.\n",
- 				filename);
diff --git a/source/l/libusb/slack-desc b/source/l/libusb/slack-desc
index e1a8b5dfd..68090cf63 100644
--- a/source/l/libusb/slack-desc
+++ b/source/l/libusb/slack-desc
@@ -9,11 +9,11 @@
 libusb: libusb (USB library)
 libusb:
 libusb: This is libusb, a library which allows userspace application access
-libusb: to USB devices.  It is used to connect to USB devices like scanners.
-libusb: http://libusb.org/wiki/Libusb1.0
+libusb: to USB devices.  It is used to connect to USB devices like scanners
+libusb: and printers.
+libusb:
+libusb: http://libusb.org
 libusb:
-libusb: This package also contains libusb-compat for the "old" libusb users.
-libusb: http://libusb.org/wiki/LibusbCompat0.1
 libusb:
 libusb:
 libusb: