SOURCES: vlc-x8664.patch (NEW), vlc-samba.patch (NEW), vlc-pic-mmx...
arekm
arekm at pld-linux.org
Fri Sep 16 12:11:38 CEST 2005
Author: arekm Date: Fri Sep 16 10:11:38 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- new (proper amd64 support; fix for samba 3.0.20; shared matroska
---- Files affected:
SOURCES:
vlc-x8664.patch (NONE -> 1.1) (NEW), vlc-samba.patch (NONE -> 1.1) (NEW), vlc-pic-mmx.patch (NONE -> 1.1) (NEW), vlc-matroska-shared.patch (NONE -> 1.1) (NEW), vlc-x8864.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: SOURCES/vlc-x8664.patch
diff -u /dev/null SOURCES/vlc-x8664.patch:1.1
--- /dev/null Fri Sep 16 12:11:38 2005
+++ SOURCES/vlc-x8664.patch Fri Sep 16 12:11:33 2005
@@ -0,0 +1,55 @@
+diff -x '*~' -ur vlc-snapshot-20050607/src/misc/cpu.c vlc-snapshot-20050607-amd64/src/misc/cpu.c
+--- vlc-snapshot-20050607/src/misc/cpu.c 2005-06-07 22:50:02.000000000 +0200
++++ vlc-snapshot-20050607-amd64/src/misc/cpu.c 2005-06-08 13:05:49.821853128 +0200
+@@ -80,15 +80,23 @@
+ return i_capabilities;
+
+ #elif defined( __i386__ ) || defined( __x86_64__ )
+- volatile unsigned int i_eax, i_ebx, i_ecx, i_edx;
++ volatile unsigned long i_eax, i_ebx, i_ecx, i_edx;
+ volatile vlc_bool_t b_amd;
+
++# ifdef __x86_64__
++# define REG_a "rax"
++# define REG_b "rbx"
++# else
++# define REG_a "eax"
++# define REG_b "ebx"
++# endif
++
+ /* Needed for x86 CPU capabilities detection */
+ # define cpuid( reg ) \
+- asm volatile ( "push %%ebx\n\t" \
++ asm volatile ( "push %%"REG_b"\n\t" \
+ "cpuid\n\t" \
+- "movl %%ebx,%1\n\t" \
+- "pop %%ebx\n\t" \
++ "mov %%"REG_b",%1\n\t" \
++ "pop %%"REG_b"\n\t" \
+ : "=a" ( i_eax ), \
+ "=r" ( i_ebx ), \
+ "=c" ( i_ecx ), \
+@@ -103,17 +111,17 @@
+
+ i_capabilities |= CPU_CAPABILITY_FPU;
+
+- asm volatile ( "push %%ebx\n\t"
++ asm volatile ( "push %%"REG_b"\n\t"
+ "pushf\n\t"
+- "pop %%eax\n\t"
++ "pop %%"REG_a"\n\t"
+ "movl %%eax, %%ebx\n\t"
+ "xorl $0x200000, %%eax\n\t"
+- "push %%eax\n\t"
++ "push %%"REG_a"\n\t"
+ "popf\n\t"
+ "pushf\n\t"
+- "pop %%eax\n\t"
+- "movl %%ebx,%1\n\t"
+- "pop %%ebx\n\t"
++ "pop %%"REG_a"\n\t"
++ "mov %%"REG_b",%1\n\t"
++ "pop %%"REG_b"\n\t"
+ : "=a" ( i_eax ),
+ "=r" ( i_ebx )
+ :
================================================================
Index: SOURCES/vlc-samba.patch
diff -u /dev/null SOURCES/vlc-samba.patch:1.1
--- /dev/null Fri Sep 16 12:11:38 2005
+++ SOURCES/vlc-samba.patch Fri Sep 16 12:11:33 2005
@@ -0,0 +1,30 @@
+Index: vlc-0.8.2/configure.ac
+===================================================================
+--- vlc-0.8.2.orig/configure.ac
++++ vlc-0.8.2/configure.ac
+@@ -1493,6 +1493,9 @@ if test "${enable_smb}" != "no"; then
+ [ if test -n "${enable_smb}"; then
+ AC_MSG_ERROR([cannot find libsmbclient headers])
+ fi ])
++ AC_CHECK_MEMBER([struct _SMBCCTX.close_fn],
++ AC_DEFINE([HAVE__SMBCCTX_CLOSE_FN], [1], [Define if samba has _SMBCCTX.close_fn]),,
++ [#include <libsmbclient.h>])
+ fi
+
+ dnl
+Index: vlc-0.8.2/modules/access/smb.c
+===================================================================
+--- vlc-0.8.2.orig/modules/access/smb.c
++++ vlc-0.8.2/modules/access/smb.c
+@@ -301,7 +301,11 @@ static void Close( vlc_object_t *p_this
+ access_sys_t *p_sys = p_access->p_sys;
+
+ #ifdef USE_CTX
++# ifndef HAVE__SMBCCTX_CLOSE_FN
+ p_sys->p_smb->close( p_sys->p_smb, p_sys->p_file );
++# else
++ p_sys->p_smb->close_fn( p_sys->p_smb, p_sys->p_file );
++# endif
+ smbc_free_context( p_sys->p_smb, 1 );
+ #else
+ smbc_close( p_sys->i_smb );
================================================================
Index: SOURCES/vlc-pic-mmx.patch
diff -u /dev/null SOURCES/vlc-pic-mmx.patch:1.1
--- /dev/null Fri Sep 16 12:11:38 2005
+++ SOURCES/vlc-pic-mmx.patch Fri Sep 16 12:11:33 2005
@@ -0,0 +1,87 @@
+diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb16.c vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c
+--- vlc-0.8.2/modules/video_chroma/i420_rgb16.c 2005-06-25 15:43:10.000000000 +0200
++++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb16.c 2005-07-10 23:59:57.656177984 +0200
+@@ -31,7 +31,7 @@
+ #include <vlc/vout.h>
+
+ #include "i420_rgb.h"
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ # include "i420_rgb_c.h"
+ #elif defined (MODULE_NAME_IS_i420_rgb_mmx)
+ # include "i420_rgb_mmx.h"
+@@ -216,7 +216,7 @@
+ int i_scale_count; /* scale modulo counter */
+ int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ uint16_t * p_pic_start; /* beginning of the current line for copy */
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
+ int i_uval, i_vval; /* U and V samples */
+ int i_red, i_green, i_blue; /* U and V modified samples */
+ uint16_t * p_yuv = p_vout->chroma.p_sys->p_rgb16;
+@@ -264,7 +264,7 @@
+ p_pic_start = p_pic;
+ p_buffer = b_hscale ? p_buffer_start : p_pic;
+
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ {
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+@@ -323,7 +323,7 @@
+ p_u -= i_rewind >> 1;
+ p_v -= i_rewind >> 1;
+ p_buffer -= i_rewind;
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+ CONVERT_YUV_PIXEL(2); CONVERT_Y_PIXEL(2);
+@@ -397,7 +397,7 @@
+ int i_scale_count; /* scale modulo counter */
+ int i_chroma_width = p_vout->render.i_width / 2; /* chroma width */
+ uint32_t * p_pic_start; /* beginning of the current line for copy */
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined (__PIC__)
+ int i_uval, i_vval; /* U and V samples */
+ int i_red, i_green, i_blue; /* U and V modified samples */
+ uint32_t * p_yuv = p_vout->chroma.p_sys->p_rgb32;
+@@ -447,7 +447,7 @@
+
+ for ( i_x = p_vout->render.i_width / 8; i_x--; )
+ {
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+@@ -477,7 +477,7 @@
+ p_u -= i_rewind >> 1;
+ p_v -= i_rewind >> 1;
+ p_buffer -= i_rewind;
+-#if defined (MODULE_NAME_IS_i420_rgb)
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+ CONVERT_YUV_PIXEL(4); CONVERT_Y_PIXEL(4);
+diff -ur -x '*~' vlc-0.8.2/modules/video_chroma/i420_rgb.h vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h
+--- vlc-0.8.2/modules/video_chroma/i420_rgb.h 2005-06-25 15:43:10.000000000 +0200
++++ vlc-0.8.2-pic/modules/video_chroma/i420_rgb.h 2005-07-10 23:57:30.248587344 +0200
+@@ -35,7 +35,7 @@
+ uint8_t *p_buffer;
+ int *p_offset;
+
+-#ifdef MODULE_NAME_IS_i420_rgb
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ /**< Pre-calculated conversion tables */
+ void *p_base; /**< base for all conversion tables */
+ uint8_t *p_rgb8; /**< RGB 8 bits table */
+@@ -55,7 +55,7 @@
+ /*****************************************************************************
+ * Prototypes
+ *****************************************************************************/
+-#ifdef MODULE_NAME_IS_i420_rgb
++#if defined (MODULE_NAME_IS_i420_rgb) || defined(__PIC__)
+ void E_(I420_RGB8) ( vout_thread_t *, picture_t *, picture_t * );
+ void E_(I420_RGB16_dither) ( vout_thread_t *, picture_t *, picture_t * );
+ #endif
================================================================
Index: SOURCES/vlc-matroska-shared.patch
diff -u /dev/null SOURCES/vlc-matroska-shared.patch:1.1
--- /dev/null Fri Sep 16 12:11:38 2005
+++ SOURCES/vlc-matroska-shared.patch Fri Sep 16 12:11:33 2005
@@ -0,0 +1,23 @@
+Index: vlc-0.8.2/configure.ac
+===================================================================
+--- vlc-0.8.2.orig/configure.ac
++++ vlc-0.8.2/configure.ac
+@@ -1877,16 +1877,9 @@ if test "${enable_mkv}" != "no" -a "${CX
+ if test "${SYS}" = "darwin"; then
+ VLC_ADD_CXXFLAGS([mkv],[-O1])
+ fi
+- AC_CHECK_LIB(ebml_pic, main, [
+- # We have ebml_pic, that's good, we can build an mkv.so plugin !
++ AC_CHECK_LIB(ebml, main, [
+ VLC_ADD_PLUGINS([mkv])
+- VLC_ADD_LDFLAGS([mkv],[-lmatroska_pic -lebml_pic])
+- ], [
+- AC_CHECK_LIB(ebml, main, [
+- # We only have libebml, make mkv.a a builtin
+- VLC_ADD_BUILTINS([mkv])
+- VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+- ])
++ VLC_ADD_LDFLAGS([mkv],[-lmatroska -lebml])
+ ])
+ ],
+ [AC_MSG_RESULT([no])
================================================================
More information about the pld-cvs-commit
mailing list