[SCM] mplayer packaging branch, master.experimental, updated. debian/1.0.rc3++final-1.exp1-8-gf51a9b9

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Thu Jul 29 01:18:55 UTC 2010


The following commit has been merged in the master.experimental branch:
commit 2d717ff8ca09307893c373a2aa7a090aabebbefd
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Jul 28 21:07:03 2010 -0400

    Revert "build mplayer against internal ffmpeg to workaround interoperability problems with FFmpeg 0.6"
    
    This reverts commit cd44791cc32367a8b135643729564c305e30c9b8.

diff --git a/debian/control b/debian/control
index 614a004..f243760 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,10 @@ Build-Depends: debhelper (>= 7),
                libaa1-dev,
                libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libaudio-dev,
+               libavcodec-dev (>= 0.svn20080206),
+               libavdevice-dev,
+               libavformat-dev,
+               libavutil-dev,
                libcaca-dev,
                libcdparanoia-dev | libcdparanoia0-dev,
                libdirectfb-dev,
diff --git a/debian/rules b/debian/rules
index 57f0f5d..398ed42 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,11 @@ 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)

-- 
mplayer packaging



More information about the pkg-multimedia-commits mailing list