[SCM] mplayer/master: Fix includes to libavutil/x86/asm.h

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 3bbbe1a47a8fa04c8093978e459cdf7e321ebabf
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Jan 19 09:22:33 2013 +0100

    Fix includes to libavutil/x86/asm.h

diff --git a/debian/patches/65-fix-x86-asm-includes.patch b/debian/patches/65-fix-x86-asm-includes.patch
new file mode 100644
index 0000000..97efae1
--- /dev/null
+++ b/debian/patches/65-fix-x86-asm-includes.patch
@@ -0,0 +1,192 @@
+Description: Fix includes to libavutil/x86/asm.h
+Author: Reinhard Tartler <siretart at tauware.de>
+Forwarded: no
+
+
+--- mplayer-1.1+dfsg1.orig/cpudetect.c
++++ mplayer-1.1+dfsg1/cpudetect.c
+@@ -16,7 +16,7 @@
+  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "config.h"
+ #include "cpudetect.h"
+ #include "mp_msg.h"
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/pullup.c
++++ mplayer-1.1+dfsg1/libmpcodecs/pullup.c
+@@ -20,7 +20,7 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "config.h"
+ #include "pullup.h"
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_yadif.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_yadif.c
+@@ -34,7 +34,7 @@
+ #include "libmpdemux/demuxer.h"
+ #include "libvo/fastmemcpy.h"
+ #include "libavutil/common.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ //===========================================================================//
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_filmdint.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_filmdint.c
+@@ -30,7 +30,7 @@
+ #include "vd.h"
+ #include "vf.h"
+ #include "cmmx.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "libvo/fastmemcpy.h"
+ 
+ #define NUM_STORED 4
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_ilpack.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_ilpack.c
+@@ -29,7 +29,7 @@
+ #include "mp_image.h"
+ #include "vf.h"
+ #include "libavutil/attributes.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ typedef void (pack_func_t)(unsigned char *dst, unsigned char *y,
+     unsigned char *u, unsigned char *v, int w, int us, int vs);
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_ivtc.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_ivtc.c
+@@ -27,7 +27,7 @@
+ #include "img_format.h"
+ #include "mp_image.h"
+ #include "vf.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "libvo/fastmemcpy.h"
+ 
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_fspp.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_fspp.c
+@@ -51,7 +51,7 @@
+ #include "libavutil/internal.h"
+ #include "libavutil/intreadwrite.h"
+ #include "libavutil/mem.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "libavcodec/avcodec.h"
+ #include "libavcodec/dsputil.h"
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_noise.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_noise.c
+@@ -37,7 +37,7 @@
+ #include "vf.h"
+ #include "libvo/fastmemcpy.h"
+ #include "libavutil/mem.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ #define MAX_NOISE 4096
+ #define MAX_SHIFT 1024
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_divtc.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_divtc.c
+@@ -26,7 +26,7 @@
+ #include "mp_msg.h"
+ #include "cpudetect.h"
+ #include "libavutil/common.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "mpbswap.h"
+ 
+ #include "img_format.h"
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_tfields.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_tfields.c
+@@ -27,7 +27,7 @@
+ #include "img_format.h"
+ #include "mp_image.h"
+ #include "vf.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "libmpdemux/demuxer.h"
+ #include "libvo/fastmemcpy.h"
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_decimate.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_decimate.c
+@@ -27,7 +27,7 @@
+ #include "img_format.h"
+ #include "mp_image.h"
+ #include "vf.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ #include "libvo/fastmemcpy.h"
+ 
+ 
+--- mplayer-1.1+dfsg1.orig/libmpcodecs/vf_gradfun.c
++++ mplayer-1.1+dfsg1/libmpcodecs/vf_gradfun.c
+@@ -40,7 +40,7 @@
+ #include "libvo/fastmemcpy.h"
+ #include "libavutil/avutil.h"
+ #include "libavutil/common.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ struct vf_priv_s {
+     int thresh;
+--- mplayer-1.1+dfsg1.orig/mp3lib/dct64_3dnow.c
++++ mplayer-1.1+dfsg1/mp3lib/dct64_3dnow.c
+@@ -11,7 +11,7 @@
+ #include "config.h"
+ #include "mangle.h"
+ #include "mpg123.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
+ static float attribute_used plus_1f = 1.0;
+--- mplayer-1.1+dfsg1.orig/mp3lib/dct64_mmx.c
++++ mplayer-1.1+dfsg1/mp3lib/dct64_mmx.c
+@@ -6,7 +6,7 @@
+ #include "config.h"
+ #include "mangle.h"
+ #include "mpg123.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ void dct64_MMX(short *a,short *b,real *c)
+ {
+--- mplayer-1.1+dfsg1.orig/mp3lib/dct36_3dnow.c
++++ mplayer-1.1+dfsg1/mp3lib/dct36_3dnow.c
+@@ -30,7 +30,7 @@
+ #include "config.h"
+ #include "mangle.h"
+ #include "mpg123.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ #ifdef DCT36_OPTIMIZE_FOR_K7
+ void dct36_3dnowex(real *inbuf, real *o1,
+--- mplayer-1.1+dfsg1.orig/mp3lib/dct64_k7.c
++++ mplayer-1.1+dfsg1/mp3lib/dct64_k7.c
+@@ -11,7 +11,7 @@
+ #include "config.h"
+ #include "mangle.h"
+ #include "mpg123.h"
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ static unsigned long long int attribute_used __attribute__((aligned(8))) x_plus_minus_3dnow = 0x8000000000000000ULL;
+ static float attribute_used plus_1f = 1.0;
+--- mplayer-1.1+dfsg1.orig/libvo/aclib_template.c
++++ mplayer-1.1+dfsg1/libvo/aclib_template.c
+@@ -80,7 +80,7 @@ If you have questions please contact wit
+ // 3dnow memcpy support from kernel 2.4.2
+ //  by Pontscho/fresh!mindworkz
+ 
+-#include "libavutil/x86_cpu.h"
++#include "libavutil/x86/asm.h"
+ 
+ #undef HAVE_ONLY_MMX1
+ #if HAVE_MMX && !HAVE_MMX2 && !HAVE_AMD3DNOW && !HAVE_SSE
diff --git a/debian/patches/series b/debian/patches/series
index 46f2ee1..d894def 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 62-libav-0.8.patch
 62-libav-9.patch
 64-planaraudio.patch
+65-fix-x86-asm-includes.patch

-- 
mplayer packaging