summaryrefslogtreecommitdiffstats
path: root/meta/packages/libpng
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/libpng')
-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/"
3LICENSE = "libpng" 3LICENSE = "libpng"
4SECTION = "libs" 4SECTION = "libs"
5PRIORITY = "required" 5PRIORITY = "required"
6PR = "r5"
6 7
7DEPENDS = "zlib" 8DEPENDS = "zlib"
8 9
9PACKAGES =+ "${PN}12 ${PN}12-dev" 10PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
10 11
11FILES_${PN}12 = ${libdir}/libpng12.so.* 12FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg"
12FILES_${PN}12-dev = ${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc 13FILES_${PN}12 = "${libdir}/libpng12.so.*"
13FILES_${PN} = ${libdir}/lib*.so.* 14FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
14FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \ 15FILES_${PN} = "${libdir}/lib*.so.*"
16FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
15 ${libdir}/*.a ${libdir}/pkgconfig \ 17 ${libdir}/*.a ${libdir}/pkgconfig \
16 ${datadir}/aclocal ${bindir} ${sbindir} 18 ${datadir}/aclocal ${bindir} ${sbindir}"
17 19
18SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2" 20SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
19S = "${WORKDIR}/libpng-${PV}" 21S = "${WORKDIR}/libpng-${PV}"
20 22
21inherit pkgconfig binconfig 23inherit autotools binconfig pkgconfig
22
23EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
24
25do_compile() {
26 sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
27 unset LDFLAGS
28 oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
29 'ZLIBINC=${STAGING_INCDIR}' \
30 'ZLIBLIB=${STAGING_LIBDIR}'
31}
32 24
33do_stage() { 25do_stage() {
34 cp libpng.pc libpng12.pc 26 cp libpng.pc libpng12.pc
35 install -m 644 png.h ${STAGING_INCDIR}/png.h 27 install -m 644 png.h ${STAGING_INCDIR}/png.h
36 install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h 28 install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
29 oe_libinstall -so libpng ${STAGING_LIBDIR}/
37 oe_libinstall -so libpng12 ${STAGING_LIBDIR}/ 30 oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
38 ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so 31 ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
39} 32}