r1281 - in /unstable/ffmpeg/debian: confflags rules

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

Author: fabian-guest
Date: Tue Jul  1 14:44:34 2008
New Revision: 1281

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1281
Log:
* debian/confflags:
+ Moved some confflags from the bottom of the file (where they are useless) some lines up. This brings back support for ieee1394 and external codecs.
* debian/rules:
+ Made the clean rule remove *all* build directories, fixing FTPFS if built twice in a row.


Modified:
    unstable/ffmpeg/debian/confflags
    unstable/ffmpeg/debian/rules

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1281&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Tue Jul  1 14:44:34 2008
@@ -13,7 +13,7 @@
 FLAVORS += vis
 endif
 
-$(info Building FFMmpeg for flavors: $(FLAVORS))
+$(info Building FFmpeg for flavors: $(FLAVORS))
 
 # Comment out the following lines for LGPL versions of the libraries
 gpl_confflags := --enable-gpl
@@ -31,6 +31,38 @@
 confflags += --enable-libvorbis
 confflags += --enable-pthreads
 confflags += --disable-strip
+
+# Enable IEEE 1394 (FireWire) support on Linux only
+ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
+  confflags += --enable-libdc1394
+  lib1394-dev = libraw1394-dev, libdc1394-22-dev | libdc1394-13-dev
+else
+  lib1394-dev =
+endif
+
+# This hack is necessary because GCC won't build fdct_mmx.c with -O0
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+  confflags += --extra-cflags="-O1"
+endif
+
+# Support for additional external codecs
+ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
+# Uncomment the following lines to allow the use of nonfree code,
+# the resulting packages will be unredistributable!
+# weak-build-deps += libamrnb-dev
+# confflags += --enable-nonfree --enable-libamr-nb
+# weak-build-deps += libamrwb-dev
+# confflags += --enable-nonfree --enable-libamr-wb
+  weak-build-deps += libmp3lame-dev | liblame-dev
+  confflags += --enable-libmp3lame
+  weak-build-deps += libfaac-dev
+  confflags += --enable-libfaac
+  weak-build-deps += libxvidcore-dev | libxvidcore4-dev
+  confflags += --enable-gpl --enable-libxvid
+  weak-build-deps += libx264-dev
+  confflags += --enable-gpl --enable-libx264
+  $(warning Make sure these packages are installed: $(weak-build-deps))
+endif
 
 # Disable architecture-specific optimizations for default shared build
 nooptflags += --disable-armv5te --disable-armv6
@@ -103,37 +135,7 @@
   NJOBS := 1
 endif
 
-ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
-  confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-22-dev | libdc1394-13-dev 
-else
-  lib1394-dev =
-endif
-
+# Additional documentation for PowerPC
 ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
   extradoc = doc/ffmpeg_powerpc_performance_evaluation_howto.txt
 endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  # This hack is necessary because GCC won't build fdct_mmx.c with -O0
-  confflags += --extra-cflags="-O1"
-endif
-
-ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
-# Uncomment the following lines to allow the use of nonfree code,
-# the resulting packages will be unredistributable!
-# weak-build-deps += libamrnb-dev
-# confflags += --enable-nonfree --enable-libamr-nb
-# weak-build-deps += libamrwb-dev
-# confflags += --enable-nonfree --enable-libamr-wb
-  weak-build-deps += libmp3lame-dev | liblame-dev
-  confflags += --enable-libmp3lame
-  weak-build-deps += libfaac-dev
-  confflags += --enable-libfaac
-  weak-build-deps += libxvidcore-dev | libxvidcore4-dev
-  confflags += --enable-gpl --enable-libxvid
-  weak-build-deps += libx264-dev
-  confflags += --enable-gpl --enable-libx264
-  $(warning Make sure these packages are installed: $(weak-build-deps))
-endif
-

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1281&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Tue Jul  1 14:44:34 2008
@@ -55,7 +55,7 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp build-*-stamp configure-*-stamp patch-stamp
-	rm -rf debian-static debian-shared doxy
+	rm -rf $(foreach flavor,$(FLAVORS),debian-$(flavor)) doxy
 	dh_clean config-extra-includes.h debian/tmp.debhelper.log
 
 get-orig-source: