1 files changed, 6 insertions, 35 deletions
diff --git a/libraries/libsigrok/libsigrok.SlackBuild b/libraries/libsigrok/libsigrok.SlackBuild
index 05c34518bb..95abcfa494 100644
--- a/libraries/libsigrok/libsigrok.SlackBuild
+++ b/libraries/libsigrok/libsigrok.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libsigrok
 
-# Copyright 2015 Andrzej Telszewski, Sabadell
+# Copyright 2017 Andrzej Telszewski, Banie
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,16 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=libsigrok
-VERSION=${VERSION:-0.3.0}
+VERSION=${VERSION:-0.4.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-LIBUSB_VERSION=${LIBUSB_VERSION:-1.0.19}
-LIBUSB=${LIBUSB:-no}
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,34 +69,8 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Build libusb statically (based on qemu.SlackBuild).
-if [ "$LIBUSB" = "yes" ]; then
-  tar xvf $CWD/libusb-$LIBUSB_VERSION.tar.bz2
-  cd libusb-$LIBUSB_VERSION
-  CFLAGS="$SLKCFLAGS" \
-  ./configure \
-    --prefix=$TMP/$PRGNAM-$VERSION/libusb-static \
-    --libdir=$TMP/$PRGNAM-$VERSION/libusb-static/lib \
-    --build=$ARCH-slackware-linux \
-    --disable-shared \
-    --enable-static
-  make
-  make install
-  cd ..
-
-  LIBUSB_PKG_CONFIG_PATH="$TMP/$PRGNAM-$VERSION/libusb-static/lib/pkgconfig:"
-fi
-
-# Check for librevisa >= 0.0.20130412 - the latest official release:
-# http://comments.gmane.org/gmane.comp.debugging.sigrok.devel/1415
-patch -p0 < $CWD/01-depend-on-librevisa-20130412.patch
-
-aclocal
-automake
-autoconf
-
-PKG_CONFIG_PATH="${LIBUSB_PKG_CONFIG_PATH}${PKG_CONFIG_PATH}" \
 CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \