Wed Oct 9 03:18:48 PDT 2013

3 files changed, 125 insertions, 19 deletions

diff --git a/community/splix/PKGBUILD b/community/splix/PKGBUILD
index 9d4f7f6a9..c809681cd 100644
--- a/community/splix/PKGBUILD
+++ b/community/splix/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 65457 2012-02-21 05:54:06Z spupykin $
+# $Id: PKGBUILD 98329 2013-10-08 13:33:57Z heftig $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: Francis Carroll (franciscarroll at gmail dot com)
 
 pkgname=splix
 pkgver=2.0.0
-pkgrel=11
+pkgrel=12
 pkgdesc="CUPS drivers for SPL (Samsung Printer Language) printers"
 arch=('i686' 'x86_64')
 url="http://splix.ap2c.org/"
@@ -13,19 +13,24 @@ license=('GPL')
 depends=('libcups' 'gcc-libs' 'ghostscript>=9.02')
 makedepends=('libcups' 'jbigkit' 'krb5')
 install=splix.install
-source=(http://downloads.sourceforge.net/splix/$pkgname-$pkgver.tar.bz2)
-md5sums=('f3aa735c22a926818b3d8b26c9964186')
+source=(svn://svn.code.sf.net/p/splix/code/splix#revision=315
+        splix-deviceID.patch)
+md5sums=('SKIP'
+         '674b6880dcee844e0e7f50baae0dc09f')
+
+prepare() {
+  cd splix
+  patch -Np1 -i ../splix-deviceID.patch
+}
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  sed -i 's#const PPDFile::Value::Value #const PPDFile::Value #' src/ppdfile.cpp
-  make PSTORASTER=gstoraster
+  cd splix
+  CXXFLAGS+=" -fno-strict-aliasing"
+  make drv
+  make all DRV_ONLY=1
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  install -d "$pkgdir/usr/lib/cups/filter"
-  install -d "$pkgdir/usr/share/cups/model/samsung"
-  make DESTDIR="$pkgdir" install
-  ln -s gstoraster $pkgdir/usr/lib/cups/filter/pstoraster
+  cd splix
+  make DESTDIR="$pkgdir" install DRV_ONLY=1
 }
diff --git a/community/splix/splix-deviceID.patch b/community/splix/splix-deviceID.patch
new file mode 100644
index 000000000..74822473d
--- /dev/null
+++ b/community/splix/splix-deviceID.patch
@@ -0,0 +1,105 @@
+diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
+--- splix/ppd/samsung.drv.in.deviceID	2013-08-26 21:45:31.000000000 +0200
++++ splix/ppd/samsung.drv.in	2013-09-02 13:56:57.002669362 +0200
+@@ -39,6 +39,7 @@ Manufacturer "Samsung"
+             Resolution k 1 0 0 0 "300dpi/300 DPI"
+  
+             ModelName "SCX-4200"
++            Attribute "1284DeviceID" "" "MFG:Samsung;MDL:SCX-4200 Series;CMD:GDI;"
+             PCFileName "scx4200.ppd"
+         } {
+             Resolution k 1 0 0 0 "300dpi/300 DPI"
+@@ -83,6 +84,7 @@ Manufacturer "Samsung"
+                     PCFileName "ml1520.ppd"
+                 } {
+                     ModelName "ML-1610"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-1610;CMD:GDI;"
+                     PCFileName "ml1610.ppd"
+                 } {
+                     ModelName "ML-1710"
+@@ -121,6 +123,7 @@ Manufacturer "Samsung"
+                     Throughput 22
+     		{
+                     	ModelName "ML-2250"
++                        Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2250;"
+     	                PCFileName "ml2250.ppd"
+     		} {
+                     	ModelName "ML-2251"
+@@ -166,6 +169,7 @@ Manufacturer "Samsung"
+                     PCFileName "ml1640.ppd"
+                 } {
+                     ModelName "ML-2010"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2010;CMD:GDI;"
+                     PCFileName "ml2010.ppd"
+                 } {
+                     ModelName "ML-2015"
+@@ -177,6 +181,7 @@ Manufacturer "Samsung"
+                     #import "srtmode.defs"
+     
+                     ModelName "ML-2510"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2510 Series;CMD:GDI;"
+                     PCFileName "ml2510.ppd"
+                 }
+             }
+@@ -193,15 +198,18 @@ Manufacturer "Samsung"
+     
+                 {
+                     ModelName "ML-1660"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-1660 Series;CMD:GDI,FWV,EXT;"
+                     PCFileName "ml1660.ppd"
+                 } {
+                     ModelName "ML-1910"
+                     PCFileName "ml1910.ppd"
+                 } {
+                     ModelName "ML-2525"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2525 Series;CMD:GDI,FWV,EXT;"
+                     PCFileName "ml2525.ppd"
+                 } {
+                     ModelName "ML-2525W"
++                    Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2525W Series;CMD:GDI,FWV,EXT;"
+                     PCFileName "ml2525w.ppd"
+                 }
+             } {
+@@ -465,6 +473,7 @@ Manufacturer "Samsung"
+         Attribute General CMSFile "CLP-310"
+ 
+         ModelName "CLP-310"
++        Attribute "1284DeviceID" "" "MFG:Samsung;MDL:CLP-310 Series;CMD:SPLC,FWV;"
+         PCFileName "clp310.ppd"
+     }{
+         Attribute General CMSFile "CLP-315"
+diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
+--- splix/ppd/xerox.drv.in.deviceID	2013-08-26 17:22:00.000000000 +0200
++++ splix/ppd/xerox.drv.in	2013-09-02 13:55:22.634957854 +0200
+@@ -66,6 +66,7 @@ Manufacturer "Xerox"
+                 } {
+                     #import "manualduplex.defs"
+                     ModelName "Phaser 3120"
++                    Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3120;CMD:GDI;"
+                     PCFileName "ph3120.ppd"
+                 } {
+                     #import "manualduplex.defs"
+@@ -74,6 +75,7 @@ Manufacturer "Xerox"
+                 } {
+                     #import "manualduplex.defs"
+                     ModelName "Phaser 3130"
++                    Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3130;CMD:PCL5E,PCL6;"
+                     PCFileName "ph3130.ppd"
+                 } {
+                     // Multi-tray
+@@ -118,6 +120,7 @@ Manufacturer "Xerox"
+ 
+             {
+                 ModelName "Phaser 3117"
++                Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3117;CMD:GDI;"
+                 PCFileName "ph3117.ppd"
+             } {
+                 Resolution k 1 0 0 0 "1200x600dpi/1200x600 DPI"
+@@ -131,6 +134,7 @@ Manufacturer "Xerox"
+ 
+                 {
+                     ModelName "Phaser 3124"
++                    Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3124;CMD:GDI;"
+                     PCFileName "ph3124.ppd"
+                 }
+             }
diff --git a/community/splix/splix.install b/community/splix/splix.install
index ee1eb78a3..d0b9b2798 100644
--- a/community/splix/splix.install
+++ b/community/splix/splix.install
@@ -3,17 +3,13 @@ post_install() {
 Installation of the color profile for color printers:
 -----------------------------------------------------
 
-	Color printers needs color profile files to get better results. These
+	Color printers need color profile files to get better results. These
 files are provided by your printer manufacturer and you have to install them
-manually. To do that, download the linux official drivers and locate the "cms"
-directory. Install this directory to "/usr/share/cups/model/\$MANUFACTURER/cms".
+manually. To do that, download the official linux drivers and locate the "cms"
+directory. Install the contents to "/usr/share/cups/profiles/\$MANUFACTURER".
 
 	Samsung color profile files are available at:
 		(Then use MANUFACTURER=samsung)
 		http://splix.ap2c.org/samsung_cms.tar.bz2
 EOF
 }
-
-post_upgrade() {
-  post_install
-}