diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-06-01 16:11:11 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-06-01 16:11:11 +0000 |
| commit | 578d807f0a7b6fb2e579e076c87a489c7664b702 (patch) | |
| tree | aaf9a5b31863ccc07c20d45cf82295a038ff2817 | |
| parent | e15455541cc2a3b2744dd0d3092b33566a09bb8f (diff) | |
| download | openembedded-core-578d807f0a7b6fb2e579e076c87a489c7664b702.tar.gz openembedded-core-578d807f0a7b6fb2e579e076c87a489c7664b702.tar.bz2 openembedded-core-578d807f0a7b6fb2e579e076c87a489c7664b702.tar.xz openembedded-core-578d807f0a7b6fb2e579e076c87a489c7664b702.zip | |
libpng12: 1.2.16 -> 1.2.20
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4566 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/packages/libpng/libpng-1.2.20/makefile_fix.patch (renamed from meta/packages/libpng/libpng-1.2.16/makefile_fix.patch) | 0 | ||||
| -rw-r--r-- | meta/packages/libpng/libpng-native_1.2.20.bb (renamed from meta/packages/libpng/libpng-native_1.2.16.bb) | 0 | ||||
| -rw-r--r-- | meta/packages/libpng/libpng_1.2.20.bb (renamed from meta/packages/libpng/libpng_1.2.16.bb) | 28 |
3 files changed, 14 insertions, 14 deletions
diff --git a/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch b/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch index 3fa8793ad..3fa8793ad 100644 --- a/meta/packages/libpng/libpng-1.2.16/makefile_fix.patch +++ b/meta/packages/libpng/libpng-1.2.20/makefile_fix.patch diff --git a/meta/packages/libpng/libpng-native_1.2.16.bb b/meta/packages/libpng/libpng-native_1.2.20.bb index 231b95667..231b95667 100644 --- a/meta/packages/libpng/libpng-native_1.2.16.bb +++ b/meta/packages/libpng/libpng-native_1.2.20.bb diff --git a/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.20.bb index 0b15018d0..842fc04af 100644 --- a/meta/packages/libpng/libpng_1.2.16.bb +++ b/meta/packages/libpng/libpng_1.2.20.bb @@ -2,21 +2,10 @@ DESCRIPTION = "PNG Library" HOMEPAGE = "http://www.libpng.org/" LICENSE = "libpng" SECTION = "libs" +DEPENDS = "zlib" PRIORITY = "required" PR = "r6" -DEPENDS = "zlib" - -PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" - -FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" -FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" -FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" -FILES_${PN} = "${libdir}/lib*${SOLIBS}" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2 \ file://makefile_fix.patch;patch=1" S = "${WORKDIR}/libpng-${PV}" @@ -33,8 +22,10 @@ do_stage() { } do_install() { - install -d ${D}${bindir} ${D}${mandir} \ - ${D}${libdir} ${D}${includedir} + install -d ${D}${bindir} + install -d ${D}${mandir} + install -d ${D}${libdir} + install -d ${D}${includedir} unset LDFLAGS oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ @@ -48,3 +39,12 @@ python do_package() { bb.build.exec_func('package_do_package', d) } +PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" + +FILES_${PN}12-dbg += "${libdir}/libpng12*.dbg" +FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" +FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ + ${libdir}/*.a ${libdir}/pkgconfig \ + ${datadir}/aclocal ${bindir} ${sbindir}" |