Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/vlc/1.0.2: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 030_all_xcb_sysconf_bsd.patch 300_all_pic.patch 310_all_mmx_pic.patch 320_all_disable_media_list_player_tests.patch series
Date: Fri, 28 Aug 2009 20:15:47
Message-Id: E1MfolP-0007Hh-PE@stork.gentoo.org
1 aballier 09/08/25 05:40:11
2
3 Added: 010_all_freetype-font.patch
4 020_all_check_headers_regexps.patch
5 030_all_xcb_sysconf_bsd.patch 300_all_pic.patch
6 310_all_mmx_pic.patch
7 320_all_disable_media_list_player_tests.patch
8 series
9 Log:
10 clone 1.0.1 dir for 1.0.2 (not released yet)
11
12 Revision Changes Path
13 1.1 src/patchsets/vlc/1.0.2/010_all_freetype-font.patch
14
15 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/010_all_freetype-font.patch?rev=1.1&view=markup
16 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/010_all_freetype-font.patch?rev=1.1&content-type=text/plain
17
18 Index: 010_all_freetype-font.patch
19 ===================================================================
20 The default font used by VLC does not exists on every system, instead of that,
21 we use DejaVU, and add it to the dependencies, as anyway many people have that
22 font installed.
23
24 Index: vlc-1.0.1/modules/misc/freetype.c
25 ===================================================================
26 --- vlc-1.0.1.orig/modules/misc/freetype.c
27 +++ vlc-1.0.1/modules/misc/freetype.c
28 @@ -60,8 +60,8 @@
29 #define DEFAULT_FONT "" /* Default font found at run-time */
30 #define FC_DEFAULT_FONT "Arial"
31 #else
32 -#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
33 -#define FC_DEFAULT_FONT "Serif Bold"
34 +#define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf"
35 +#define FC_DEFAULT_FONT "Sans"
36 #endif
37
38 #if defined(HAVE_FRIBIDI)
39
40
41
42 1.1 src/patchsets/vlc/1.0.2/020_all_check_headers_regexps.patch
43
44 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/020_all_check_headers_regexps.patch?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/020_all_check_headers_regexps.patch?rev=1.1&content-type=text/plain
46
47 Index: 020_all_check_headers_regexps.patch
48 ===================================================================
49 This fixes weird check_headers failures when it also matches things like 'const' which are obviously allowed in the public headers and cause check failures due to these false positives.
50 ---
51 src/check_headers | 2 +-
52 1 files changed, 1 insertions(+), 1 deletions(-)
53
54 Index: vlc-1.0.1/src/check_headers
55 ===================================================================
56 --- vlc-1.0.1.orig/src/check_headers
57 +++ vlc-1.0.1/src/check_headers
58 @@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
59 # Look for configure #defines in public headers.
60 # There are incorrect, as external users don't have our <config.h>.
61 regexp="$(cat ../config.h.in | \
62 - sed -n -e 's/^#undef \([A-Z0-9_]*\)$/\1/p' | \
63 + sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \
64 grep -v 'WORDS_BIGENDIAN' | \
65 xargs | \
66 sed -e 's/ /\\\|/g')"
67
68
69
70 1.1 src/patchsets/vlc/1.0.2/030_all_xcb_sysconf_bsd.patch
71
72 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/030_all_xcb_sysconf_bsd.patch?rev=1.1&view=markup
73 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/030_all_xcb_sysconf_bsd.patch?rev=1.1&content-type=text/plain
74
75 Index: 030_all_xcb_sysconf_bsd.patch
76 ===================================================================
77 commit a73ea66ebb2b60d1e2e83a9ab17feefb8ad15e16
78 Author: Alexis Ballier <aballier@g.o>
79 Date: Fri Jul 10 15:04:42 2009 +0200
80
81 xcb_window: Use sysconf to discover HOST_NAME_MAX.
82
83 POSIX does not mandate HOST_NAME_MAX to be defined and FreeBSD does not
84 define it to encourage people to use sysconf() for discovering its
85 value. If sysconf fails, fallback to _POSIX_HOST_NAME_MAX.
86
87 Signed-off-by: Rémi Denis-Courmont <remi@××××××.net> (with minor changes)
88
89 Index: vlc-1.0.1/modules/video_output/xcb/window.c
90 ===================================================================
91 --- vlc-1.0.1.orig/modules/video_output/xcb/window.c
92 +++ vlc-1.0.1/modules/video_output/xcb/window.c
93 @@ -27,8 +27,8 @@
94 #include <stdarg.h>
95 #include <assert.h>
96 #include <poll.h>
97 -#include <unistd.h> /* gethostname() */
98 -#include <limits.h> /* HOST_NAME_MAX */
99 +#include <unistd.h> /* gethostname() and sysconf() */
100 +#include <limits.h> /* _POSIX_HOST_NAME_MAX */
101
102 #include <xcb/xcb.h>
103 typedef xcb_atom_t Atom;
104 @@ -96,13 +96,18 @@ void set_ascii_prop (xcb_connection_t *c
105 static inline
106 void set_hostname_prop (xcb_connection_t *conn, xcb_window_t window)
107 {
108 - char hostname[HOST_NAME_MAX];
109 + char* hostname;
110 + long host_name_max = sysconf (_SC_HOST_NAME_MAX);
111 + if (host_name_max <= 0) host_name_max = _POSIX_HOST_NAME_MAX;
112 + hostname = malloc (host_name_max);
113 + if(!hostname) return;
114
115 - if (gethostname (hostname, sizeof (hostname)) == 0)
116 + if (gethostname (hostname, host_name_max) == 0)
117 {
118 - hostname[sizeof (hostname) - 1] = '\0';
119 + hostname[host_name_max - 1] = '\0';
120 set_ascii_prop (conn, window, XA_WM_CLIENT_MACHINE, hostname);
121 }
122 + free(hostname);
123 }
124
125 static inline
126
127
128
129 1.1 src/patchsets/vlc/1.0.2/300_all_pic.patch
130
131 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/300_all_pic.patch?rev=1.1&view=markup
132 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/300_all_pic.patch?rev=1.1&content-type=text/plain
133
134 Index: 300_all_pic.patch
135 ===================================================================
136 Index: vlc-1.0.1/libs/loader/Makefile.am
137 ===================================================================
138 --- vlc-1.0.1.orig/libs/loader/Makefile.am
139 +++ vlc-1.0.1/libs/loader/Makefile.am
140 @@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
141 # TODO: real check for vsscanf() and <sys/mmap.h>
142 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
143 -DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
144 -AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
145 +AM_CFLAGS = -fPIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
146 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
147
148 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
149 Index: vlc-1.0.1/libs/loader/module.c
150 ===================================================================
151 --- vlc-1.0.1.orig/libs/loader/module.c
152 +++ vlc-1.0.1/libs/loader/module.c
153 @@ -63,8 +63,8 @@
154
155 #ifdef EMU_QTX_API
156 #include "wrapper.h"
157 -static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
158 -static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
159 +int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
160 +int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
161 #endif
162
163 //#undef TRACE
164 @@ -572,8 +572,6 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib
165 fprintf(stderr,"QuickTime.qts patched!!! old entry=%p\n",ptr[0]);
166
167 #ifdef EMU_QTX_API
168 - report_entry = report_func;
169 - report_ret = report_func_ret;
170 wrapper_target=ptr[0];
171 ptr[0]=wrapper;
172 #endif
173 @@ -754,7 +752,7 @@ static int dump_component(char* name,int
174 static uint32_t ret_array[4096];
175 static int ret_i=0;
176
177 -static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
178 +int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
179 {
180 #ifdef DEBUG_QTX_API
181 int i;
182 @@ -953,7 +951,7 @@ static int report_func(void *stack_base,
183 return 0;
184 }
185
186 -static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
187 +int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
188 {
189 int i;
190 short err;
191 @@ -1066,8 +1064,6 @@ FARPROC MODULE_GetProcAddress(
192 // || !strcmp(function,"_CallComponent")
193 ){
194 fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
195 - report_entry = report_func;
196 - report_ret = report_func_ret;
197 wrapper_target=(void(*)(void))retproc;
198 retproc=(FARPROC)wrapper;
199 }
200 Index: vlc-1.0.1/libs/loader/stubs.s
201 ===================================================================
202 --- vlc-1.0.1.orig/libs/loader/stubs.s
203 +++ vlc-1.0.1/libs/loader/stubs.s
204 @@ -33,3 +33,6 @@ exp_EH_prolog:
205 leal 12(%esp), %ebp
206 pushl %eax
207 ret
208 +
209 +.section .note.GNU-stack,"",@progbits
210 +
211 Index: vlc-1.0.1/libs/loader/wrapper.S
212 ===================================================================
213 --- vlc-1.0.1.orig/libs/loader/wrapper.S
214 +++ vlc-1.0.1/libs/loader/wrapper.S
215 @@ -1,17 +1,19 @@
216 .section .data
217 -.globl caller_return
218 caller_return:
219 .long 0
220 -.globl report_entry
221 -report_entry:
222 - .long null_call
223 -.globl report_ret
224 -report_ret:
225 - .long null_call
226 .global wrapper_target
227 wrapper_target:
228 .long null_call
229
230 +#undef __i686 /* gcc define gets in our way */
231 + .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
232 +.globl __i686.get_pc_thunk.bx
233 + .hidden __i686.get_pc_thunk.bx
234 + .type __i686.get_pc_thunk.bx,@function
235 +__i686.get_pc_thunk.bx:
236 + movl (%esp), %ebx
237 + ret
238 +
239 .section .text
240 .globl null_call
241 .type null_call, @function
242 @@ -22,46 +24,60 @@ null_call:
243 .type wrapper, @function
244 .balign 16,0x90
245 wrapper:
246 + pushl $0
247 pusha # store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI)
248 pushf # store flags
249
250 push %ebp # set up a stack frame
251 movl %esp, %ebp
252
253 + call __i686.get_pc_thunk.bx
254 + addl $_GLOBAL_OFFSET_TABLE_, %ebx
255 +
256 leal 4(%ebp), %eax # push flags addr
257 push %eax
258 leal 8(%ebp), %eax # push registers addr
259 push %eax
260 -
261 - leal 40(%ebp), %edx
262 +
263 + leal 44(%ebp), %edx
264 movl (%ebp), %eax
265 subl %edx, %eax
266 push %eax
267 push %edx
268 -
269 - call *report_entry # report entry
270 -
271 +
272 + call report_func@PLT # report entry
273 +
274 test %eax, %eax
275 jnz .Ldone
276
277 + movl 44(%ebp), %eax # switch return addresses
278 + movl %eax, caller_return@GOTOFF(%ebx)
279 + leal .Lwrapper_return@GOTOFF(%ebx), %eax
280 + movl %eax, 40(%ebp)
281 +
282 + movl wrapper_target@GOTOFF(%ebx), %eax
283 + mov %eax, 40(%ebp) # wrapper_target should return at .Lwrapper_return
284 +
285 leave # restore %esp, %ebp
286 popf # restore flags
287 popa # restore registers
288 -
289 - popl caller_return # switch return addresses
290 - pushl $.Lwrapper_return
291 -
292 - jmp *wrapper_target # wrapper_target should return at .Lwrapper_return
293 +
294 + ret
295
296 .balign 16, 0x90
297 .Lwrapper_return:
298 - pushl caller_return # restore the original return address
299 + pushl $0 # restore the original return address
300 pusha # more for reference sake here
301 pushf
302
303 push %ebp # set up a stack frame
304 movl %esp, %ebp
305
306 + call __i686.get_pc_thunk.bx
307 + addl $_GLOBAL_OFFSET_TABLE_, %ebx
308 + movl caller_return@GOTOFF(%ebx), %eax
309 + movl %eax, 40(%ebp) # restore the original return address
310 +
311 leal 4(%ebp), %eax # push flags addr
312 push %eax
313 leal 8(%ebp), %eax # push registers addr
314 @@ -73,11 +89,13 @@ wrapper:
315 push %eax
316 push %edx
317
318 - call *report_ret # report the return information (same args)
319 + call report_func_ret@PLT# report the return information (same args)
320 .Ldone:
321
322 leave
323 popf
324 popa
325 ret
326 -
327 +
328 +.section .note.GNU-stack,"",@progbits
329 +
330 Index: vlc-1.0.1/libs/loader/wrapper.h
331 ===================================================================
332 --- vlc-1.0.1.orig/libs/loader/wrapper.h
333 +++ vlc-1.0.1/libs/loader/wrapper.h
334 @@ -7,10 +7,6 @@ typedef struct {
335 uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
336 } reg386_t;
337
338 -typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
339 -
340 -extern wrapper_func_t report_entry, report_ret;
341 -
342 extern void (*wrapper_target)(void);
343
344 extern int wrapper(void);
345
346
347
348 1.1 src/patchsets/vlc/1.0.2/310_all_mmx_pic.patch
349
350 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/310_all_mmx_pic.patch?rev=1.1&view=markup
351 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/310_all_mmx_pic.patch?rev=1.1&content-type=text/plain
352
353 Index: 310_all_mmx_pic.patch
354 ===================================================================
355 Fix textrels in the mmx accelerated i420_rgb plugin
356 http://trac.videolan.org/vlc/ticket/1383
357 Let gcc choose how to reference memory addresses
358
359 Index: vlc-1.0.1/modules/video_chroma/i420_rgb_mmx.h
360 ===================================================================
361 --- vlc-1.0.1.orig/modules/video_chroma/i420_rgb_mmx.h
362 +++ vlc-1.0.1/modules/video_chroma/i420_rgb_mmx.h
363 @@ -34,18 +34,18 @@
364 #define USED_U64(foo) \
365 static const uint64_t foo __asm__ (#foo) __attribute__((unused))
366 #endif
367 -USED_U64(mmx_80w) = 0x0080008000800080ULL;
368 -USED_U64(mmx_10w) = 0x1010101010101010ULL;
369 -USED_U64(mmx_00ffw) = 0x00ff00ff00ff00ffULL;
370 -USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL;
371 -
372 -USED_U64(mmx_U_green) = 0xf37df37df37df37dULL;
373 -USED_U64(mmx_U_blue) = 0x4093409340934093ULL;
374 -USED_U64(mmx_V_red) = 0x3312331233123312ULL;
375 -USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL;
376 +USED_U64(mmx_80w) = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
377 +USED_U64(mmx_10w) = 0x1010101010101010ULL; /* -- as %5 */
378 +USED_U64(mmx_00ffw) = 0x00ff00ff00ff00ffULL; /* -- as %6 */
379 +USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
380 +
381 +USED_U64(mmx_U_green) = 0xf37df37df37df37dULL; /* -- as %8 */
382 +USED_U64(mmx_U_blue) = 0x4093409340934093ULL; /* -- as %9 */
383 +USED_U64(mmx_V_red) = 0x3312331233123312ULL; /* -- as %10 */
384 +USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL; /* -- as %11 */
385
386 -USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL;
387 -USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL;
388 +USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL; /* -- as %12 */
389 +USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
390 #undef USED_U64
391
392 #if defined(CAN_COMPILE_MMX)
393 @@ -59,18 +59,16 @@ USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfc
394 MMX_INSTRUCTIONS \
395 : \
396 : "r" (p_y), "r" (p_u), \
397 - "r" (p_v), "r" (p_buffer) ); \
398 + "r" (p_v), "r" (p_buffer), \
399 + "m" (mmx_80w), "m" (mmx_10w), \
400 + "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
401 + "m" (mmx_U_green), "m" (mmx_U_blue), \
402 + "m" (mmx_V_red), "m" (mmx_V_green), \
403 + "m" (mmx_mask_f8), "m" (mmx_mask_fc) ); \
404 } while(0)
405
406 #define MMX_END __asm__ __volatile__ ( "emms" )
407
408 -/* Use RIP-relative code in PIC mode on amd64 */
409 -#if defined(__x86_64__) && defined(__PIC__)
410 -# define G "(%%rip)"
411 -#else
412 -# define G
413 -#endif
414 -
415 #define MMX_INIT_16 " \n\
416 movd (%1), %%mm0 # Load 4 Cb 00 00 00 00 u3 u2 u1 u0 \n\
417 movd (%2), %%mm1 # Load 4 Cr 00 00 00 00 v3 v2 v1 v0 \n\
418 @@ -103,27 +101,27 @@ movq (%0), %%mm6 # Load 8 Y
419 # convert the chroma part \n\
420 punpcklbw %%mm4, %%mm0 # scatter 4 Cb 00 u3 00 u2 00 u1 00 u0 \n\
421 punpcklbw %%mm4, %%mm1 # scatter 4 Cr 00 v3 00 v2 00 v1 00 v0 \n\
422 -psubsw mmx_80w"G", %%mm0 # Cb -= 128 \n\
423 -psubsw mmx_80w"G", %%mm1 # Cr -= 128 \n\
424 +psubsw %4, %%mm0 # Cb -= 128 \n\
425 +psubsw %4, %%mm1 # Cr -= 128 \n\
426 psllw $3, %%mm0 # Promote precision \n\
427 psllw $3, %%mm1 # Promote precision \n\
428 movq %%mm0, %%mm2 # Copy 4 Cb 00 u3 00 u2 00 u1 00 u0 \n\
429 movq %%mm1, %%mm3 # Copy 4 Cr 00 v3 00 v2 00 v1 00 v0 \n\
430 -pmulhw mmx_U_green"G", %%mm2 # Mul Cb with green coeff -> Cb green \n\
431 -pmulhw mmx_V_green"G", %%mm3 # Mul Cr with green coeff -> Cr green \n\
432 -pmulhw mmx_U_blue"G", %%mm0 # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0 \n\
433 -pmulhw mmx_V_red"G", %%mm1 # Mul Cr -> Cred 00 r3 00 r2 00 r1 00 r0 \n\
434 +pmulhw %8, %%mm2 # Mul Cb with green coeff -> Cb green \n\
435 +pmulhw %11, %%mm3 # Mul Cr with green coeff -> Cr green \n\
436 +pmulhw %9, %%mm0 # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0 \n\
437 +pmulhw %10, %%mm1 # Mul Cr -> Cred 00 r3 00 r2 00 r1 00 r0 \n\
438 paddsw %%mm3, %%mm2 # Cb green + Cr green -> Cgreen \n\
439 \n\
440 # convert the luma part \n\
441 -psubusb mmx_10w"G", %%mm6 # Y -= 16 \n\
442 +psubusb %5, %%mm6 # Y -= 16 \n\
443 movq %%mm6, %%mm7 # Copy 8 Y Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0 \n\
444 -pand mmx_00ffw"G", %%mm6 # get Y even 00 Y6 00 Y4 00 Y2 00 Y0 \n\
445 +pand %6, %%mm6 # get Y even 00 Y6 00 Y4 00 Y2 00 Y0 \n\
446 psrlw $8, %%mm7 # get Y odd 00 Y7 00 Y5 00 Y3 00 Y1 \n\
447 psllw $3, %%mm6 # Promote precision \n\
448 psllw $3, %%mm7 # Promote precision \n\
449 -pmulhw mmx_Y_coeff"G", %%mm6 # Mul 4 Y even 00 y6 00 y4 00 y2 00 y0 \n\
450 -pmulhw mmx_Y_coeff"G", %%mm7 # Mul 4 Y odd 00 y7 00 y5 00 y3 00 y1 \n\
451 +pmulhw %7, %%mm6 # Mul 4 Y even 00 y6 00 y4 00 y2 00 y0 \n\
452 +pmulhw %7, %%mm7 # Mul 4 Y odd 00 y7 00 y5 00 y3 00 y1 \n\
453 "
454
455 /*
456 @@ -168,14 +166,14 @@ punpcklbw %%mm5, %%mm2 #
457
458 #define MMX_YUV_GRAY " \n\
459 # convert the luma part \n\
460 -psubusb mmx_10w"G", %%mm6 \n\
461 +psubusb %5, %%mm6 \n\
462 movq %%mm6, %%mm7 \n\
463 -pand mmx_00ffw"G", %%mm6 \n\
464 +pand %6, %%mm6 \n\
465 psrlw $8, %%mm7 \n\
466 psllw $3, %%mm6 \n\
467 psllw $3, %%mm7 \n\
468 -pmulhw mmx_Y_coeff"G", %%mm6 \n\
469 -pmulhw mmx_Y_coeff"G", %%mm7 \n\
470 +pmulhw %7, %%mm6 \n\
471 +pmulhw %7, %%mm7 \n\
472 packuswb %%mm6, %%mm6 \n\
473 packuswb %%mm7, %%mm7 \n\
474 punpcklbw %%mm7, %%mm6 \n\
475 @@ -183,8 +181,8 @@ punpcklbw %%mm7, %%mm6
476
477 #define MMX_UNPACK_16_GRAY " \n\
478 movq %%mm6, %%mm5 \n\
479 -pand mmx_mask_f8"G", %%mm6 \n\
480 -pand mmx_mask_fc"G", %%mm5 \n\
481 +pand %12, %%mm6 \n\
482 +pand %13, %%mm5 \n\
483 movq %%mm6, %%mm7 \n\
484 psrlw $3, %%mm7 \n\
485 pxor %%mm3, %%mm3 \n\
486 @@ -213,10 +211,10 @@ movq %%mm2, 8(%3)
487
488 #define MMX_UNPACK_15 " \n\
489 # mask unneeded bits off \n\
490 -pand mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______ \n\
491 +pand %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______ \n\
492 psrlw $3,%%mm0 # ______b7 b6b5b4b3 ______b7 b6b5b4b3 \n\
493 -pand mmx_mask_f8"G", %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______ \n\
494 -pand mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______ \n\
495 +pand %12, %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______ \n\
496 +pand %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______ \n\
497 psrlw $1,%%mm1 # __r7r6r5 r4r3____ __r7r6r5 r4r3____ \n\
498 pxor %%mm4, %%mm4 # zero mm4 \n\
499 movq %%mm0, %%mm5 # Copy B7-B0 \n\
500 @@ -249,9 +247,9 @@ movq %%mm5, 8(%3) # store
501
502 #define MMX_UNPACK_16 " \n\
503 # mask unneeded bits off \n\
504 -pand mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______ \n\
505 -pand mmx_mask_fc"G", %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____ \n\
506 -pand mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______ \n\
507 +pand %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______ \n\
508 +pand %13, %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____ \n\
509 +pand %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______ \n\
510 psrlw $3,%%mm0 # ______b7 b6b5b4b3 ______b7 b6b5b4b3 \n\
511 pxor %%mm4, %%mm4 # zero mm4 \n\
512 movq %%mm0, %%mm5 # Copy B7-B0 \n\
513
514
515
516 1.1 src/patchsets/vlc/1.0.2/320_all_disable_media_list_player_tests.patch
517
518 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/320_all_disable_media_list_player_tests.patch?rev=1.1&view=markup
519 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/320_all_disable_media_list_player_tests.patch?rev=1.1&content-type=text/plain
520
521 Index: 320_all_disable_media_list_player_tests.patch
522 ===================================================================
523 commit 3403c4274410115dbe5ce282aa8b045f8aedb002
524 Author: Pierre d'Herbemont <pdherbemont@××××.fr>
525 Date: Wed Aug 19 11:42:53 2009 +0200
526
527 test: Disable test_media_list_player as it deadlocks.
528
529 Index: vlc-1.0.1/test/Makefile.am
530 ===================================================================
531 --- vlc-1.0.1.orig/test/Makefile.am
532 +++ vlc-1.0.1/test/Makefile.am
533 @@ -11,7 +11,6 @@ check_PROGRAMS = \
534 test_libvlc_core \
535 test_libvlc_events \
536 test_libvlc_media_list \
537 - test_libvlc_media_list_player \
538 $(NULL)
539 EXTRA_PROGRAMS = \
540 test_libvlc_media_player \
541
542
543
544 1.1 src/patchsets/vlc/1.0.2/series
545
546 file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/series?rev=1.1&view=markup
547 plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.2/series?rev=1.1&content-type=text/plain
548
549 Index: series
550 ===================================================================
551 010_all_freetype-font.patch
552 020_all_check_headers_regexps.patch
553 030_all_xcb_sysconf_bsd.patch
554 300_all_pic.patch
555 310_all_mmx_pic.patch
556 320_all_disable_media_list_player_tests.patch