rename libpng_1.2.50 to libpng12

PATCH In review Kang Kai 2 participants 5 messages Apr 8, 2013 – Apr 9, 2013

lore

Share & tools

lore

Kang Kai

author

2013-04-08 09:27 UTC #0 lore raw

cover rename libpng_1.2.50 to libpng12

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%)

Signature · 1 line

1.7.5.4

Kang Kai

author

2013-04-08 09:27 UTC #1 lore raw

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. 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 <[email protected]>

Signed-off-by Kang Kai <[email protected]>

---
 .../{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%)

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +15 -3

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
@@ -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
+}

Signature · 1 line

1.7.5.4

Mark Hatle

2013-04-08 15:18 UTC #2 lore raw

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

Quoted 33 lines · 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 <[email protected]>
Signed-off-by Kang Kai <[email protected]>
---
  .../{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%)
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +3 -0
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
@@ -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"

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 25

Quoted 10 lines

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +5 -1

  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.

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 29

Quoted 4 lines

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +4 -0
+
+	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.

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 30

Quoted 1 line

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +1 -0
+	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.)

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 33

Quoted 4 lines

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +2 -2
-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

Kang Kai

author

2013-04-09 02:39 UTC #3 lore raw

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

Quoted 37 lines · Mark Hatle

Quoted 36 lines · 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 <[email protected]>
Signed-off-by Kang Kai <[email protected]>
---
.../{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%)
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +0 -0
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
@@ -8,14 +8,26 @@ LIC_FILES_CHKSUM = 
 "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \
DEPENDS = "zlib"
PR = "r0"
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +3 -0
+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"

Quoted 9 lines

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 25
Quoted 8 lines
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +2 -0
+BINCONFIG_GLOB = "${PN}-config"
+
inherit autotools binconfig pkgconfig
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +3 -1
-PACKAGES =+ "${PN}12"
+do_install_append() {
+ unlink ${D}/${includedir}/png.h
+ unlink ${D}/${includedir}/pngconf.h

Hi Mark,

Quoted 3 lines

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.

Quoted 7 lines

Quoted 5 lines
+
+ 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.*.

Quoted 6 lines

Quoted 2 lines
+ 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.

Quoted 7 lines

meta/recipes-lsb4/libpng/libpng12_1.2.50.bb LIC_FILES_CHKSUM = "file://LICENSE;md5=c3d807a85c09ebdff087f18b4969ff96 \ · line 33
Quoted 5 lines
meta/recipes-lsb4/libpng/libpng12_1.2.50.bb renamed from meta/recipes-lsb4/libpng/libpng_1.2.50.bb +2 -2
-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.

Quoted 4 lines

(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.

Signature · 2 lines

Regards,
Neil | Kai Kang

Kang Kai

author

2013-04-08 09:27 UTC #4 lore raw

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

In reply to 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 <[email protected]>

---
 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

index 0a5b2f4..53ec2e7 100644
@@ -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

index d692a26..cf04f0f 100644
@@ -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