From c8c8cbe755c8038f80f16704dc600f4d2ed50d09 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 25 Apr 2015 03:25:46 +0200 Subject: [PATCH] splix-svn: added jbigkit dependency --- srcpkgs/splix-svn/patches/crosscompile.patch | 17 +++ .../splix-svn/patches/splix-deviceID.patch | 105 ++++++++++++++++++ srcpkgs/splix-svn/template | 17 ++- 3 files changed, 136 insertions(+), 3 deletions(-) create mode 100644 srcpkgs/splix-svn/patches/crosscompile.patch create mode 100644 srcpkgs/splix-svn/patches/splix-deviceID.patch diff --git a/srcpkgs/splix-svn/patches/crosscompile.patch b/srcpkgs/splix-svn/patches/crosscompile.patch new file mode 100644 index 0000000000..a7652710ef --- /dev/null +++ b/srcpkgs/splix-svn/patches/crosscompile.patch @@ -0,0 +1,17 @@ +--- rules.mk 2015-04-25 03:13:58.762185962 +0200 ++++ rules.mk 2015-04-25 03:40:23.891254518 +0200 +@@ -6,12 +6,12 @@ + + $(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \ ++ $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \ + $(rastertoqpdl_LIBS) + + $(pstoqpdl_TARGET): $(pstoqpdl_OBJ) + $(call printCmd, $(cmd_link)) +- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \ ++ $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \ + $(pstoqpdl_LIBS) + + .PHONY: install installcms diff --git a/srcpkgs/splix-svn/patches/splix-deviceID.patch b/srcpkgs/splix-svn/patches/splix-deviceID.patch new file mode 100644 index 0000000000..fcdae393d5 --- /dev/null +++ b/srcpkgs/splix-svn/patches/splix-deviceID.patch @@ -0,0 +1,105 @@ +diff -up ppd/samsung.drv.in.deviceID ppd/samsung.drv.in +--- ppd/samsung.drv.in.deviceID 2013-08-26 21:45:31.000000000 +0200 ++++ 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 +--- ppd/xerox.drv.in.deviceID 2013-08-26 17:22:00.000000000 +0200 ++++ 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/srcpkgs/splix-svn/template b/srcpkgs/splix-svn/template index 07e89eac0c..afa7865610 100644 --- a/srcpkgs/splix-svn/template +++ b/srcpkgs/splix-svn/template @@ -2,16 +2,27 @@ pkgname=splix-svn _svnrev=315 version=r$_svnrev -revision=1 +revision=2 build_style=gnu-makefile -make_build_args="DISABLE_JBIG=1" hostmakedepends="subversion" -makedepends="cups-devel mit-krb5-devel" +makedepends="cups-devel mit-krb5-devel jbigkit-devel" short_desc="CUPS driver for SPL printers (Samsung and several Xerox printers)" maintainer="Andrea Brancaleoni " license="GPL-2" homepage="http://splix.ap2c.org" +CXXFLAGS=" -fno-strict-aliasing" do_fetch() { svn checkout svn://svn.code.sf.net/p/splix/code/splix@$_svnrev $pkgname-$version } + +do_build() { + make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \ + CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" drv + make CC="$CC" CXX="$CXX" LD="$LD" AR="$AR" RANLIB="$RANLIB" \ + CPP="$CPP" AS="$AS" OBJDUMP="$OBJDUMP" STRIP="true" all DRV_ONLY=1 +} + +do_install() { + make STRIP=true PREFIX=/usr DESTDIR="${DESTDIR}" install DRV_ONLY=1 +}