diff options
| -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 231b956678..231b956678 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 52d8818f8a..c26d5e5d87 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 } |