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 deleted file mode 100644 index dc527bf7216..00000000000 --- a/meta-oe/recipes-printing/cups/cups-filters_1.28.17.bb +++ /dev/null @@ -1,84 +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 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 += " --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" - -CXXFLAGS += "-std=c++17" - -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* \ - " -RDEPENDS:${PN}-gst += "ghostscript" - -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 \ -" -RDEPENDS:${PN} += "bash" -RDEPENDS:${PN} += "ghostscript" - -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 -} diff --git a/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb new file mode 100644 index 00000000000..0370ae79d2b --- /dev/null +++ b/meta-oe/recipes-printing/cups/cups-filters_2.0.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "CUPS backends, filters, and other software" +HOMEPAGE = "http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=6d5b952b53dbe7752199903d082e5f07" + +DEPENDS = "libcupsfilters libppd glib-2.0 poppler" + +SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "b5152e3dd148ed73835827ac2f219df7cf5808dbf9dbaec2aa0127b44de800d8" + +inherit autotools gettext pkgconfig github-releases + +EXTRA_OECONF += " \ + --enable-imagefilters \ + --enable-ghostscript --with-gs-path=${bindir}/gs \ + --with-fontdir=${datadir}/fonts \ + --localstatedir=${localstatedir} \ +" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" + +FILES:${PN} += "${datadir}" +FILES:${PN}-dev += "${datadir}/ppdc" + +RDEPENDS:${PN} += "bash" +RDEPENDS:${PN} += "ghostscript" diff --git a/meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch similarity index 71% rename from meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch rename to meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch index 5de8dae0066..72bbf10a143 100644 --- a/meta-oe/recipes-printing/cups/cups-filters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch +++ b/meta-oe/recipes-printing/cups/libcupsfilters/0001-use-noexcept-false-instead-of-throw-from-c-17-onward.patch @@ -15,22 +15,22 @@ Signed-off-by: Khem Raj filter/pdftoraster.cxx | 4 ++++ 1 file changed, 4 insertions(+) -diff --git a/filter/pdftoraster.cxx b/filter/pdftoraster.cxx +diff --git a/cupsfilters/pdftoraster.cxx b/cupsfilters/pdftoraster.cxx index e8af184fb..e91e22459 100755 ---- a/filter/pdftoraster.cxx -+++ b/filter/pdftoraster.cxx -@@ -2148,7 +2148,11 @@ int main(int argc, char *argv[]) { - /* For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW - * should be used as a guard, otherwise use traditional definition */ +@@ -2198,7 +2198,11 @@ + // For compatibility with g++ >= 4.7 compilers _GLIBCXX_THROW + // should be used as a guard, otherwise use traditional definition #ifndef _GLIBCXX_THROW +-#define _GLIBCXX_THROW throw +#if __cplusplus < 201703L - #define _GLIBCXX_THROW throw ++#define _GLIBCXX_THROW throw +#else +#define _GLIBCXX_THROW(x) noexcept(false) +#endif #endif void * operator new(size_t size) _GLIBCXX_THROW (std::bad_alloc) + -- 2.39.1 diff --git a/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb b/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb new file mode 100644 index 00000000000..7f7174d940b --- /dev/null +++ b/meta-oe/recipes-printing/cups/libcupsfilters_2.0.0.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "OpenPrinting libcupsfilters" +HOMEPAGE = "https://github.com/OpenPrinting" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=aab2024bd2a475438a154cd1640c9684" + +DEPENDS = "cups fontconfig libexif dbus lcms qpdf poppler libpng jpeg tiff" + +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] = "542f2bfbc58136a4743c11dc8c86cee03c9aca705612654e36ac34aa0d9aa601" + +inherit autotools gettext pkgconfig github-releases + +FILES:${PN} += "${datadir}" +RDEPENDS:${PN} += "ghostscript" diff --git a/meta-oe/recipes-printing/cups/libppd_2.0.0.bb b/meta-oe/recipes-printing/cups/libppd_2.0.0.bb new file mode 100644 index 00000000000..99b1f6e730f --- /dev/null +++ b/meta-oe/recipes-printing/cups/libppd_2.0.0.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "OpenPrinting libppd" +HOMEPAGE = "https://github.com/OpenPrinting" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=c1fca671047153ce6825c4ab06f2ab49" + +DEPENDS = "libcupsfilters" + +SRC_URI = "https://github.com/OpenPrinting/${BPN}/releases/download/${PV}/${BP}.tar.xz" +SRC_URI[sha256sum] = "882d3c659a336e91559de8f3c76fc26197fe6e5539d9b484a596e29a5a4e0bc8" + +inherit autotools gettext pkgconfig github-releases + +do_install:append() { + rm -r ${D}${bindir} +} + +FILES:${PN} += "${datadir}" +