From b749bed86efcdc063d720fa095ffa7a7984cd53c Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Sun, 27 Oct 2013 01:42:18 +0300 Subject: cups: upgrade to 1.7.0 Rename and consolidate cups16.inc to cups.inc use PACKAGECONFIG for pam. Signed-off-by: Saul Wold --- meta/recipes-extended/cups/cups.inc | 116 +++++++++++++++++++++++++++++++ meta/recipes-extended/cups/cups16.inc | 105 ---------------------------- meta/recipes-extended/cups/cups_1.6.4.bb | 19 ----- meta/recipes-extended/cups/cups_1.7.0.bb | 6 ++ 4 files changed, 122 insertions(+), 124 deletions(-) create mode 100644 meta/recipes-extended/cups/cups.inc delete mode 100644 meta/recipes-extended/cups/cups16.inc delete mode 100644 meta/recipes-extended/cups/cups_1.6.4.bb create mode 100644 meta/recipes-extended/cups/cups_1.7.0.bb (limited to 'meta/recipes-extended/cups') diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc new file mode 100644 index 0000000000..62295b73ca --- /dev/null +++ b/meta/recipes-extended/cups/cups.inc @@ -0,0 +1,116 @@ +SUMMARY = "An Internet printing system for Unix" +DESCRIPTION = "An Internet printing system for Unix." +SECTION = "console/utils" +LICENSE = "GPLv2 & LGPLv2" +DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb" +PROVIDES = "cups14" + +SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2 \ + file://use_echo_only_in_init.patch \ + file://0001-don-t-try-to-run-generated-binaries.patch \ + file://cups_serverbin.patch \ + " + +LEAD_SONAME = "libcupsdriver.so" + +inherit autotools binconfig + +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)} \ + ${@base_contains('DISTRO_FEATURES', 'pam', 'pam', '', d)}" +PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" +PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" +PACKAGECONFIG[pam] = "--enable-pam, --disable-pam, libpam" + +EXTRA_OECONF = " \ + --enable-gnutls \ + --enable-dbus \ + --enable-browsing \ + --disable-openssl \ + --disable-tiff \ + --disable-gssapi \ + --enable-debug \ + --disable-relro \ + --enable-libusb \ + --without-php \ + --without-perl \ + --without-python \ + --without-java \ + --with-pdftops=none \ + " + + +do_configure() { + gnu-configize + libtoolize --force + DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf +} + +do_compile () { + sed -i s:STRIP:NOSTRIP: Makedefs + sed -i s:serial:: backend/Makefile + + echo "all:" > man/Makefile + echo "libs:" >> man/Makefile + echo "install:" >> man/Makefile + echo "install-data:" >> man/Makefile + echo "install-exec:" >> man/Makefile + echo "install-headers:" >> man/Makefile + echo "install-libs:" >> man/Makefile + + oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ + "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ + "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ + "LIBZ=-lz -L${STAGING_LIBDIR}" \ + "-I." +} + +fakeroot do_install () { + oe_runmake "DSTROOT=${D}" install + + # Remove /var/run from package as cupsd will populate it on startup + rm -fr ${D}/${localstatedir}/run + rmdir ${D}/${libdir}/${BPN}/driver +} + +python do_package_append() { + import subprocess + # Change permissions back the way they were, they probably had a reason... + workdir = d.getVar('WORKDIR', True) + subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) +} + +PACKAGES =+ "${PN}-lib ${PN}-libimage" + +FILES_${PN} += "${libdir}/cups/backend \ + ${libdir}/cups/cgi-bin \ + ${libdir}/cups/filter \ + ${libdir}/cups/monitor \ + ${libdir}/cups/notifier \ + ${libdir}/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 \ + " + +#package the html for the webgui inside the main packages (~1MB uncompressed) + +FILES_${PN} += "${datadir}/doc/cups/images \ + ${datadir}/doc/cups/*html \ + ${datadir}/doc/cups/*.css \ + ${datadir}/icons/ \ + " +CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" + +SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" +cups_sysroot_preprocess () { + sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' +} diff --git a/meta/recipes-extended/cups/cups16.inc b/meta/recipes-extended/cups/cups16.inc deleted file mode 100644 index 7b8ba06d59..0000000000 --- a/meta/recipes-extended/cups/cups16.inc +++ /dev/null @@ -1,105 +0,0 @@ -SUMMARY = "An Internet printing system for Unix" -DESCRIPTION = "An Internet printing system for Unix." -SECTION = "console/utils" -LICENSE = "GPLv2 & LGPLv2" -DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" -PROVIDES = "cups14" - -SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2" - -LEAD_SONAME = "libcupsdriver.so" - -inherit autotools binconfig - -PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" -PACKAGECONFIG[avahi] = "--enable-avahi,--disable-avahi,avahi" -PACKAGECONFIG[acl] = "--enable-acl,--disable-acl,acl" - -EXTRA_OECONF = " \ - --enable-gnutls \ - --enable-dbus \ - --enable-browsing \ - --disable-openssl \ - --disable-tiff \ - --without-php \ - --without-perl \ - --without-python \ - --without-java \ - --with-pdftops=none \ - " - - -do_configure() { - gnu-configize - libtoolize --force - DSOFLAGS="${LDFLAGS}" SERVERBIN="${libdir}/cups" oe_runconf -} - -do_compile () { - sed -i s:STRIP:NOSTRIP: Makedefs - sed -i s:serial:: backend/Makefile - - echo "all:" > man/Makefile - echo "libs:" >> man/Makefile - echo "install:" >> man/Makefile - echo "install-data:" >> man/Makefile - echo "install-exec:" >> man/Makefile - echo "install-headers:" >> man/Makefile - echo "install-libs:" >> man/Makefile - - oe_runmake "SSLLIBS=-lgnutls -L${STAGING_LIBDIR}" \ - "LIBPNG=-lpng -lm -L${STAGING_LIBDIR}" \ - "LIBJPEG=-ljpeg -L${STAGING_LIBDIR}" \ - "LIBZ=-lz -L${STAGING_LIBDIR}" \ - "-I." -} - -fakeroot do_install () { - oe_runmake "DSTROOT=${D}" install - - # Remove /var/run from package as cupsd will populate it on startup - rm -fr ${D}/${localstatedir}/run - rmdir ${D}/${libdir}/${BPN}/driver -} - -python do_package_append() { - import subprocess - # Change permissions back the way they were, they probably had a reason... - workdir = d.getVar('WORKDIR', True) - subprocess.call('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir, shell=True) -} - -PACKAGES =+ "${PN}-lib ${PN}-libimage" - -FILES_${PN} += "${libdir}/cups/backend \ - ${libdir}/cups/cgi-bin \ - ${libdir}/cups/filter \ - ${libdir}/cups/monitor \ - ${libdir}/cups/notifier \ - ${libdir}/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 \ - " - -#package the html for the webgui inside the main packages (~1MB uncompressed) - -FILES_${PN} += "${datadir}/doc/cups/images \ - ${datadir}/doc/cups/*html \ - ${datadir}/doc/cups/*.css \ - ${datadir}/icons/ \ - " - -SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" -cups_sysroot_preprocess () { - sed -i ${SYSROOT_DESTDIR}${bindir_crossscripts}/cups-config -e 's:cups_datadir=.*:cups_datadir=${datadir}/cups:' -e 's:cups_serverbin=.*:cups_serverbin=${libdir}/cups:' -} diff --git a/meta/recipes-extended/cups/cups_1.6.4.bb b/meta/recipes-extended/cups/cups_1.6.4.bb deleted file mode 100644 index 8aabd49d26..0000000000 --- a/meta/recipes-extended/cups/cups_1.6.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -require cups16.inc - -DEPENDS += "libusb \ - ${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}" - -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d" -SRC_URI += " \ - file://use_echo_only_in_init.patch \ - file://0001-don-t-try-to-run-generated-binaries.patch \ - file://cups_serverbin.patch \ - " - -SRC_URI[md5sum] = "52c3df269709a4d25472cfe72ab5e856" -SRC_URI[sha256sum] = "b910c3e43b2d06f54154d12710e849455d0710c9983dab0a5f49a5e93b1b7e73" - -EXTRA_OECONF += " --disable-gssapi --enable-debug --disable-relro --enable-libusb \ - ${@base_contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" - -CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" diff --git a/meta/recipes-extended/cups/cups_1.7.0.bb b/meta/recipes-extended/cups/cups_1.7.0.bb new file mode 100644 index 0000000000..157d90b2de --- /dev/null +++ b/meta/recipes-extended/cups/cups_1.7.0.bb @@ -0,0 +1,6 @@ +require cups.inc + +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d" + +SRC_URI[md5sum] = "5ab496a2ce27017fcdb3d7ec4818a75a" +SRC_URI[sha256sum] = "cf15b8caa9dab4638b628427ef309ab381817fc574b8e736d58680e0475cb2c8" -- cgit 1.2.3-korg