V2: rename libpng_1.2.50 to libpng12
cover V2: rename libpng_1.2.50 to libpng12
V2: add comments to explain why drop some link files
The following changes since commit e57284abca76fe7e6c29484104ae4349459c63dc:
kernel.bbclass: do_sizecheck: update path to build image and do not delete (2013-04-08 22:26:24 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kangkai/libpng12
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/libpng12
Kang Kai (2):
libpng12: rename libpng_1.2.50 to libpng12
libpng12: remove prefer version and add it to lsb packagegroup
meta/conf/distro/include/default-versions.inc | 3 ---
.../packagegroups/packagegroup-core-lsb.bb | 1 +
.../{libpng_1.2.50.bb => libpng12_1.2.50.bb} | 20 +++++++++++++++++---
3 files changed, 18 insertions(+), 6 deletions(-)
rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (55%)Signature · 1 line
1.7.5.4
PATCH 1/2 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]
---
.../{libpng_1.2.50.bb => libpng12_1.2.50.bb} | 20 +++++++++++++++++---
1 files changed, 17 insertions(+), 3 deletions(-)
rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (55%)meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +17 -3
@@ -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 +}
Signature · 1 line
1.7.5.4
Re: [PATCH 1/2] libpng12: rename libpng_1.2.50 to libpng12
Quoted 7 lines · Kang Kai
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.
Quoted 6 lines
And drop link files that conflict with higher version.
[YOCTO #4221]
Signed-off-by Kang Kai <[email protected]>CC Mark Hatle <[email protected]>
Thanks for the additional comment below. I'm happy with this, it should help resolve one of the LSB test failures.
--Mark
Quoted 45 lines
--- .../{libpng_1.2.50.bb => libpng12_1.2.50.bb} | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-)rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (55%)
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +17
-3@@ -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 +}
PATCH 2/2 libpng12: remove prefer version and add it to lsb packagegroup
In reply to Kang KaiBecause rename libpng_1.2.50 to libpng, remove the perfer verion from default-versions.inc and add libpng12 to lsb packagegroup.
--- meta/conf/distro/include/default-versions.inc | 3 --- .../packagegroups/packagegroup-core-lsb.bb | 1 + 2 files changed, 1 insertions(+), 3 deletions(-)
meta/conf/distro/include/default-versions.inc +0 -3
@@ -9,6 +9,3 @@ PREFERRED_VERSION_python-native ?= "2.7.3" # Force the older version of liberation-fonts until we fix the fontforge issue PREFERRED_VERSION_liberation-fonts ?= "1.04" - -# Set libpng default version for linuxstdbase -PREFERRED_VERSION_libpng_linuxstdbase ?= "1.2.50"
meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +1 -0
@@ -161,6 +161,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\ ncurses \ zlib \ nspr \ + libpng12 \ " SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"
Signature · 1 line
1.7.5.4