r1277 - in /unstable/ffmpeg/debian: ./ changelog confflags

[siretart at users.alioth.debian.org]

Author: siretart
Date: Mon Jun 30 14:04:09 2008
New Revision: 1277

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1277
Log:
provide mmx-enabled shared objects on amd64. AFAIK all amd64 machines
do support MMX.

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

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. (original)
+++ bzr:revision-id:v3-single1-dW5zdGFibGUvZmZtcGVnL2RlYmlhbg.. Mon Jun 30 14:04:09 2008
@@ -19,3 +19,4 @@
 52 siretart at tauware.de-20080630131214-81k1az9u115l7bul
 53 siretart at tauware.de-20080630132119-e2wkrw6eug0jcguy
 54 siretart at tauware.de-20080630134834-3sz4ajk51eww79dz
+55 siretart at tauware.de-20080630140311-8yarzkn3kyczbdkc

Propchange: unstable/ffmpeg/debian/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Mon Jun 30 14:04:09 2008
@@ -1,4 +1,4 @@
-timestamp: 2008-06-30 15:48:34.775000095 +0200
+timestamp: 2008-06-30 16:03:11.575000048 +0200
 committer: Reinhard Tartler <siretart at tauware.de>
 properties: 
 	branch-nick: unstable

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1277&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Mon Jun 30 14:04:09 2008
@@ -5,6 +5,8 @@
   * debian/strip.sh: no need to remove the glue code for x264 and xvid.
     However, since that code is not built in debian anyway, the orig.tar.gz
     was not rebuilt with this change.
+  * provide mmx-enabled shared objects on amd64. AFAIK all amd64 machines
+    do support MMX.
   * Provide optimized versions of the libraries along the unoptimized
     ones. They are installed in machines and architecture specific
     directories. Optimized for further target will be added per request,

Modified: unstable/ffmpeg/debian/confflags
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/confflags?rev=1277&op=diff
==============================================================================
--- unstable/ffmpeg/debian/confflags (original)
+++ unstable/ffmpeg/debian/confflags Mon Jun 30 14:04:09 2008
@@ -1,4 +1,5 @@
-
+# -*- mode: makefile -*-
+#
 # build a static version on every architecture
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS := static shared
@@ -32,7 +33,8 @@
 confflags += --disable-strip
 
 # Disable architecture-specific optimizations for default shared build
-nooptflags += --disable-armv5te --disable-armv6 --disable-iwmmxt
+nooptflags += --disable-armv5te --disable-armv6
+nooptflags += --disable-iwmmxt
 nooptflags += --disable-mmx
 nooptflags += --disable-altivec
 
@@ -45,10 +47,12 @@
 
 # Configuration flags for the non-optimized shared libraries
 shared_build_confflags := $(confflags)
+# amd64 has no problems with optimized shared libs. i386 and arm do.
+ifneq      ($(DEB_HOST_ARCH),amd64)
 shared_build_confflags += $(nooptflags)
+endif
 shared_build_confflags += --enable-shared
 shared_build_confflags += --disable-static
-shared_build_confflags += --cpu='generic'
 shared_build_confflags += --extra-cflags="-fPIC -DPIC"
 
 ## i386 architecture specific