diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-02-11 23:15:40 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-02-11 23:15:40 +0000 |
| commit | 0cf79cd7721c9302d90c964516a6d8966120d174 (patch) | |
| tree | 3e76532b666a2bc99cbbec18dac25e4e5844010e /meta/packages | |
| parent | fbd561a1f65518a076eed7de0539389d913259d3 (diff) | |
| download | openembedded-core-0cf79cd7721c9302d90c964516a6d8966120d174.tar.gz openembedded-core-0cf79cd7721c9302d90c964516a6d8966120d174.tar.bz2 openembedded-core-0cf79cd7721c9302d90c964516a6d8966120d174.tar.xz openembedded-core-0cf79cd7721c9302d90c964516a6d8966120d174.zip | |
libpng: Update libpng-native 1.2.12 -> 1.2.16, convert to use SOLIBS variables
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3775 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/packages')
| -rw-r--r-- | meta/packages/libpng/libpng-native_1.2.16.bb (renamed from meta/packages/libpng/libpng-native_1.2.12.bb) | 0 | ||||
| -rw-r--r-- | meta/packages/libpng/libpng_1.2.12.bb | 49 | ||||
| -rw-r--r-- | meta/packages/libpng/libpng_1.2.16.bb | 6 |
3 files changed, 3 insertions, 52 deletions
diff --git a/meta/packages/libpng/libpng-native_1.2.12.bb b/meta/packages/libpng/libpng-native_1.2.16.bb index 231b95667..231b95667 100644 --- a/meta/packages/libpng/libpng-native_1.2.12.bb +++ b/meta/packages/libpng/libpng-native_1.2.16.bb diff --git a/meta/packages/libpng/libpng_1.2.12.bb b/meta/packages/libpng/libpng_1.2.12.bb deleted file mode 100644 index c26d5e5d8..000000000 --- a/meta/packages/libpng/libpng_1.2.12.bb +++ /dev/null @@ -1,49 +0,0 @@ -DESCRIPTION = "PNG Library" -HOMEPAGE = "http://www.libpng.org/" -LICENSE = "libpng" -SECTION = "libs" -PRIORITY = "required" -PR = "r5" - -DEPENDS = "zlib" - -PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" - -FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" -FILES_${PN}12 = "${libdir}/libpng12.so.*" -FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ - ${libdir}/*.a ${libdir}/pkgconfig \ - ${datadir}/aclocal ${bindir} ${sbindir}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" -S = "${WORKDIR}/libpng-${PV}" - -inherit autotools binconfig pkgconfig - -do_stage() { - cp libpng.pc libpng12.pc - install -m 644 png.h ${STAGING_INCDIR}/png.h - install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h - oe_libinstall -so libpng ${STAGING_LIBDIR}/ - oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ - ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so -} - -do_install() { - install -d ${D}${bindir} ${D}${mandir} \ - ${D}${libdir} ${D}${includedir} - unset LDFLAGS - oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \ - 'DB=${D}${bindir}' 'DI=${D}${includedir}' \ - 'DL=${D}${libdir}' 'DM=${D}${mandir}' \ - install -} - -python do_package() { - if bb.data.getVar('DEBIAN_NAMES', d, 1): - bb.data.setVar('PKG_${PN}', 'libpng12', d) - bb.build.exec_func('package_do_package', d) -} - diff --git a/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.16.bb index c26d5e5d8..3395bc857 100644 --- a/meta/packages/libpng/libpng_1.2.16.bb +++ b/meta/packages/libpng/libpng_1.2.16.bb @@ -10,10 +10,10 @@ DEPENDS = "zlib" PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" -FILES_${PN}12 = "${libdir}/libpng12.so.*" +FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" -FILES_${PN} = "${libdir}/lib*.so.*" -FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ +FILES_${PN} = "${libdir}/lib*${SOLIBS}" +FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${libdir}/*.a ${libdir}/pkgconfig \ ${datadir}/aclocal ${bindir} ${sbindir}" |