[gentoo-commits] gentoo commit in src/patchsets/vlc/1.0.3: 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 530_all_older_xcb_xv.patch 540_all_x264.patch 550_all_nofc.patch series

[Alexis Ballier (aballier)]

aballier    09/10/02 21:42:18

  Added:                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
                        530_all_older_xcb_xv.patch 540_all_x264.patch
                        550_all_nofc.patch series
  Log:
  add patches for 1.0-bugfix as future 1.0.3

Revision  Changes    Path
1.1                  src/patchsets/vlc/1.0.3/010_all_freetype-font.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/010_all_freetype-font.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/010_all_freetype-font.patch?rev=1.1&content-type=text/plain

Index: 010_all_freetype-font.patch
===================================================================
The default font used by VLC does not exists on every system, instead of that,
we use DejaVU, and add it to the dependencies, as anyway many people have that
font installed.

Index: vlc/modules/misc/freetype.c
===================================================================
--- vlc.orig/modules/misc/freetype.c
+++ vlc/modules/misc/freetype.c
@@ -64,8 +64,8 @@
 #define DEFAULT_FONT "" /* Default font found at run-time */
 #define FC_DEFAULT_FONT "Arial"
 #else
-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-#define FC_DEFAULT_FONT "Serif Bold"
+#define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf"
+#define FC_DEFAULT_FONT "Sans"
 #endif
 
 #if defined(HAVE_FRIBIDI)



1.1                  src/patchsets/vlc/1.0.3/020_all_check_headers_regexps.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/020_all_check_headers_regexps.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/020_all_check_headers_regexps.patch?rev=1.1&content-type=text/plain

Index: 020_all_check_headers_regexps.patch
===================================================================
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.
---
 src/check_headers |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Index: vlc-1.0.1/src/check_headers
===================================================================
--- vlc-1.0.1.orig/src/check_headers
+++ vlc-1.0.1/src/check_headers
@@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
 # Look for configure #defines in public headers.
 # There are incorrect, as external users don't have our <config.h>.
 regexp="$(cat ../config.h.in | \
-	sed -n -e 's/^#undef \([A-Z0-9_]*\)$/\1/p' | \
+	sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \
 	grep -v 'WORDS_BIGENDIAN' | \
 	xargs | \
 	sed -e 's/ /\\\|/g')"



1.1                  src/patchsets/vlc/1.0.3/030_all_xcb_sysconf_bsd.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/030_all_xcb_sysconf_bsd.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/030_all_xcb_sysconf_bsd.patch?rev=1.1&content-type=text/plain

Index: 030_all_xcb_sysconf_bsd.patch
===================================================================
commit a73ea66ebb2b60d1e2e83a9ab17feefb8ad15e16
Author: Alexis Ballier <aballier@g.o>
Date:   Fri Jul 10 15:04:42 2009 +0200

    xcb_window: Use sysconf to discover HOST_NAME_MAX.
    
    POSIX does not mandate HOST_NAME_MAX to be defined and FreeBSD does not
    define it to encourage people to use sysconf() for discovering its
    value. If sysconf fails, fallback to _POSIX_HOST_NAME_MAX.
    
    Signed-off-by: Rémi Denis-Courmont <remi@××××××.net> (with minor changes)

Index: vlc-1.0.1/modules/video_output/xcb/window.c
===================================================================
--- vlc-1.0.1.orig/modules/video_output/xcb/window.c
+++ vlc-1.0.1/modules/video_output/xcb/window.c
@@ -27,8 +27,8 @@
 #include <stdarg.h>
 #include <assert.h>
 #include <poll.h>
-#include <unistd.h> /* gethostname() */
-#include <limits.h> /* HOST_NAME_MAX */
+#include <unistd.h> /* gethostname() and sysconf() */
+#include <limits.h> /* _POSIX_HOST_NAME_MAX */
 
 #include <xcb/xcb.h>
 typedef xcb_atom_t Atom;
@@ -96,13 +96,18 @@ void set_ascii_prop (xcb_connection_t *c
 static inline
 void set_hostname_prop (xcb_connection_t *conn, xcb_window_t window)
 {
-    char hostname[HOST_NAME_MAX];
+    char* hostname;
+    long host_name_max = sysconf (_SC_HOST_NAME_MAX);
+    if (host_name_max <= 0) host_name_max = _POSIX_HOST_NAME_MAX;
+    hostname = malloc (host_name_max);
+    if(!hostname) return;
 
-    if (gethostname (hostname, sizeof (hostname)) == 0)
+    if (gethostname (hostname, host_name_max) == 0)
     {
-        hostname[sizeof (hostname) - 1] = '\0';
+        hostname[host_name_max - 1] = '\0';
         set_ascii_prop (conn, window, XA_WM_CLIENT_MACHINE, hostname);
     }
+    free(hostname);
 }
 
 static inline



1.1                  src/patchsets/vlc/1.0.3/300_all_pic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/300_all_pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/300_all_pic.patch?rev=1.1&content-type=text/plain

Index: 300_all_pic.patch
===================================================================
Index: vlc-1.0.1/libs/loader/Makefile.am
===================================================================
--- vlc-1.0.1.orig/libs/loader/Makefile.am
+++ vlc-1.0.1/libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
 # TODO: real check for vsscanf() and <sys/mmap.h>
 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
 	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
-AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
+AM_CFLAGS = -fPIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \
 	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 
 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
Index: vlc-1.0.1/libs/loader/module.c
===================================================================
--- vlc-1.0.1.orig/libs/loader/module.c
+++ vlc-1.0.1/libs/loader/module.c
@@ -63,8 +63,8 @@
 
 #ifdef EMU_QTX_API
 #include "wrapper.h"
-static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
-static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
+int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
+int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
 #endif
 
 //#undef TRACE
@@ -572,8 +572,6 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib
 	    fprintf(stderr,"QuickTime.qts patched!!! old entry=%p\n",ptr[0]);
 
 #ifdef EMU_QTX_API
-	    report_entry = report_func;
-	    report_ret   = report_func_ret;
 	    wrapper_target=ptr[0];
 	    ptr[0]=wrapper;
 #endif
@@ -754,7 +752,7 @@ static int dump_component(char* name,int
 static uint32_t ret_array[4096];
 static int ret_i=0;
 
-static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
+int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
 {
 #ifdef DEBUG_QTX_API
   int i;
@@ -953,7 +951,7 @@ static int report_func(void *stack_base,
     return 0;
 }
 
-static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
+int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
 {
   int i;
   short err;
@@ -1066,8 +1064,6 @@ FARPROC MODULE_GetProcAddress(
 //      || !strcmp(function,"_CallComponent")
       ){
 	fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
-      report_entry = report_func;
-      report_ret   = report_func_ret;
       wrapper_target=(void(*)(void))retproc;
       retproc=(FARPROC)wrapper;
     }
Index: vlc-1.0.1/libs/loader/stubs.s
===================================================================
--- vlc-1.0.1.orig/libs/loader/stubs.s
+++ vlc-1.0.1/libs/loader/stubs.s
@@ -33,3 +33,6 @@ exp_EH_prolog:
 	leal  12(%esp), %ebp
 	pushl %eax
 	ret
+
+.section .note.GNU-stack,"",@progbits
+
Index: vlc-1.0.1/libs/loader/wrapper.S
===================================================================
--- vlc-1.0.1.orig/libs/loader/wrapper.S
+++ vlc-1.0.1/libs/loader/wrapper.S
@@ -1,17 +1,19 @@
 .section .data
-.globl caller_return
 caller_return:
 	.long 0
-.globl report_entry
-report_entry:
-	.long null_call
-.globl report_ret
-report_ret:	
-	.long null_call
 .global wrapper_target
 wrapper_target:	
 	.long null_call
 
+#undef __i686 /* gcc define gets in our way */
+	.section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
+.globl __i686.get_pc_thunk.bx
+	.hidden	__i686.get_pc_thunk.bx
+	.type	__i686.get_pc_thunk.bx,@function
+__i686.get_pc_thunk.bx:
+	movl (%esp), %ebx
+	ret
+
 .section .text
 .globl null_call
 	.type null_call, @function
@@ -22,46 +24,60 @@ null_call:
 	.type wrapper, @function
 	.balign 16,0x90
 wrapper:
+	pushl $0
 	pusha			# store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI) 
 	pushf			# store flags
 	
 	push %ebp		# set up a stack frame 
 	movl %esp, %ebp
 
+	call __i686.get_pc_thunk.bx
+	addl $_GLOBAL_OFFSET_TABLE_, %ebx
+
 	leal 4(%ebp), %eax	# push flags addr
 	push %eax
 	leal 8(%ebp), %eax	# push registers addr
 	push %eax
-	
-	leal 40(%ebp), %edx	
+
+	leal 44(%ebp), %edx	
 	movl (%ebp), %eax
 	subl %edx, %eax
 	push %eax
 	push %edx
-	
-	call *report_entry	# report entry
-	
+
+	call report_func@PLT	# report entry
+
 	test %eax, %eax
 	jnz .Ldone
 
+	movl 44(%ebp), %eax	# switch return addresses
+	movl %eax, caller_return@GOTOFF(%ebx)
+	leal .Lwrapper_return@GOTOFF(%ebx), %eax
+	movl %eax, 40(%ebp)
+
+	movl wrapper_target@GOTOFF(%ebx), %eax
+	mov %eax, 40(%ebp)	# wrapper_target should return at .Lwrapper_return
+
 	leave			# restore %esp, %ebp
 	popf			# restore flags
 	popa			# restore registers
-	
-	popl caller_return	# switch return addresses
-	pushl $.Lwrapper_return 
-	
-	jmp *wrapper_target	# wrapper_target should return at .Lwrapper_return
+
+	ret
 
 	.balign 16, 0x90
 .Lwrapper_return:	
-	pushl caller_return	# restore the original return address
+	pushl $0		# restore the original return address
 	pusha			# more for reference sake here
 	pushf
 	
 	push %ebp		# set up a stack frame
 	movl %esp, %ebp
 
+	call __i686.get_pc_thunk.bx
+	addl $_GLOBAL_OFFSET_TABLE_, %ebx
+	movl caller_return@GOTOFF(%ebx), %eax
+	movl %eax, 40(%ebp)	# restore the original return address
+
 	leal 4(%ebp), %eax	# push flags addr
 	push %eax
 	leal 8(%ebp), %eax	# push registers addr
@@ -73,11 +89,13 @@ wrapper:
 	push %eax
 	push %edx
 
-	call *report_ret	# report the return information (same args)
+	call report_func_ret@PLT# report the return information (same args)
 .Ldone:	
 
 	leave
 	popf
 	popa
 	ret
-	
+
+.section .note.GNU-stack,"",@progbits
+
Index: vlc-1.0.1/libs/loader/wrapper.h
===================================================================
--- vlc-1.0.1.orig/libs/loader/wrapper.h
+++ vlc-1.0.1/libs/loader/wrapper.h
@@ -7,10 +7,6 @@ typedef struct {
   uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
 } reg386_t;
 
-typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg,  uint32_t *flags);
-
-extern wrapper_func_t report_entry, report_ret;
-
 extern void (*wrapper_target)(void);
 
 extern int wrapper(void);



1.1                  src/patchsets/vlc/1.0.3/310_all_mmx_pic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/310_all_mmx_pic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/310_all_mmx_pic.patch?rev=1.1&content-type=text/plain

Index: 310_all_mmx_pic.patch
===================================================================
Fix textrels in the mmx accelerated i420_rgb plugin
http://trac.videolan.org/vlc/ticket/1383
Let gcc choose how to reference memory addresses

Index: vlc-1.0.1/modules/video_chroma/i420_rgb_mmx.h
===================================================================
--- vlc-1.0.1.orig/modules/video_chroma/i420_rgb_mmx.h
+++ vlc-1.0.1/modules/video_chroma/i420_rgb_mmx.h
@@ -34,18 +34,18 @@
 #define USED_U64(foo) \
     static const uint64_t foo __asm__ (#foo) __attribute__((unused))
 #endif
-USED_U64(mmx_80w)     = 0x0080008000800080ULL;
-USED_U64(mmx_10w)     = 0x1010101010101010ULL;
-USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL;
-USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL;
-
-USED_U64(mmx_U_green) = 0xf37df37df37df37dULL;
-USED_U64(mmx_U_blue)  = 0x4093409340934093ULL;
-USED_U64(mmx_V_red)   = 0x3312331233123312ULL;
-USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL;
+USED_U64(mmx_80w)     = 0x0080008000800080ULL; /* Will be referenced as %4 in inline asm */
+USED_U64(mmx_10w)     = 0x1010101010101010ULL; /* -- as %5 */
+USED_U64(mmx_00ffw)   = 0x00ff00ff00ff00ffULL; /* -- as %6 */
+USED_U64(mmx_Y_coeff) = 0x253f253f253f253fULL; /* -- as %7 */
+
+USED_U64(mmx_U_green) = 0xf37df37df37df37dULL; /* -- as %8 */
+USED_U64(mmx_U_blue)  = 0x4093409340934093ULL; /* -- as %9 */
+USED_U64(mmx_V_red)   = 0x3312331233123312ULL; /* -- as %10 */
+USED_U64(mmx_V_green) = 0xe5fce5fce5fce5fcULL; /* -- as %11 */
 
-USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL;
-USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL;
+USED_U64(mmx_mask_f8) = 0xf8f8f8f8f8f8f8f8ULL; /* -- as %12 */
+USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfcfcULL; /* -- as %13 */
 #undef USED_U64
 
 #if defined(CAN_COMPILE_MMX)
@@ -59,18 +59,16 @@ USED_U64(mmx_mask_fc) = 0xfcfcfcfcfcfcfc
         MMX_INSTRUCTIONS                \
         :                               \
         : "r" (p_y), "r" (p_u),         \
-          "r" (p_v), "r" (p_buffer) );  \
+          "r" (p_v), "r" (p_buffer),    \
+	  "m" (mmx_80w), "m" (mmx_10w), \
+	  "m" (mmx_00ffw), "m" (mmx_Y_coeff), \
+	  "m" (mmx_U_green), "m" (mmx_U_blue), \
+	  "m" (mmx_V_red), "m" (mmx_V_green), \
+	  "m" (mmx_mask_f8), "m" (mmx_mask_fc) );  \
     } while(0)
 
 #define MMX_END __asm__ __volatile__ ( "emms" )
 
-/* Use RIP-relative code in PIC mode on amd64 */
-#if defined(__x86_64__) && defined(__PIC__)
-#   define G "(%%rip)"
-#else
-#   define G
-#endif
-
 #define MMX_INIT_16 "                                                       \n\
 movd       (%1), %%mm0      # Load 4 Cb       00 00 00 00 u3 u2 u1 u0       \n\
 movd       (%2), %%mm1      # Load 4 Cr       00 00 00 00 v3 v2 v1 v0       \n\
@@ -103,27 +101,27 @@ movq      (%0), %%mm6       # Load 8 Y  
 # convert the chroma part                                                   \n\
 punpcklbw %%mm4, %%mm0          # scatter 4 Cb    00 u3 00 u2 00 u1 00 u0   \n\
 punpcklbw %%mm4, %%mm1          # scatter 4 Cr    00 v3 00 v2 00 v1 00 v0   \n\
-psubsw    mmx_80w"G", %%mm0     # Cb -= 128                                 \n\
-psubsw    mmx_80w"G", %%mm1     # Cr -= 128                                 \n\
+psubsw    %4, %%mm0     # Cb -= 128                                 \n\
+psubsw    %4, %%mm1     # Cr -= 128                                 \n\
 psllw     $3, %%mm0             # Promote precision                         \n\
 psllw     $3, %%mm1             # Promote precision                         \n\
 movq      %%mm0, %%mm2          # Copy 4 Cb       00 u3 00 u2 00 u1 00 u0   \n\
 movq      %%mm1, %%mm3          # Copy 4 Cr       00 v3 00 v2 00 v1 00 v0   \n\
-pmulhw    mmx_U_green"G", %%mm2 # Mul Cb with green coeff -> Cb green       \n\
-pmulhw    mmx_V_green"G", %%mm3 # Mul Cr with green coeff -> Cr green       \n\
-pmulhw    mmx_U_blue"G", %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
-pmulhw    mmx_V_red"G", %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
+pmulhw    %8, %%mm2 # Mul Cb with green coeff -> Cb green       \n\
+pmulhw    %11, %%mm3 # Mul Cr with green coeff -> Cr green       \n\
+pmulhw    %9, %%mm0  # Mul Cb -> Cblue 00 b3 00 b2 00 b1 00 b0   \n\
+pmulhw    %10, %%mm1   # Mul Cr -> Cred  00 r3 00 r2 00 r1 00 r0   \n\
 paddsw    %%mm3, %%mm2          # Cb green + Cr green -> Cgreen             \n\
                                                                             \n\
 # convert the luma part                                                     \n\
-psubusb   mmx_10w"G", %%mm6     # Y -= 16                                   \n\
+psubusb   %5, %%mm6     # Y -= 16                                   \n\
 movq      %%mm6, %%mm7          # Copy 8 Y        Y7 Y6 Y5 Y4 Y3 Y2 Y1 Y0   \n\
-pand      mmx_00ffw"G", %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
+pand      %6, %%mm6   # get Y even      00 Y6 00 Y4 00 Y2 00 Y0   \n\
 psrlw     $8, %%mm7             # get Y odd       00 Y7 00 Y5 00 Y3 00 Y1   \n\
 psllw     $3, %%mm6             # Promote precision                         \n\
 psllw     $3, %%mm7             # Promote precision                         \n\
-pmulhw    mmx_Y_coeff"G", %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
-pmulhw    mmx_Y_coeff"G", %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
+pmulhw    %7, %%mm6 # Mul 4 Y even    00 y6 00 y4 00 y2 00 y0   \n\
+pmulhw    %7, %%mm7 # Mul 4 Y odd     00 y7 00 y5 00 y3 00 y1   \n\
 "
 
 /*
@@ -168,14 +166,14 @@ punpcklbw %%mm5, %%mm2          #       
 
 #define MMX_YUV_GRAY "                                                      \n\
 # convert the luma part                                                     \n\
-psubusb   mmx_10w"G", %%mm6                                                 \n\
+psubusb   %5, %%mm6                                                 \n\
 movq      %%mm6, %%mm7                                                      \n\
-pand      mmx_00ffw"G", %%mm6                                               \n\
+pand      %6, %%mm6                                               \n\
 psrlw     $8, %%mm7                                                         \n\
 psllw     $3, %%mm6                                                         \n\
 psllw     $3, %%mm7                                                         \n\
-pmulhw    mmx_Y_coeff"G", %%mm6                                             \n\
-pmulhw    mmx_Y_coeff"G", %%mm7                                             \n\
+pmulhw    %7, %%mm6                                             \n\
+pmulhw    %7, %%mm7                                             \n\
 packuswb  %%mm6, %%mm6                                                      \n\
 packuswb  %%mm7, %%mm7                                                      \n\
 punpcklbw %%mm7, %%mm6                                                      \n\
@@ -183,8 +181,8 @@ punpcklbw %%mm7, %%mm6                  
 
 #define MMX_UNPACK_16_GRAY "                                                \n\
 movq      %%mm6, %%mm5                                                      \n\
-pand      mmx_mask_f8"G", %%mm6                                             \n\
-pand      mmx_mask_fc"G", %%mm5                                             \n\
+pand      %12, %%mm6                                             \n\
+pand      %13, %%mm5                                             \n\
 movq      %%mm6, %%mm7                                                      \n\
 psrlw     $3, %%mm7                                                         \n\
 pxor      %%mm3, %%mm3                                                      \n\
@@ -213,10 +211,10 @@ movq      %%mm2, 8(%3)                  
 
 #define MMX_UNPACK_15 "                                                     \n\
 # mask unneeded bits off                                                    \n\
-pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
 psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
-pand      mmx_mask_f8"G", %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
-pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+pand      %12, %%mm2 # g7g6g5g4 g3______ g7g6g5g4 g3______       \n\
+pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
 psrlw     $1,%%mm1              # __r7r6r5 r4r3____ __r7r6r5 r4r3____       \n\
 pxor      %%mm4, %%mm4          # zero mm4                                  \n\
 movq      %%mm0, %%mm5          # Copy B7-B0                                \n\
@@ -249,9 +247,9 @@ movq      %%mm5, 8(%3)          # store 
 
 #define MMX_UNPACK_16 "                                                     \n\
 # mask unneeded bits off                                                    \n\
-pand      mmx_mask_f8"G", %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
-pand      mmx_mask_fc"G", %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
-pand      mmx_mask_f8"G", %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
+pand      %12, %%mm0 # b7b6b5b4 b3______ b7b6b5b4 b3______       \n\
+pand      %13, %%mm2 # g7g6g5g4 g3g2____ g7g6g5g4 g3g2____       \n\
+pand      %12, %%mm1 # r7r6r5r4 r3______ r7r6r5r4 r3______       \n\
 psrlw     $3,%%mm0              # ______b7 b6b5b4b3 ______b7 b6b5b4b3       \n\
 pxor      %%mm4, %%mm4          # zero mm4                                  \n\
 movq      %%mm0, %%mm5          # Copy B7-B0                                \n\



1.1                  src/patchsets/vlc/1.0.3/320_all_disable_media_list_player_tests.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/320_all_disable_media_list_player_tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/320_all_disable_media_list_player_tests.patch?rev=1.1&content-type=text/plain

Index: 320_all_disable_media_list_player_tests.patch
===================================================================
commit 3403c4274410115dbe5ce282aa8b045f8aedb002
Author: Pierre d'Herbemont <pdherbemont@××××.fr>
Date:   Wed Aug 19 11:42:53 2009 +0200

    test: Disable test_media_list_player as it deadlocks.

Index: vlc-1.0.1/test/Makefile.am
===================================================================
--- vlc-1.0.1.orig/test/Makefile.am
+++ vlc-1.0.1/test/Makefile.am
@@ -11,7 +11,6 @@ check_PROGRAMS = \
 	test_libvlc_core \
 	test_libvlc_events \
 	test_libvlc_media_list \
-	test_libvlc_media_list_player \
 	$(NULL)
 EXTRA_PROGRAMS = \
 	test_libvlc_media_player \



1.1                  src/patchsets/vlc/1.0.3/530_all_older_xcb_xv.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/530_all_older_xcb_xv.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/530_all_older_xcb_xv.patch?rev=1.1&content-type=text/plain

Index: 530_all_older_xcb_xv.patch
===================================================================
commit f77bf7a10aa7b10a5e27701da137dcb29ae9f3bd
Author: Rémi Denis-Courmont <remi@××××××.net>
Date:   Sat May 23 15:45:56 2009 +0300

    Support for older xcb-xv

Index: vlc/configure.ac
===================================================================
--- vlc.orig/configure.ac
+++ vlc/configure.ac
@@ -4174,6 +4174,11 @@ AS_IF([test "${enable_xcb}" != "no"], [
   AS_IF([test "${enable_xvideo}" != "no"], [
     PKG_CHECK_MODULES(XCB_XV, [xcb-xv >= 1.1.90.1], [
       VLC_ADD_PLUGIN([xcb_xv])
+    ], [
+      PKG_CHECK_MODULES(XCB_XV, [xcb-xv], [
+        VLC_ADD_PLUGIN([xcb_xv])
+        VLC_ADD_CFLAGS([xcb_xv], [-DXCB_XV_OLD])
+      ])
     ])
   ])
 
Index: vlc/modules/video_output/xcb/xvideo.c
===================================================================
--- vlc.orig/modules/video_output/xcb/xvideo.c
+++ vlc/modules/video_output/xcb/xvideo.c
@@ -345,7 +345,11 @@ FindFormat (vout_thread_t *vout, vlc_fou
     xcb_connection_t *conn = vout->p_sys->conn;
     const xcb_xv_image_format_info_t *f, *end;
 
+#ifndef XCB_XV_OLD
     f = xcb_xv_list_image_formats_format (list);
+#else
+    f = (xcb_xv_image_format_info_t *) (list + 1);
+#endif
     end = f + xcb_xv_list_image_formats_format_length (list);
     for (; f < end; f++)
     {
Index: vlc/src/misc/linux_specific.c
===================================================================
--- vlc.orig/src/misc/linux_specific.c
+++ vlc/src/misc/linux_specific.c
@@ -91,7 +91,7 @@ void system_Init (libvlc_int_t *libvlc, 
                "Please update to version 2.8 or newer.\n", stderr);
         fflush (stderr);
 #ifndef DISABLE_BUGGY_GLIBC_CHECK
-        abort ();
+        //abort ();
 #endif
     }
 #endif



1.1                  src/patchsets/vlc/1.0.3/540_all_x264.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/540_all_x264.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/540_all_x264.patch?rev=1.1&content-type=text/plain

Index: 540_all_x264.patch
===================================================================
From 6cdaaf845e734bf124fb7af53caf5c6bdcaca63f Mon Sep 17 00:00:00 2001
From: Alexis Ballier <aballier@g.o>
Date: Thu, 24 Sep 2009 20:05:10 +0200
Subject: [PATCH] Fix build with libx264 >= 76, ported from [e8c090dc917ca2eb5b639a4c137084791768b347]

---
 modules/codec/x264.c |   21 +++++++++++++++++++++
 1 files changed, 21 insertions(+), 0 deletions(-)

Index: vlc-1.0.2/modules/codec/x264.c
===================================================================
--- vlc-1.0.2.orig/modules/codec/x264.c
+++ vlc-1.0.2/modules/codec/x264.c
@@ -1366,6 +1366,21 @@ static int  Open ( vlc_object_t *p_this 
     p_enc->fmt_out.i_extra = 0;
     p_enc->fmt_out.p_extra = NULL;
 
+#if X264_BUILD >= 76
+    p_enc->fmt_out.i_extra = x264_encoder_headers( p_sys->h, &nal, &i_nal );
+    p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
+    if( !p_enc->fmt_out.p_extra )
+    {
+        Close( VLC_OBJECT(p_enc) );
+        return VLC_ENOMEM;
+    }
+    void *p_tmp = p_enc->fmt_out.p_extra;
+    for( i = 0; i < i_nal; i++ )
+    {
+        memcpy( p_tmp, nal[i].p_payload, nal[i].i_payload );
+        p_tmp += nal[i].i_payload;
+    }
+#else
     x264_encoder_headers( p_sys->h, &nal, &i_nal );
     for( i = 0; i < i_nal; i++ )
     {
@@ -1387,6 +1402,7 @@ static int  Open ( vlc_object_t *p_this 
 
         p_enc->fmt_out.i_extra += i_size;
     }
+#endif
 
     return VLC_SUCCESS;
 }
@@ -1423,10 +1439,15 @@ static block_t *Encode( encoder_t *p_enc
 
     for( i = 0, i_out = 0; i < i_nal; i++ )
     {
+#if X264_BUILD >= 76
+        memcpy( p_sys->p_buffer + i_out, nal[i].p_payload, nal[i].i_payload );
+        i_out += nal[i].i_payload;
+#else
         int i_size = p_sys->i_buffer - i_out;
         x264_nal_encode( p_sys->p_buffer + i_out, &i_size, 1, &nal[i] );
 
         i_out += i_size;
+#endif
     }
 
     p_block = block_New( p_enc, i_out );



1.1                  src/patchsets/vlc/1.0.3/550_all_nofc.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/550_all_nofc.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/550_all_nofc.patch?rev=1.1&content-type=text/plain

Index: 550_all_nofc.patch
===================================================================
commit 184f04c939a361c9c9f2eb549fcc2e3d1dac2227
Author: Alexis Ballier <aballier@g.o>
Date:   Thu Sep 24 21:58:36 2009 +0200

    Fix build without fontconfig nor optimizations.
    
    Configuring vlc with --disable-fontconfig and --disable-optimizations makes it fail to build the freetype plugin.
    At higher optimizations levels, gcc performs dead code elimitation which does not happen at -O0, then the linker is looking for functions that are defined only when fontconfig is enabled.
    
    References: https://bugs.gentoo.org/show_bug.cgi?id=281963
    
    Signed-off-by: Rémi Denis-Courmont <remi@××××××.net>

Index: vlc-1.0.2/modules/misc/freetype.c
===================================================================
--- vlc-1.0.2.orig/modules/misc/freetype.c
+++ vlc-1.0.2/modules/misc/freetype.c
@@ -2416,6 +2416,33 @@ static char* FontConfig_Select( FcConfig
     FcPatternDestroy( p_pat );
     return strdup( (const char*)val_s );
 }
+#else
+
+static void SetupLine( filter_t *p_filter, const char *psz_text_in,
+                       uint32_t **psz_text_out, uint32_t *pi_runs,
+                       uint32_t **ppi_run_lengths, ft_style_t ***ppp_styles,
+                       ft_style_t *p_style )
+{
+        VLC_UNUSED(p_filter);
+        VLC_UNUSED(psz_text_in);
+        VLC_UNUSED(psz_text_out);
+        VLC_UNUSED(pi_runs);
+        VLC_UNUSED(ppi_run_lengths);
+        VLC_UNUSED(ppp_styles);
+        VLC_UNUSED(p_style);
+}
+
+static ft_style_t *GetStyleFromFontStack( filter_sys_t *p_sys,
+        font_stack_t **p_fonts, bool b_bold, bool b_italic,
+        bool b_uline )
+{
+        VLC_UNUSED(p_sys);
+        VLC_UNUSED(p_fonts);
+        VLC_UNUSED(b_bold);
+        VLC_UNUSED(b_italic);
+        VLC_UNUSED(b_uline);
+        return NULL;
+}
 #endif
 
 static void FreeLine( line_desc_t *p_line )



1.1                  src/patchsets/vlc/1.0.3/series

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/series?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/1.0.3/series?rev=1.1&content-type=text/plain

Index: series
===================================================================
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
530_all_older_xcb_xv.patch
540_all_x264.patch
550_all_nofc.patch