r1289 - in /unstable/ffmpeg/debian: ./ confflags rules

Wed Jul 2 11:24:05 UTC 2008

Author: siretart
Date: Wed Jul  2 11:24:05 2008
New Revision: 1289

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1289
Log:
clean up the broken noopt build variant. and explain why it is broken

Modified:
    unstable/ffmpeg/debian/   (props changed)
    unstable/ffmpeg/debian/confflags
    unstable/ffmpeg/debian/rules

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------

--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Wed Jul  2 11:24:05 2008
@@ -30,3 +30,4 @@
 64 siretart at tauware.de-20080702085032-6vwqsaw4ppzl2ub5
 65 siretart at tauware.de-20080702104457-s3crd3ov5bn3ry3g
 66 siretart at tauware.de-20080702110840-piwsn89fri8r5qt7
+67 siretart at tauware.de-20080702112019-sr23fdojj0wmmzjd

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Jul  2 11:24:05 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-07-02 13:08:40.358999968 +0200
+timestamp: 2008-07-02 13:20:19.448999882 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1289&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Wed Jul  2 11:24:05 2008
@@ -3,6 +3,10 @@
 # build a static version on every architecture
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS := static shared
+
+export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # the other flavors always build dynamic versions
 ifeq      ($(DEB_HOST_ARCH),i386)
@@ -12,8 +16,6 @@
 else ifeq ($(DEB_HOST_ARCH),sparc)
 FLAVORS += vis
 endif
-
-$(info Building FFmpeg for flavors: $(FLAVORS))
 
 # Comment out the following lines for LGPL versions of the libraries
 gpl_confflags := --enable-gpl
@@ -40,9 +42,19 @@
   lib1394-dev =
 endif
 
-# This hack is necessary because GCC won't build fdct_mmx.c with -O0
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-  confflags += --extra-cflags="-O1"
+# we cannot build with -O1 or -O2, because parts of ffmpeg, namely
+# fdct_mmx.c and libswscale, namely rgb2rgb_template.c FTBFS in hand
+# written assembler on i386. If you are on another arch, or want to work
+# on a patch fixing this, change the next variable to -O0
+  CFLAGS := -O1
+# Without the following setting noopt becomes meaningless and ffmpeg
+# will always compile with -O3. However libswscale FTBFS without
+# --disable-mmx and with --disable-optimizations :/ - patches welcome!
+#  confflags += --disable-optimizations
+  confflags += --disable-mmx
+else
+  CFLAGS := -O2
 endif
 
 # Support for additional external codecs

Modified: unstable/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/rules?rev=1289&op=diff
==============================================================================
--- unstable/ffmpeg/debian/rules (original)
+++ unstable/ffmpeg/debian/rules Wed Jul  2 11:24:05 2008
@@ -3,9 +3,6 @@
 include /usr/share/quilt/quilt.make
 
 #export DH_VERBOSE=1
-export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)
@@ -15,6 +12,10 @@
 
 include debian/confflags
 
+$(info Building FFmpeg for flavors: $(FLAVORS))
+$(info DEB_BUILD_OPTIONS are: $(DEB_BUILD_OPTIONS))
+$(info Using as CFLAGS: $(CFLAGS))
+
 config-extra-includes.h:
 	sh debian/fixup-config.sh > $@
 
@@ -22,7 +23,7 @@
 configure-%-stamp: $(QUILT_STAMPFN) config-extra-includes.h
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && ../configure $($*_build_confflags)
+	cd debian-$* && CFLAGS="$(CFLAGS)" ../configure $($*_build_confflags)
 ifeq (,$(findstring internalencoders,$(DEB_BUILD_OPTIONS)))
 	echo "#include \"config-extra-includes.h\"" >> debian-$*/config.h
 endif
@@ -84,7 +85,10 @@
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 	cp -a libavcodec/dsputil.h debian/tmp/usr/include/ffmpeg
 	cp debian-shared/doc/*.html debian/tmp/usr/share/doc/ffmpeg/html/
-	cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/
+#	dont fail on binary-indep only builds.
+	if test -d doxy; then \
+		cp doxy/html/* debian/tmp/usr/share/doc/ffmpeg-doc/html/; \
+	fi
 	cp doc/ffserver.conf debian/tmp/etc/
 	cp debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
 	dh_install --fail-missing --sourcedir=debian/tmp


