libpng-1.5.13

libpng-1.5.13

[Marko Lindqvist]

First preparatory patch makes it easier to add multiple major versions of
libpng. You may choose to commit this one only.

Second patch adds 1.5.13 recipe. This produces library named libpng15, while
old 1.2.50 recipe produces libpng12. Some older programs (and their recipes)
may fail to find newer library. So far I'm aware of one such case in
meta-openembedded; libsdl-image-1.2.10 needs update. I've already submitted
patch for that one.

[PATCH 1/2] libpng: split recipe to libpng.inc and libpng_1.2.50.bb

[Marko Lindqvist]

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-multimedia/libpng/libpng.inc       |   17 +++++++++++++++++
 meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   22 ++++++----------------
 2 files changed, 23 insertions(+), 16 deletions(-)
 create mode 100644 meta/recipes-multimedia/libpng/libpng.inc

diff --git a/meta/recipes-multimedia/libpng/libpng.inc b/meta/recipes-multimedia/libpng/libpng.inc
new file mode 100644
index 0000000..68b325a
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng.inc
@@ -0,0 +1,17 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+DEPENDS = "zlib"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${PNV}/${PV}/libpng-${PV}.tar.xz"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}${PNV}"
+
+FILES_${PN}${PNV} = "${libdir}/libpng${PNV}${SOLIBS}"
+RPROVIDES_${PN}-dev += "${PN}${PNV}-dev"
+
+BBCLASSEXTEND = "native"
diff --git a/meta/recipes-multimedia/libpng/libpng_1.2.50.bb b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
index 62989bb..7627e3a 100644
--- a/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
+++ b/meta/recipes-multimedia/libpng/libpng_1.2.50.bb
@@ -1,23 +1,13 @@
-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"
+PNV="12"
+
+require libpng.inc
+
 PR = "r0"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng12/${PV}/libpng-${PV}.tar.xz"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
+                    file://png.h;beginline=310;endline=424;md5=b87b5e9252a3e14808a27b92912d268d"
 
 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"
-
-BBCLASSEXTEND = "native"
-- 
1.7.10.4

[PATCH 2/2] libpng: add 1.5.13 recipe

[Marko Lindqvist]

License md5sums differ from 1.2.50 only because of version numbers
and release dates mentioned, and formatting changes.

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-multimedia/libpng/libpng_1.5.13.bb |   13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 meta/recipes-multimedia/libpng/libpng_1.5.13.bb

diff --git a/meta/recipes-multimedia/libpng/libpng_1.5.13.bb b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
new file mode 100644
index 0000000..90c8bed
--- /dev/null
+++ b/meta/recipes-multimedia/libpng/libpng_1.5.13.bb
@@ -0,0 +1,13 @@
+PNV="15"
+
+require libpng.inc
+
+PR = "r0"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
+                    file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
+
+SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183"
+SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee"
+
+inherit autotools binconfig pkgconfig
-- 
1.7.10.4

Re: libpng-1.5.13

[Saul Wold]

On 12/05/2012 12:40 PM, Marko Lindqvist wrote:
>
> First preparatory patch makes it easier to add multiple major versions of
> libpng. You may choose to commit this one only.
>
> Second patch adds 1.5.13 recipe. This produces library named libpng15, while
> old 1.2.50 recipe produces libpng12. Some older programs (and their recipes)
> may fail to find newer library. So far I'm aware of one such case in
> meta-openembedded; libsdl-image-1.2.10 needs update. I've already submitted
> patch for that one.
>
Overall, it's great to see the recipes updated, but we don't typically 
keep the older versions of recipes around.  So if you want to preserve 
the older version, it should be moved meta-oe.  The only case we keep 
older recipes is for License changes from GPLv2 -> GPLv3 where it makes 
sense.

So, the request would be a v2 that also removes the 1.2.50 recipe.

Thanks
	Sau!

> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
>

Re: libpng-1.5.13

[Marko Lindqvist]

On 6 December 2012 20:26, Saul Wold <sgw@linux.intel.com> wrote:
> On 12/05/2012 12:40 PM, Marko Lindqvist wrote:
>>
>>
>> First preparatory patch makes it easier to add multiple major versions of
>> libpng. You may choose to commit this one only.
>>
>> Second patch adds 1.5.13 recipe. This produces library named libpng15,
>> while
>> old 1.2.50 recipe produces libpng12. Some older programs (and their
>> recipes)
>> may fail to find newer library. So far I'm aware of one such case in
>> meta-openembedded; libsdl-image-1.2.10 needs update. I've already
>> submitted
>> patch for that one.
>>
> Overall, it's great to see the recipes updated, but we don't typically keep
> the older versions of recipes around.  So if you want to preserve the older
> version, it should be moved meta-oe.  The only case we keep older recipes is
> for License changes from GPLv2 -> GPLv3 where it makes sense.
>
> So, the request would be a v2 that also removes the 1.2.50 recipe.

 I wanted to keep 1.2.x as an option for a while in case someone needs
it for building something not yet compatible with 1.5.x (cleaned up
API).

 As requested, I'll make a simple patch to update from 1.2.50 to
1.5.13, but I'll leave it to you to decide if time is ready for such
an API changing update.


 - ML

Re: libpng-1.5.13

[Scott Garman]

On 12/06/2012 10:26 AM, Saul Wold wrote:
> On 12/05/2012 12:40 PM, Marko Lindqvist wrote:
>>
>> First preparatory patch makes it easier to add multiple major versions of
>> libpng. You may choose to commit this one only.
>>
>> Second patch adds 1.5.13 recipe. This produces library named libpng15,
>> while
>> old 1.2.50 recipe produces libpng12. Some older programs (and their
>> recipes)
>> may fail to find newer library. So far I'm aware of one such case in
>> meta-openembedded; libsdl-image-1.2.10 needs update. I've already
>> submitted
>> patch for that one.
>>
> Overall, it's great to see the recipes updated, but we don't typically
> keep the older versions of recipes around.  So if you want to preserve
> the older version, it should be moved meta-oe.  The only case we keep
> older recipes is for License changes from GPLv2 -> GPLv3 where it makes
> sense.
>
> So, the request would be a v2 that also removes the 1.2.50 recipe.

libpng has an entry in upstream_tracking.inc with a 
RECIPE_NO_UPDATE_REASON of "1.4.3 and later changes the API and breaks 
libmatchbox. Sticking with the 1.2.x series instead"

So if libmatchbox now builds with 1.5, we can remove the 1.2.x recipe 
for good. Otherwise we may need both versions, and need to ensure 
libmatchbox will use 1.2.x if it still requires it.

Scott

-- 
Scott Garman
Embedded Linux Engineer - Yocto Project
Intel Open Source Technology Center