3 files changed, 28 insertions, 1 deletions

diff --git a/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch b/meta-moblin/packages/libsndfile/libsndfile1/acincludefix.patch
new file mode 100644
index 0000000000..46a21c19be
--- /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/files/add-cxx.patch b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
index da0c4010e6..da0c4010e6 100644
--- a/meta-moblin/packages/libsndfile/files/add-cxx.patch
+++ b/meta-moblin/packages/libsndfile/libsndfile1/add-cxx.patch
diff --git a/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb b/meta-moblin/packages/libsndfile/libsndfile1_1.0.17.bb
index 7ca7731511..b49d7a45e7 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}"