libpng 1.2.12: fix libpng.pc

diff --git a/packages/libpng/libpng_1.2.12.bb b/packages/libpng/libpng_1.2.12.bb
index b109677..47849a7 100644 (file)
--- a/packages/libpng/libpng_1.2.12.bb
+++ b/packages/libpng/libpng_1.2.12.bb
@@ -4,6 +4,7 @@ LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth@handhelds.org>"
+PR = "r1"
 
 DEPENDS = "zlib"
 
@@ -20,7 +21,7 @@ FILES_${PN}-dev = ${includedir} ${libdir}/lib*.so ${libdir}/*.la \
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig binconfig
+inherit pkgconfig binconfig pkgconfig
 
 EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
 
@@ -32,6 +33,18 @@ do_compile() {
                   'ZLIBLIB=${STAGING_LIBDIR}'
 }
 
+# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed
+# pkgconfig.bbclass will use a similar trick to fix them
+
+do_stage_prepend() {
+       sed -i  -e 's:=@libdir@:=${libdir}:;' \
+               -e 's:=@includedir@:=${includedir}:;' \
+               -e 's:=@prefix@:=${prefix}:' \
+               -e 's:=@exec_prefix@:=${exec_prefix}:' \
+               libpng.pc
+
+}
+
 do_stage() {
        cp libpng.pc libpng12.pc
        install -m 644 png.h ${STAGING_INCDIR}/png.h