[SCM] FFmpeg packaging branch, master.snapshot, updated. debian/0.5+svn20090706-5-16-g4d1c511

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Mon Jan 25 14:48:02 UTC 2010


The following commit has been merged in the master.snapshot branch:
commit 1757d3b16c8abe6f94f4ca12ca6399451dbf960b
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jan 24 21:50:01 2010 +0100

    remove confflags that no longer apply

diff --git a/debian/confflags b/debian/confflags
index a79bd13..52cf6f9 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -65,7 +65,6 @@ endef
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
 gpl_confflags += --enable-postproc
-gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
 # there is no libfaad in ubuntu/main, on in ubuntu/multiverse
@@ -100,7 +99,6 @@ confflags += --enable-libvorbis
 confflags += --enable-pthreads
 confflags += --enable-zlib
 confflags += --disable-stripping
-confflags += --disable-vhook
 ifeq      ($(DEB_HOST_ARCH),armel)
 # this is required on Ubuntu lucid as it defaults to thumb2 and ffmpeg has
 # plenty of incompatible assembly; not sure how to detect that properly

-- 
FFmpeg packaging



More information about the pkg-multimedia-commits mailing list