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

fabian-guest at users.alioth.debian.org fabian-guest at users.alioth.debian.org
Fri Apr 18 15:35:19 UTC 2008 

Author: fabian-guest
Date: Fri Apr 18 15:35:19 2008
New Revision: 1132

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1132
Log:
+ Build ffmpeg and shared libraries with --extra-cflags="-fPIC -DPIC"
(feeling confident that this closes: #472613) and "drop the surgery
regarding Makefile.pic and config.mak.pic".
+ In this context, cleaned up build rule: Run '$(MAKE)' and '$(MAKE) clean'
from the top source directory instead of diving into the library
directories; force move during backup and recovery of the static
libraries; let the build rule itself depend on config-extra-includes.h
(instead of build-stamp) to avoid being run again from the binary rule;
some more minor changes of cosmetic type.
+ Renamed config-extra-includes rule to config-extra-includes.h to
reflect the file name of the created file (also changed to override it
instead of appending) and to avoid the rule to be run twice.
+ Disabled all architecture-specific optimizations for the time being.


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=1132&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Fri Apr 18 15:35:19 2008
@@ -12,9 +12,20 @@
   * debian/rules:
     + Build with --enable-x11grab (Closes: #441983).
     + Build ffmpeg and shared libraries with --extra-cflags="-fPIC -DPIC"
-      (feeling confident that this closes: #472613).
-
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 17 Apr 2008 09:57:00 +0100
+      (feeling confident that this closes: #472613) and "drop the surgery
+      regarding Makefile.pic and config.mak.pic".
+    + In this context, cleaned up build rule: Run '$(MAKE)' and '$(MAKE) clean'
+      from the top source directory instead of diving into the library
+      directories; force move during backup and recovery of the static
+      libraries; let the build rule itself depend on config-extra-includes.h
+      (instead of build-stamp) to avoid being run again from the binary rule;
+      some more minor changes of cosmetic type.
+    + Renamed config-extra-includes rule to config-extra-includes.h to
+      reflect the file name of the created file (also changed to override it
+      instead of appending) and to avoid the rule to be run twice.
+    + Disabled all architecture-specific optimizations for the time being.
+
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Fri, 1 Apr 2008 17:22:00 +0100
 
 ffmpeg-free (0.svn20080206-1) experimental; urgency=low
 

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1132&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Fri Apr 18 15:35:19 2008
@@ -10,7 +10,8 @@
 confflags += --enable-pthreads
 confflags += --enable-libvorbis --enable-libtheora
 confflags += --enable-libgsm
-confflags += --disable-armv6 --disable-armv5te
+# Disable all architecture-specific optimizations
+confflags += --disable-mmx --disable-armv5te --disable-armv6 --disable-iwmmxt --disable-altivec
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
@@ -37,55 +38,53 @@
 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
-weak-build-deps += libmp3lame-dev | liblame-dev
-confflags += --enable-libmp3lame
-weak-build-deps += libfaac-dev
-confflags += --enable-libfaac
-weak-build-deps += libxvidcore-dev | libxvidcore4-dev
-confflags += --enable-gpl --enable-libxvid
-weak-build-deps += libx264-dev
-confflags += --enable-gpl --enable-libx264
-$(warning Make sure these packages are installed: $(weak-build-deps))
+  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
+  confflags += --enable-libfaac
+  weak-build-deps += libxvidcore-dev | libxvidcore4-dev
+  confflags += --enable-gpl --enable-libxvid
+  weak-build-deps += libx264-dev
+  confflags += --enable-gpl --enable-libx264
+  $(warning Make sure these packages are installed: $(weak-build-deps))
 endif
 
-config-extra-includes:
-	sh debian/fixup-config.sh >> config-extra-includes.h
+config-extra-includes.h:
+	sh debian/fixup-config.sh > config-extra-includes.h
 
-build: build-stamp
-build-stamp: config-extra-includes
+build: config-extra-includes.h build-stamp
+build-stamp:
 	dh_testdir
 	QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
 
-	# Build and backup static libraries
+	# Build static libraries
 	./configure $(confflags) --disable-ffmpeg --disable-vhook --disable-ffserver --disable-ffplay --prefix=/usr
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
 	$(MAKE)
-	for d in $(LIBS); do mv $$d/$$d.a $$d/$$d.a.bak; done
+
+	# Backup static libraries
+	for d in $(LIBS); do \
+	  mv -f $$d/$$d.a $$d/$$d.a.bak ; \
+	done
+
+	$(MAKE) clean
 
 	# Build ffmpeg and shared libraries
 	./configure $(confflags) --enable-shared --prefix=/usr --extra-cflags="-fPIC -DPIC"
 ifeq (,$(findstring risky,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> config.h
 endif
-	echo 'CFLAGS += -fPIC -DPIC' >> config.mak.pic
-	for d in $(LIBS); do \
-	  $(MAKE) -C $$d clean && \
-	  rm -f $$d/Makefile.pic && \
-	  sed 's/config.mak/&.pic/' <$$d/Makefile >$$d/Makefile.pic && \
-	  $(MAKE) -C $$d -f Makefile.pic && \
-	  rm -f $$d/Makefile.pic ; \
-	done
-	rm -f config.mak.pic
+	$(MAKE)
 
 	# Restore static libraries and fix timestamps
 	for d in $(LIBS); do \
-	  mv $$d/$$d.a.bak $$d/$$d.a ; \
+	  mv -f $$d/$$d.a.bak $$d/$$d.a ; \
 	  touch $$d/$$d.a ; \
 	done
 	touch ffmpeg ffmpeg_g ffplay ffplay_g
@@ -103,7 +102,7 @@
 	[ ! -f Makefile ] || [ ! -f config.mak ] || $(MAKE) distclean
 	QUILT_PATCHES=debian/patches quilt pop -a -R || test $$? = 2
 	for d in $(LIBS); do \
-	  rm -f $$d/Makefile.pic $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
+	  rm -f $$d/$$d.a.bak $$d-unistalled.pc $$d.pc ; \
 	done
 	dh_clean config.log config-extra-includes.h config.h

More information about the pkg-multimedia-commits mailing list