[SCM] mplayer packaging branch, master, updated. debian/1.0.rc2+svn20090303-2-18-gab28511

[mennucc1 at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit ab28511d1a4f8624b8f8b279fd234fa7e3572f08
Author: Andrea Mennucc <mennucc1 at debian.org>
Date:   Fri Mar 27 15:23:47 2009 +0100

    delete patch 30link-system-ffmpeg.patch , use ./configure flags

diff --git a/debian/changelog b/debian/changelog
index ec1ed86..38b9832 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mplayer (1.0~rc2+svn20090303-6) unstable; urgency=low
+
+  * use ./configure flags to dynamically link FFmpeg,
+    delete patch  30link-system-ffmpeg.patch
+
+ --
+
 mplayer (1.0~rc2+svn20090303-5) unstable; urgency=low
 
   * debian/control : move docbook-xml,docbook-xsl,xsltproc from 
diff --git a/debian/patches/30link-system-ffmpeg.patch b/debian/patches/30link-system-ffmpeg.patch
deleted file mode 100644
index a6074a6..0000000
--- a/debian/patches/30link-system-ffmpeg.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/Makefile
-+++ b/Makefile
-@@ -701,11 +701,11 @@ SRCS_COMMON   += $(SRCS_COMMON-yes) $(SR
- SRCS_MENCODER += $(SRCS_MENCODER-yes)
- SRCS_MPLAYER  += $(SRCS_MPLAYER-yes)
- 
--COMMON_LIBS-$(LIBAVFORMAT_A)      += libavformat/libavformat.a
--COMMON_LIBS-$(LIBAVCODEC_A)       += libavcodec/libavcodec.a
--COMMON_LIBS-$(LIBAVUTIL_A)        += libavutil/libavutil.a
--COMMON_LIBS-$(LIBPOSTPROC_A)      += libpostproc/libpostproc.a
--COMMON_LIBS-$(LIBSWSCALE_A)       += libswscale/libswscale.a
-+COMMON_LIBS-$(LIBAVFORMAT_A)      += /usr/lib/libavformat.so
-+COMMON_LIBS-$(LIBAVCODEC_A)       += /usr/lib/libavcodec.so
-+COMMON_LIBS-$(LIBAVUTIL_A)        += /usr/lib/libavutil.so
-+COMMON_LIBS-$(LIBPOSTPROC_A)      += /usr/lib/libpostproc.so
-+COMMON_LIBS-$(LIBSWSCALE_A)       += /usr/lib/libswscale.so
- COMMON_LIBS += $(COMMON_LIBS-yes)
- 
- OBJS_COMMON    += $(addsuffix .o, $(basename $(SRCS_COMMON)))
diff --git a/debian/patches/series b/debian/patches/series
index 38f715b..58f683f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 11configure-mktemp.patch
 22disable-xscreensaver.patch
 23mplayer-debug-printf.patch
-30link-system-ffmpeg.patch
 50_r28803_segfault_print_int.patch
diff --git a/debian/rules b/debian/rules
index d5454b5..5d458f3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,10 +47,11 @@ DEB_BUILD_CONFIGURE = \
 	--disable-aa \
 	--disable-mad \
 	--disable-libdv \
-	--enable-libavutil_so \
-	--enable-libavcodec_so \
-	--enable-libavformat_so \
-	--enable-libpostproc_so \
+	--disable-libavutil_a \
+	--disable-libavcodec_a \
+	--disable-libavformat_a \
+	--disable-libpostproc_a \
+	--disable-libswscale_a \
 	--enable-faad \
 	$(archconf)
 

-- 
mplayer packaging