Gentoo Archives: gentoo-commits

From: "PaweA Hajdan (phajdan.jr)" <phajdan.jr@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in www-client/chromium/files: chromium-ffmpeg-r0.patch
Date: Sat, 24 May 2014 08:15:59
Message-Id: 20140524081556.5D7702004F@flycatcher.gentoo.org
1 phajdan.jr 14/05/24 08:15:56
2
3 Added: chromium-ffmpeg-r0.patch
4 Log:
5 Fix build on hardened x86, bug #507080 by Anthoine Bourgeois.
6
7 (Portage version: 2.2.8-r1/cvs/Linux i686, signed Manifest commit with key 0x4F1A2555EA71991D!)
8
9 Revision Changes Path
10 1.1 www-client/chromium/files/chromium-ffmpeg-r0.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r0.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/www-client/chromium/files/chromium-ffmpeg-r0.patch?rev=1.1&content-type=text/plain
14
15 Index: chromium-ffmpeg-r0.patch
16 ===================================================================
17 --- third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c.orig 2014-05-22 08:12:08.770613935 +0000
18 +++ third_party/ffmpeg/libavcodec/x86/vp3dsp_init.c 2014-05-22 08:20:23.970456534 +0000
19 @@ -43,7 +43,7 @@
20 void ff_vp3_h_loop_filter_mmxext(uint8_t *src, int stride,
21 int *bounding_values);
22
23 -#if HAVE_MMX_INLINE
24 +#if HAVE_MMX_INLINE && HAVE_6REGS
25
26 #define MOVQ_BFE(regd) \
27 __asm__ volatile ( \
28 @@ -95,15 +95,15 @@
29 :"memory");
30 // STOP_TIMER("put_vp_no_rnd_pixels8_l2_mmx")
31 }
32 -#endif /* HAVE_MMX_INLINE */
33 +#endif /* HAVE_MMX_INLINE && HAVE_6REGS */
34
35 av_cold void ff_vp3dsp_init_x86(VP3DSPContext *c, int flags)
36 {
37 int cpu_flags = av_get_cpu_flags();
38
39 -#if HAVE_MMX_INLINE
40 +#if HAVE_MMX_INLINE && HAVE_6REGS
41 c->put_no_rnd_pixels_l2 = put_vp_no_rnd_pixels8_l2_mmx;
42 -#endif /* HAVE_MMX_INLINE */
43 +#endif /* HAVE_MMX_INLINE && HAVE_6REGS */
44
45 #if ARCH_X86_32
46 if (EXTERNAL_MMX(cpu_flags)) {