[01/22] libpng: Version 1.6.7
diff mbox

Message ID 101dc5d8a9de5ad2b6083d9ceccd8adeb62025fe.1389173315.git.kibo@prevas.dk
State Accepted
Delegated to: Esben Haabendal
Headers show

Commit Message

Kim B√łndergaard Jan. 8, 2014, 9:30 a.m. UTC
---
 recipes/libpng/libpng.inc          | 9 ++++++++-
 recipes/libpng/libpng16.inc        | 6 ++++++
 recipes/libpng/libpng_1.6.7.oe     | 1 +
 recipes/libpng/libpng_1.6.7.oe.sig | 1 +
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 recipes/libpng/libpng16.inc
 create mode 100644 recipes/libpng/libpng_1.6.7.oe
 create mode 100644 recipes/libpng/libpng_1.6.7.oe.sig

Comments

Esben Haabendal Feb. 6, 2014, 1:17 p.m. UTC | #1
Kim B√łndergaard <kibo@prevas.dk> writes:

> ---
>  recipes/libpng/libpng.inc          | 9 ++++++++-
>  recipes/libpng/libpng16.inc        | 6 ++++++
>  recipes/libpng/libpng_1.6.7.oe     | 1 +
>  recipes/libpng/libpng_1.6.7.oe.sig | 1 +
>  4 files changed, 16 insertions(+), 1 deletion(-)
>  create mode 100644 recipes/libpng/libpng16.inc
>  create mode 100644 recipes/libpng/libpng_1.6.7.oe
>  create mode 100644 recipes/libpng/libpng_1.6.7.oe.sig
>
> diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
> index 4d29ba9..8989265 100644
> --- a/recipes/libpng/libpng.inc
> +++ b/recipes/libpng/libpng.inc
> @@ -8,6 +8,13 @@ BINCONFIG_GLOB = "${bindir}/libpng-config"
>  RECIPE_TYPES = "machine native sdk"
>  
>  DEPENDS = "libz libm"
> +DEPENDS_${PN} += "libc"
>  
>  require conf/fetch/sourceforge.conf
> -SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
> +TARBALL_EXT ?= "bz2"
> +SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.${TARBALL_EXT}"
> +
> +PACKAGES += "${PN}-pngfix"
> +FILES_${PN}-pngfix = "${bindir}/pngfix ${bindir}/png-fix-itxt"
> +DEPENDS_${PN}-pngfix = "libc libm libpng16 libz"
> +RDEPENDS_${PN}-pngfix = "libc libm libpng16 libz"

Is this pngfix package new for 1.6?  Or is it also valid for both 1.2
and 1.5?  If it is not valid for all supported versions, the change
should go into fx. libpng16.inc instead.

> diff --git a/recipes/libpng/libpng16.inc b/recipes/libpng/libpng16.inc
> new file mode 100644
> index 0000000..c0500c7
> --- /dev/null
> +++ b/recipes/libpng/libpng16.inc
> @@ -0,0 +1,6 @@
> +TARBALL_EXT = "gz"
> +require libpng.inc
> +
> +DEPENDS_${PN} += "libm libz"
> +PROVIDES_${PN} += "libpng16"
> +PROVIDES_${PN}-dev += "libpng16-dev"
> diff --git a/recipes/libpng/libpng_1.6.7.oe b/recipes/libpng/libpng_1.6.7.oe
> new file mode 100644
> index 0000000..cb63880
> --- /dev/null
> +++ b/recipes/libpng/libpng_1.6.7.oe
> @@ -0,0 +1 @@
> +require libpng16.inc
> diff --git a/recipes/libpng/libpng_1.6.7.oe.sig b/recipes/libpng/libpng_1.6.7.oe.sig
> new file mode 100644
> index 0000000..0352ab3
> --- /dev/null
> +++ b/recipes/libpng/libpng_1.6.7.oe.sig
> @@ -0,0 +1 @@
> +22fcd1aaab3d8f4b98f43e5b301cc4fd7cc15722  libpng-1.6.7.tar.gz

/Esben
Esben Haabendal Feb. 7, 2014, 11:49 a.m. UTC | #2
Merged to master, thanks.

/Esben

Patch
diff mbox

diff --git a/recipes/libpng/libpng.inc b/recipes/libpng/libpng.inc
index 4d29ba9..8989265 100644
--- a/recipes/libpng/libpng.inc
+++ b/recipes/libpng/libpng.inc
@@ -8,6 +8,13 @@  BINCONFIG_GLOB = "${bindir}/libpng-config"
 RECIPE_TYPES = "machine native sdk"
 
 DEPENDS = "libz libm"
+DEPENDS_${PN} += "libc"
 
 require conf/fetch/sourceforge.conf
-SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.bz2"
+TARBALL_EXT ?= "bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/${PN}/${PN}-${PV}.tar.${TARBALL_EXT}"
+
+PACKAGES += "${PN}-pngfix"
+FILES_${PN}-pngfix = "${bindir}/pngfix ${bindir}/png-fix-itxt"
+DEPENDS_${PN}-pngfix = "libc libm libpng16 libz"
+RDEPENDS_${PN}-pngfix = "libc libm libpng16 libz"
diff --git a/recipes/libpng/libpng16.inc b/recipes/libpng/libpng16.inc
new file mode 100644
index 0000000..c0500c7
--- /dev/null
+++ b/recipes/libpng/libpng16.inc
@@ -0,0 +1,6 @@ 
+TARBALL_EXT = "gz"
+require libpng.inc
+
+DEPENDS_${PN} += "libm libz"
+PROVIDES_${PN} += "libpng16"
+PROVIDES_${PN}-dev += "libpng16-dev"
diff --git a/recipes/libpng/libpng_1.6.7.oe b/recipes/libpng/libpng_1.6.7.oe
new file mode 100644
index 0000000..cb63880
--- /dev/null
+++ b/recipes/libpng/libpng_1.6.7.oe
@@ -0,0 +1 @@ 
+require libpng16.inc
diff --git a/recipes/libpng/libpng_1.6.7.oe.sig b/recipes/libpng/libpng_1.6.7.oe.sig
new file mode 100644
index 0000000..0352ab3
--- /dev/null
+++ b/recipes/libpng/libpng_1.6.7.oe.sig
@@ -0,0 +1 @@ 
+22fcd1aaab3d8f4b98f43e5b301cc4fd7cc15722  libpng-1.6.7.tar.gz