[oe-commits] org.oe.dev cups: update to 1.2.12, closes #2705
joaquinduran commit
openembedded-commits at lists.openembedded.org
Thu Aug 2 12:56:24 UTC 2007
cups: update to 1.2.12, closes #2705
Author: joaquinduran at adtelecom.es
Branch: org.openembedded.dev
Revision: 12ec1f9512e2ed14ec81d1f32d608c0b084486af
ViewMTN: http://monotone.openembedded.org/revision.psp?id=12ec1f9512e2ed14ec81d1f32d608c0b084486af
Files:
1
packages/cups/cups.inc
packages/cups/cups_1.2.12.bb
packages/cups/cups_1.2.10.bb
Diffs:
#
# mt diff -r364a300cd8b196c7ab564a39b76ff134f65c4184 -r12ec1f9512e2ed14ec81d1f32d608c0b084486af
#
#
#
# add_file "packages/cups/cups.inc"
# content [222ec9d8aeac6ec4e9ebcaaaa920915c43052b25]
#
# add_file "packages/cups/cups_1.2.12.bb"
# content [dc5d10665104ca7d5faa51dabb605e562691f6e9]
#
# patch "packages/cups/cups_1.2.10.bb"
# from [01555f20ac2e318e45a508b2d1f6672b3a9e1f74]
# to [61eb68a7e7eb38c6af4139bae6ef7c9be81c5acf]
#
============================================================
--- packages/cups/cups.inc 222ec9d8aeac6ec4e9ebcaaaa920915c43052b25
+++ packages/cups/cups.inc 222ec9d8aeac6ec4e9ebcaaaa920915c43052b25
@@ -0,0 +1,83 @@
+DESCRIPTION = "An Internet printing system for Unix."
+SECTION = "console/utils"
+LICENSE = "GPL LGPL"
+DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
+
+SRC_URI = "ftp://ftp.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
+ "
+
+inherit autotools binconfig
+
+LDFLAGS += " -L${STAGING_LIBDIR} "
+
+EXTRA_OECONF = " \
+ --enable-gnutls \
+ --enable-dbus \
+ --enable-browsing \
+ --disable-openssl \
+ --disable-tiff \
+ --without-php \
+ --without-perl \
+ --without-python \
+ --without-java \
+ "
+
+
+do_configure() {
+ gnu-configize
+ libtoolize --force
+ oe_runconf
+}
+
+do_compile () {
+ sed -i s:STRIP:NOSTRIP: Makedefs
+ sed -i s:serial:: backend/Makefile
+
+ echo "all:" > man/Makefile
+ echo "install:" >> 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
+
+ # This directory gets installed with perms 511, which makes packaging fail
+ chmod 0711 "${D}/${localstatedir}/run/cups/certs"
+}
+
+do_stage () {
+ install -d ${STAGING_INCDIR}/cups
+ install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
+ install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
+ oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
+ oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
+}
+
+python do_package_append() {
+ # Change permissions back the way they were, they probably had a reason...
+ workdir = bb.data.getVar('WORKDIR', d, 1)
+ os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
+}
+
+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/ \
+ "
+
+LEAD_SONAME = "libcups.so.*"
+
============================================================
--- packages/cups/cups_1.2.12.bb dc5d10665104ca7d5faa51dabb605e562691f6e9
+++ packages/cups/cups_1.2.12.bb dc5d10665104ca7d5faa51dabb605e562691f6e9
@@ -0,0 +1,5 @@
+require cups.inc
+
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
============================================================
--- packages/cups/cups_1.2.10.bb 01555f20ac2e318e45a508b2d1f6672b3a9e1f74
+++ packages/cups/cups_1.2.10.bb 61eb68a7e7eb38c6af4139bae6ef7c9be81c5acf
@@ -1,83 +1,4 @@
-DESCRIPTION = "An Internet printing system for Unix."
-SECTION = "console/utils"
-LICENSE = "GPL LGPL"
-DEPENDS = "gnutls jpeg dbus dbus-glib libpng zlib install-native fakeroot-native"
-PR = "r1"
+require cups.inc
-SRC_URI = "ftp://ftp3.easysw.com/pub/cups/${PV}/cups-${PV}-source.tar.bz2 \
- "
+PR = "r2"
-inherit autotools binconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} "
-
-EXTRA_OECONF = " \
- --enable-gnutls \
- --enable-dbus \
- --enable-browsing \
- --disable-openssl \
- --disable-tiff \
- --without-php \
- --without-perl \
- --without-python \
- --without-java \
- "
-
-
-do_configure() {
- gnu-configize
- libtoolize --force
- oe_runconf
-}
-
-do_compile () {
- sed -i s:STRIP:NOSTRIP: Makedefs
- sed -i s:serial:: backend/Makefile
-
- echo "all:" > man/Makefile
- echo "install:" >> 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
-
- # This directory gets installed with perms 511, which makes packaging fail
- chmod 0711 "${D}/${localstatedir}/run/cups/certs"
-}
-
-do_stage () {
- install -d ${STAGING_INCDIR}/cups
- install ${S}/cups/*.h ${STAGING_INCDIR}/cups/
- install ${S}/filter/*.h ${STAGING_INCDIR}/cups/
- oe_libinstall -C cups -so libcups ${STAGING_LIBDIR}
- oe_libinstall -C filter -so libcupsimage ${STAGING_LIBDIR}
-}
-
-python do_package_append() {
- # Change permissions back the way they were, they probably had a reason...
- workdir = bb.data.getVar('WORKDIR', d, 1)
- os.system('chmod 0511 %s/install/cups/var/run/cups/certs' % workdir)
-}
-
-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/ \
- "
-
-LEAD_SONAME = "libcups.so.*"
More information about the Openembedded-commits
mailing list