From 832f4f4ad2948d19978dd161bbd3a84c9afeab3f Mon Sep 17 00:00:00 2001 From: Kang Kai Date: Tue, 9 Apr 2013 11:16:37 +0800 Subject: [PATCH] libpng12: rename libpng_1.2.50 to libpng12 As Mark's suggestion, rename libpng_1.2.50 to libpng12 that multi-versions libpng could coexist. We want to make sure we have both the old and new versions to meet LSB compliance (for people who have that enabled) as well as the new version for newer applications. And drop link files that conflict with higher version. [YOCTO #4221] (From OE-Core rev: fc626e6861e491b0144b813a5b48b0f5f57664e6) Signed-off-by: Kang Kai CC: Mark Hatle Signed-off-by: Richard Purdie --- .../libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (55%) diff --git a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb similarity index 55% rename from meta/recipes-lsb4/libpng/libpng_1.2.50.bb rename to meta/recipes-lsb4/libpng/libpng12_1.2.50.bb index 8fdc41b..cfefd41 100644 --- a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb @@ -8,14 +8,28 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ DEPENDS = "zlib" PR = "r0" +PN = "libpng12" +S = "${WORKDIR}/libpng-${PV}" + SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz" SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7" SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7" +BINCONFIG_GLOB = "${PN}-config" + inherit autotools binconfig pkgconfig -PACKAGES =+ "${PN}12" +do_install_append() { + # The follow link files link to corresponding png12*.h and libpng12* files + # They conflict with higher verison, so drop them + unlink ${D}/${includedir}/png.h + unlink ${D}/${includedir}/pngconf.h + + unlink ${D}/${libdir}/libpng.la + unlink ${D}/${libdir}/libpng.so + unlink ${D}/${libdir}/libpng.a + unlink ${D}/${libdir}/pkgconfig/libpng.pc -FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}" -RPROVIDES_${PN}-dev += "${PN}12-dev" + unlink ${D}/${bindir}/libpng-config +} -- 2.7.4