Patchwork [1/2] libpng: add version 1.2 back

login
register
mail settings
Submitter Kang Kai
Date March 25, 2013, 10:21 a.m.
Message ID <e3e9dea5c45c1b5ba29300e4957dcd611655492e.1364204199.git.kai.kang@windriver.com>
Download mbox | patch
Permalink /patch/46835/
State New
Headers show

Comments

Kang Kai - March 25, 2013, 10:21 a.m.
Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
back, and set it as default verison for linuxstdbase image.

[YOCTO 4015]

Signed-off-by: Kang Kai <kai.kang@windriver.com>
---
 meta/conf/distro/include/default-versions.inc   |    3 +++
 meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   21 +++++++++++++++++++++
 2 files changed, 24 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.50.bb
Richard Purdie - March 25, 2013, 10:52 a.m.
On Mon, 2013-03-25 at 18:21 +0800, Kang Kai wrote:
> Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
> back, and set it as default verison for linuxstdbase image.
> 
> [YOCTO 4015]
> 
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>  meta/conf/distro/include/default-versions.inc   |    3 +++
>  meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   21 +++++++++++++++++++++
>  2 files changed, 24 insertions(+), 0 deletions(-)
>  create mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.50.bb

I'm not entirely happy about this :/ Lets put this into
meta/recipes-lsb4 along with the other stuff we just have around for
official compatibility. 

Cheers,

Richard
Mark Hatle - March 25, 2013, 1:38 p.m.
On 3/25/13 5:21 AM, Kang Kai wrote:
> Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
> back, and set it as default verison for linuxstdbase image.

I think this is close, but incorrect.  What should be added for compatibility is 
a -new- package called "libpng12_1.2.50.bb".  Ensure that the libpng-config 
(which should installed into crossscripts) is also renamed to libpng12-config.

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.

--Mark

> [YOCTO 4015]
>
> Signed-off-by: Kang Kai <kai.kang@windriver.com>
> ---
>   meta/conf/distro/include/default-versions.inc   |    3 +++
>   meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   21 +++++++++++++++++++++
>   2 files changed, 24 insertions(+), 0 deletions(-)
>   create mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.50.bb
>
> diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
> index 53ec2e7..0a5b2f4 100644
> --- a/meta/conf/distro/include/default-versions.inc
> +++ b/meta/conf/distro/include/default-versions.inc
> @@ -9,3 +9,6 @@ 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-multimedia/libpng/libpng_1.2.50.bb b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
> new file mode 100644
> index 0000000..8fdc41b
> --- /dev/null
> +++ b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
> @@ -0,0 +1,21 @@
> +SUMMARY = "PNG Library"
> +DESCRIPTION = "PNG Library"
> +HOMEPAGE = "http://www.libpng.org/"
> +SECTION = "libs"
> +LICENSE = "Libpng"
> +LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
> +                    file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
> +DEPENDS = "zlib"
> +PR = "r0"
> +
> +SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
> +
> +SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7"
> +SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7"
> +
> +inherit autotools binconfig pkgconfig
> +
> +PACKAGES =+ "${PN}12"
> +
> +FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
> +RPROVIDES_${PN}-dev += "${PN}12-dev"
>
Kang Kai - March 26, 2013, 2:17 a.m.
On 2013?03?25? 18:52, Richard Purdie wrote:
> On Mon, 2013-03-25 at 18:21 +0800, Kang Kai wrote:
>> Current LSB 4.1 test suite still check libpng12.so, so add libpng 1.2.x
>> back, and set it as default verison for linuxstdbase image.
>>
>> [YOCTO 4015]
>>
>> Signed-off-by: Kang Kai<kai.kang@windriver.com>
>> ---
>>   meta/conf/distro/include/default-versions.inc   |    3 +++
>>   meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   21 +++++++++++++++++++++
>>   2 files changed, 24 insertions(+), 0 deletions(-)
>>   create mode 100644 meta/recipes-multimedia/libpng/libpng_1.2.50.bb
> I'm not entirely happy about this :/ Lets put this into
> meta/recipes-lsb4 along with the other stuff we just have around for
> official compatibility.

OK, I'll send V2.

Regards,
Kai

>
> Cheers,
>
> Richard
>
>
>

Patch

diff --git a/meta/conf/distro/include/default-versions.inc b/meta/conf/distro/include/default-versions.inc
index 53ec2e7..0a5b2f4 100644
--- a/meta/conf/distro/include/default-versions.inc
+++ b/meta/conf/distro/include/default-versions.inc
@@ -9,3 +9,6 @@  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-multimedia/libpng/libpng_1.2.50.bb b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
new file mode 100644
index 0000000..8fdc41b
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
@@ -0,0 +1,21 @@ 
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
+                    file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
+DEPENDS = "zlib"
+PR = "r0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "a3e00fccbfe356174ab515b5c00641c7"
+SRC_URI[sha256sum] = "4724f81f8c92ac7f360ad1fbf173396ea7c535923424db9fbaff07bfd9d8e8e7"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}12"
+
+FILES_${PN}12 = "${libdir}/libpng12${SOLIBS}"
+RPROVIDES_${PN}-dev += "${PN}12-dev"