[PATCH 0/2] rename libpng_1.2.50 to libpng12

[PATCH 0/2] rename libpng_1.2.50 to libpng12

[Kang Kai]

Rename libpng_1.2.50 to libpng12 that multi-versions libpng could coexist.

The following changes since commit 6d4d42d63db4c3fcffd831ce359599f3ee1d710e:

  qemuimage-tests/sanity/boot: Increase timeout (2013-04-06 17:22:21 +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}       |   18 +++++++++++++++---
 3 files changed, 16 insertions(+), 6 deletions(-)
 rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (62%)

-- 
1.7.5.4

[PATCH 1/2] libpng12: rename libpng_1.2.50 to libpng12

[Kang Kai]

As Mark's suggestion, rename libpng_1.2.50 to libpng12 that
multi-versions libpng could coexist. And drop files that conflict with
higher version.

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.

CC: Mark Hatle <mark.hatle@windriver.com>

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 .../{libpng_1.2.50.bb => libpng12_1.2.50.bb}       |   18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)
 rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (62%)

diff --git a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
similarity index 62%
rename from meta/recipes-lsb4/libpng/libpng_1.2.50.bb
rename to meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
index 8fdc41b..43ff75a 100644
--- a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb
+++ b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
@@ -8,14 +8,26 @@ 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() {
+	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
+}
-- 
1.7.5.4

Re: [PATCH 1/2] libpng12: rename libpng_1.2.50 to libpng12

[Mark Hatle]

On 4/8/13 4:12 AM, Kang Kai wrote:
> As Mark's suggestion, rename libpng_1.2.50 to libpng12 that
> multi-versions libpng could coexist. And drop files that conflict with
> higher version.
>
> 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.
>
> CC: Mark Hatle <mark.hatle@windriver.com>
>
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>   .../{libpng_1.2.50.bb => libpng12_1.2.50.bb}       |   18 +++++++++++++++---
>   1 files changed, 15 insertions(+), 3 deletions(-)
>   rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => libpng12_1.2.50.bb} (62%)
>
> diff --git a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
> similarity index 62%
> rename from meta/recipes-lsb4/libpng/libpng_1.2.50.bb
> rename to meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
> index 8fdc41b..43ff75a 100644
> --- a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb
> +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
> @@ -8,14 +8,26 @@ 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() {
> +	unlink ${D}/${includedir}/png.h
> +	unlink ${D}/${includedir}/pngconf.h

You should move those two into a subdirectory called "${D}/${includedir}/libpng12/"

That way they will still be available for anyone who needs them.

> +
> +	unlink ${D}/${libdir}/libpng.la
> +	unlink ${D}/${libdir}/libpng.so
> +	unlink ${D}/${libdir}/libpng.a

The .la, .a seen above should be similarly renamed to be libpng12...  The .so 
should be dropped, as anyone who needs the alternative version would need to 
directly specify it.

> +	unlink ${D}/${libdir}/pkgconfig/libpng.pc

Should be renamed to be libpng12.pc.

(Note both the .la and .pc files will likely need to be modified to reference 
the correct header and library paths.)

> -FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
> -RPROVIDES_${PN}-dev += "${PN}12-dev"
> +	unlink ${D}/${bindir}/libpng-config
> +}

The above should be renamed to be "libpng12-config".

(Again, make sure that the results of it match the renamed .a/.so and include 
paths.)

--Mark

Re: [PATCH 1/2] libpng12: rename libpng_1.2.50 to libpng12

[Kang Kai]

On 2013年04月08日 23:01, Mark Hatle wrote:
> On 4/8/13 4:12 AM, Kang Kai wrote:
>> As Mark's suggestion, rename libpng_1.2.50 to libpng12 that
>> multi-versions libpng could coexist. And drop files that conflict with
>> higher version.
>>
>> 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.
>>
>> CC: Mark Hatle <mark.hatle@windriver.com>
>>
>> Signed-off-by: Kang Kai <kai.kang@windriver.com>
>> ---
>> .../{libpng_1.2.50.bb => libpng12_1.2.50.bb} | 18 +++++++++++++++---
>> 1 files changed, 15 insertions(+), 3 deletions(-)
>> rename meta/recipes-lsb4/libpng/{libpng_1.2.50.bb => 
>> libpng12_1.2.50.bb} (62%)
>>
>> diff --git a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb 
>> b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
>> similarity index 62%
>> rename from meta/recipes-lsb4/libpng/libpng_1.2.50.bb
>> rename to meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
>> index 8fdc41b..43ff75a 100644
>> --- a/meta/recipes-lsb4/libpng/libpng_1.2.50.bb
>> +++ b/meta/recipes-lsb4/libpng/libpng12_1.2.50.bb
>> @@ -8,14 +8,26 @@ 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() {
>> + unlink ${D}/${includedir}/png.h
>> + unlink ${D}/${includedir}/pngconf.h
>

Hi Mark,

> You should move those two into a subdirectory called 
> "${D}/${includedir}/libpng12/"
>
> That way they will still be available for anyone who needs them.
Files
/usr/include/libpng12/png.h
/usr/include/libpng12/pngconf.h

already exist. Those two files unlinked link to them and conflict with 
libpng16.

>
>> +
>> + unlink ${D}/${libdir}/libpng.la
>> + unlink ${D}/${libdir}/libpng.so
>> + unlink ${D}/${libdir}/libpng.a
>
> The .la, .a seen above should be similarly renamed to be libpng12... 
> The .so should be dropped, as anyone who needs the alternative version 
> would need to directly specify it.

Same reason. They are links to libpng12.*.

>
>> + unlink ${D}/${libdir}/pkgconfig/libpng.pc
>
> Should be renamed to be libpng12.pc.
>
> (Note both the .la and .pc files will likely need to be modified to 
> reference the correct header and library paths.)

libpng12.pc exists too, and the patch I checked that are right.

>
>> -FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
>> -RPROVIDES_${PN}-dev += "${PN}12-dev"
>> + unlink ${D}/${bindir}/libpng-config
>> +}
>
> The above should be renamed to be "libpng12-config".
Link file too.

> (Again, make sure that the results of it match the renamed .a/.so and 
> include paths.)
>
> --Mark
>

Thanks for detailed review, I'll add some comment to make it clear.

-- 
Regards,
Neil | Kai Kang

[PATCH 2/2] libpng12: remove prefer version and add it to lsb packagegroup

[Kang Kai]

Because rename libpng_1.2.50 to libpng, remove the perfer verion from
default-versions.inc and add libpng12 to lsb packagegroup.

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/conf/distro/include/default-versions.inc      |    3 ---
 .../packagegroups/packagegroup-core-lsb.bb         |    1 +
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 0a5b2f4..53ec2e7 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -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"
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index d692a26..cf04f0f 100644
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -161,6 +161,7 @@ RDEPENDS_packagegroup-core-lsb-core = "\
     ncurses \
     zlib \
     nspr \
+    libpng12 \
 "
 
 SUMMARY_packagegroup-core-lsb-perl = "LSB Runtime Languages (Perl)"
-- 
1.7.5.4