From ca51dda5064492a654d23f18e053a35e90882095 Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Mon, 1 Feb 2010 15:01:18 +0000
Subject: libsndfile1: Add infinite recursion fix for recent autotools

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 .../packages/libsndfile/files/add-cxx.patch        | 18 ---------------
 .../libsndfile/libsndfile1/acincludefix.patch      | 26 ++++++++++++++++++++++
 .../packages/libsndfile/libsndfile1/add-cxx.patch  | 18 +++++++++++++++
 .../packages/libsndfile/libsndfile1_1.0.17.bb      |  3 ++-
 4 files changed, 46 insertions(+), 19 deletions(-)
 delete mode 100644 meta-moblin/packages/libsndfile/files/add-cxx.patch
 create mode 100644 meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
 create mode 100644 meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch

(limited to 'meta-moblin')

diff --git a/meta-moblin/packages/libsndfile/files/add-cxx.patch b/meta-moblin/packages/libsndfile/files/add-cxx.patch
deleted file mode 100644
index da0c4010e..000000000
--- a/meta-moblin/packages/libsndfile/files/add-cxx.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- configure.ac |    1 +
- 1 file changed, 1 insertion(+)
-
---- libsndfile-1.0.17.orig/configure.ac
-+++ libsndfile-1.0.17/configure.ac
-@@ -29,10 +29,11 @@ AC_LANG([C])
- #     to 0.
- 
- SHARED_VERSION_INFO="1:17:0"
- 
- AC_PROG_CC
-+AC_PROG_CXX
- AM_PROG_LIBTOOL
- 
- AC_CHECK_PROG(autogen, autogen, yes, no)
- 
- AC_PROG_INSTALL
diff --git a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
new file mode 100644
index 000000000..46a21c19b
--- /dev/null
+++ b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
@@ -0,0 +1,26 @@
+Fix m4 quoting to avoid an infinite loop in m4 with recent autoconf/automake
+
+RP 1/2/10
+
+Index: libsndfile-1.0.17/acinclude.m4
+===================================================================
+--- libsndfile-1.0.17.orig/acinclude.m4	2010-02-01 14:53:35.517826746 +0000
++++ libsndfile-1.0.17/acinclude.m4	2010-02-01 14:53:51.409122706 +0000
+@@ -255,7 +255,7 @@
+ 
+ )
+ ]
+-
++[
+ if test $ac_cv_c_byte_order = big ; then
+ 	ac_cv_c_big_endian=1
+ 	ac_cv_c_little_endian=0
+@@ -272,7 +272,7 @@
+ 	AC_MSG_WARN([[*** src/config.h may need to be hand editied.                    ]])
+ 	AC_MSG_WARN([[*****************************************************************]])
+ 	fi
+-
++]
+ )# AC_C_FIND_ENDIAN
+ 
+ 
diff --git a/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
new file mode 100644
index 000000000..da0c4010e
--- /dev/null
+++ b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
@@ -0,0 +1,18 @@
+---
+ configure.ac |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- libsndfile-1.0.17.orig/configure.ac
++++ libsndfile-1.0.17/configure.ac
+@@ -29,10 +29,11 @@ AC_LANG([C])
+ #     to 0.
+ 
+ SHARED_VERSION_INFO="1:17:0"
+ 
+ AC_PROG_CC
++AC_PROG_CXX
+ AM_PROG_LIBTOOL
+ 
+ AC_CHECK_PROG(autogen, autogen, yes, no)
+ 
+ AC_PROG_INSTALL
diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
index 7ca773151..b49d7a45e 100644
--- a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
+++ b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
@@ -4,9 +4,10 @@ AUTHOR = "Erik de Castro Lopo"
 DEPENDS = "sqlite3"
 SECTION = "libs/multimedia"
 LICENSE = "LGPL"
-PR = "r3"
+PR = "r4"
 
 SRC_URI = "http://www.mega-nerd.com/libsndfile/libsndfile-${PV}.tar.gz \
+           file://acincludefix.patch;patch=1 \
            file://add-cxx.patch;patch=1"
 
 S = "${WORKDIR}/libsndfile-${PV}"
-- 
cgit v1.2.3