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

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

Author: fabian-guest
Date: Tue Apr 29 07:35:14 2008
New Revision: 1171

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1171
Log:
+ Renamed the "risky" keyword to "internalencoders". Set this in
DEB_BUILD_OPTIONS in order to create and build from an unstripped tarball
in the get-orig-source and build rules.
+ Introduced the "externalcodecs" keyword. Set this in DEB_BUILD_OPTIONS to
enable support for additional codecs via external libraries.
+ Commented out the amr?b codecs among the external codecs, because the
resulting packages will be unredistributable.


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=1171&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Tue Apr 29 07:35:14 2008
@@ -5,8 +5,15 @@
       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
+    + Renamed the "risky" keyword to "internalencoders". Set this in
+      DEB_BUILD_OPTIONS in order to create and build from an unstripped tarball
+      in the get-orig-source and build rules.
+    + Introduced the "externalcodecs" keyword. Set this in DEB_BUILD_OPTIONS to
+      enable support for additional codecs via external libraries.
+    + Commented out the amr?b codecs among the external codecs, because the
+      resulting packages will be unredistributable.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Tue, 29 Apr 2008 09:07:11 +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=1171&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Tue Apr 29 07:35:14 2008
@@ -51,11 +51,13 @@
   confflags += --disable-strip
 endif
 
-ifneq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-  weak-build-deps += libamrnb-dev
-  confflags += --enable-nonfree --enable-libamr-nb
-  weak-build-deps += libamrwb-dev
-  confflags += --enable-nonfree --enable-libamr-wb
+ifneq (,$(findstring externalcodecs,$(DEB_BUILD_OPTIONS)))
+# Uncomment the following line to allow 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
@@ -83,7 +85,7 @@
 
 	# Build static libraries
 	./configure $(static_build_confflags)
-ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
 	$(MAKE)
@@ -97,7 +99,7 @@
 
 	# Build ffmpeg and shared libraries
 	./configure $(shared_build_confflags)
-ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
 	$(MAKE)
@@ -131,7 +133,7 @@
 
 get-orig-source:
 	dh_testdir
-ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
+ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
         # Disable potentially dangerous patented code
 	chmod +x debian/strip.sh
 	sh debian/get-orig-source.sh -r{$(SVN_VERSION)} \