Marko Lindqvist : libpng: update to upstream version 1.5.13

oe-commits New Martin Jansa 1 participant 3 messages Dec 22, 2012 1 message not in the archive

lore

Share & tools

lore

A message that is not in the archive (sent off-list or not yet received): 20121219175401.20C2610394@opal

Martin Jansa

author

2012-12-22 16:20 UTC #1 lore raw

Quoted 5 lines · On Wed, Dec 19, 2012 at 05:54:00PM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: 317cbe5f5d4bf9366657a0d5383108c1b3340a8a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=317cbe5f5d4bf9366657a0d5383108c1b3340a8a

Quoted 7 lines

Author: Marko Lindqvist <[email protected]>
Date:   Thu Dec 13 19:48:14 2012 +0200
libpng: update to upstream version 1.5.13
Updating from 1.2.x means also change in actual library name from libpng12 to libpng15, and slight changes in API.

Why isn't this handled by debian.bbclass like in other libs?

PN-dev and PN-dbg are broken, because they depend on nonexistent libpng and main libpng package is named libpng15-15

Package: libpng15-15
Version: 1.5.13-r0
Depends: libz1 (>= 1.2.7), libc6 (>= 2.16)

Package: libpng-dev
Version: 1.5.13-r0
Depends: libpng (= 1.5.13-r0), libpng15-15

Package: libpng-dbg
Version: 1.5.13-r0
Recommends: libpng (= 1.5.13-r0), libc6-dbg, libz-dbg

Cheers,

Quoted 78 lines

License md5sums differ only because of license text formatting changes and because they contain version numbers and release dates.

Signed-off-by Marko Lindqvist <[email protected]>

Signed-off-by Saul Wold <[email protected]>

---

 meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   23 ----------------------
 meta/recipes-multimedia/libpng/libpng_1.5.13.bb |   24 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)

meta/recipes-multimedia/libpng/libpng_1.2.50.bb deleted +0 ~~-23~~

deleted file mode 100644
index 7015538..0000000
@@ -1,23 +0,0 @@
-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"
-
-BBCLASSEXTEND = "native nativesdk"

meta/recipes-multimedia/libpng/libpng_1.5.13.bb new file +24 -0

new file mode 100644
index 0000000..28220ad
@@ -0,0 +1,24 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
+                    file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
+DEPENDS = "zlib"
+PR = "r0"
+LIBV = "15"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183"
+SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}${LIBV}"
+
+FILES_${PN}${LIBV} = "${libdir}/libpng${LIBV}${SOLIBS}"
+RPROVIDES_${PN}-dev += "${PN}${LIBV}-dev"
+
+BBCLASSEXTEND = "native nativesdk"

_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-12-22 16:31 UTC #2 lore raw

Hmm public.gmane.org is accepted for patches and SOB lines?

To be more clear about the issue with this upgrade:

See this change in buildhistory:
https://github.com/shr-distribution/buildhistory/commit/440d53dc7b448e05f9d01fc80587e50b3406768f

It's together with a lot of other changes, so github will probably show it badly, but you probably have better commit in buildhistory from own tests.

Old package had PN/libpng3 and PN12/libpng12-0, while new recipe build only one version and moves it incorrectly to PN15:

packages/cortexa8-vfp-neon-oe-linux-gnueabi/libpng/libpng/latest +3 -4

@@ -1,8 +1,7 @@
-PV = 1.2.50
+PV = 1.5.13
 PR = r0
-PKG = libpng3
-RDEPENDS = eglibc (>= 2.16) zlib (>= 1.2.7)
+RDEPENDS = 
 RRECOMMENDS =
-PKGSIZE = 105584
+PKGSIZE = 0
 FILES = /usr/bin/* /usr/sbin/* /usr/lib/libpng/* /usr/lib/lib*.so.*

/etc /com /var /bin/* /sbin/* /lib/*.so.* /lib/udev/rules.d /usr/lib/udev/rules.d /usr/share/libpng /usr/lib/libpng/* /usr/share/pixmaps /usr/share/applications /usr/share/idl /usr/share/omf /usr/share/sounds /usr/lib/bonobo/servers
-FILELIST = /usr/lib/libpng.so.3 /usr/lib/libpng.so.3.50.0 +FILELIST =

packages/cortexa8-vfp-neon-oe-linux-gnueabi/libpng/libpng12/latest deleted +0 -8

@@ -1,8 +0,0 @@
-PV = 1.2.50
-PR = r0
-PKG = libpng12-0
-RDEPENDS = eglibc (>= 2.16) zlib (>= 1.2.7)
-RRECOMMENDS = 
-PKGSIZE = 94738
-FILES = /usr/lib/libpng12.so.*
-FILELIST = /usr/lib/libpng12.so.0 /usr/lib/libpng12.so.0.50.0

packages/cortexa8-vfp-neon-oe-linux-gnueabi/libpng/libpng15/latest new file +8 -0

@@ -0,0 +1,8 @@
+PV = 1.5.13
+PR = r0
+PKG = libpng15-15
+RDEPENDS = eglibc (>= 2.16) zlib (>= 1.2.7)
+RRECOMMENDS = 
+PKGSIZE = 103515
+FILES = /usr/lib/libpng15.so.*
+FILELIST = /usr/lib/libpng15.so.15 /usr/lib/libpng15.so.15.13.0

Regards,

Quoted 114 lines · Martin Jansa

Quoted 5 lines · On Wed, Dec 19, 2012 at 05:54:00PM +0000, [email protected] wrote:
Module: openembedded-core.git
Branch: master
Commit: 317cbe5f5d4bf9366657a0d5383108c1b3340a8a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=317cbe5f5d4bf9366657a0d5383108c1b3340a8a
Quoted 7 lines
Author: Marko Lindqvist <[email protected]>
Date:   Thu Dec 13 19:48:14 2012 +0200
libpng: update to upstream version 1.5.13
Updating from 1.2.x means also change in actual library name from libpng12 to libpng15, and slight changes in API.
Why isn't this handled by debian.bbclass like in other libs?
PN-dev and PN-dbg are broken, because they depend on nonexistent libpng and main libpng package is named libpng15-15
Package: libpng15-15
Version: 1.5.13-r0
Depends: libz1 (>= 1.2.7), libc6 (>= 2.16)
Package: libpng-dev
Version: 1.5.13-r0
Depends: libpng (= 1.5.13-r0), libpng15-15
Package: libpng-dbg
Version: 1.5.13-r0
Recommends: libpng (= 1.5.13-r0), libc6-dbg, libz-dbg
Cheers,
Quoted 78 lines
License md5sums differ only because of license text formatting changes and because they contain version numbers and release dates.
Signed-off-by Marko Lindqvist <[email protected]>
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-multimedia/libpng/libpng_1.2.50.bb |   23 ----------------------
 meta/recipes-multimedia/libpng/libpng_1.5.13.bb |   24 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 23 deletions(-)
meta/recipes-multimedia/libpng/libpng_1.2.50.bb deleted +0 ~~-23~~
deleted file mode 100644
index 7015538..0000000
@@ -1,23 +0,0 @@
-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"
-
-BBCLASSEXTEND = "native nativesdk"
meta/recipes-multimedia/libpng/libpng_1.5.13.bb new file +24 -0
new file mode 100644
index 0000000..28220ad
@@ -0,0 +1,24 @@
+SUMMARY = "PNG Library"
+DESCRIPTION = "PNG Library"
+HOMEPAGE = "http://www.libpng.org/"
+SECTION = "libs"
+LICENSE = "Libpng"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
+                    file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
+DEPENDS = "zlib"
+PR = "r0"
+LIBV = "15"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz"
+
+SRC_URI[md5sum] = "0b607a685da977f1bfc96e1c47055183"
+SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271257aee"
+
+inherit autotools binconfig pkgconfig
+
+PACKAGES =+ "${PN}${LIBV}"
+
+FILES_${PN}${LIBV} = "${libdir}/libpng${LIBV}${SOLIBS}"
+RPROVIDES_${PN}-dev += "${PN}${LIBV}-dev"
+
+BBCLASSEXTEND = "native nativesdk"
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-12-22 16:39 UTC #3 lore raw

PATCH 1/1 libpng: fix packaging

* PN-LIBV is not needed, was used to package libpng12 from libpng3 build now only libpng15 is built.
* if you're not using OEBasicHash + PRserv you need to rebuild and reinstall a lot of packages to upgrade to libpng-1.5 correctly

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-multimedia/libpng/libpng_1.5.13.bb | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

meta/recipes-multimedia/libpng/libpng_1.5.13.bb +1 -6

index 28220ad..04bb932 100644
@@ -6,7 +6,7 @@ LICENSE = "Libpng"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=00b5b35853278d508806c2e5860e82cb \
                     file://png.h;beginline=207;endline=321;md5=50e583fb60bb36f37ab5023b2a3715d1"
 DEPENDS = "zlib"
-PR = "r0"
+PR = "r1"
 LIBV = "15"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/project/libpng/libpng${LIBV}/${PV}/libpng-${PV}.tar.xz"

@@ -16,9 +16,4 @@ SRC_URI[sha256sum] = "b843f9cb01d10ae22acd9aaf58aceaa4a6aeb9cf78943b41588004b271
 
 inherit autotools binconfig pkgconfig
 
-PACKAGES =+ "${PN}${LIBV}"
-
-FILES_${PN}${LIBV} = "${libdir}/libpng${LIBV}${SOLIBS}"
-RPROVIDES_${PN}-dev += "${PN}${LIBV}-dev"
-
 BBCLASSEXTEND = "native nativesdk"

Signature · 1 line

1.8.0.2