diff --git a/hardware/printer/splix/actions.py b/hardware/printer/splix/actions.py
index e4710be8f2..30835c5888 100755
--- a/hardware/printer/splix/actions.py
+++ b/hardware/printer/splix/actions.py
@@ -9,7 +9,7 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
from pisi.actionsapi import get
-WorkDir = "splix"
+# WorkDir = "splix"
def build():
shelltools.export("OS_CFLAGS", get.CFLAGS())
@@ -19,12 +19,15 @@ def build():
shelltools.makedirs("ppd")
autotools.make("-C ppd")
- autotools.make("V=1")
+ autotools.make("drv")
+
+ autotools.make("all DRV_ONLY=1")
def install():
- autotools.install("DESTDIR=%s CUPSPPD=/usr/share/cups/model/splix" % get.installDIR())
+ autotools.install("DESTDIR=%s DRV_ONLY=1" % get.installDIR())
+ autotools.install("DESTDIR=%s -C ppd CUPSPPD=/usr/share/cups/model/splix" % get.installDIR())
# Install color profiles
- pisitools.insinto("/usr/share/cups/model/samsung/cms", "cms/*")
+ # pisitools.insinto("/usr/share/cups/model/samsung/cms", "cms/*")
- pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README", "THANKS", "TODO")
+ pisitools.dodoc("AUTHORS", "ChangeLog", "COPYING", "README*", "THANKS", "TODO")
diff --git a/hardware/printer/splix/files/splix-deviceID.patch b/hardware/printer/splix/files/splix-deviceID.patch
index a0d2240a7c..bb9d49594c 100644
--- a/hardware/printer/splix/files/splix-deviceID.patch
+++ b/hardware/printer/splix/files/splix-deviceID.patch
@@ -1,6 +1,6 @@
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
++++ 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"
@@ -21,11 +21,15 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
Throughput 22
{
ModelName "ML-2250"
-+ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2250;"
++ Attribute "1284DeviceID" "" "MFG:Samsung;MDL:ML-2250;"
PCFileName "ml2250.ppd"
} {
ModelName "ML-2251"
-@@ -166,6 +169,7 @@ Manufacturer "Samsung"
+@@ -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"
@@ -33,7 +37,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml2010.ppd"
} {
ModelName "ML-2015"
-@@ -177,6 +181,7 @@ Manufacturer "Samsung"
+@@ -177,6 +182,7 @@ Manufacturer "Samsung"
#import "srtmode.defs"
ModelName "ML-2510"
@@ -41,7 +45,7 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml2510.ppd"
}
}
-@@ -193,15 +198,18 @@ Manufacturer "Samsung"
+@@ -193,15 +199,18 @@ Manufacturer "Samsung"
{
ModelName "ML-1660"
@@ -60,7 +64,15 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
PCFileName "ml2525w.ppd"
}
} {
-@@ -465,6 +473,7 @@ Manufacturer "Samsung"
+@@ -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"
@@ -70,8 +82,16 @@ diff -up splix/ppd/samsung.drv.in.deviceID splix/ppd/samsung.drv.in
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"
++++ 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"
@@ -79,7 +99,7 @@ diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
PCFileName "ph3120.ppd"
} {
#import "manualduplex.defs"
-@@ -74,6 +75,7 @@ Manufacturer "Xerox"
+@@ -74,6 +76,7 @@ Manufacturer "Xerox"
} {
#import "manualduplex.defs"
ModelName "Phaser 3130"
@@ -87,7 +107,7 @@ diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
PCFileName "ph3130.ppd"
} {
// Multi-tray
-@@ -118,6 +120,7 @@ Manufacturer "Xerox"
+@@ -118,6 +121,7 @@ Manufacturer "Xerox"
{
ModelName "Phaser 3117"
@@ -95,11 +115,11 @@ diff -up splix/ppd/xerox.drv.in.deviceID splix/ppd/xerox.drv.in
PCFileName "ph3117.ppd"
} {
Resolution k 1 0 0 0 "1200x600dpi/1200x600 DPI"
-@@ -131,6 +134,7 @@ Manufacturer "Xerox"
+@@ -131,6 +135,7 @@ Manufacturer "Xerox"
{
ModelName "Phaser 3124"
+ Attribute "1284DeviceID" "" "MFG:Xerox;MDL:Phaser 3124;CMD:GDI;"
PCFileName "ph3124.ppd"
}
- }
\ No newline at end of file
+ }
diff --git a/hardware/printer/splix/files/splix-ldflags.patch b/hardware/printer/splix/files/splix-ldflags.patch
index 77e2c7ee0a..fa83af8fd6 100644
--- a/hardware/printer/splix/files/splix-ldflags.patch
+++ b/hardware/printer/splix/files/splix-ldflags.patch
@@ -5,14 +5,14 @@ diff -up splix/rules.mk.ldflags splix/rules.mk
$(rastertoqpdl_TARGET): $(rastertoqpdl_OBJ)
$(call printCmd, $(cmd_link))
-- $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
-+ $(Q)g++ -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \
+- $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) \
++ $(Q)$(CXX) -o $@ $^ $(rastertoqpdl_CXXFLAGS) $(rastertoqpdl_LDFLAGS) $(LDFLAGS) \
$(rastertoqpdl_LIBS)
$(pstoqpdl_TARGET): $(pstoqpdl_OBJ)
$(call printCmd, $(cmd_link))
-- $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
-+ $(Q)g++ -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \
+- $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) \
++ $(Q)$(CXX) -o $@ $^ $(pstoqpdl_CXXFLAGS) $(pstoqpdl_LDFLAGS) $(LDFLAGS) \
$(pstoqpdl_LIBS)
- .PHONY: install installcms
\ No newline at end of file
+ .PHONY: install installcms
diff --git a/hardware/printer/splix/pspec.xml b/hardware/printer/splix/pspec.xml
index e49a1a6f01..b037c628fd 100755
--- a/hardware/printer/splix/pspec.xml
+++ b/hardware/printer/splix/pspec.xml
@@ -13,8 +13,8 @@
app:console
A set of CUPS printer drivers for SPL (Samsung Printer Language) printers
The Splix drivers are usable by all printer devices which understand the SPL II language. It covers several Samsung, Xerox, Dell and Ricoh printers.
- https://sourceforge.net/projects/pisilinux/files/source/splix-2.0.1.tar.gz
- http://splix.ap2c.org/samsung_cms.tar.bz2
+ https://github.com/OpenPrinting/splix/releases/download/2.0.1/splix-2.0.1.tar.xz
+
cups-devel
jbigkit-devel
@@ -43,6 +43,13 @@
+
+ 2024-06-10
+ 2.0.1
+ Rebuild
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2022-05-28
2.0.1