summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2008-02-11 23:15:40 +0000
committerRichard Purdie <richard@openedhand.com>2008-02-11 23:15:40 +0000
commit0cf79cd7721c9302d90c964516a6d8966120d174 (patch)
tree3e76532b666a2bc99cbbec18dac25e4e5844010e /meta/packages
parentfbd561a1f65518a076eed7de0539389d913259d3 (diff)
downloadpoky-0cf79cd7721c9302d90c964516a6d8966120d174.tar.gz
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.bb49
-rw-r--r--meta/packages/libpng/libpng_1.2.16.bb6
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 231b956678..231b956678 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 c26d5e5d87..0000000000
--- a/meta/packages/libpng/libpng_1.2.12.bb
+++ /dev/null
@@ -1,49 +0,0 @@
1DESCRIPTION = "PNG Library"
2HOMEPAGE = "http://www.libpng.org/"
3LICENSE = "libpng"
4SECTION = "libs"
5PRIORITY = "required"
6PR = "r5"
7
8DEPENDS = "zlib"
9
10PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
11
12FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg"
13FILES_${PN}12 = "${libdir}/libpng12.so.*"
14FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
15FILES_${PN} = "${libdir}/lib*.so.*"
16FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
17 ${libdir}/*.a ${libdir}/pkgconfig \
18 ${datadir}/aclocal ${bindir} ${sbindir}"
19
20SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
21S = "${WORKDIR}/libpng-${PV}"
22
23inherit autotools binconfig pkgconfig
24
25do_stage() {
26 cp libpng.pc libpng12.pc
27 install -m 644 png.h ${STAGING_INCDIR}/png.h
28 install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
29 oe_libinstall -so libpng ${STAGING_LIBDIR}/
30 oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
31 ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
32}
33
34do_install() {
35 install -d ${D}${bindir} ${D}${mandir} \
36 ${D}${libdir} ${D}${includedir}
37 unset LDFLAGS
38 oe_runmake 'prefix=${prefix}' 'DESTDIR=${D}' \
39 'DB=${D}${bindir}' 'DI=${D}${includedir}' \
40 'DL=${D}${libdir}' 'DM=${D}${mandir}' \
41 install
42}
43
44python do_package() {
45 if bb.data.getVar('DEBIAN_NAMES', d, 1):
46 bb.data.setVar('PKG_${PN}', 'libpng12', d)
47 bb.build.exec_func('package_do_package', d)
48}
49
diff --git a/meta/packages/libpng/libpng_1.2.16.bb b/meta/packages/libpng/libpng_1.2.16.bb
index c26d5e5d87..3395bc857e 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"
10PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev" 10PACKAGES =+ "${PN}12-dbg ${PN}12 ${PN}12-dev"
11 11
12FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg" 12FILES_${PN}12-dbg = "${libdir}/libpng12*.dbg"
13FILES_${PN}12 = "${libdir}/libpng12.so.*" 13FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
14FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc" 14FILES_${PN}12-dev = "${libdir}/libpng12.* ${includedir}/libpng12 ${libdir}/pkgconfig/libpng12.pc"
15FILES_${PN} = "${libdir}/lib*.so.*" 15FILES_${PN} = "${libdir}/lib*${SOLIBS}"
16FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ 16FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \
17 ${libdir}/*.a ${libdir}/pkgconfig \ 17 ${libdir}/*.a ${libdir}/pkgconfig \
18 ${datadir}/aclocal ${bindir} ${sbindir}" 18 ${datadir}/aclocal ${bindir} ${sbindir}"
19 19