lzo: upgrade to version 2.04

from 2.03

lzo: fix LIC_FILES_CHKSUM

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

4 files changed, 25 insertions, 22 deletions

diff --git a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch b/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
deleted file mode 100644
index 5762f4c6e2..0000000000
--- a/meta/recipes-support/lzo/lzo-2.03/autofoo.patch
+++ /dev/null
@@ -1,17 +0,0 @@
----
- configure.ac |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Index: lzo-2.02/configure.ac
-===================================================================
---- lzo-2.02.orig/configure.ac	2007-08-08 15:28:14.000000000 +0100
-+++ lzo-2.02/configure.ac	2007-08-08 15:28:21.000000000 +0100
-@@ -47,7 +47,7 @@ AC_CANONICAL_TARGET
- AM_MAINTAINER_MODE
- 
- if test -z "$ac_abs_top_srcdir"; then
--    _AC_SRCPATHS(.)
-+    _AC_SRCDIRS(.)
- fi
- if test -r .Conf.settings1; then
-     . ./.Conf.settings1
diff --git a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4 b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4
index c4d2ccd5b5..c4d2ccd5b5 100644
--- a/meta/recipes-support/lzo/lzo-2.03/acinclude.m4
+++ b/meta/recipes-support/lzo/lzo-2.04/acinclude.m4
diff --git a/meta/recipes-support/lzo/lzo-2.04/autoconf.patch b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch
new file mode 100644
index 0000000000..c342387107
--- /dev/null
+++ b/meta/recipes-support/lzo/lzo-2.04/autoconf.patch
@@ -0,0 +1,19 @@
+Date: 12/31/2010
+Didn't find 2.67 specific features, so lower the requirement
+to pass build
+
+Signed-off-by: Qing He <qing.he@intel.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 650749a..2a78845 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -36,7 +36,7 @@ All Rights Reserved.
+ This configure script may be copied, distributed and modified under the
+ terms of the GNU General Public License; see COPYING for more details.])
+ 
+-AC_PREREQ(2.67)
++AC_PREREQ(2.65)
+ AC_INIT([LZO],[2.04],[markus@oberhumer.com],[lzo],[http://www.oberhumer.com/opensource/lzo/])
+ AC_MSG_NOTICE([Configuring LZO $PACKAGE_VERSION])
+ AC_CONFIG_SRCDIR(src/lzo_init.c)
diff --git a/meta/recipes-support/lzo/lzo_2.03.bb b/meta/recipes-support/lzo/lzo_2.04.bb
index 05b10ee9f7..f8c8aba3a3 100644
--- a/meta/recipes-support/lzo/lzo_2.03.bb
+++ b/meta/recipes-support/lzo/lzo_2.04.bb
@@ -4,15 +4,16 @@ SECTION = "libs"
 PRIORITY = "optional"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=8cad52263e636e25377bc18420118101 \
-                    file://src/lzo_init.c;beginline=5;endline=33;md5=094776237523b2e93124cf09b9c76aef"
+                    file://src/lzo_init.c;beginline=5;endline=36;md5=454f781644dfe945e3634a9b699e91f3"
 PR = "r0"
 
 SRC_URI = "http://www.oberhumer.com/opensource/lzo/download/lzo-${PV}.tar.gz \
-           file://autofoo.patch \
-           file://acinclude.m4"
+           file://autoconf.patch \
+           file://acinclude.m4 \
+           "
 
-SRC_URI[md5sum] = "0c3d078c2e8ea5a88971089a2f02a726"
-SRC_URI[sha256sum] = "8b1b0da8f757b9ac318e1c15a0eac8bdb56ca902a2dd25beda06c0f265f22591"
+SRC_URI[md5sum] = "a383c7055a310e2a71b9ecd19cfea238"
+SRC_URI[sha256sum] = "4ee3a040facf39561f13e4ef2ab99a886fd68251a35d612486ed0625cc6ab428"
 
 inherit autotools