From 875eb121539d56507e9156c5024270fe3f3a71a9 Mon Sep 17 00:00:00 2001
From: Andrzej Telszewski
Date: Sun, 15 Jan 2017 23:47:55 +0700
Subject: libraries/libsigrok: Updated for version 0.4.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 libraries/libsigrok/README               | 14 +++++------
 libraries/libsigrok/libsigrok.SlackBuild | 41 +++++---------------------------
 libraries/libsigrok/libsigrok.info       |  8 +++----
 libraries/libsigrok/slack-desc           |  2 +-
 4 files changed, 16 insertions(+), 49 deletions(-)

(limited to 'libraries/libsigrok')

diff --git a/libraries/libsigrok/README b/libraries/libsigrok/README
index 7acfbdd03f..967861e1fd 100644
--- a/libraries/libsigrok/README
+++ b/libraries/libsigrok/README
@@ -1,10 +1,8 @@
 libsigrok is a shared library written in C, which provides the basic
-hardware access drivers for logic analyzers and other supported
-devices, as well as input/output file format support.
+hardware access drivers for logic analyzers and other supported devices,
+as well as input/output file format support.
 
-NOTE:
-Slackware's libusb is too old. Thus, to enable more hardware support,
-build with LIBUSB=yes ./libsigrok.SlackBuild
-
-Optional, but highly recommended dependencies are (available from
-SlackBuilds.org): libftdi, librevisa and libserialport.
+Optional dependencies (available from SlackBuilds.org):
+- libftdi,
+- librevisa,
+- libserialport.
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} \
diff --git a/libraries/libsigrok/libsigrok.info b/libraries/libsigrok/libsigrok.info
index 21d904f11d..dda425dd46 100644
--- a/libraries/libsigrok/libsigrok.info
+++ b/libraries/libsigrok/libsigrok.info
@@ -1,10 +1,8 @@
 PRGNAM="libsigrok"
-VERSION="0.3.0"
+VERSION="0.4.0"
 HOMEPAGE="http://sigrok.org/wiki/Libsigrok"
-DOWNLOAD="http://sigrok.org/download/source/libsigrok/libsigrok-0.3.0.tar.gz \
-          http://downloads.sourceforge.net/libusb/libusb-1.0/libusb-1.0.19/libusb-1.0.19.tar.bz2"
-MD5SUM="6bc9fa9da9b791b8da961003244adeec \
-        f9e2bb5879968467e5ca756cb4e1fa7e"
+DOWNLOAD="http://sigrok.org/download/source/libsigrok/libsigrok-0.4.0.tar.gz"
+MD5SUM="6cd64b94be0b8ce7224de8c823f735aa"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
diff --git a/libraries/libsigrok/slack-desc b/libraries/libsigrok/slack-desc
index e28c4a7ea6..52ec73ae0c 100644
--- a/libraries/libsigrok/slack-desc
+++ b/libraries/libsigrok/slack-desc
@@ -12,8 +12,8 @@ libsigrok: libsigrok is a shared library written in C, which provides
 libsigrok: the basic hardware access drivers for logic analyzers and other
 libsigrok: supported devices, as well as input/output file format support.
 libsigrok:
+libsigrok: Homepage: http://sigrok.org/wiki/Libsigrok
 libsigrok:
 libsigrok:
 libsigrok:
-libsigrok: Homepage: http://sigrok.org/wiki/Libsigrok
 libsigrok:
-- 
cgit v1.2.3