PKGBUILD: actually do precompile *.ppds, fix Makefiles for consistent usage of CFLAGS/LDFLAGS.

3 files changed, 148 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed8b546901df..5ed71af1d0e6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Mon Oct  3 21:14:32 UTC 2016
+# Tue Oct  4 06:19:28 UTC 2016
 pkgbase = foo2zjs
 	pkgdesc = foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers.
 	pkgver = 20160902
-	pkgrel = 2
+	pkgrel = 3
 	url = http://foo2zjs.rkkda.com/
 	install = foo2zjs.install
 	arch = i686
@@ -27,6 +27,7 @@ pkgbase = foo2zjs
 	source = udev-firmware-loading-ruleset-20130601-1.patch
 	source = skip-foomatic-db-20161003-1.patch
 	source = make-ppd-20161003-2.patch
+	source = compile-flags-20161004-1.patch
 	sha256sums = 0e04ecf67c38538dd463a1b635d43339dbdbe018af96fe6d2828668852d5c6e7
 	sha256sums = 6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a
 	sha256sums = 2a104b8f93d8cb4bd0a10156043f9cf47eddaa728f6317d235bc6d9843312f05
@@ -34,6 +35,7 @@ pkgbase = foo2zjs
 	sha256sums = 32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d
 	sha256sums = ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801
 	sha256sums = bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407
+	sha256sums = 37bd36ce5712e1e007c78200f0bb8681eaf4236646d8221018bc71dad08caae3
 
 pkgname = foo2zjs
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c28b06a52b2..59f6b51bb085 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=foo2zjs
 pkgver=20160902
-pkgrel=2
+pkgrel=3
 pkgdesc="foo2zjs Printer Drivers. Includes also foo2hp, foo2hbpl, foo2oak, foo2xqx, foo2qpdl, foo2slx, foo2hiperc and foo2lava drivers."
 url="http://foo2zjs.rkkda.com/"
 license=('GPL' 'custom')
@@ -22,7 +22,8 @@ source=('http://foo2zjs.rkkda.com/foo2zjs.tar.gz'
         'firmware-loader-20130602-1.patch'
         'udev-firmware-loading-ruleset-20130601-1.patch'
         'skip-foomatic-db-20161003-1.patch'
-        'make-ppd-20161003-2.patch')
+        'make-ppd-20161003-2.patch'
+        'compile-flags-20161004-1.patch')
 
 sha256sums=('0e04ecf67c38538dd463a1b635d43339dbdbe018af96fe6d2828668852d5c6e7'
             '6fe2abe505305c627e35123ffdf80279b0e6e065b34a1967674fe56f09380f6a'
@@ -30,7 +31,8 @@ sha256sums=('0e04ecf67c38538dd463a1b635d43339dbdbe018af96fe6d2828668852d5c6e7'
             '5fe072326173d5008741ffed2e122053f821eabc0d3369ef64a2e346e4e327d1'
             '32c2ccf07eb0be50f2d27e976de6383795ff1755f72965e47c238825621c459d'
             'ade69e3dc9d1081879be9c5bd41202ca43e48a3cc6bf123254d7ea84d8f4e801'
-            'bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407')
+            'bc7a75a0e827bb47cb9a1c86cef2b55746c865a5682803d4b36d00bc6f8b1407'
+            '37bd36ce5712e1e007c78200f0bb8681eaf4236646d8221018bc71dad08caae3')
 
 prepare() {
   cd "${pkgname}"
@@ -48,7 +50,7 @@ prepare() {
 build() {
   cd "${pkgname}"
 
-  make
+  make all ppd
 }
 
 package() {
diff --git a/compile-flags-20161004-1.patch b/compile-flags-20161004-1.patch
new file mode 100644
index 000000000000..04385a969e10
--- /dev/null
+++ b/compile-flags-20161004-1.patch
@@ -0,0 +1,138 @@
+--- a/Makefile	2016-10-04 01:03:09.395540994 +0300
++++ b/Makefile	2016-10-04 01:04:17.631046575 +0300
+@@ -455,33 +455,15 @@
+ 	@echo "yourself."
+ 
+ 
+-foo2zjs: foo2zjs.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2zjs.o $(LIBJBG)
+-
+-foo2hp: foo2hp.o $(LIBJBG)
+-	# $(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG) /usr/local/lib/libdmalloc.a
+-	$(CC) $(CFLAGS) -o $@ foo2hp.o $(LIBJBG)
+-
+-foo2xqx: foo2xqx.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2xqx.o $(LIBJBG)
+-
+-foo2lava: foo2lava.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2lava.o $(LIBJBG)
+-
+-foo2qpdl: foo2qpdl.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2qpdl.o $(LIBJBG)
+-
+-foo2oak: foo2oak.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2oak.o $(LIBJBG)
+-
+-foo2slx: foo2slx.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2slx.o $(LIBJBG)
+-
+-foo2hiperc: foo2hiperc.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2hiperc.o $(LIBJBG)
+-
+-foo2hbpl2: foo2hbpl2.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -o $@ foo2hbpl2.o $(LIBJBG)
++foo2zjs: $(LIBJBG)
++foo2hp: $(LIBJBG)
++foo2xqx: $(LIBJBG)
++foo2lava: $(LIBJBG)
++foo2qpdl: $(LIBJBG)
++foo2oak: $(LIBJBG)
++foo2slx: $(LIBJBG)
++foo2hiperc: $(LIBJBG)
++foo2hbpl2: $(LIBJBG)
+ 
+ foo2zjs-loadfw: foo2zjs-loadfw.in Makefile
+ 	[ ! -f $@ ] || chmod +w $@
+@@ -558,49 +540,21 @@
+ 	chmod 555 $@
+ 
+ all-icc2ps:
+-	cd icc2ps; $(MAKE) all
+-
+-ok: ok.o $(LIBJBG)
+-	$(CC) $(CFLAGS) ok.o $(LIBJBG) -o $@
+-
+-gipddecode: gipddecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) gipddecode.o $(LIBJBG) -o $@
+-
+-hbpldecode: hbpldecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) hbpldecode.o $(LIBJBG) -o $@
+-
+-hipercdecode: hipercdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) hipercdecode.o $(LIBJBG) -o $@
+-
+-lavadecode: lavadecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) lavadecode.o $(LIBJBG) -o $@
+-
+-oakdecode: oakdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -g oakdecode.o $(LIBJBG) -o $@
+-
+-opldecode: opldecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) -g opldecode.o $(LIBJBG) -o $@
+-
+-qpdldecode: qpdldecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) qpdldecode.o $(LIBJBG) -o $@
+-
+-splcdecode: splcdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) splcdecode.o $(LIBJBG) -lz -o $@
+-
+-slxdecode: slxdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) slxdecode.o $(LIBJBG) -o $@
+-
+-xqxdecode: xqxdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) xqxdecode.o $(LIBJBG) -o $@
+-
+-zjsdecode: zjsdecode.o $(LIBJBG)
+-	$(CC) $(CFLAGS) zjsdecode.o $(LIBJBG) -o $@
+-
+-command2foo2lava-pjl: command2foo2lava-pjl.o
+-	$(CC) $(CFLAGS) -L/usr/local/lib command2foo2lava-pjl.o -lcups -o $@
++	$(MAKE) -C icc2ps all
+ 
+-command2foo2lava-pjl.o: command2foo2lava-pjl.c
+-	$(CC) $(CFLAGS) -I/usr/local/include -c command2foo2lava-pjl.c
++ok: $(LIBJBG)
++gipddecode: $(LIBJBG)
++hbpldecode: $(LIBJBG)
++hipercdecode: $(LIBJBG)
++lavadecode: $(LIBJBG)
++oakdecode: $(LIBJBG)
++opldecode: $(LIBJBG)
++qpdldecode: $(LIBJBG)
++splcdecode: $(LIBJBG)
++slxdecode: $(LIBJBG)
++xqxdecode: $(LIBJBG)
++zjsdecode: $(LIBJBG)
++command2foo2lava-pjl: LDLIBS += -lcups
+ 
+ #
+ # Installation rules
+--- a/icc2ps/Makefile	2016-03-14 00:01:59.000000000 +0300
++++ b/icc2ps/Makefile	2016-10-04 01:04:26.580995863 +0300
+@@ -9,19 +9,20 @@
+ LIB=	cmscam97.c cmscnvrt.c cmserr.c cmsgamma.c cmsgmt.c cmsintrp.c cmsio1.c \
+ 	cmslut.c cmsmatsh.c cmsmtrx.c cmsnamed.c cmspack.c cmspcs.c cmsps2.c \
+ 	cmssamp.c cmswtpnt.c cmsxform.c cmsio0.c cmsvirt.c
+-CFLAGS=	-O3
+-INSTALL=install
++CFLAGS += -O3
++LDLIBS += -lm
++INSTALL ?= install
+ ifeq ($(UNAME),SunOS)
+-    INSTALL=/usr/ucb/install
+-    CC=gcc
++    INSTALL ?= /usr/ucb/install
++    CC ?= gcc
+ endif
+ 
+ .SUFFIXES: .1 .1in
+ 
+ all: foo2zjs-icc2ps man
+ 
+-foo2zjs-icc2ps: $(SRC) $(LIB)
+-	$(CC) $(CFLAGS) $(SRC) $(LIB) -lm -o $@
++foo2zjs-icc2ps: $(SRC:.c=.o) $(LIB:.c=.o)
++	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@
+ 
+ install: all
+ 	$(INSTALL) -c foo2zjs-icc2ps $(BIN)