[SCM] mplayer packaging branch, ubuntu, updated. debian/1.0.rc4.try1-1-22-g6729499

[siretart at users.alioth.debian.org]

The following commit has been merged in the ubuntu branch:
commit c50aba26e84fabc6ccabe72a4b2777b819f69fbd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Thu Jul 29 07:28:33 2010 -0400

    build against system ffmpeg, enable mplayer-gui and mencoder

diff --git a/debian/rules b/debian/rules
index 097c3c0..bfd8998 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,11 +49,6 @@ CONFIGURE_FLAGS = \
 	--language=all \
 	--disable-libdvdcss-internal \
 	--disable-dvdread-internal \
-	--disable-libavutil_a \
-	--disable-libavcodec_a \
-	--disable-libavformat_a \
-	--disable-libpostproc_a \
-	--disable-libswscale_a \
 	$(archconf)
 
 ifeq ($(DEB_HOST_ARCH),i386)
@@ -101,8 +96,8 @@ build-arch:
 	dh_testdir
 	dh_prep -a
 	$(MAKE) -f debian/rules debian/mplayer/usr/bin/mplayer
-#	$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
-#	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
+	$(MAKE) -f debian/rules debian/mencoder/usr/bin/mencoder
+	$(MAKE) -f debian/rules debian/mplayer-gui/usr/bin/gmplayer
 
 # build non-gui version
 # & mencoder
@@ -114,7 +109,7 @@ debian/mplayer/usr/bin/mplayer debian/mencoder/usr/bin/mencoder:
 	$(MAKE) $(NUMJOBS) mplayer mencoder
 	$(MAKE) install-mplayer DESTDIR=$(CURDIR)/debian/mplayer
 	$(MAKE) install-mplayer-man DESTDIR=$(CURDIR)/debian/mplayer
-#	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
+	$(MAKE) install-mencoder DESTDIR=$(CURDIR)/debian/mencoder
 	$(MAKE) install-mencoder-man DESTDIR=$(CURDIR)/debian/mplayer
 	install -D -m 644 debian/mplayer.conf \
 	                  $(CURDIR)/debian/mplayer/etc/mplayer/mplayer.conf

-- 
mplayer packaging