[SCM] FFmpeg packaging branch, master, updated. debian/0.5+svn20090420-2-26-g015003a

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

The following commit has been merged in the master branch:
commit 1973752f66bc89f13b9d001da387ba43bf3ea6cd
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed May 13 21:12:01 2009 -0400

    Allow passing in extra confflags, removes the need for fix-fpic DEB_BUILD_OPTIONS.
    
      This is a matter of convenience so we can test builds of ffmpeg with other
      configure options, such as enabling libdirac and libamr among other things.

diff --git a/debian/confflags b/debian/confflags
index 22f2462..66fd300 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -83,6 +83,7 @@ confflags += --enable-pthreads
 confflags += --enable-zlib
 confflags += --disable-stripping
 confflags += --disable-vhook
+confflags += $(extra_common_confflags)
 
 # this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
 gpl_confflags += $(call cond_enable,/usr/include/xvid.h,libxvid)
@@ -124,9 +125,6 @@ shared_build_confflags += $(nooptflags)
 endif
 shared_build_confflags += --enable-shared
 shared_build_confflags += --disable-static
-ifneq (,$(findstring fix-fpic,$(DEB_BUILD_OPTIONS)))
-shared_build_confflags += --extra-cflags="-fPIC -DPIC"
-endif
 
 ## armel architecture specific
 # Configuration flags for the optimised shared libraries
@@ -154,9 +152,6 @@ cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
 cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
-ifneq (,$(findstring fix-fpic,$(DEB_BUILD_OPTIONS)))
-cmov_build_confflags += --extra-cflags="-fPIC -DPIC"
-endif
 cmov_build_confflags += --disable-ffmpeg
 cmov_build_confflags += --disable-ffserver
 cmov_build_confflags += --disable-ffplay
diff --git a/debian/rules b/debian/rules
index 3c6cb2a..fbf2966 100755
--- a/debian/rules
+++ b/debian/rules
@@ -54,7 +54,8 @@ configure-stamp-%: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
 	mkdir -p debian-$*
 	cp .svnrevision debian-$*/snapshot_version
-	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure $($*_build_confflags)
+	cd debian-$* && CFLAGS="$(CFLAGS)" $(CURDIR)/configure \
+		$($*_build_confflags) $(extra_$*_build_confflags)
 ifeq ($(internalencoders),)
 	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
 endif

-- 
FFmpeg packaging