cups: upgrade to 1.7.0
Rename and consolidate cups16.inc to cups.inc use PACKAGECONFIG for pam. (From OE-Core rev: b749bed86efcdc063d720fa095ffa7a7984cd53c) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
1a573bbf2d
commit
3f4d3eef34
|
@ -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 () {
|
|
@ -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"
|
|
@ -0,0 +1,6 @@
|
|||
require cups.inc
|
||||
|
||||
LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5e50cb4b8f24b04636b719683a9102d"
|
||||
|
||||
SRC_URI[md5sum] = "5ab496a2ce27017fcdb3d7ec4818a75a"
|
||||
SRC_URI[sha256sum] = "cf15b8caa9dab4638b628427ef309ab381817fc574b8e736d58680e0475cb2c8"
|
Loading…
Reference in New Issue