[SCM] gmerlin-avdecoder/master: use system's libGSM (instead of upstream GSM610)

[zmoelnig-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 76477bd8732e31a6a3e21336f07d75d31c55a812
Author: IOhannes m zmölnig <zmoelnig at iem.at>
Date:   Mon Jan 10 15:28:43 2011 +0100

    use system's libGSM (instead of upstream GSM610)

diff --git a/debian/patches/autoconf_removed_sources.patch b/debian/patches/autoconf_removed_sources.patch
index 5cc0c54..7f9eccb 100644
--- a/debian/patches/autoconf_removed_sources.patch
+++ b/debian/patches/autoconf_removed_sources.patch
@@ -36,23 +36,16 @@
  
  if HAVE_REALDLL
  real_sources = audio_real.c video_real.c
-@@ -281,15 +271,9 @@
- dvb_sources = 	 
- endif	
- 
--if HAVE_LIBGSM
--gsm_sources = audio_gsm.c
--gsm_subdirs = GSM610
--gsm_libs = $(top_builddir)/lib/GSM610/libgsm.la
--else
+@@ -289,7 +279,7 @@
  gsm_sources =
  gsm_subdirs =
  gsm_libs = 
 -endif  
++endif
  
  
  SUBDIRS = $(win32_subdirs) $(gsm_subdirs)
-@@ -493,8 +477,6 @@
+@@ -493,8 +483,6 @@
  mxf.c \
  nanosoft.c \
  options.c \
diff --git a/debian/patches/series b/debian/patches/series
index c27173a..1ba1e20 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_dvdread_configure.patch
 autoconf_removed_sources.patch
+system_gsm.patch
diff --git a/debian/patches/system_gsm.patch b/debian/patches/system_gsm.patch
new file mode 100644
index 0000000..c1853df
--- /dev/null
+++ b/debian/patches/system_gsm.patch
@@ -0,0 +1,49 @@
+--- gmerlin-avdecoder.orig/configure.ac
++++ gmerlin-avdecoder/configure.ac
+@@ -504,6 +504,18 @@
+     [disable libgsm]),
+     have_libgsm="false", have_libgsm="true")
+ 
++AC_SUBST(GSM_LIBS)
++if test "x$have_libgsm" = "xtrue"; then
++ have_sysgsm="false"
++ AC_CHECK_HEADER(gsm/gsm.h,
++   [AC_CHECK_LIB(gsm, gsm_create, have_sysgsm="true")]
++ )
++ if test "x$have_sysgsm" = "xtrue"; then
++    GSM_LIBS="-lgsm"
++    AC_DEFINE([HAVE_GSM_GSM_H], [1], [define if you have 'gsm/gsm.h'])
++ fi
++fi
++
+ if test "x$have_libgsm" = "xtrue"; then
+ AC_DEFINE([HAVE_LIBGSM])
+ fi
+--- gmerlin-avdecoder.orig/lib/audio_gsm.c
++++ gmerlin-avdecoder/lib/audio_gsm.c
+@@ -23,7 +23,11 @@
+ #include <avdec_private.h>
+ #include <codecs.h>
+ 
+-#include "GSM610/gsm.h"
++#ifdef HAVE_GSM_GSM_H
++# include "gsm/gsm.h"
++#else
++# include "GSM610/gsm.h"
++#endif
+ 
+ /* Audio decoder for the internal libgsm */
+ 
+--- gmerlin-avdecoder.orig/lib/Makefile.am
++++ gmerlin-avdecoder/lib/Makefile.am
+@@ -273,8 +273,8 @@
+ 
+ if HAVE_LIBGSM
+ gsm_sources = audio_gsm.c
+-gsm_subdirs = GSM610
+-gsm_libs = $(top_builddir)/lib/GSM610/libgsm.la
++gsm_subdirs =
++gsm_libs = @GSM_LIBS@
+ else
+ gsm_sources =
+ gsm_subdirs =

-- 
gmerlin-avdecoder packaging