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

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sun Apr 20 06:13:34 2008
New Revision: 1148

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1148
Log:
Reenable altivec, fixes FTBFS on powerpc.

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=1148&op=diff
==============================================================================
--- experimental/ffmpeg/debian/changelog (original)
+++ experimental/ffmpeg/debian/changelog Sun Apr 20 06:13:34 2008
@@ -3,6 +3,7 @@
   * install qt-faststart. Thanks Stefan Hermann for the patch from ubuntu.
     (Closes: #470484)
   * Reenable 020_fix_libswscale_pic_code, fixes FTBFS on amd64.
+  * Reenable altivec, fixes FTBFS on powerpc.
 
  -- Reinhard Tartler <siretart at tauware.de>  Fri, 18 Apr 2008 23:02:24 +0200
 

Modified: experimental/ffmpeg/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/ffmpeg/debian/rules?rev=1148&op=diff
==============================================================================
--- experimental/ffmpeg/debian/rules (original)
+++ experimental/ffmpeg/debian/rules Sun Apr 20 06:13:34 2008
@@ -12,8 +12,13 @@
 confflags += --enable-libgsm
 
 # Disable architecture-specific optimizations for shared build
-nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt --disable-altivec
+nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt
 nooptflags += --disable-mmx
+
+# Don't disable altivec, at least for now. Disabling altivec causes a
+# FTBFS in libswscale, as it will fallback to a "plain c version" of
+# some functions, which only compile with altivec enabled.
+nooptflags += --disable-altivec
 
 DEB_VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: //p')
 SRC_VERSION := $(shell echo $(DEB_VERSION) | cut -d '-' -f 1)