r1275 - in /unstable/ffmpeg/debian: ./ confflags rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Mon Jun 30 13:21:21 2008
New Revision: 1275

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1275
Log:
move configuration flags from debian/rules to debian/confflags. improving readability of debian/rules

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/confflags
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:file-ids (original)
+++ bzr:file-ids Mon Jun 30 13:21:21 2008
@@ -1,1 +1,0 @@
-confflags	confflags-20080630125322-7rg1ieetyenhgll4-1

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 13:21:21 2008
@@ -17,3 +17,4 @@
 50 siretart at tauware.de-20080622093402-afmkqeqt3h21qf7l
 51 siretart at tauware.de-20080630102856-77rwx9cthv955qja
 52 siretart at tauware.de-20080630131214-81k1az9u115l7bul
+53 siretart at tauware.de-20080630132119-e2wkrw6eug0jcguy

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Mon Jun 30 13:21:21 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-30 15:12:14.457999945 +0200
+timestamp: 2008-06-30 15:21:19.413000107 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
-	branch-nick: t
+	branch-nick: unstable

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1275&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Mon Jun 30 13:21:21 2008
@@ -92,3 +92,45 @@
 altivec_build_confflags += --disable-vhook
 altivec_build_confflags += --disable-ffserver
 altivec_build_confflags += --disable-ffplay
+
+# Support multiple makes at once (taken from the qemu package)
+ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+  NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
+else
+  NJOBS := 1
+endif
+
+ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
+  confflags += --enable-libdc1394
+  lib1394-dev = libraw1394-dev, libdc1394-22-dev
+else
+  lib1394-dev =
+endif
+
+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=1275&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Mon Jun 30 13:21:21 2008
@@ -14,47 +14,6 @@
 LIBS := libavutil libavcodec libpostproc libavformat libavdevice libswscale
 
 include debian/confflags
-
-# Support multiple makes at once (taken from the qemu package)
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-  NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
-else
-  NJOBS := 1
-endif
-
-ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
-  confflags += --enable-libdc1394
-  lib1394-dev = libraw1394-dev, libdc1394-22-dev
-else
-  lib1394-dev =
-endif
-
-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
 
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h