[PATCH] zlib: Add version 1.2.5

[PATCH] zlib: Add version 1.2.5

[Eric Benard]

- update autotool patch for this version
- tested on x86

Signed-off-by: Eric Benard <eric@eukrea.com>
---
 recipes/zlib/files/0001-autotools.patch |   58 +++++++++++++++++++++++++++++++
 recipes/zlib/zlib-native_1.2.5.bb       |    9 +++++
 recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
 recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
 4 files changed, 93 insertions(+), 0 deletions(-)
 create mode 100644 recipes/zlib/files/0001-autotools.patch
 create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
 create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
 create mode 100644 recipes/zlib/zlib_1.2.5.bb

diff --git a/recipes/zlib/files/0001-autotools.patch b/recipes/zlib/files/0001-autotools.patch
new file mode 100644
index 0000000..38cae87
--- /dev/null
+++ b/recipes/zlib/files/0001-autotools.patch
@@ -0,0 +1,58 @@
+From ce7f7b24c6bf140feeb92da4e9b662e35a163c35 Mon Sep 17 00:00:00 2001
+From: Eric Benard <eric@eukrea.com>
+Date: Sun, 2 May 2010 10:49:05 +0200
+Subject: [PATCH] autotools
+
+---
+ Makefile.am  |   12 ++++++++++++
+ configure.ac |   17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..0f2e882
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,12 @@
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = adler32.c compress.c crc32.c gzclose.c gzlib.c gzread.c gzwrite.c \
++		uncompr.c deflate.c trees.c zutil.c inflate.c infback.c inftrees.c \
++		inffast.c
++
++libz_la_LDFLAGS = -version-number 1:2:3                                                                                
++
++include_HEADERS = zconf.h zlib.h                                                                                       
++
++pkgconfigdir = $(libdir)/pkgconfig                                                                                     
++pkgconfig_DATA = zlib.pc
+\ No newline at end of file
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..177c89a
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,17 @@
++AC_INIT(zlib,1.2.5)
++AC_CONFIG_SRCDIR(adler32.c)
++AM_INIT_AUTOMAKE(zlibs,1.2.5)
++
++AC_PREREQ([2.59])
++
++AC_PROG_CC([gcc])
++AC_PROG_LIBTOOL
++
++AC_HEADER_STDC
++
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
++
++AC_OUTPUT
+\ No newline at end of file
+-- 
+1.6.3.3
+
diff --git a/recipes/zlib/zlib-native_1.2.5.bb b/recipes/zlib/zlib-native_1.2.5.bb
new file mode 100644
index 0000000..1ac5c96
--- /dev/null
+++ b/recipes/zlib/zlib-native_1.2.5.bb
@@ -0,0 +1,9 @@
+require zlib_${PV}.bb
+ZLIB_EXTRA = ""
+DEPENDS = "libtool-native"
+
+inherit native
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
+
diff --git a/recipes/zlib/zlib-sdk_1.2.5.bb b/recipes/zlib/zlib-sdk_1.2.5.bb
new file mode 100644
index 0000000..4863395
--- /dev/null
+++ b/recipes/zlib/zlib-sdk_1.2.5.bb
@@ -0,0 +1,4 @@
+require zlib_${PV}.bb
+LIB_EXTRA = ""
+
+inherit sdk
diff --git a/recipes/zlib/zlib_1.2.5.bb b/recipes/zlib/zlib_1.2.5.bb
new file mode 100644
index 0000000..3a8c26f
--- /dev/null
+++ b/recipes/zlib/zlib_1.2.5.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+PR ="r1"
+
+SRC_URI = "http://www.zlib.net/zlib-1.2.5.tar.bz2 \
+		file://0001-autotools.patch;patch=1 "
+
+S = "${WORKDIR}/zlib-${PV}"
+
+DEPENDS = "libtool-cross"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
-- 
1.6.3.3

Re: [PATCH] zlib: Add version 1.2.5

[Eric Bénard]

Hi,

Le 02/05/2010 11:03, Eric Benard a écrit :
> ++
> ++libz_la_LDFLAGS = -version-number 1:2:3
> ++
forget this one I didn't update the patch before format patch.

Eric

[PATCH v2] zlib: Add version 1.2.5

[Eric Benard]

- update autotool patch for this version
- tested on x86

Signed-off-by: Eric Benard <eric@eukrea.com>
---
v2 :
	fix the autotools patch to have the correct version number
	remove whitspaces

 recipes/zlib/files/0001-autotools.patch |   57 +++++++++++++++++++++++++++++++
 recipes/zlib/zlib-native_1.2.5.bb       |    9 +++++
 recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
 recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
 4 files changed, 92 insertions(+), 0 deletions(-)
 create mode 100644 recipes/zlib/files/0001-autotools.patch
 create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
 create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
 create mode 100644 recipes/zlib/zlib_1.2.5.bb

diff --git a/recipes/zlib/files/0001-autotools.patch b/recipes/zlib/files/0001-autotools.patch
new file mode 100644
index 0000000..6642860
--- /dev/null
+++ b/recipes/zlib/files/0001-autotools.patch
@@ -0,0 +1,57 @@
+From d6b0c74edb3fc58060d1ab337bcb1f838328ebbf Mon Sep 17 00:00:00 2001
+From: Eric Benard <eric@eukrea.com>
+Date: Sun, 2 May 2010 10:49:05 +0200
+Subject: [PATCH] autotools
+
+---
+ Makefile.am  |   12 ++++++++++++
+ configure.ac |   17 +++++++++++++++++
+ 2 files changed, 29 insertions(+), 0 deletions(-)
+ create mode 100644 Makefile.am
+ create mode 100644 configure.ac
+
+diff --git a/Makefile.am b/Makefile.am
+new file mode 100644
+index 0000000..76976fb
+--- /dev/null
++++ b/Makefile.am
+@@ -0,0 +1,12 @@
++lib_LTLIBRARIES = libz.la
++
++libz_la_SOURCES = adler32.c compress.c crc32.c gzclose.c gzlib.c gzread.c gzwrite.c \
++		uncompr.c deflate.c trees.c zutil.c inflate.c infback.c inftrees.c \
++		inffast.c
++
++libz_la_LDFLAGS = -version-number 1:2:5
++
++include_HEADERS = zconf.h zlib.h
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = zlib.pc
+diff --git a/configure.ac b/configure.ac
+new file mode 100644
+index 0000000..177c89a
+--- /dev/null
++++ b/configure.ac
+@@ -0,0 +1,17 @@
++AC_INIT(zlib,1.2.5)
++AC_CONFIG_SRCDIR(adler32.c)
++AM_INIT_AUTOMAKE(zlibs,1.2.5)
++
++AC_PREREQ([2.59])
++
++AC_PROG_CC([gcc])
++AC_PROG_LIBTOOL
++
++AC_HEADER_STDC
++
++AC_CONFIG_FILES([
++Makefile
++zlib.pc
++])
++
++AC_OUTPUT
+\ No newline at end of file
+-- 
+1.6.3.3
+
diff --git a/recipes/zlib/zlib-native_1.2.5.bb b/recipes/zlib/zlib-native_1.2.5.bb
new file mode 100644
index 0000000..1ac5c96
--- /dev/null
+++ b/recipes/zlib/zlib-native_1.2.5.bb
@@ -0,0 +1,9 @@
+require zlib_${PV}.bb
+ZLIB_EXTRA = ""
+DEPENDS = "libtool-native"
+
+inherit native
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
+
diff --git a/recipes/zlib/zlib-sdk_1.2.5.bb b/recipes/zlib/zlib-sdk_1.2.5.bb
new file mode 100644
index 0000000..4863395
--- /dev/null
+++ b/recipes/zlib/zlib-sdk_1.2.5.bb
@@ -0,0 +1,4 @@
+require zlib_${PV}.bb
+LIB_EXTRA = ""
+
+inherit sdk
diff --git a/recipes/zlib/zlib_1.2.5.bb b/recipes/zlib/zlib_1.2.5.bb
new file mode 100644
index 0000000..3a8c26f
--- /dev/null
+++ b/recipes/zlib/zlib_1.2.5.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Zlib Compression Library"
+SECTION = "libs"
+PRIORITY = "required"
+HOMEPAGE = "http://www.gzip.org/zlib/"
+LICENSE = "zlib"
+PR ="r1"
+
+SRC_URI = "http://www.zlib.net/zlib-1.2.5.tar.bz2 \
+		file://0001-autotools.patch;patch=1 "
+
+S = "${WORKDIR}/zlib-${PV}"
+
+DEPENDS = "libtool-cross"
+
+inherit autotools
+
+do_stage() {
+	autotools_stage_all
+}
+
+SRC_URI[md5sum] = "be1e89810e66150f5b0327984d8625a0"
+SRC_URI[sha256sum] = "239aead2f22f16bfcfa6a6a5150dcbd6d6f2e4d1eaa8727b5769ea014120b307"
-- 
1.6.3.3

Re: [PATCH v2] zlib: Add version 1.2.5

[Roman I Khimov]

[-- Attachment #1: Type: Text/Plain, Size: 1940 bytes --]

В сообщении от Воскресенье 02 мая 2010 14:21:38 автор Eric Benard написал:
> - update autotool patch for this version
> - tested on x86
> 
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> v2 :
> 	fix the autotools patch to have the correct version number
> 	remove whitspaces

Please, the next time you submit updated version of any patch go to 
patchwork.openembedded.org and update the status of old one to "Superseded". 
I've done that for this particular patch as I've looked at it anyway, but at 
quick glance there are other leftovers there, so it'd be nice if you've 
cleaned that up.

>  recipes/zlib/files/0001-autotools.patch |   57
>  +++++++++++++++++++++++++++++++ recipes/zlib/zlib-native_1.2.5.bb       | 
>    9 +++++
>  recipes/zlib/zlib-sdk_1.2.5.bb          |    4 ++
>  recipes/zlib/zlib_1.2.5.bb              |   22 ++++++++++++
>  4 files changed, 92 insertions(+), 0 deletions(-)
>  create mode 100644 recipes/zlib/files/0001-autotools.patch
>  create mode 100644 recipes/zlib/zlib-native_1.2.5.bb
>  create mode 100644 recipes/zlib/zlib-sdk_1.2.5.bb
>  create mode 100644 recipes/zlib/zlib_1.2.5.bb

I think it'd be nice to do BBCLASSEXTEND conversion here (there was an 
attempt: 
http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-March/018132.html 
) and add new version with a move to common .inc file.

> --- /dev/null
> +++ b/recipes/zlib/zlib_1.2.5.bb
> @@ -0,0 +1,22 @@
> +DESCRIPTION = "Zlib Compression Library"
> +SECTION = "libs"
> +PRIORITY = "required"
> +HOMEPAGE = "http://www.gzip.org/zlib/"
> +LICENSE = "zlib"
> +PR ="r1"

PR should be "r0".

> +inherit autotools
> +
> +do_stage() {
> +       autotools_stage_all
> +}

Maybe change this to

inherit autotools_stage

?

-- 
 http://roman.khimov.ru
mailto: roman@khimov.ru
gpg --keyserver hkp://subkeys.pgp.net --recv-keys 0xE5E055C3

[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH v2] zlib: Add version 1.2.5

[Eric Bénard]

Le 02/05/2010 14:57, Roman I Khimov a écrit :
> Please, the next time you submit updated version of any patch go to
> patchwork.openembedded.org and update the status of old one to "Superseded".
> I've done that for this particular patch as I've looked at it anyway, but at
> quick glance there are other leftovers there, so it'd be nice if you've
> cleaned that up.
>
done, I was not aware of these features in patchwork.

> I think it'd be nice to do BBCLASSEXTEND conversion here (there was an
> attempt:
> http://lists.linuxtogo.org/pipermail/openembedded-devel/2010-March/018132.html
> ) and add new version with a move to common .inc file.
>
OK, I will send an updated patch with this.

Eric

Re: [PATCH v2] zlib: Add version 1.2.5

[Henning Heinold]

On Sun, May 02, 2010 at 12:21:38PM +0200, Eric Benard wrote:
> - update autotool patch for this version
> - tested on x86
> 
> Signed-off-by: Eric Benard <eric@eukrea.com>
> ---
> +do_stage() {
> +	autotools_stage_all
> +}
> +

do_stage is deprecated and shouldn't be used for new recipes. Furthermore zlib is a Candidate for
BBCLASSEXTEND to get native and sdk packages with one recipe.

Bye Henning

Re: [PATCH] zlib: Add version 1.2.5

[Mark Brown]

On Sun, May 02, 2010 at 11:03:06AM +0200, Eric Benard wrote:
> - update autotool patch for this version
> - tested on x86
> 
> Signed-off-by: Eric Benard <eric@eukrea.com>

I don't see any handling of the incompatibility with old versions of
libxml here?