Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libtheora/files: libtheora-1.0_beta2-pic-fix.patch libtheora-1.0_beta2-flags.patch
Date: Thu, 03 Jan 2008 15:44:22
Message-Id: E1JASEv-0002K6-8P@stork.gentoo.org
1 aballier 08/01/03 15:44:13
2
3 Modified: libtheora-1.0_beta2-pic-fix.patch
4 libtheora-1.0_beta2-flags.patch
5 Log:
6 Update pic patch from the PaX team to gain one register and allow building without -fomit-frame-pointer, bug #200549
7 (Portage version: 2.1.4_rc14)
8
9 Revision Changes Path
10 1.2 media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch?rev=1.2&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch?rev=1.2&content-type=text/plain
14 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch?r1=1.1&r2=1.2
15
16 Index: libtheora-1.0_beta2-pic-fix.patch
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-pic-fix.patch,v
19 retrieving revision 1.1
20 retrieving revision 1.2
21 diff -u -r1.1 -r1.2
22 --- libtheora-1.0_beta2-pic-fix.patch 7 Dec 2007 20:01:14 -0000 1.1
23 +++ libtheora-1.0_beta2-pic-fix.patch 3 Jan 2008 15:44:12 -0000 1.2
24 @@ -1,7 +1,6 @@
25 -Index: libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
26 -===================================================================
27 ---- libtheora-1.0beta2.orig/lib/enc/x86_32/dct_decode_mmx.c
28 -+++ libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
29 +diff -urp libtheora-1.0beta2-orig/lib/enc/x86_32/dct_decode_mmx.c libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c
30 +--- libtheora-1.0beta2-orig/lib/enc/x86_32/dct_decode_mmx.c 2007-10-04 20:37:01.000000000 +0200
31 ++++ libtheora-1.0beta2/lib/enc/x86_32/dct_decode_mmx.c 2007-12-17 10:32:44.000000000 +0100
32 @@ -57,9 +57,9 @@ static void FilterHoriz__mmx(unsigned ch
33 "psubw %%mm3,%%mm1\n" /* mm1 = pix[0]-pix[3] mm1 - mm3 */ \
34 "movq %%mm0,%%mm7\n" /* mm7 = pix[2]*/ \
35 @@ -14,16 +13,38 @@
36 "psraw $3,%%mm1\n" /* >>3 */ \
37 " pextrw $0,%%mm1,%%esi\n" /* In MM1 we have 4 f coefs (16bits) */ \
38 " pextrw $1,%%mm1,%%edi\n" /* now perform MM4 = *(_bv+ f) */ \
39 -@@ -87,7 +87,7 @@ static void FilterHoriz__mmx(unsigned ch
40 - " shrl $16,%%eax\n" \
41 - " movw %%ax,1(%0,%%esi)\n" \
42 +@@ -75,20 +75,19 @@ static void FilterHoriz__mmx(unsigned ch
43 + " packuswb %%mm0,%%mm5\n" /* mm5 = x x x x newpix1 */ \
44 + " packuswb %%mm0,%%mm7\n" /* mm7 = x x x x newpix2 */ \
45 + " punpcklbw %%mm7,%%mm5\n" /* 2 1 2 1 2 1 2 1 */ \
46 +- " movd %%mm5,%%eax\n" /* eax = newpix21 */ \
47 +- " movw %%ax,1(%0)\n" \
48 ++ " movd %%mm5,%%edi\n" /* eax = newpix21 */ \
49 ++ " movw %%di,1(%0)\n" \
50 + " psrlq $32,%%mm5\n" /* why is so big stall here ? */ \
51 +- " shrl $16,%%eax\n" \
52 +- " lea 1(%0,%1,2),%%edi\n" \
53 +- " movw %%ax,1(%0,%1,1)\n" \
54 +- " movd %%mm5,%%eax\n" /* eax = newpix21 high part */ \
55 ++ " shrl $16,%%edi\n" \
56 ++ " movw %%di,1(%0,%1,1)\n" \
57 ++ " movd %%mm5,%%edi\n" /* eax = newpix21 high part */ \
58 + " lea (%1,%1,2),%%esi\n" \
59 +- " movw %%ax,(%%edi)\n" \
60 +- " shrl $16,%%eax\n" \
61 +- " movw %%ax,1(%0,%%esi)\n" \
62 ++ " movw %%di,1(%0,%1,2)\n" \
63 ++ " shrl $16,%%edi\n" \
64 ++ " movw %%di,1(%0,%%esi)\n" \
65 : \
66 - : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256) \
67 +- : "esi", "edi" , "memory", "eax" \
68 + : "r" (PixelPtr), "r" (LineLength), "r" (BoundingValuePtr-256), "m" (V3), "m" (V804) \
69 - : "esi", "edi" , "memory", "eax" \
70 ++ : "esi", "edi" , "memory" \
71 );
72
73 -@@ -126,12 +126,12 @@ static void FilterVert__mmx(unsigned cha
74 + OC_LOOP_H_4x4
75 +@@ -126,12 +125,12 @@ static void FilterVert__mmx(unsigned cha
76 "psubw %%mm5,%%mm3\n"
77 "psubw %%mm4,%%mm2\n"
78 /* mm3:mm2 = (pix[ystride*2]-pix[ystride]); */
79 @@ -40,7 +61,7 @@
80 "psraw $3,%%mm3\n" /* >>3 f coefs high */
81 "psraw $3,%%mm2\n" /* >>3 f coefs low */
82
83 -@@ -168,7 +168,7 @@ static void FilterVert__mmx(unsigned cha
84 +@@ -168,7 +167,7 @@ static void FilterVert__mmx(unsigned cha
85 "movq %%mm4,(%0,%1)\n" /* pix[ystride]= */
86 "emms\n"
87 :
88
89
90
91 1.3 media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch
92
93 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch?rev=1.3&view=markup
94 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch?rev=1.3&content-type=text/plain
95 diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch?r1=1.2&r2=1.3
96
97 Index: libtheora-1.0_beta2-flags.patch
98 ===================================================================
99 RCS file: /var/cvsroot/gentoo-x86/media-libs/libtheora/files/libtheora-1.0_beta2-flags.patch,v
100 retrieving revision 1.2
101 retrieving revision 1.3
102 diff -u -r1.2 -r1.3
103 --- libtheora-1.0_beta2-flags.patch 27 Nov 2007 20:54:57 -0000 1.2
104 +++ libtheora-1.0_beta2-flags.patch 3 Jan 2008 15:44:12 -0000 1.3
105 @@ -7,7 +7,7 @@
106 DEBUG="-g -Wall -Wno-parentheses -DDEBUG -D__NO_MATH_INLINES"
107 - CFLAGS="-Wall -Wno-parentheses -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
108 - PROFILE="-Wall -Wno-parentheses -pg -g -O3 -fno-inline-functions -DDEBUG";;
109 -+ CFLAGS="-Wall -Wno-parentheses -fomit-frame-pointer"
110 ++ CFLAGS="-Wall -Wno-parentheses"
111 + PROFILE="-Wall -Wno-parentheses -pg -g -fno-inline-functions -DDEBUG";;
112 esac
113 fi
114
115
116
117 --
118 gentoo-commits@g.o mailing list
Report Message
Find on MARC Find on Google Groups