Fix configure check for a52dec after latest upload of a52decdebian/1.2.3-2

3 files changed, 65 insertions, 0 deletions

diff --git a/debian/changelog b/debian/changelog
index 2d645d8..bf17b4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gst-plugins-ugly1.0 (1.2.3-2) unstable; urgency=medium
+
+  * debian/patches/01_a52dec-configure.patch:
+    + Fix configure check for a52dec after latest upload of a52dec.
+      Patch taken from multiple upstream commits (Closes: #739803).
+
+ -- Sebastian Dröge <slomo@debian.org>  Sun, 23 Feb 2014 11:09:07 +0100
+
 gst-plugins-ugly1.0 (1.2.3-1) unstable; urgency=medium
 
   [ Iain Lane ]
diff --git a/debian/patches/01_a52dec-configure.patch b/debian/patches/01_a52dec-configure.patch
new file mode 100644
index 0000000..ab72d31
--- /dev/null
+++ b/debian/patches/01_a52dec-configure.patch
@@ -0,0 +1,56 @@
+diff --git a/m4/a52.m4 b/m4/a52.m4
+index e562581..33594bc 100644
+--- a/m4/a52.m4
++++ b/m4/a52.m4
+@@ -56,7 +56,7 @@ AC_ARG_WITH(a52dec-prefix,
+                    [prefix where a52dec is installed (optional)]),
+     a52dec_config_prefix="$withval", a52dec_config_prefix="")
+ 
+-if test x$a52dec_config_prefix = x ; then
++if test "x$a52dec_config_prefix" = "x" ; then
+     A52_CHECK_LIBHEADER(A52DEC, a52, a52_init, a52dec/a52.h,
+         A52DEC_LIBS="-la52 -lm", , -lm)
+ else
+@@ -66,7 +66,7 @@ else
+         ], , -L$a52dec_config_prefix/lib, -I$a52dec_config_prefix/include)
+ fi
+ 
+-if test $HAVE_A52DEC = "yes"; then
++if test "x$HAVE_A52DEC" = "xyes"; then
+     ac_save_CFLAGS="$CFLAGS"
+     ac_save_LIBS="$LIBS"
+     CFLAGS="$CFLAGS $A52DEC_CFLAGS"
+@@ -89,31 +89,14 @@ main ()
+ }
+         ],, HAVE_A52DEC=no, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ 
+-    if test HAVE_A52DEC = "no"; then
++    if test "x$HAVE_A52DEC" = "xno"; then
+         echo "*** Your a52dec is borked somehow. Please update to 0.7.4 or newer."
+-    else
+-        AC_TRY_RUN([
+-#include <inttypes.h>
+-#include <a52dec/a52.h>
+-
+-int 
+-main ()
+-{
+-  int i = sizeof (a52_state_t);
+-  if ( i )
+-    return 0;
+-}
+-            ], HAVE_A52DEC=no,, [echo $ac_n "cross compiling; assumed OK... $ac_c"])
+-
+-        if test HAVE_A52DEC = "no"; then
+-            echo "*** Your a52dec is too old. Please update to 0.7.4 or newer."
+-        fi
+     fi
+     CFLAGS="$ac_save_CFLAGS"
+     LIBS="$ac_save_LIBS"
+ fi
+ 
+-if test HAVE_A52DEC = "no"; then
++if test "x$HAVE_A52DEC" = "xno"; then
+     A52DEC_CFLAGS=""
+     A52DEC_LIBS=""
+ fi
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..02f4abd
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_a52dec-configure.patch