summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-11-21 10:39:29 +0000
committerRichard Purdie <richard@openedhand.com>2006-11-21 10:39:29 +0000
commit6f5035a9ccda297b0059f464b2fd98a016b86466 (patch)
tree59b24389fee701e83984ca3ea43e2c5ea30ecd25
parentd1c347552d5251a43ab071f1ca33453bad57a047 (diff)
downloadopenembedded-core-6f5035a9ccda297b0059f464b2fd98a016b86466.tar.gz
openembedded-core-6f5035a9ccda297b0059f464b2fd98a016b86466.tar.bz2
openembedded-core-6f5035a9ccda297b0059f464b2fd98a016b86466.tar.xz
openembedded-core-6f5035a9ccda297b0059f464b2fd98a016b86466.zip
libpng: 1.2.8 -> 1.2.12
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@909 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/libpng/libpng-native_1.2.12.bb (renamed from meta/packages/libpng/libpng-native_1.2.8.bb)0
-rw-r--r--meta/packages/libpng/libpng_1.2.12.bb (renamed from meta/packages/libpng/libpng_1.2.8.bb)27
2 files changed, 10 insertions, 17 deletions
diff --git a/meta/packages/libpng/libpng-native_1.2.8.bb b/meta/packages/libpng/libpng-native_1.2.12.bb
index 231b95667..231b95667 100644
--- a/meta/packages/libpng/libpng-native_1.2.8.bb
+++ b/meta/packages/libpng/libpng-native_1.2.12.bb
diff --git a/meta/packages/libpng/libpng_1.2.8.bb b/meta/packages/libpng/libpng_1.2.12.bb
index 52d8818f8..c26d5e5d8 100644
--- a/meta/packages/libpng/libpng_1.2.8.bb
+++ b/meta/packages/libpng/libpng_1.2.12.bb
@@ -3,37 +3,30 @@ HOMEPAGE = "http://www.libpng.org/"
LICENSE = "libpng"
SECTION = "libs"
PRIORITY = "required"
+PR = "r5"
DEPENDS = "zlib"
-PACKAGES =+ "${PN}12 ${PN}12-dev"
+PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
-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 \
+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}
+ ${datadir}/aclocal ${bindir} ${sbindir}"
SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
S = "${WORKDIR}/libpng-${PV}"
-inherit pkgconfig binconfig
-
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-
-do_compile() {
- sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
- unset LDFLAGS
- oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
- 'ZLIBINC=${STAGING_INCDIR}' \
- 'ZLIBLIB=${STAGING_LIBDIR}'
-}
+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
}