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

[siretart at users.alioth.debian.org]

Author: siretart
Date: Thu Mar 20 15:31:41 2008
New Revision: 1085

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1085
Log:
implement a more robust approach for fixup-config.sh

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

Modified: experimental/ffmpeg.20080206/debian/fixup-config.sh
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/fixup-config.sh?rev=1085&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/fixup-config.sh (original)
+++ experimental/ffmpeg.20080206/debian/fixup-config.sh Thu Mar 20 15:31:41 2008
@@ -7,6 +7,9 @@
 # config.h
 
 EXPECTED_CODECS="H261 H263 H263P MSMPEG4V1 MSMPEG4V2 MSMPEG4V3 MPEG4 MPEG2VIDEO"
+echo "#ifndef FIXUP_CONFIG_"
+echo "#define FIXUP_CONFIG_"
 for codec in $EXPECTED_CODECS; do
     echo "#define ENABLE_${codec}_ENCODER 0"
 done
+echo "#endif"

Modified: experimental/ffmpeg.20080206/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg.20080206/debian/rules?rev=1085&op=diff
==============================================================================
--- experimental/ffmpeg.20080206/debian/rules (original)
+++ experimental/ffmpeg.20080206/debian/rules Thu Mar 20 15:31:41 2008
@@ -55,15 +55,18 @@
 $(warning Make sure these packages are installed: $(weak-build-deps))
 endif
 
+config-extra-includes:
+	sh debian/fixup-config.sh >> config-extra-includes.h
+
 build: build-stamp
-build-stamp:
+build-stamp: config-extra-includes
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
 	# Build and backup static libraries
 	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-	sh debian/fixup-config.sh >> config.h
+	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
 	$(MAKE)
 	for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
@@ -71,7 +74,7 @@
 	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
-	sh debian/fixup-config.sh >> config.h
+	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
 	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
 	for d in $(LIBS); do \
@@ -106,8 +109,7 @@
 	for d in $(LIBS); do \
 	  rm -f $$d/Makefile.pic $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
 	done
-	rm -f config.log
-	dh_clean
+	dh_clean config.log config-extra-includes.h config.h
 
 get-orig-source:
 	svn export -r{$(SVN_VERSION)} svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg-free-$(SRC_VERSION)
@@ -163,12 +165,8 @@
 	dh_strip
 	dh_compress
 	dh_fixperms
-#	for d in libavutil49 libavcodec51 libpostproc51 libavformat52 libavdevice52 libswscale0 ; do \
-#	  dh_makeshlibs -p $${d} -V "$${d} (>= 0.svn20080206)" ; \
-#	done
 	dh_makeshlibs -V
 	dh_installdeb
-#	dh_shlibdeps -L libavutil49 -L libavcodec51 -L libavdevice52 -L libpostproc51 -L libavformat52 -L libswscale0 -l debian/libavutil49/usr/lib:debian/libavcodec51/usr/lib:debian/libavdevice52/usr/lib:debian/libavformat52/usr/lib:debian/libpostproc51/usr/lib:debian/libswscale0/usr/lib
 	dh_shlibdeps
 	dh_gencontrol -- -Vlib1394-dev="$(lib1394-dev)"
 	dh_md5sums