[SCM] gmerlin-avdecoder packaging branch, master, updated. upstream/1.0.3-19-gfd24ec5

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

The following commit has been merged in the master branch:
commit 50c0bb2290a7d78505c8419e92eb35e3214d7c2d
Author: IOhannes m zmölnig <zmoelnig at umlaeute.mur.at>
Date:   Fri Aug 13 21:46:32 2010 +0200

    remove stripped sources from autoconf
    
    since lib/libw32dll and lib/GSM610 have been removed from the upstream
    sourceball, they have to be removed from the autoconf system as well

diff --git a/debian/patches/autoconf_removed_sources.patch b/debian/patches/autoconf_removed_sources.patch
new file mode 100644
index 0000000..678cfaf
--- /dev/null
+++ b/debian/patches/autoconf_removed_sources.patch
@@ -0,0 +1,63 @@
+--- gmerlin-avdecoder.orig/configure.ac
++++ gmerlin-avdecoder/configure.ac
+@@ -551,13 +551,6 @@
+ include/Makefile \
+ include/bgav_version.h \
+ lib/Makefile \
+-lib/libw32dll/Makefile \
+-lib/libw32dll/dmo/Makefile \
+-lib/libw32dll/qtx/Makefile \
+-lib/libw32dll/qtx/qtxsdk/Makefile \
+-lib/libw32dll/wine/Makefile \
+-lib/libw32dll/DirectShow/Makefile \
+-lib/GSM610/Makefile \
+ m4/Makefile \
+ plugins/Makefile \
+ tests/Makefile ])
+--- gmerlin-avdecoder.orig/lib/Makefile.am
++++ gmerlin-avdecoder/lib/Makefile.am
+@@ -236,19 +236,9 @@
+ speex_sources =
+ endif
+ 
+-if HAVE_W32DLL
+-win32_subdirs = libw32dll
+-win32_libs = \
+-$(top_builddir)/lib/libw32dll/DirectShow/libds_filter.la \
+-$(top_builddir)/lib/libw32dll/dmo/libdmo_filter.la \
+-$(top_builddir)/lib/libw32dll/wine/libwine.la \
+--lpthread
+-win32_sources = video_win32.c audio_qtwin32.c audio_win32.c win32codec.c
+-else
+ win32_subdirs =
+ win32_libs =
+ win32_sources =
+-endif
+ 
+ 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 \
diff --git a/debian/patches/series b/debian/patches/series
index 5d44437..c27173a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_dvdread_configure.patch
+autoconf_removed_sources.patch

-- 
gmerlin-avdecoder packaging