system/splix: Updated for version 2.0.0_76268c4.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 35 insertions, 38 deletions

diff --git a/system/splix/README b/system/splix/README
index 17714ab92e840..d7e672df80f1a 100644
--- a/system/splix/README
+++ b/system/splix/README
@@ -1,18 +1,12 @@
 SpliX is a set of CUPS printer drivers for SPL (Samsung Printer Language)
 printers. It covers several Samsung and Xerox printers. See ppd/*.ppd in
-the tarball for supported models. Only SPL2 and SPLc printers are 
-currently supported; however, work is in progress to implement support 
-for other SPL printers.
+the tarball for supported models. Only SPL2 and SPLc printers are supported.
 
-IMPORTANT NOTICE:
-If you are upgrading your current version, you MUST delete your printer 
-in the CUPS interface and install it again. This operation MUST be done 
-since CUPS caches a copy of the PPD file, so if the PPD changes from one
-version of splix to the next, cups will still have the cached copy.
+JBIG-KIT is an optional dependency. To build SpliX with support for JBIG printers:
+  JBIG=yes ./splix.SlackBuild
 
-IMPORTANT NOTICE ABOUT THE JBIG ALGORITHM:
-JBIG-KIT is an optional dependency for SpliX, but it seems that parts of this
-algorithm was previously or is still patented. To disable the use of JBIG, add
-NO_JBIG=1 when executing the build script: NO_JBIG=1 ./splix.SlackBuild
-Unfortunately, JBIG printers (such as the CLP-600) won't work with SpliX if 
-the JBIG algorithm is disabled.
+IMPORTANT:
+If you are upgrading your current version, you MUST delete your printer
+in the CUPS interface and install it again. This operation MUST be done
+since CUPS caches a copy of the PPD file, so if the PPD changes from one
+version of splix to the next, CUPS will still have the cached copy.
diff --git a/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild
index 6b631c785cdc5..65d2327c2035a 100644
--- a/system/splix/splix.SlackBuild
+++ b/system/splix/splix.SlackBuild
@@ -2,11 +2,12 @@
 
 # Slackware build script for splix
 # Written by Iskar Enev <iskar.enev[@]gmail.com>
-# Currently maintained by Glenn Becker <burningc@sdf.lonestar.org>
+# Currently maintained by endspiel <endspiel@disroot.org>
 
 PRGNAM=splix
-VERSION=${VERSION:-2.0.0}
-BUILD=${BUILD:-2}
+SRCVERSION=${SRCVERSION:-76268c4dd7dbc8218ea7426401104c3b40cc707a}
+VERSION=${VERSION:-2.0.0_${SRCVERSION:0:7}}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -22,6 +23,9 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+[ ${JBIG:-no} = "yes" ] \
+  && JBIGOPT=0 || JBIGOPT=1
+
 CUPSCFLAGS=$(cups-config --cflags)
 CUPSLDFLAGS=$(cups-config --ldflags)
 CUPSLIBS=$(cups-config --libs)
@@ -42,17 +46,17 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Whether or not to use JBIG (see README)
-# 0 - enable JBIG (default), 1 - disable JBIG
-NO_JBIG=${NO_JBIG:-0}
-
 set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+mkdir $PRGNAM-$VERSION
+tar \
+  -C $PRGNAM-$VERSION \
+  --strip-components=2 \
+  -xvf $CWD/$PRGNAM-$SRCVERSION.tar.bz2 $PRGNAM-$SRCVERSION/$PRGNAM
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -61,24 +65,23 @@ 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 {} \;
 
-sed -i "s%\`cups-config --cflags\`%$CUPSCFLAGS%" module.mk
-sed -i "s%\`cups-config --ldflags\`%$CUPSLDFLAGS%" module.mk
-sed -i "s%\`cups-config --libs\`%$CUPSLIBS%" module.mk
-sed -i "s%\`cups-config --serverbin\`%$CUPSSERVERBIN%" module.mk
-sed -i "s%\`cups-config --datadir\`%$CUPSDATADIR%" module.mk
-
-sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp
+sed -e "s%\`cups-config --cflags\`%$CUPSCFLAGS%" \
+    -e "s%\`cups-config --ldflags\`%$CUPSLDFLAGS%" \
+    -e "s%\`cups-config --libs\`%$CUPSLIBS%" \
+    -e "s%\`cups-config --serverbin\`%$CUPSSERVERBIN%" \
+    -e "s%\`cups-config --datadir\`%$CUPSDATADIR%" \
+    -i module.mk
 
 make \
   V=1 \
-  DISABLE_JBIG=$NO_JBIG \
+  DISABLE_JBIG=$JBIGOPT \
   OPTIM_CFLAGS="$SLKCFLAGS" \
   OPTIM_CXXFLAGS="$SLKCFLAGS"
 
 mkdir -p ${PKG}${CUPSSERVERBIN}/filter ${PKG}${CUPSDATADIR}/model
 
 make install \
-  DISABLE_JBIG=$NO_JBIG \
+  DISABLE_JBIG=$JBIGOPT \
   DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
diff --git a/system/splix/splix.info b/system/splix/splix.info
index f3366d562eea1..d81de53ea6a40 100644
--- a/system/splix/splix.info
+++ b/system/splix/splix.info
@@ -1,10 +1,10 @@
 PRGNAM="splix"
-VERSION="2.0.0"
-HOMEPAGE="http://splix.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/splix/splix-2.0.0.tar.bz2"
-MD5SUM="f3aa735c22a926818b3d8b26c9964186"
+VERSION="2.0.0_76268c4"
+HOMEPAGE="https://gitlab.com/ScumCoder/splix"
+DOWNLOAD="https://gitlab.com/ScumCoder/splix/-/archive/76268c4dd7dbc8218ea7426401104c3b40cc707a/splix-76268c4dd7dbc8218ea7426401104c3b40cc707a.tar.bz2"
+MD5SUM="a7ef1c396b221b962c8f2b6838c67cbf"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="jbigkit"
-MAINTAINER="orphaned - no maintainer"
-EMAIL="nobody@nowhere.com"
+REQUIRES=""
+MAINTAINER="endspiel"
+EMAIL="endspiel@disroot.org"