From 3d74a8d07d36454c6cf2b31c979a1d3afa8d51b7 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 6 Feb 2023 18:34:31 -0800 Subject: cups-filters: Upgrade to 1.28.17 release - Switch to github release artifact downloads - Add missing dependency on libexif - Merge .inc into .bb as there are no other users of it Signed-off-by: Khem Raj --- meta-oe/recipes-printing/cups/cups-filters.inc | 81 --------------------- .../recipes-printing/cups/cups-filters_1.28.11.bb | 4 -- .../recipes-printing/cups/cups-filters_1.28.17.bb | 83 ++++++++++++++++++++++ 3 files changed, 83 insertions(+), 85 deletions(-) delete mode 100644 meta-oe/recipes-printing/cups/cups-filters.inc delete mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb create mode 100644 meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb (limited to 'meta-oe') diff --git a/meta-oe/recipes-printing/cups/cups-filters.inc b/meta-oe/recipes-printing/cups/cups-filters.inc deleted file mode 100644 index f0f915e946..0000000000 --- a/meta-oe/recipes-printing/cups/cups-filters.inc +++ /dev/null @@ -1,81 +0,0 @@ -DESCRIPTION = "CUPS backends, filters, and other software" -HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" - -LICENSE = "GPL-2.0-only & LGPL-2.0-only & MIT & GPL-2.0-or-later & GPL-3.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6" - -SECTION = "console/utils" - -DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms ghostscript poppler qpdf libpng" -DEPENDS:class-native = "poppler-native glib-2.0-native dbus-native pkgconfig-native gettext-native libpng-native" - -SRC_URI = "http://openprinting.org/download/cups-filters/cups-filters-${PV}.tar.gz" - -inherit autotools-brokensep gettext pkgconfig - -EXTRA_OECONF += " --enable-ghostscript --disable-ldap \ - --with-pdftops=hybrid --enable-imagefilters \ - --enable-ghostscript --with-gs-path=${bindir}/gs \ - --with-pdftops-path=${bindir}/gs \ - --with-fontdir=${datadir}/fonts --with-rcdir=no \ - --with-cups-rundir=${localstatedir}/run/cups \ - --localstatedir=${localstatedir}/var \ - --with-rcdir=no \ - --without-php" - -EXTRA_OECONF:class-native += " --with-pdftops=pdftops \ - --disable-avahi --disable-ghostscript \ - --disable-ldap \ - --with-png --without-jpeg --without-tiff" - -BBCLASSEXTEND = "native" - -PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" -PACKAGECONFIG[png] = "--with-png,--without-png,libpng" -PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" - -PACKAGECONFIG ??= "dbus ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" - -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,,dbus" - -DIRFILES = "1" - -PACKAGES =+ "\ - ${PN}-gst \ - ${PN}-data \ - " - -FILES:${PN}-gst = "\ - ${libexecdir}/cups/filter/gsto* \ - " - -FILES:${PN}-data = "\ - ${datadir}/cups/data \ - " - -FILES:${PN}-dbg += "\ - ${libexecdir}/cups/backend/.debug \ - ${libexecdir}/cups/driver/.debug \ - ${libexecdir}/cups/filter/.debug \ - " - -FILES:${PN} += "\ - ${libexecdir}/cups \ - ${datadir}/ppd/ \ - ${datadir}/cups/charsets \ - ${datadir}/cups/drv \ - ${datadir}/cups/mime \ - ${datadir}/cups/ppdc \ - ${datadir}/cups/banners \ -" - -do_install:append() { - # remove braille dir - rm -rf ${D}${datadir}/cups/braille - - # remove sysroot path contamination from pkgconfig file - sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc -} - -RDEPENDS:${PN} += "bash" diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb b/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb deleted file mode 100644 index 9a0a23671b..0000000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.28.11.bb +++ /dev/null @@ -1,4 +0,0 @@ -include cups-filters.inc - -SRC_URI += "file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch" -SRC_URI[sha256sum] = "472418f1a1e12c9ad91b01caa020eb668626776d85de9da488be38e6663102ca" diff --git a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb new file mode 100644 index 0000000000..22de3d5441 --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb @@ -0,0 +1,83 @@ +DESCRIPTION = "CUPS backends, filters, and other software" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" + +LICENSE = "GPL-2.0-only & LGPL-2.0-only & MIT & GPL-2.0-or-later & GPL-3.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d77679ce6a2cc4d873d4ebbf2a401e6" + +SECTION = "console/utils" + +DEPENDS = "cups glib-2.0 glib-2.0-native dbus dbus-glib lcms ghostscript poppler qpdf libpng libexif" +DEPENDS:class-native = "poppler-native glib-2.0-native dbus-native pkgconfig-native gettext-native libpng-native" + +SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz \ + file://0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch" +SRC_URI[sha256sum] = "270a3752a960368aa99d431fb5d34f4039b2ac943c576d840612d1d8185c9bb9" + +inherit autotools-brokensep gettext pkgconfig github-releases + +EXTRA_OECONF += " --enable-ghostscript --disable-ldap \ + --with-pdftops=hybrid --enable-imagefilters \ + --enable-ghostscript --with-gs-path=${bindir}/gs \ + --with-pdftops-path=${bindir}/gs \ + --with-fontdir=${datadir}/fonts --with-rcdir=no \ + --with-cups-rundir=${localstatedir}/run/cups \ + --localstatedir=${localstatedir}/var \ + --with-rcdir=no \ + --without-php" + +EXTRA_OECONF:class-native += " --with-pdftops=pdftops \ + --disable-avahi --disable-ghostscript \ + --disable-ldap \ + --with-png --without-jpeg --without-tiff" + +BBCLASSEXTEND = "native" + +PACKAGECONFIG[jpeg] = "--with-jpeg,--without-jpeg,jpeg" +PACKAGECONFIG[png] = "--with-png,--without-png,libpng" +PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" + +PACKAGECONFIG ??= "dbus ${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" + +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,,dbus" + +DIRFILES = "1" + +PACKAGES =+ "\ + ${PN}-gst \ + ${PN}-data \ + " + +FILES:${PN}-gst = "\ + ${libexecdir}/cups/filter/gsto* \ + " + +FILES:${PN}-data = "\ + ${datadir}/cups/data \ + " + +FILES:${PN}-dbg += "\ + ${libexecdir}/cups/backend/.debug \ + ${libexecdir}/cups/driver/.debug \ + ${libexecdir}/cups/filter/.debug \ + " + +FILES:${PN} += "\ + ${libexecdir}/cups \ + ${datadir}/ppd/ \ + ${datadir}/cups/charsets \ + ${datadir}/cups/drv \ + ${datadir}/cups/mime \ + ${datadir}/cups/ppdc \ + ${datadir}/cups/banners \ +" + +do_install:append() { + # remove braille dir + rm -rf ${D}${datadir}/cups/braille + + # remove sysroot path contamination from pkgconfig file + sed -i -e 's:${STAGING_DIR_TARGET}::' ${D}/${libdir}/pkgconfig/libcupsfilters.pc +} + +RDEPENDS:${PN} += "bash" -- cgit v1.2.3-54-g00ecf