diff --git a/README.md b/README.md index ef7513c..cf73c4c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,4 @@ # splix A driver for SPL printers (Samsung and several Xerox printers). + diff --git a/splix-2.0.0-gcc45.patch b/splix-2.0.0-gcc45.patch deleted file mode 100644 index 7fe8aa7..0000000 --- a/splix-2.0.0-gcc45.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nru splix-2.0.0.orig/src/ppdfile.cpp splix-2.0.0/src/ppdfile.cpp ---- splix-2.0.0.orig/src/ppdfile.cpp 2009-02-06 12:49:10.000000000 +0100 -+++ splix-2.0.0/src/ppdfile.cpp 2011-10-21 00:30:40.652147953 +0200 -@@ -282,7 +282,7 @@ - * Opérateur d'assignation - * Assignment operator - */ --void PPDFile::Value::operator = (const PPDFile::Value::Value &val) -+void PPDFile::Value::operator = (const PPDFile::Value &val) - { - if (_preformatted) - delete[] _preformatted; diff --git a/splix-2.0.1-deviceID.patch b/splix-2.0.1-deviceID.patch new file mode 100644 index 0000000..bb9d495 --- /dev/null +++ b/splix-2.0.1-deviceID.patch @@ -0,0 +1,125 @@ +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 2015-12-29 11:01:10.646489492 +0100 +@@ -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" +@@ -163,9 +166,11 @@ Manufacturer "Samsung" + PCFileName "ml1630.ppd" + } { + ModelName "ML-1640" ++ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-1640 Series;CMD:GDI,FWV;" + PCFileName "ml1640.ppd" + } { + ModelName "ML-2010" ++ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2010;CMD:GDI;" + PCFileName "ml2010.ppd" + } { + ModelName "ML-2015" +@@ -177,6 +182,7 @@ Manufacturer "Samsung" + #import "srtmode.defs" + + ModelName "ML-2510" ++ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2510 Series;CMD:GDI;" + PCFileName "ml2510.ppd" + } + } +@@ -193,15 +199,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" + } + } { +@@ -239,6 +248,7 @@ Manufacturer "Samsung" + Attribute QPDL PacketSize "512" + { + ModelName "ML-2160" ++ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2160 Series;CMD:SPL,FWV,PIC,BDN,EXT;" + PCFileName "ml2160.ppd" + } + } +@@ -465,6 +475,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 2015-12-29 11:03:33.639830777 +0100 +@@ -31,6 +31,7 @@ Manufacturer "Xerox" + Resolution k 1 0 0 0 "300dpi/300 DPI" + + ModelName "WorkCentre 3119" ++ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:WorkCentre 3119 Series;CMD:GDI;" + PCFileName "wc3119.ppd" + } { + Resolution k 1 0 0 0 "300dpi/300 DPI" +@@ -66,6 +67,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 +76,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 +121,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 +135,7 @@ Manufacturer "Xerox" + + { + ModelName "Phaser 3124" ++ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3124;CMD:GDI;" + PCFileName "ph3124.ppd" + } + } diff --git a/splix-2.0.1-ldflags.patch b/splix-2.0.1-ldflags.patch new file mode 100644 index 0000000..a83f65f --- /dev/null +++ b/splix-2.0.1-ldflags.patch @@ -0,0 +1,15 @@ +diff -up splix-2.0.1/module.mk.ldflags splix-2.0.1/module.mk +--- splix-2.0.1/module.mk.ldflags 2024-04-15 13:35:28.509696883 +0200 ++++ splix-2.0.1/module.mk 2024-04-15 13:36:30.921074454 +0200 +@@ -31,9 +31,9 @@ DRV_ONLY ?= 0 + CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include + DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE + OPTIM_CXXFLAGS += -g +-rastertoqpdl_LDFLAGS := `cups-config --ldflags` -L/opt/local/lib ++rastertoqpdl_LDFLAGS := $(LDFLAGS) `cups-config --ldflags` -L/opt/local/lib + rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage +-pstoqpdl_LDFLAGS := `cups-config --ldflags` ++pstoqpdl_LDFLAGS := $(LDFLAGS) `cups-config --ldflags` + pstoqpdl_LIBS := `cups-config --libs` -lcupsimage + + diff --git a/splix-2.0.1-use-pkg-conf.patch b/splix-2.0.1-use-pkg-conf.patch new file mode 100644 index 0000000..3527fc3 --- /dev/null +++ b/splix-2.0.1-use-pkg-conf.patch @@ -0,0 +1,44 @@ +diff --git a/module.mk b/module.mk +index eeda210..002664c 100644 +--- a/module.mk ++++ b/module.mk +@@ -28,13 +28,13 @@ DRV_ONLY ?= 0 + + + # Flags +-CXXFLAGS += `cups-config --cflags` -Iinclude -Wall -I/opt/local/include ++CXXFLAGS += `pkg-config --cflags cups` -Iinclude -Wall -I/opt/local/include + DEBUG_CXXFLAGS += -DDEBUG -DDUMP_CACHE + OPTIM_CXXFLAGS += -g +-rastertoqpdl_LDFLAGS := $(LDFLAGS) `cups-config --ldflags` -L/opt/local/lib +-rastertoqpdl_LIBS := `cups-config --libs` -lcupsimage +-pstoqpdl_LDFLAGS := $(LDFLAGS) `cups-config --ldflags` +-pstoqpdl_LIBS := `cups-config --libs` -lcupsimage ++rastertoqpdl_LDFLAGS := $(LDFLAGS) -L/opt/local/lib ++rastertoqpdl_LIBS := `pkg-config --libs cups` -lcupsimage ++pstoqpdl_LDFLAGS := $(LDFLAGS) ++pstoqpdl_LIBS := `pkg-config --libs cups` -lcupsimage + + + # Update compilation flags with defined options +@@ -56,16 +56,16 @@ endif + + + # Get some information +-CUPSFILTER := `cups-config --serverbin`/filter +-CUPSPPD ?= `cups-config --datadir`/model +-CUPSDRV ?= `cups-config --datadir`/drv ++CUPSFILTER := `pkg-config --variable=cups_serverbin cups`/filter ++CUPSPPD ?= `pkg-config --variable=cups_datadir cups`/model ++CUPSDRV ?= `pkg-config --variable=cups_datadir cups`/drv + ifeq ($(ARCHI),Darwin) + PSTORASTER := pstocupsraster + else + PSTORASTER := pstoraster + endif + GSTORASTER := gstoraster +-CUPSPROFILE := `cups-config --datadir`/profiles ++CUPSPROFILE := `pkg-config --variable=cups_datadir`/profiles + export CUPSFILTER CUPSPPD CUPSDRV + + diff --git a/splix.spec b/splix.spec index 3017ec9..0e0ca0d 100644 --- a/splix.spec +++ b/splix.spec @@ -1,14 +1,16 @@ Name: splix -Version: 2.0.0 -Release: 3mamba +Version: 2.0.1 +Release: 1mamba Summary: A driver for SPL printers (Samsung and several Xerox printers) Group: System/Spooling Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://splix.sourceforge.net/ -Source: http://sourceforge.net/projects/splix/files/splix/%{version}/splix-%{version}.tar.bz2 -Patch0: splix-2.0.0-gcc45.patch +URL: https://sourceforge.net/projects/splix/ +Source: https://github.com/OpenPrinting/splix.git/%{version}/splix-%{version}.tar.bz2 +Patch0: splix-2.0.1-deviceID.patch +Patch1: splix-2.0.1-ldflags.patch +Patch2: splix-2.0.1-use-pkg-conf.patch License: GPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -17,23 +19,35 @@ BuildRequires: libgcc BuildRequires: libjbig-devel BuildRequires: libstdc++6-devel ## AUTOBUILDREQ-END -BuildRequires: libcups-devel +Requires: cups %description A driver for SPL printers (Samsung and several Xerox printers). -#% debug_package +%debug_package %prep %setup -q -%patch 0 -p1 +# remove old PPDs (not sure why some PPDs are outside ppd/) +rm -f *.ppd +pushd ppd +# remove old PPDs +make distclean +popd + +%patch 0 -p1 -b .deviceID +%patch 1 -p1 -b .ldflags +%patch 2 -p1 -b .use-pkg-conf %build -%make -j1 +%make_build drv + +CXXFLAGS="%{optflags} -fno-strict-aliasing" \ +%make_build all V=1 DRV_ONLY=1 LDFLAGS="-pie" %install [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" -%makeinstall +%makeinstall DRV_ONLY=1 %clean [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" @@ -42,13 +56,14 @@ A driver for SPL printers (Samsung and several Xerox printers). %defattr(-,root,root) %{_prefix}/lib/cups/filter/pstoqpdl %{_prefix}/lib/cups/filter/rastertoqpdl -%{_datadir}/cups/model/dell/*.ppd -%{_datadir}/cups/model/samsung/*.ppd -%{_datadir}/cups/model/xerox/*.ppd +%{_datadir}/cups/drv/splix-*.drv %doc AUTHORS COPYING # ChangeLog README THANKS TODO %changelog +* Thu Nov 28 2024 Silvan Calarco 2.0.1-1mamba +- update to 2.0.1 + * Wed Aug 16 2023 Silvan Calarco 2.0.0-3mamba - rebuilt