r1217 - in /unstable/ffmpeg/debian: changelog patches/010_revert_r10648_disable_mfspr_emulation.diff patches/series

[siretart at users.alioth.debian.org]

Author: siretart
Date: Sun Jun  1 16:38:38 2008
New Revision: 1217

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1217
Log:
* new patch: 010_revert_r10648_disable_mfspr_emulation.diff. Commit r11569
  introduces an mfspr-based AltiVec detection code, which will break on
  machines not having altivec. (Closes: #482717)

Added:
    unstable/ffmpeg/debian/patches/010_revert_r10648_disable_mfspr_emulation.diff
Modified:
    unstable/ffmpeg/debian/changelog
    unstable/ffmpeg/debian/patches/series

Modified: unstable/ffmpeg/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/changelog?rev=1217&op=diff
==============================================================================
--- unstable/ffmpeg/debian/changelog (original)
+++ unstable/ffmpeg/debian/changelog Sun Jun  1 16:38:38 2008
@@ -17,6 +17,9 @@
       been fixed in a different way and is not reproducible. Verified that
       the file referenced in bug #404176 does not crash anymore even
       without this patch.
+  * new patch: 010_revert_r10648_disable_mfspr_emulation.diff. Commit r11569
+    introduces an mfspr-based AltiVec detection code, which will break on
+    machines not having altivec. (Closes: #482717)
 
  -- Reinhard Tartler <siretart at tauware.de>  Thu, 29 May 2008 16:17:54 +0200
 

Added: unstable/ffmpeg/debian/patches/010_revert_r10648_disable_mfspr_emulation.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/010_revert_r10648_disable_mfspr_emulation.diff?rev=1217&op=file
==============================================================================
--- unstable/ffmpeg/debian/patches/010_revert_r10648_disable_mfspr_emulation.diff (added)
+++ unstable/ffmpeg/debian/patches/010_revert_r10648_disable_mfspr_emulation.diff Sun Jun  1 16:38:38 2008
@@ -1,0 +1,23 @@
+Index: ffmpeg/libavcodec/ppc/check_altivec.c
+===================================================================
+--- ffmpeg.orig/libavcodec/ppc/check_altivec.c	2008-06-01 18:28:18.000000000 +0200
++++ ffmpeg/libavcodec/ppc/check_altivec.c	2008-06-01 18:29:34.000000000 +0200
+@@ -54,18 +54,6 @@
+ 
+     if (err == 0) return (has_vu != 0);
+     return 0;
+-#elif defined(RUNTIME_CPUDETECT)
+-    int proc_ver;
+-    // support of mfspr PVR emulation added in Linux 2.6.17
+-    asm volatile("mfspr %0, 287" : "=r" (proc_ver));
+-    proc_ver >>= 16;
+-    if (proc_ver  & 0x8000 ||
+-        proc_ver == 0x000c ||
+-        proc_ver == 0x0039 || proc_ver == 0x003c ||
+-        proc_ver == 0x0044 || proc_ver == 0x0045 ||
+-        proc_ver == 0x0070)
+-        return 1;
+-    return 0;
+ #else
+     // since we were compiled for altivec, just assume we have it
+     // until someone comes up with a proper way (not involving signal hacks).

Modified: unstable/ffmpeg/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/ffmpeg/debian/patches/series?rev=1217&op=diff
==============================================================================
--- unstable/ffmpeg/debian/patches/series (original)
+++ unstable/ffmpeg/debian/patches/series Sun Jun  1 16:38:38 2008
@@ -1,6 +1,7 @@
 005_runtime_cpudetect.diff
 010_proper_rpath.diff
 010_ffmpeg-config.diff
+010_revert_r10648_disable_mfspr_emulation.diff
 011_link_plugins.diff
 013_strip_unneeded_linker_flags.diff
 020_fix_libswscale_pic_code