r1154 - in /experimental/ffmpeg/debian: changelog rules

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

Author: fabian-guest
Date: Mon Apr 21 08:08:49 2008
New Revision: 1154

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1154
Log:
* debian/rules:
+ Moved confflags, that result in GPL versions of the libraries, into a
dedicated variable gpl_confflags. Add this to the common confflags.
+ Moved --prefix=/usr to the common confflags.
+ Added some comments and whitespace (nothing special).


Modified:
    experimental/ffmpeg/debian/changelog
    experimental/ffmpeg/debian/rules

Modified: experimental/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/changelog?rev=1154&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Mon Apr 21 08:08:49 2008
@@ -1,8 +1,12 @@
 ffmpeg-free (0.svn20080206-4) UNRELEASED; urgency=low
 
-  * ...
-
- -- Reinhard Tartler <siretart at tauware.de>  Sun, 20 Apr 2008 09:09:26 +0200
+  * debian/rules:
+    + Moved confflags, that result in GPL versions of the libraries, into a
+      dedicated variable gpl_confflags. Add this to the common confflags.
+    + Moved --prefix=/usr to the common confflags.
+    + Added some comments and whitespace (nothing special).
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Mon, 21 Apr 2008 10:06:10 +0100
 
 ffmpeg-free (0.svn20080206-3) experimental; urgency=low
 

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1154&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Mon Apr 21 08:08:49 2008
@@ -5,8 +5,13 @@
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 LIBS = libavutil libavcodec libpostproc libavformat libavdevice libswscale
-# Comment out the following single line for LGPL versions of the libraries
-confflags += --enable-gpl --enable-liba52 --enable-libfaad --enable-pp --enable-swscaler --enable-x11grab
+
+# Comment out the following two lines for LGPL versions of the libraries
+gpl_confflags += --enable-gpl --enable-liba52 --enable-libfaad
+gpl_confflags += --enable-gpl --enable-pp --enable-swscaler --enable-x11grab
+
+# Common configuration flags
+confflags += $(gpl_confflags) --prefix=/usr
 confflags += --enable-pthreads
 confflags += --enable-libvorbis --enable-libtheora
 confflags += --enable-libgsm
@@ -18,7 +23,7 @@
 # Don't disable altivec, at least for now. Disabling altivec causes a
 # FTBFS in libswscale, as it will fallback to a "plain c version" of
 # some functions, which only compile with altivec enabled.
-# nooptflags += --disable-altivec
+#nooptflags += --disable-altivec
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
@@ -32,6 +37,7 @@
   lib1394-dev =
   FIREWIRELIBS=""
 endif
+
 ifneq (,$(findstring powerpc,$(DEB_BUILD_GNU_TYPE)))
   extradoc = doc/ffmpeg_powerpc_performance_evaluation_howto.txt
 endif
@@ -40,6 +46,7 @@
   # This hack is necessary because GCC won't build fdct_mmx.c with -O0
   confflags += --extra-cflags="-O1"
 endif
+
 ifneq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
   confflags += --disable-strip
 endif
@@ -61,10 +68,10 @@
 endif
 
 static_build_confflags = $(confflags) --disable-ffmpeg --disable-vhook \
-	--disable-ffserver --disable-ffplay --prefix=/usr
+	--disable-ffserver --disable-ffplay
 
 shared_build_confflags = $(confflags) $(nooptflags) --enable-shared \
-	--prefix=/usr --extra-cflags="-fPIC -DPIC"
+	--extra-cflags="-fPIC -DPIC"
 
 config-extra-includes.h:
 	sh debian/fixup-config.sh > config-extra-includes.h
@@ -102,7 +109,7 @@
 	done
 	touch ffmpeg ffmpeg_g ffplay ffplay_g
 
-	# build qt-faststart
+	# Build qt-faststart
 	$(MAKE) tools/qt-faststart
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -125,7 +132,7 @@
 get-orig-source:
 	dh_testdir
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-        # disable potentially dangerous patented code
+        # Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \
 	    -c $(CURDIR)/debian/strip.sh \