3 files changed, 41 insertions, 93 deletions

diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
deleted file mode 100644
index cf5d7752e5..0000000000
--- a/meta-oe/recipes-extended/rrdtool/rrdtool/0001-removing-testing-leftovers.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From c581b02d074f5a109074bc190f373f5ba4320468 Mon Sep 17 00:00:00 2001
-From: Tobias Oetiker <tobi@oetiker.ch>
-Date: Thu, 3 Oct 2013 15:51:00 +0200
-Subject: [PATCH] removing testing leftovers
-
-Upstream-Status: Backport
-
-Signed-off-by: Peter A. Bigot <pab@pabigot.com>
-
----
- bindings/perl-piped/leaktest.pl | 16 ----------------
- 1 file changed, 16 deletions(-)
- delete mode 100644 bindings/perl-piped/leaktest.pl
-
-diff --git a/bindings/perl-piped/leaktest.pl b/bindings/perl-piped/leaktest.pl
-deleted file mode 100644
-index cebf1c7..0000000
---- a/bindings/perl-piped/leaktest.pl
-+++ /dev/null
-@@ -1,16 +0,0 @@
--#!/bin/perl -w
--$ENV{PATH}="/usr/ucb";
--use strict;   
--use RRDp;     
--my $rrdfile='/tmp/test.rrd';
--RRDp::start '/home/oetiker/data/projects/AABN-rrdtool/src/rrdtool';
--print grep /rrdtool/,`ps au`;
--print grep /rrdtool/,`ps au`;
--my $i=0;
--while ($i<1000) {
-- RRDp::cmd 'info /tmp/test.rrd';
-- $_ = RRDp::read;
-- $i++;
--}
--$_ = RRDp::end;
--print grep /rrdtool/,`ps au`;
--- 
-1.8.5.5
-
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch b/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
deleted file mode 100644
index 321a842b62..0000000000
--- a/meta-oe/recipes-extended/rrdtool/rrdtool/remove_hardcoded_xml_include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac      2012-11-06 11:20:54.099021892 -0500
-+++ b/configure.ac~     2012-11-06 11:19:57.255023857 -0500
-@@ -548,7 +548,7 @@
- 
- fi
- EX_CHECK_ALL(glib-2.0,   glib_check_version,            glib.h,                 glib-2.0,    2.28.7, ftp://ftp.gtk.org/pub/glib/2.28/, "")
--EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, /usr/include/libxml2)
-+EX_CHECK_ALL(xml2,       xmlParseFile,                  libxml/parser.h,        libxml-2.0,        2.7.8,  http://xmlsoft.org/downloads.html, "")
- 
- if test "$EX_CHECK_ALL_ERR" = "YES"; then
-   AC_MSG_ERROR([Please fix the library issues listed above and try again.])
diff --git a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
index 6bc5e98633..91a30cf3df 100644
--- a/meta-oe/recipes-extended/rrdtool/rrdtool_1.4.8.bb
+++ b/meta-oe/recipes-extended/rrdtool/rrdtool_1.5.4.bb
@@ -2,17 +2,15 @@ SUMMARY = "High performance data logging and graphing system for time series dat
 HOMEPAGE = "http://oss.oetiker.ch/rrdtool/"
 
 LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=44fee82a1d2ed0676cf35478283e0aa0"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=3349111ed0533471494beec99715bc9d"
 
 DEPENDS = "libpng zlib cairo pango glib-2.0 libxml2 groff-native"
 
-SRCREV = "1850e00a17e25e93c39e608f4e2da50f29c5c712"
-PV = "1.4.8"
+SRCREV = "04f70058cc894c0a3ee5d555ea1bb5a8d4bb8a0e"
+PV = "1.5.4"
 
 SRC_URI = "\
-    git://github.com/oetiker/rrdtool-1.x.git;branch=1.4 \
-    file://remove_hardcoded_xml_include.patch \
-    file://0001-removing-testing-leftovers.patch \
+    git://github.com/oetiker/rrdtool-1.x.git;branch=1.5 \
 "
 
 S = "${WORKDIR}/git"
@@ -63,43 +61,43 @@ export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}
 export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
 
 do_configure() {
-        #fix the pkglib problem with newer automake
-        #perl
-        sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \
-            ${S}/bindings/perl-shared/Makefile.PL
-
-        #python
-        sed -i -e '/PYTHON_INCLUDES="-I${/c \
-        PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
-            ${S}/m4/acinclude.m4
-        #remove the hardcoded $(libdir) rpath
-        sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
-
-        autotools_do_configure
-
-        #modify python sitepkg
-        #remove the dependency of perl-shared:Makefile
-        #or perl-shared/Makefile will be regenerated
-        #if any code touch bindings/Makefile after below perl bindings code
-        sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \
-            --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \
-            -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
-            ${B}/bindings/Makefile
-
-        #redo the perl bindings
-        (
-        cd ${S}/bindings/perl-shared;
-        perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc";
-
-        cd ../../bindings/perl-piped;
-        perl Makefile.PL INSTALLDIRS="vendor";
-        )
-
-        #change the interpreter in file
-        sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \
-            ${B}/examples/Makefile
-        sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \
-            ${B}/examples/*.pl
+    #fix the pkglib problem with newer automake
+    #perl
+    sed -i -e "s|-Wl,--rpath -Wl,\$rp||g" \
+        ${S}/bindings/perl-shared/Makefile.PL
+
+    #python
+    sed -i -e '/PYTHON_INCLUDES="-I${/c \
+    PYTHON_INCLUDES="-I=/usr/include/python${PYTHON_BASEVERSION}"' \
+        ${S}/m4/acinclude.m4
+    #remove the hardcoded $(libdir) rpath
+    sed -i -e 's|--rpath=$(libdir)||g' ${S}/bindings/Makefile.am
+
+    autotools_do_configure
+
+    #modify python sitepkg
+    #remove the dependency of perl-shared:Makefile
+    #or perl-shared/Makefile will be regenerated
+    #if any code touch bindings/Makefile after below perl bindings code
+    sed -i -e "s:\$(PYTHON) setup.py install:\$(PYTHON) setup.py install \
+        --install-lib=${D}${PYTHON_SITEPACKAGES_DIR}:" \
+        -e "s:perl-shared/Makefile.PL Makefile:perl-shared/Makefile.PL:" \
+        ${B}/bindings/Makefile
+
+    #redo the perl bindings
+    (
+    cd ${S}/bindings/perl-shared;
+    perl Makefile.PL INSTALLDIRS="vendor" INSTALLPRIVLIB="abc";
+
+    cd ../../bindings/perl-piped;
+    perl Makefile.PL INSTALLDIRS="vendor";
+    )
+
+    #change the interpreter in file
+    sed -i -e "s|^PERL = ${STAGING_BINDIR_NATIVE}/.*|PERL = /usr/bin/perl|g" \
+        ${B}/examples/Makefile
+    sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" \
+        ${B}/examples/*.pl
 }
 
 PACKAGES =+ "${PN}-perl ${PN}-python"