[Pkg-gstreamer-commits] [SCM] GStreamer Ugly Plugins 0.10 Packaging branch, master, updated. debian/0.10.19-1-2-g5e90e58

[Sebastian Dröge]

The following commit has been merged in the master branch:
commit 5e90e5812251b496d8df823ea37e08d9f6e3f5fc
Author: Sebastian Dröge <sebastian.droege at collabora.co.uk>
Date:   Mon Apr 23 08:57:26 2012 +0200

    Fix patch

diff --git a/debian/patches/01_opencore-amr-0.1.3.patch b/debian/patches/01_opencore-amr-0.1.3.patch
index 6d13bd2..5f7e15d 100644
--- a/debian/patches/01_opencore-amr-0.1.3.patch
+++ b/debian/patches/01_opencore-amr-0.1.3.patch
@@ -22,26 +22,49 @@ diff --git a/configure.ac b/configure.ac
 index 3c2e341..18f2904 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -251,6 +251,9 @@ dnl *** amr-nb ***
+@@ -248,12 +248,14 @@
+ dnl *** amr-nb ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_AMRNB, true)
  AG_GST_CHECK_FEATURE(AMRNB, [amrnb library], amrnb, [
-   PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
+-  PKG_CHECK_MODULES(AMRNB, opencore-amrnb, HAVE_AMRNB="yes",
+-      [ AG_GST_CHECK_LIBHEADER(AMRNB, opencore-amrnb,
+-		           Decoder_Interface_init, $LIBM,
+-		           opencore-amrnb/interf_dec.h,
+-			   AMRNB_LIBS="-lopencore-amrnb")
+-      ])
++  PKG_CHECK_MODULES(AMRNB, opencore-amrnb, [
 +    if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrnb; then
 +      AC_DEFINE(HAVE_OPENCORE_AMRNB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrnb])
 +    fi
-     HAVE_AMRNB="yes"
-   ], [
-     HAVE_AMRNB="no"
-@@ -263,6 +266,9 @@ dnl *** amr-wb dec ***
++    HAVE_AMRNB="yes"
++  ], [
++    HAVE_AMRNB="no"
++  ])
+   AC_SUBST(AMRNB_CFLAGS)
+   AC_SUBST(AMRNB_LIBS)
+ ])
+@@ -261,12 +263,14 @@
+ dnl *** amr-wb dec ***
  translit(dnm, m, l) AM_CONDITIONAL(USE_AMRWB, true)
  AG_GST_CHECK_FEATURE(AMRWB, [amrwb library], amrwbdec, [
-   PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
+-  PKG_CHECK_MODULES(AMRWB, opencore-amrwb, HAVE_AMRWB="yes",
+-      [ AG_GST_CHECK_LIBHEADER(AMRWB, opencore-amrwb,
+-			   D_IF_decode, ,
+-			   opencore-amrwb/dec_if.h,
+-			   AMRWB_LIBS="-lopencore-amrwb")
+-      ])
++  PKG_CHECK_MODULES(AMRWB, opencore-amrwb, [
 +    if $PKG_CONFIG --atleast-version=0.1.3 opencore-amrwb; then
 +      AC_DEFINE(HAVE_OPENCORE_AMRWB_0_1_3_OR_LATER, 1, [Defined for newer opencore-amrwb])
 +    fi
-     HAVE_AMRWB="yes"
-   ], [
-     HAVE_AMRWB="no"
++    HAVE_AMRWB="yes"
++  ], [
++    HAVE_AMRWB="no"
++  ])
+   AC_SUBST(AMRWB_CFLAGS)
+   AC_SUBST(AMRWB_LIBS)
+ ])
+
 diff --git a/ext/amrnb/amrnbdec.h b/ext/amrnb/amrnbdec.h
 index 1e81839..5fe6982 100644
 --- a/ext/amrnb/amrnbdec.h

-- 
GStreamer Ugly Plugins 0.10 Packaging