Skip to contentSkip to conversation

Update cups and foomatic

PATCH Applied Mark Hatle 2 participants 4 messages Sep 22, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Update cups and foomatic

Based on RP's comments to the previous foomatic-filter update, I have reviewed and revised both cups and foomatic-filters.

The following changes since commit 468e4a2f0e63e9d33e88b98a7d075b186ef481b2:

glib-2.0: Drop old 2.27.5 development version (2011-09-22 08:47:22 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm

Mark Hatle (2):
cups: Fix recipe to use the correct cups directories
foomatic-filters: Disable filter checking

 meta/recipes-extended/cups/cups14.inc              |   20 +++++++++++++-----
 meta/recipes-extended/cups/cups_1.4.6.bb           |    2 +-
 .../foomatic/foomatic-filters_4.0.7.bb             |   21 ++++++++++++++-----
 3 files changed, 30 insertions(+), 13 deletions(-)
Signature · 1 line
1.7.3.4
author
#1 lore raw

PATCH 1/2 cups: Fix recipe to use the correct cups directories

${libdir} is not used, instead they use a common ${exec_prefix}/lib directory structure for helpers, filters, renderers, etc.

Signed-off-by Mark Hatle <[email protected]>
---
 meta/recipes-extended/cups/cups14.inc    |   20 ++++++++++++++------
 meta/recipes-extended/cups/cups_1.4.6.bb |    2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)
meta/recipes-extended/cups/cups14.inc +14 -6
index e64f239..48f493d 100644
@@ -64,16 +64,24 @@ python do_package_append() {
 
 PACKAGES =+ "${PN}-lib ${PN}-libimage"
 
+FILES_${PN} += "${exec_prefix}/lib/cups/backend \
+		${exec_prefix}/lib/cups/cgi-bin \
+		${exec_prefix}/lib/cups/filter \
+		${exec_prefix}/lib/cups/monitor \
+		${exec_prefix}/lib/cups/notifier \
+		${exec_prefix}/lib/cups/daemon \
+	       "
+
 FILES_${PN}-lib = "${libdir}/libcups.so.*"
 
 FILES_${PN}-libimage = "${libdir}/libcupsimage.so.*"
 
-FILES_${PN}-dbg += "${libdir}/cups/backend/.debug \
-                    ${libdir}/cups/cgi-bin/.debug \
-                    ${libdir}/cups/filter/.debug \
-                    ${libdir}/cups/monitor/.debug \
-                    ${libdir}/cups/notifier/.debug \
-                    ${libdir}/cups/daemon/.debug \
+FILES_${PN}-dbg += "${exec_prefix}/lib/cups/backend/.debug \
+                    ${exec_prefix}/lib/cups/cgi-bin/.debug \
+                    ${exec_prefix}/lib/cups/filter/.debug \
+                    ${exec_prefix}/lib/cups/monitor/.debug \
+                    ${exec_prefix}/lib/cups/notifier/.debug \
+                    ${exec_prefix}/lib/cups/daemon/.debug \
                    "
 
 #package the html for the webgui inside the main packages (~1MB uncompressed)
meta/recipes-extended/cups/cups_1.4.6.bb +1 -1
index fd20dcc..0dc2d4a 100644
@@ -1,6 +1,6 @@
 require cups14.inc
 
-PR = "r1"
+PR = "r2"
 DEPENDS += "libusb \
        ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
Signature · 1 line
1.7.3.4
author
#2 lore raw

PATCH 2/2 foomatic-filters: Disable filter checking

In reply to Mark Hatle

Disable a few checks, and hard code the values for a few other items to work around potential host contamination issues. We also default to the cups configuration for items.

Signed-off-by Mark Hatle <[email protected]>
---
 .../foomatic/foomatic-filters_4.0.7.bb             |   21 ++++++++++++++-----
 1 files changed, 15 insertions(+), 6 deletions(-)
meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb +15 -6
index 9627187..e3bcf78 100644
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD file. \
 "
 
 DEPENDS += "cups perl libxml2"
-PR = "r1"
+PR = "r2"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"

@@ -20,11 +20,20 @@ SRC_URI = "http://www.openprinting.org/download/foomatic/foomatic-filters-${PV}.
 SRC_URI[md5sum] = "20abd25c1c98b2dae68709062a132a7d"
 SRC_URI[sha256sum] = "090313fae40b177f505d9c9b93d7a4d7188b6d5d18b6ae41ab24903ac983478d"
 
-do_install_append_linuxstdbase() {
-    install -d ${D}${libdir}/cups/filter
-    ln -sf ${bindir}/foomatic-rip ${D}${libdir}/cups/filter
+inherit autotools
+
+EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
+
+do_configure_prepend() {
+    export LIB_CUPS=${exec_prefix}/lib/cups               # /usr/lib NOT libdir
+    export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend  # /usr/lib NOT libdir
+    export CUPS_FILTERS=${exec_prefix}/lib/cups/filter    # /usr/lib NOT libdir
+    export CUPS_PPDS=${datadir}/cups/model
 }
 
-FILES_${PN}_append_linuxstdbase += "${libdir}/cups/filter/foomatic-rip"
+do_install_append_linuxstdbase() {
+    install -d ${D}${exec_prefix}/lib/cups/filter
+    ln -sf ${bindir}/foomatic-rip ${D}${exec_prefix}/lib/cups/filter
+}
 
-inherit autotools
+FILES_${PN}_append_linuxstdbase += "${exec_prefix}/lib/cups/filter/foomatic-rip"
Signature · 1 line
1.7.3.4
Applied
#3 lore raw
In reply to Mark Hatle
Quoted 7 lines · Mark Hatle

Based on RP's comments to the previous foomatic-filter update, I have reviewed and revised both cups and foomatic-filters.

The following changes since commit 468e4a2f0e63e9d33e88b98a7d075b186ef481b2:

glib-2.0: Drop old 2.27.5 development version (2011-09-22 08:47:22 +0100)

Quoted 7 lines

are available in the git repository at:
git://git.pokylinux.org/poky-contrib mhatle/rpm
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/rpm

Mark Hatle (2):
cups: Fix recipe to use the correct cups directories
foomatic-filters: Disable filter checking

Merged to master, thanks.

Richard