system/splix: Updated for version 1.1.1

5 files changed, 117 insertions, 37 deletions

diff --git a/system/splix/Makefile-DESTDIR.diff b/system/splix/Makefile-DESTDIR.diff
new file mode 100644
index 0000000000000..c7bc3b98c5dd0
--- /dev/null
+++ b/system/splix/Makefile-DESTDIR.diff
@@ -0,0 +1,54 @@
+# This is an easy patch to add DESTDIR support to the Makefiles in splix
+# Written by Robby Workman - http://rlworkman.net
+# Permission is granted to use the patch as you see fit
+
+diff -Nur splix-1.1.1.orig/ppd/Makefile splix-1.1.1/ppd/Makefile
+--- splix-1.1.0.orig/ppd/Makefile
++++ splix-1.1.0/ppd/Makefile
+@@ -62,25 +62,25 @@
+ 
+ .PHONY: install
+ install:
+-	install -d -m 755 ${CUPSPPD}/samsung
++	install -d -m 755 $(DESTDIR)/${CUPSPPD}/samsung
+ 	for filename in ${SAMSUNG}; do \
+-		install -m 644 $$filename.${DRIVERSEXT} ${CUPSPPD}/samsung;\
++		install -m 644 $$filename.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/samsung;\
+ 		for lang in ${LANGUAGES}; do \
+-			install -m 644 $$filename$$lang.${DRIVERSEXT} ${CUPSPPD}/samsung;\
++			install -m 644 $$filename$$lang.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/samsung;\
+ 		done; \
+ 	done; \
+-	install -d -m 755 ${CUPSPPD}/xerox
++	install -d -m 755 $(DESTDIR)/${CUPSPPD}/xerox
+ 	for filename in ${XEROX}; do \
+-		install -m 644 $$filename.${DRIVERSEXT} ${CUPSPPD}/xerox;\
++		install -m 644 $$filename.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/xerox;\
+ 		for lang in ${LANGUAGES}; do \
+-			install -m 644 $$filename$$lang.${DRIVERSEXT} ${CUPSPPD}/xerox;\
++			install -m 644 $$filename$$lang.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/xerox;\
+ 		done; \
+ 	done; \
+-	install -d -m 755 ${CUPSPPD}/dell
++	install -d -m 755 $(DESTDIR)/${CUPSPPD}/dell
+ 	for filename in ${DELL}; do \
+-		install -m 644 $$filename.${DRIVERSEXT} ${CUPSPPD}/dell;\
++		install -m 644 $$filename.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/dell;\
+ 		for lang in ${LANGUAGES}; do \
+-			install -m 644 $$filename$$lang.${DRIVERSEXT} ${CUPSPPD}/dell;\
++			install -m 644 $$filename$$lang.${DRIVERSEXT} $(DESTDIR)/${CUPSPPD}/dell;\
+ 		done; \
+ 	done;
+ 
+diff -Nur splix-1.1.1.orig/src/Makefile splix-1.1.1/src/Makefile
+--- splix-1.1.1.orig/src/Makefile
++++ splix-1.1.1/src/Makefile
+@@ -30,7 +30,7 @@
+ 	$(CXX) $(CXXFLAGS) -c $<
+ 
+ install: rastertospl2
+-	install -m 755 -s rastertospl2 ${CUPSFILTER}
++	install -m 755 -s rastertospl2 $(DESTDIR)/${CUPSFILTER}
+ 
+ .PHONY: clean distclean
+ clean:
diff --git a/system/splix/README b/system/splix/README
index b4deb26c54acb..5bdd9f945f553 100644
--- a/system/splix/README
+++ b/system/splix/README
@@ -1,6 +1,23 @@
-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 SPL printers.
+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.
 
-Requirements: cupsddk (slackbuild available at slackbuilds.org)
+This requires cupsddk and jbigkit, both of which are available at
+SlackBuilds.org).
+
+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.
+
+
+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.
diff --git a/system/splix/slack-desc b/system/splix/slack-desc
index 23ff556792b6d..b7e4101e4798c 100644
--- a/system/splix/slack-desc
+++ b/system/splix/slack-desc
@@ -5,14 +5,14 @@
 # exactly 11 lines for the formatting to be correct.  It's also customary to
 # leave one space after the ':'.
 
-	  |-----handy-ruler---------------------------------------------------------|
-splix: SpliX
+     |-----handy-ruler------------------------------------------------------|
+splix: SpliX (CUPS printer drivers for SPL)
 splix:
-splix: SpliX is a set of CUPS printer drivers for SPL(Samsung Printer Language) 
-splix: printers. It covers several Samsung and Xerox printers.
+splix: SpliX is a set of CUPS printer drivers for SPL (Samsung Printer 
+splix: Language) printers. It covers several Samsung and Xerox printers.
 splix: 
-splix: Only SPL2 and SPLc printers are currently supported. However work is in 
-splix: progress to implement support for SPL printers.
+splix: Only SPL2 and SPLc printers are currently supported; However, 
+splix: work is in progress to implement support for other SPL printers.
 splix: 
 splix: 
 splix: 
diff --git a/system/splix/splix.SlackBuild b/system/splix/splix.SlackBuild
index b666dc8648429..3bc19027b8931 100644
--- a/system/splix/splix.SlackBuild
+++ b/system/splix/splix.SlackBuild
@@ -1,22 +1,23 @@
 #!/bin/sh
 
 # Slackware build script for splix
-# Written by Iskar Enev iskar.enev@gmail.com
+# Written by Iskar Enev <iskar.enev[@]gmail.com>
 
 PRGNAM=splix
-VERSION=1.0.1-1
-PKGVERSION=1.0.1.1
+VERSION=1.1.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
-CUPSCFLAGS=`cups-config --cflags`
-CUPSLDFLAGS=`cups-config --ldflags`
-CUPSFILTER=`cups-config --serverbin`/filter
-CUPSMODEL=`cups-config --datadir`/model
+
+CUPSCFLAGS=$(cups-config --cflags)
+CUPSLDFLAGS=$(cups-config --ldflags)
+CUPSFILTER=$(cups-config --serverbin)/filter
+CUPSMODEL=$(cups-config --datadir)/model
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -24,37 +25,45 @@ elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
 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 || exit 1
+cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-sed -i "s%CXXFLAGS	:= -O2 \`cups-config --cflags\`%CXXFLAGS	:= $SLKCFLAGS $CUPSCFLAGS%" Makefile ||exit 1
-sed -i "s%LDFLAGS		:= \`cups-config --ldflags\`%LDFLAGS		:= $CUPSLDFLAGS%" Makefile ||exit 1
-sed -i "s%CUPSFILTER	:= \`cups-config --serverbin\`/filter%CUPSFILTER	:= $PKG$CUPSFILTER%" Makefile || exit 1
-sed -i "s%CUPSPPD		:= \`cups-config --datadir\`/model%CUPSPPD		:= $PKG$CUPSMODEL%" Makefile || exit 1
+# Add DESTDIR support to the Makefile
+patch -p1 < $CWD/Makefile-DESTDIR.diff
+
+sed -i "s%CXXFLAGS	:= -O2 \`cups-config --cflags\` %CXXFLAGS	:= $SLKCFLAGS $CUPSCFLAGS%" Makefile
+sed -i "s%LDFLAGS		:= \`cups-config --ldflags\`%LDFLAGS		:= $CUPSLDFLAGS%" Makefile
 
 mkdir -p $PKG$CUPSFILTER
 mkdir -p $PKG$CUPSMODEL
 
-make || exit 1
-make install || exit 1
+make DISABLE_JBIG=$NO_JBIG
+make install DISABLE_JBIG=$NO_JBIG DESTDIR=$PKG
 
 ( cd $PKG
-	find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-	find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS ChangeLog COPYING INSTALL README THANKS TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS ChangeLog COPYING INSTALL README THANKS TODO \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/system/splix/splix.info b/system/splix/splix.info
index 0770f53a1e2d6..6e00691e6dedb 100644
--- a/system/splix/splix.info
+++ b/system/splix/splix.info
@@ -1,8 +1,8 @@
 PRGNAM="splix"
-VERSION="1.0.1-1"
+VERSION="1.1.1"
 HOMEPAGE="http://splix.sourceforge.net/"
-DOWNLOAD="http://dl.sourceforge.net/splix/splix-1.0.1-1.tar.bz2"
-MD5SUM="4773d8a451455b5b3d0cec00434cecf7"
+DOWNLOAD="http://downloads.sourceforge.net/splix/splix-1.1.1.tar.bz2"
+MD5SUM="13af25dd72aae68b39eaf557d62957a5"
 MAINTAINER="Iskar Enev"
-EMAIL="iskar.enev@gmail.com"
-APPROVED="BP{k}"
+EMAIL="<iskar.enev[@]gmail.com>"
+APPROVED="rworkman"