[SCM] gmerlin-avdecoder/master: Simplify autoconf patch to no longer handle stripped GSM610 dir: Upstream treats it as optional now.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 24ce0e912cabc525561d4d46c9e762bbeccd1160
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Nov 20 06:30:34 2010 +0100

    Simplify autoconf patch to no longer handle stripped GSM610 dir: Upstream treats it as optional now.

diff --git a/debian/patches/autoconf_removed_sources.patch b/debian/patches/autoconf_removed_sources.patch
index 0b25bea..e3976cb 100644
--- a/debian/patches/autoconf_removed_sources.patch
+++ b/debian/patches/autoconf_removed_sources.patch
@@ -1,6 +1,6 @@
---- gmerlin-avdecoder.orig/configure.ac
-+++ gmerlin-avdecoder/configure.ac
-@@ -551,13 +551,6 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -570,13 +570,6 @@
  include/Makefile \
  include/bgav_version.h \
  lib/Makefile \
@@ -14,9 +14,9 @@
  m4/Makefile \
  plugins/Makefile \
  tests/Makefile ])
---- gmerlin-avdecoder.orig/lib/Makefile.am
-+++ gmerlin-avdecoder/lib/Makefile.am
-@@ -236,19 +236,9 @@
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -237,19 +237,9 @@
  speex_sources =
  endif
  
@@ -36,38 +36,3 @@
  
  if HAVE_REALDLL
  real_sources = audio_real.c video_real.c
-@@ -283,7 +273,7 @@
- dvb_sources = 	 
- endif	
- 
--SUBDIRS = $(win32_subdirs) GSM610
-+SUBDIRS = $(win32_subdirs) 
- 
- libgmerlin_avdec_la_LDFLAGS=-export-dynamic -version-info @LTVERSION_CURRENT@:@LTVERSION_REVISION@:@LTVERSION_AGE@
- 
-@@ -316,7 +306,6 @@
- $(libpostproc_libs) \
- $(libswscale_libs) \
- $(vdpau_libs) \
--$(top_builddir)/lib/GSM610/libgsm.la \
- @ICONV_LIBS@ \
- @LIBINTL@ \
- -lm
-@@ -379,7 +368,6 @@
- apetag.c \
- audio.c \
- audio_gavl.c \
--audio_gsm.c \
- audio_pcm.c \
- audioparser.c \
- asmrp.c \
---- gmerlin-avdecoder.orig/lib/codecs.c
-+++ gmerlin-avdecoder/lib/codecs.c
-@@ -320,7 +320,6 @@
-   
-   bgav_init_audio_decoders_gavl();
-   bgav_init_audio_decoders_pcm();
--  bgav_init_audio_decoders_gsm();
-   bgav_init_video_decoders_aviraw();
-   bgav_init_video_decoders_qtraw();
-   bgav_init_video_decoders_yuv();

-- 
gmerlin-avdecoder packaging