r1292 - in /unstable/ffmpeg/debian: ./ confflags

[siretart at users.alioth.debian.org]

Author: siretart
Date: Wed Jul  2 13:29:23 2008
New Revision: 1292

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1292
Log:
dont compile with -fPIC on i386. this enables debug builds to be compiled with -O0

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

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Wed Jul  2 13:29:23 2008
@@ -33,3 +33,4 @@
 67 siretart at tauware.de-20080702112019-sr23fdojj0wmmzjd
 68 siretart at tauware.de-20080702112305-q5phwlg2lhex23zf
 69 siretart at tauware.de-20080702132335-odzqumiabapdbfxk
+70 siretart at tauware.de-20080702132850-64yyk9dx23tk3yl2

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Wed Jul  2 13:29:23 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-07-02 15:23:35.512000084 +0200
+timestamp: 2008-07-02 15:28:50.433000088 +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=1292&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Wed Jul  2 13:29:23 2008
@@ -43,15 +43,10 @@
 endif
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-# 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
+  CFLAGS := -O0
+# Various parts of ffmpeg (and swscale) FTBFS when compiling with -fPIC
+# and with mmx code enabled.
+  confflags += --disable-optimizations
   confflags += --disable-mmx
 else
   CFLAGS := -O2
@@ -99,7 +94,10 @@
 endif
 shared_build_confflags += --enable-shared
 shared_build_confflags += --disable-static
+# i386 does just fine without -fPIC
+ifneq      ($(DEB_HOST_ARCH),i386)
 shared_build_confflags += --extra-cflags="-fPIC -DPIC"
+endif
 
 ## i386 architecture specific
 # Configuration flags for the optimized shared libraries
@@ -109,7 +107,6 @@
 cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
-cmov_build_confflags += --extra-cflags="-fPIC -DPIC"
 cmov_build_confflags += --disable-ffmpeg
 cmov_build_confflags += --disable-vhook
 cmov_build_confflags += --disable-ffserver