diff options
| author | Saul Wold <sgw@linux.intel.com> | 2013-10-27 01:42:18 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-30 13:39:03 +0000 |
| commit | b749bed86efcdc063d720fa095ffa7a7984cd53c (patch) | |
| tree | 71fef848f08bfa5ee60bb298d5f5c1566ec8865b /meta/recipes-extended/cups | |
| parent | 5abcfcd4380aacafc45d776f557738fb18089113 (diff) | |
| download | openembedded-core-b749bed86efcdc063d720fa095ffa7a7984cd53c.tar.gz openembedded-core-b749bed86efcdc063d720fa095ffa7a7984cd53c.tar.bz2 openembedded-core-b749bed86efcdc063d720fa095ffa7a7984cd53c.zip | |
cups: upgrade to 1.7.0
Rename and consolidate cups16.inc to cups.inc use PACKAGECONFIG
for pam.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/cups')
| -rw-r--r-- | meta/recipes-extended/cups/cups.inc (renamed from meta/recipes-extended/cups/cups16.inc) | 17 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups_1.6.4.bb | 19 | ||||
| -rw-r--r-- | meta/recipes-extended/cups/cups_1.7.0.bb | 6 |
3 files changed, 20 insertions, 22 deletions
diff --git a/meta/recipes-extended/cups/cups16.inc b/meta/recipes-extended/cups/cups.inc index 7b8ba06d59..62295b73ca 100644 --- a/meta/recipes-extended/cups/cups16.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -2,18 +2,24 @@ 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" +DEPENDS = "gnutls libpng jpeg dbus dbus-glib zlib libusb" PROVIDES = "cups14" -SRC_URI = "http://www.cups.org/software/${PV}/${BP}-source.tar.bz2" +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)}" +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 \ @@ -21,6 +27,10 @@ EXTRA_OECONF = " \ --enable-browsing \ --disable-openssl \ --disable-tiff \ + --disable-gssapi \ + --enable-debug \ + --disable-relro \ + --enable-libusb \ --without-php \ --without-perl \ --without-python \ @@ -98,6 +108,7 @@ FILES_${PN} += "${datadir}/doc/cups/images \ ${datadir}/doc/cups/*.css \ ${datadir}/icons/ \ " +CONFFILES_${PN} += "${sysconfdir}/cups/cupsd.conf" SYSROOT_PREPROCESS_FUNCS += "cups_sysroot_preprocess" cups_sysroot_preprocess () { 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" |