From dc6d641ed00ef2426d6ca9f3966c4c5974aea053 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 11 Jun 2013 22:58:56 -0700 Subject: cups: Update to 1.6.2 Signed-off-by: Saul Wold --- meta/recipes-extended/cups/cups16.inc | 2 +- meta/recipes-extended/cups/cups_1.6.1.bb | 19 ------------------- meta/recipes-extended/cups/cups_1.6.2.bb | 19 +++++++++++++++++++ 3 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 meta/recipes-extended/cups/cups_1.6.1.bb create mode 100644 meta/recipes-extended/cups/cups_1.6.2.bb (limited to 'meta/recipes-extended/cups') diff --git a/meta/recipes-extended/cups/cups16.inc b/meta/recipes-extended/cups/cups16.inc index 45e7d51705..f12c2cc20c 100644 --- a/meta/recipes-extended/cups/cups16.inc +++ b/meta/recipes-extended/cups/cups16.inc @@ -5,7 +5,7 @@ LICENSE = "GPLv2 & LGPLv2" DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib" PROVIDES = "cups14" -SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2" +SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2" LEAD_SONAME = "libcupsdriver.so" diff --git a/meta/recipes-extended/cups/cups_1.6.1.bb b/meta/recipes-extended/cups/cups_1.6.1.bb deleted file mode 100644 index 42ce059230..0000000000 --- a/meta/recipes-extended/cups/cups_1.6.1.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] = "87ade07e3d1efd03c9c3add949cf9c00" -SRC_URI[sha256sum] = "5842ab1144e653160fe667ee78b932ee036b054c0c2d20533d19e309149a7790" - -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.6.2.bb b/meta/recipes-extended/cups/cups_1.6.2.bb new file mode 100644 index 0000000000..aa199e93ea --- /dev/null +++ b/meta/recipes-extended/cups/cups_1.6.2.bb @@ -0,0 +1,19 @@ +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] = "13c8b2b2336d42001abe4899766b62dc" +SRC_URI[sha256sum] = "37a3ebd305e76cfd4c9c53013e89c0f7a4dcb04b2e9da61029a29faa57e0f10d" + +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" -- cgit v1.2.3