r939 - in /experimental/ffmpeg/debian: fixup-config.sh rules

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu Dec 13 21:54:19 2007
New Revision: 939

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=939
Log:
debian/strip.sh forcefully removes certain encoders which are expected
to be available in some parts of the code. They aren't used if they
are disabled properly, but certain macros do need to be defined.

The script debian/fixup-config was added to fix up the build by adding
adding required #defines to config.h.


Added:
    experimental/ffmpeg/debian/fixup-config.sh
Modified:
    experimental/ffmpeg/debian/rules

Added: experimental/ffmpeg/debian/fixup-config.sh
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/fixup-config.sh?rev=939&op=file
==============================================================================
--- experimental/ffmpeg/debian/fixup-config.sh (added)
+++ experimental/ffmpeg/debian/fixup-config.sh Thu Dec 13 21:54:19 2007
@@ -1,0 +1,12 @@
+#
+# debian/strip.sh forcefully removes certain encoders which are expected
+# to be available in some parts of the code. They aren't used if they
+# are disabled properly, but certain macros do need to be defined.
+#
+# This script fixes up the build by adding adding required #defines to
+# config.h
+
+EXPECTED_CODECS="H261 H263 H263P MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MPEG4 MPEG2VIDEO"
+for codec in $EXPECTED_CODECS; do
+    echo "#define ENABLE_${codec}_ENCODER 0"
+done

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=939&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Thu Dec 13 21:54:19 2007
@@ -52,11 +52,13 @@
 	
 	# Build and backup static libraries
 	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
+	sh debian/fixup-config.sh >> config.h
 	$(MAKE)
 	for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
 	
 	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr
+	sh debian/fixup-config.sh >> config.h
 	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
 	for d in $(LIBS); do \
 	  $(MAKE) -C $$d clean && \