[gentoo-commits] gentoo commit in src/patchsets/vlc/0.8.6c: 000_all_glide.patch 010_all_freetype-font.patch 110_all_dtspic.patch 130_all_textrels.patch 140_all_directfb.patch 180_all_faad.patch 190_all_strict-aliasing.patch 200_all_nonpermissive.patch 220_all_firefox.patch 230_all_libcdio-0.78.2.patch 250_all_livepic.patch 290_all_altivec.patch 330_all_libdca.patch series

[Alexis Ballier (aballier)]

aballier    07/10/22 19:12:34

  Added:                000_all_glide.patch 010_all_freetype-font.patch
                        110_all_dtspic.patch 130_all_textrels.patch
                        140_all_directfb.patch 180_all_faad.patch
                        190_all_strict-aliasing.patch
                        200_all_nonpermissive.patch 220_all_firefox.patch
                        230_all_libcdio-0.78.2.patch 250_all_livepic.patch
                        290_all_altivec.patch 330_all_libdca.patch series
  Log:
  add a new dir for vlc 0.8.6c, removing merged patches from 0.8.6 one, plus including directfb detection backport from trunk

Revision  Changes    Path
1.1                  src/patchsets/vlc/0.8.6c/000_all_glide.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/000_all_glide.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/000_all_glide.patch?rev=1.1&content-type=text/plain

Index: 000_all_glide.patch
===================================================================
Portage has just glide 3.x so use that and not glide 2.x.
This patch replaces the sed to configure in src_unpack in old ebuilds.

Updated with report of Ed Catmur, Gentoo Bug #132809
Index: vlc-0.8.6-rc1/modules/video_output/glide.c
===================================================================
--- vlc-0.8.6-rc1.orig/modules/video_output/glide.c
+++ vlc-0.8.6-rc1/modules/video_output/glide.c
@@ -244,20 +244,11 @@ static void Display( vout_thread_t *p_vo
 
 static int OpenDisplay( vout_thread_t *p_vout )
 {
-    static char version[80];
-    GrHwConfiguration hwconfig;
     GrScreenResolution_t resolution = GR_RESOLUTION_800x600;
     GrLfbInfo_t p_front_buffer_info;                    /* front buffer info */
 
-    grGlideGetVersion( version );
     grGlideInit();
 
-    if( !grSstQueryHardware(&hwconfig) )
-    {
-        msg_Err( p_vout, "cannot get 3dfx hardware config" );
-        return( 1 );
-    }
-
     grSstSelect( 0 );
     if( !grSstWinOpen( 0, resolution, GR_REFRESH_60Hz,
                        GR_COLORFORMAT_ABGR, GR_ORIGIN_UPPER_LEFT, 2, 1 ) )
Index: vlc-0.8.6-rc1/configure.ac
===================================================================
--- vlc-0.8.6-rc1.orig/configure.ac
+++ vlc-0.8.6-rc1/configure.ac
@@ -4019,11 +4019,11 @@ then
         VLC_ADD_LDFLAGS([glide],[-L${with_glide}/lib])
         CFLAGS="$CFLAGS -I${with_glide}/include"
     fi ])
-   CFLAGS="$CFLAGS -I/usr/include/glide"
+   CFLAGS="$CFLAGS -I/usr/include/glide3"
    AC_CHECK_HEADER(glide.h,[   
       VLC_ADD_PLUGINS([glide])
-      VLC_ADD_LDFLAGS([glide],[-lglide2x -lm])
-      VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide])
+      VLC_ADD_LDFLAGS([glide],[-lglide3 -lm])
+      VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide3])
     ],[
       AC_MSG_ERROR([You don't have libglide. Install it or do not use --enable-glide])
      ])



1.1                  src/patchsets/vlc/0.8.6c/010_all_freetype-font.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/010_all_freetype-font.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/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 Bitstream Vera, and add it to the dependencies, as anyway many people
have that font installed.

Index: vlc-0.8.4/modules/misc/freetype.c
===================================================================
--- vlc-0.8.4.orig/modules/misc/freetype.c
+++ vlc-0.8.4/modules/misc/freetype.c
@@ -55,7 +55,7 @@
 #elif defined( WIN32 )
 #define DEFAULT_FONT "" /* Default font found at run-time */
 #else
-#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+#define DEFAULT_FONT "/usr/share/fonts/ttf-bitstream-vera/VeraBd.ttf"
 #endif
 
 #if defined(HAVE_FRIBIDI)



1.1                  src/patchsets/vlc/0.8.6c/110_all_dtspic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/110_all_dtspic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/110_all_dtspic.patch?rev=1.1&content-type=text/plain

Index: 110_all_dtspic.patch
===================================================================
Index: vlc-0.8.6-rc1/configure.ac
===================================================================
--- vlc-0.8.6-rc1.orig/configure.ac
+++ vlc-0.8.6-rc1/configure.ac
@@ -3058,7 +3058,7 @@ if test "${enable_dts}" != "no"; then
         VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
       ],[
         AC_CHECK_LIB(dts, dts_free, [
-          VLC_ADD_BUILTINS([dtstofloat32])
+          VLC_ADD_PLUGINS([dtstofloat32])
           VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
         ],[
           if test "${enable_dts}" = "yes"; then



1.1                  src/patchsets/vlc/0.8.6c/130_all_textrels.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/130_all_textrels.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/130_all_textrels.patch?rev=1.1&content-type=text/plain

Index: 130_all_textrels.patch
===================================================================
Index: vlc-0.8.6-rc1/loader/Makefile.am
===================================================================
--- vlc-0.8.6-rc1.orig/loader/Makefile.am
+++ vlc-0.8.6-rc1/loader/Makefile.am
@@ -16,7 +16,7 @@ endif
 # 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-0.8.6-rc1/loader/module.c
===================================================================
--- vlc-0.8.6-rc1.orig/loader/module.c
+++ vlc-0.8.6-rc1/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-0.8.6-rc1/loader/stubs.s
===================================================================
--- vlc-0.8.6-rc1.orig/loader/stubs.s
+++ vlc-0.8.6-rc1/loader/stubs.s
@@ -33,3 +33,6 @@ exp_EH_prolog:
 	leal  12(%esp), %ebp
 	pushl %eax
 	ret
+
+.section .note.GNU-stack,"",@progbits
+
Index: vlc-0.8.6-rc1/loader/wrapper.S
===================================================================
--- vlc-0.8.6-rc1.orig/loader/wrapper.S
+++ vlc-0.8.6-rc1/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-0.8.6-rc1/loader/wrapper.h
===================================================================
--- vlc-0.8.6-rc1.orig/loader/wrapper.h
+++ vlc-0.8.6-rc1/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/0.8.6c/140_all_directfb.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/140_all_directfb.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/140_all_directfb.patch?rev=1.1&content-type=text/plain

Index: 140_all_directfb.patch
===================================================================
Index: vlc-0.8.6c/configure.ac
===================================================================
--- vlc-0.8.6c.orig/configure.ac
+++ vlc-0.8.6c/configure.ac
@@ -3986,38 +3986,73 @@ fi
 
 dnl
 dnl  DirectFB module
+dnl  try to find using: 1 - given location; 2 - directfb-config; 3 - pkg-config
+dnl  TODO: support for static linking
 dnl
 AC_ARG_ENABLE(directfb,
   [  --enable-directfb       DirectFB support (default disabled)])
-if test "${enable_directfb}" = "yes"
-then
-  if test "${with_directfb}" = "no"
-  then
-    AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
-    if test "${have_directfb}"= "true"
-    then
+AC_ARG_WITH(directfb, 
+  [    --with-directfb=PATH  path to DirectFB headers and libraries])
+
+if test "${enable_directfb}" = "yes"; then
+    have_directfb="false"
+    CPPFLAGS_mydirectfb=
+    LDFLAGS_mydirectfb=
+    if test "${with_directfb}" != "no" -a -n "${with_directfb}"; then
+        dnl Trying the given location
+        CPPFLAGS_save=${CPPFLAGS}
+        LDFLAGS_save=${LDFLAGS}
+
+        CPPFLAGS_new="-I${with_directfb}/include -D_REENTRANT -D_GNU_SOURCE"
+        LDFLAGS_new="-L${with_directfb}/lib/fusion/.libs/ -L${with_directfb}/lib/direct/.libs/"
+        LDFLAGS_new="${LDFLAGS_new} -L${with_directfb}/src/.libs/"
+
+        CPPFLAGS="${CPPFLAGS} ${CPPFLAGS_new}"
+        LDFLAGS="${LD_FLAGS} ${LDFLAGS_new}"
+
+        dnl FIXME: too obscure
+        AC_CHECK_HEADER([directfb.h], [
+            AC_CHECK_LIB([direct],[direct_initialize], [
+                AC_CHECK_LIB([fusion], [fusion_enter], [
+                    AC_CHECK_LIB([directfb], [DirectFBInit], have_directfb="true", have_directfb="false")
+                ], have_directfb="false")
+            ], have_directfb="false")
+        ], have_directfb="false")
+
+        dnl Restore flags
+        CPPFLAGS="${CPPFLAGS_save}"
+        LDFLAGS="${LDFLAGS_save}"
+
+        if test "${have_directfb}" = "true"; then
+            LDFLAGS_mydirectfb="${LDFLAGS_new} -lz -ldl -ldirectfb -lfusion -ldirect -lpthread"
+            CPPFLAGS_mydirectfb="${CPPFLAGS_new}"
+        fi
+    else 
+        dnl Look for directfb-config
+        AC_PATH_PROG(DIRECTFB_CONFIG, directfb-config, no, ${PATH})
+        if test "${DIRECTFB_CONFIG}" != "no"; then
+            CPPFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --cflags`"
+            LDFLAGS_mydirectfb="`${DIRECTFB_CONFIG} --libs`"
+            have_directfb="true"
+        else 
+            dnl Trying with pkg-config
+            PKG_CHECK_MODULES(DIRECTFB, directfb, [
+                CPPFLAGS_mydirectfb="${DIRECTFB_CFLAGS}"
+                LDFLAGS_mydirectfb="${DIRECTFB_LIBS}"
+                have_directfb="true"
+                ], [have_directfb="false"])
+        fi
+    fi
+    if test "${have_directfb}" = "true"; then
         VLC_ADD_PLUGINS([directfb])
-        VLC_ADD_LDFLAGS([directfb],[-ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
-        VLC_ADD_CPPFLAGS([directfb],[-I/usr/include/directfb -D_REENTRANT])
-    else
-        AC_MSG_ERROR([cannot find /usr/include/directfb headers, make sure directfb is installed on your system or use --disable-directfb])
+        VLC_ADD_CPPFLAGS([directfb],[${CPPFLAGS_mydirectfb}])
+        VLC_ADD_LDFLAGS([directfb],[${LDFLAGS_mydirectfb}])
+    else 
+        AC_MSG_ERROR([cannot find directfb headers and/or libraries ])
     fi
-  else
-    CPPFLAGS_save="${CPPFLAGS}"
-    CPPFLAGS="${CPPFLAGS} -I${with_directfb}/include"
-    AC_CHECK_HEADER(directfb.h, have_directfb="true", have_directfb="false")
-    CPPFLAGS="${CPPFLAGS_save}"
-    AC_ARG_WITH(directfb,
-        [    --with-directfb=PATH  path to directfb],
-        [ if test "${with_directfb}" != "no" -a -n "${with_directfb}"
-        then
-            VLC_ADD_PLUGINS([directfb])
-            VLC_ADD_CPPFLAGS([directfb],[-I${with_directfb}/include -D_REENTRANT])
-            VLC_ADD_LDFLAGS([directfb],[-L${with_directfb}/lib -ldirectfb -lfusion -ldirect -lpthread -ljpeg -lz -ldl])
-        fi ],
-        [ AC_MSG_ERROR([cannot find directfb headers in ${with_directfb}/include]) ])
-  fi
 fi
+ 
+
 
 dnl
 dnl  GGI module



1.1                  src/patchsets/vlc/0.8.6c/180_all_faad.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/180_all_faad.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/180_all_faad.patch?rev=1.1&content-type=text/plain

Index: 180_all_faad.patch
===================================================================
Index: vlc-0.8.6-rc1/modules/codec/ffmpeg/ffmpeg.c
===================================================================
--- vlc-0.8.6-rc1.orig/modules/codec/ffmpeg/ffmpeg.c
+++ vlc-0.8.6-rc1/modules/codec/ffmpeg/ffmpeg.c
@@ -238,14 +238,6 @@ static int OpenDecoder( vlc_object_t *p_
         return VLC_EGENERIC;
     }
 
-    /* Bail out if buggy decoder */
-    if( i_codec_id == CODEC_ID_AAC )
-    {
-        msg_Dbg( p_dec, "refusing to use ffmpeg's (%s) decoder which is buggy",
-                 psz_namecodec );
-        return VLC_EGENERIC;
-    }
-
     /* Initialization must be done before avcodec_find_decoder() */
     E_(InitLibavcodec)(p_this);
 



1.1                  src/patchsets/vlc/0.8.6c/190_all_strict-aliasing.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/190_all_strict-aliasing.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/190_all_strict-aliasing.patch?rev=1.1&content-type=text/plain

Index: 190_all_strict-aliasing.patch
===================================================================
Index: vlc-0.8.6-rc1/configure.ac
===================================================================
--- vlc-0.8.6-rc1.orig/configure.ac
+++ vlc-0.8.6-rc1/configure.ac
@@ -5310,6 +5310,16 @@ then
 fi
 
 
+AC_CACHE_CHECK([if \$CXX accepts -fno-strict-aliasing],
+   [ac_cv_cxx_fnostrictaliasing],
+   [CXXFLAGS="${CXXFLAGS_save} -fno-strict-aliasing"
+    AC_TRY_COMPILE([],,ac_cv_cxx_fnostrictaliasing=yes,
+       ac_cv_cxx_fnostrictaliasing=no)])
+# wxWidgest has the bad behaviour of forcing breakages of strict aliasing
+# rules all over, so pass this to force using -fno-strict-aliasing on it.
+if test "${ac_cv_cxx_fnostrictaliasing}" = "yes"; then
+  VLC_ADD_CXXFLAGS([wxwidgets skins2],-fno-strict-aliasing)
+fi
 dnl
 dnl  Plugin and builtin checks
 dnl
Index: vlc-0.8.6-rc1/modules/demux/m3u.c
===================================================================
--- vlc-0.8.6-rc1.orig/modules/demux/m3u.c
+++ vlc-0.8.6-rc1/modules/demux/m3u.c
@@ -127,7 +127,7 @@ static int Activate( vlc_object_t * p_th
     if( i_type != TYPE_M3U )
     {
         char *p_peek;
-        int i_size = stream_Peek( p_demux->s, (uint8_t **)&p_peek, MAX_LINE );
+        int i_size = stream_Peek( p_demux->s, &p_peek, MAX_LINE );
         i_size -= sizeof("[Reference]") - 1;
 
         if( i_size > 0 )
Index: vlc-0.8.6-rc1/modules/demux/mkv.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/demux/mkv.cpp
+++ vlc-0.8.6-rc1/modules/demux/mkv.cpp
@@ -5307,11 +5307,11 @@ bool matroska_segment_c::CompareSegmentU
     if ( p_item_a == NULL || p_item_b == NULL )
         return false;
 
-    EbmlBinary * p_itema = (EbmlBinary *)(p_item_a->p_segment_uid);
+    EbmlBinary * p_itema = dynamic_cast<EbmlBinary *>(p_item_a->p_segment_uid);
     if ( p_item_b->p_prev_segment_uid != NULL && *p_itema == *p_item_b->p_prev_segment_uid )
         return true;
 
-    p_itema = (EbmlBinary *)(&p_item_a->p_next_segment_uid);
+    p_itema = dynamic_cast<EbmlBinary *>(p_item_a->p_next_segment_uid);
     if ( p_item_b->p_segment_uid != NULL && *p_itema == *p_item_b->p_segment_uid )
         return true;
 
Index: vlc-0.8.6-rc1/modules/demux/mp4/libmp4.c
===================================================================
--- vlc-0.8.6-rc1.orig/modules/demux/mp4/libmp4.c
+++ vlc-0.8.6-rc1/modules/demux/mp4/libmp4.c
@@ -1138,8 +1138,15 @@ static int MP4_ReadBox_sample_soun( stre
         double f_sample_rate;
         uint32_t i_channel;
 
+	union {
+		double xdouble;
+		int64_t x64;
+	} u;
+
         MP4_GET4BYTES( p_box->data.p_sample_soun->i_sample_per_packet );
-        MP4_GET8BYTES( (*(int64_t *)&f_sample_rate) );
+        MP4_GET8BYTES( u.x64 );
+
+	f_sample_rate = u.xdouble;
 
         msg_Dbg( p_stream, "read box: %f Hz", f_sample_rate );
         p_box->data.p_sample_soun->i_sampleratehi = (int)f_sample_rate % 65536;



1.1                  src/patchsets/vlc/0.8.6c/200_all_nonpermissive.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/200_all_nonpermissive.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/200_all_nonpermissive.patch?rev=1.1&content-type=text/plain

Index: 200_all_nonpermissive.patch
===================================================================
Index: vlc-0.8.6-rc1/configure.ac
===================================================================
--- vlc-0.8.6-rc1.orig/configure.ac
+++ vlc-0.8.6-rc1/configure.ac
@@ -4561,17 +4561,6 @@ then
       AC_MSG_ERROR([Your development package for wxWidgets is too old, you need at least version 2.3.0. Please upgrade and try again. Alternatively you can also configure with --disable-wxwidgets.])
     fi
     AC_LANG_PUSH(C++)
-    # Turn this error:
-    #   playlist.cpp:1351: error: ISO C++ forbids cast to non-reference type
-    # into a warning. However better would be to fix playlist.cpp
-    AC_CACHE_CHECK([if \$CXX accepts -fpermissive],
-        [ac_cv_cxx_fpermissive],
-        [CXXFLAGS="${CXXFLAGS_save} -fpermissive"
-         AC_TRY_COMPILE([],,ac_cv_cxx_fpermissive=yes,
-                        ac_cv_cxx_fpermissive=no)])
-    if test "${ac_cv_cxx_fpermissive}" = "yes"; then
-      VLC_ADD_CXXFLAGS([wxwidgets],-fpermissive)
-    fi
     VLC_ADD_LDFLAGS([wxwidgets],[`${WX_CONFIG} --libs`])
     VLC_ADD_CXXFLAGS([wxwidgets],[`${WX_CONFIG} --cxxflags`])
     if ${WX_CONFIG} --unicode
Index: vlc-0.8.6-rc1/include/vlc_common.h
===================================================================
--- vlc-0.8.6-rc1.orig/include/vlc_common.h
+++ vlc-0.8.6-rc1/include/vlc_common.h
@@ -599,6 +599,29 @@ static int64_t GCD( int64_t a, int64_t b
     }                                                                         \
     while( 0 )
 
+/* Special version for C++ code */
+#define REMOVE_ELEM_PP( type_p_ar, p_ar, i_oldsize, i_pos )                   \
+    do                                                                        \
+    {                                                                         \
+        if( (i_oldsize) - (i_pos) - 1 )                                       \
+        {                                                                     \
+            memmove( (p_ar) + (i_pos),                                        \
+                     (p_ar) + (i_pos) + 1,                                    \
+                     ((i_oldsize) - (i_pos) - 1) * sizeof( *(p_ar) ) );       \
+        }                                                                     \
+        if( i_oldsize > 1 )                                                   \
+        {                                                                     \
+            (p_ar) = (type_p_ar)realloc( p_ar, ((i_oldsize) - 1) * sizeof( *(p_ar) ) );  \
+        }                                                                     \
+        else                                                                  \
+        {                                                                     \
+            free( p_ar );                                                     \
+            (p_ar) = NULL;                                                    \
+        }                                                                     \
+        (i_oldsize)--;                                                        \
+    }                                                                         \
+    while( 0 )
+
 
 #define TAB_APPEND( count, tab, p )             \
     if( (count) > 0 )                           \
Index: vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/interaction.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/gui/wxwidgets/dialogs/interaction.cpp
+++ vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/interaction.cpp
@@ -245,7 +245,7 @@ void InteractionDialog::OnClear( wxComma
         user_widget_t *p_widget = p_dialog->pp_widgets[i];
         FREE( p_widget->psz_text );
         FREE( p_widget->val.psz_string );
-        REMOVE_ELEM( p_dialog->pp_widgets, p_dialog->i_widgets, i );
+        REMOVE_ELEM_PP( user_widget_t **, p_dialog->pp_widgets, p_dialog->i_widgets, i );
         free( p_widget );
     }
     widgets_panel->DestroyChildren();
Index: vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/open.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/gui/wxwidgets/dialogs/open.cpp
+++ vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/open.cpp
@@ -1825,14 +1825,14 @@ void OpenDialog::OnSubsFileSettings( wxC
         }
         if( subsfile_dialog->align_combo )
         {
-            subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%i"),
-                              (int)subsfile_dialog->align_combo->GetClientData(
+            subsfile_mrl.Add( wxString::Format(wxT("subsdec-align=%li"),
+                              (long)subsfile_dialog->align_combo->GetClientData(
                               subsfile_dialog->align_combo->GetSelection()) ) );
         }
         if( subsfile_dialog->size_combo )
         {
-            subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%i"),
-                              (int)subsfile_dialog->size_combo->GetClientData(
+            subsfile_mrl.Add( wxString::Format( wxT("freetype-rel-fontsize=%li"),
+                              (long)subsfile_dialog->size_combo->GetClientData(
                               subsfile_dialog->size_combo->GetSelection()) ) );
         }
         subsfile_mrl.Add( wxString::Format( wxT("sub-fps=%i"),
Index: vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
+++ vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/preferences_widgets.cpp
@@ -249,7 +249,7 @@ int KeyConfigControl::GetIntValue()
     int selected = combo->GetSelection();
     if( selected != -1 )
     {
-        result |= (int)combo->GetClientData( selected );
+        result |= (long)combo->GetClientData( selected );
     }
     return result;
 }
@@ -873,7 +873,7 @@ int IntegerListConfigControl::GetIntValu
     int selected = combo->GetSelection();
     if( selected != -1 )
     {
-        return (int)combo->GetClientData( selected );
+        return static_cast<int>((long)combo->GetClientData( selected ));
     }
     return -1;
 }
Index: vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/wizard.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/gui/wxwidgets/dialogs/wizard.cpp
+++ vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/wizard.cpp
@@ -208,7 +208,7 @@ class wizInputPage : public wxWizardPage
 {
     public:
         wizInputPage( wxWizard *, wxWizardPage *, intf_thread_t *);
-        wizInputPage::~wizInputPage();
+        ~wizInputPage();
         void OnWizardPageChanging(wxWizardEvent& event);
         void OnInputChange( wxCommandEvent& event );
         void OnEnablePartial(wxCommandEvent& event);
@@ -262,7 +262,7 @@ class wizTranscodeCodecPage : public wxW
 public:
     wizTranscodeCodecPage( wxWizard *parent, wxWizardPage *next);
     ~wizTranscodeCodecPage();
-    void wizTranscodeCodecPage::OnWizardPageChanging(wxWizardEvent& event);
+    void OnWizardPageChanging(wxWizardEvent& event);
     virtual wxWizardPage *GetPrev() const;
     virtual wxWizardPage *GetNext() const;
     void SetPrev( wxWizardPage *page);
@@ -339,7 +339,7 @@ class wizEncapPage : public wxWizardPage
 {
 public:
     wizEncapPage( wxWizard *parent);
-    wizEncapPage::~wizEncapPage();
+    ~wizEncapPage();
     void OnWizardPageChanging(wxWizardEvent& event);
     virtual wxWizardPage *GetPrev() const;
     virtual wxWizardPage *GetNext() const;
@@ -387,7 +387,7 @@ public:
     void OnWizardPageChanging( wxWizardEvent& event );
 protected:
     DECLARE_EVENT_TABLE()
-    void wizTranscodeExtraPage::OnSelectFile(wxCommandEvent&);
+    void OnSelectFile(wxCommandEvent&);
     wxTextCtrl *file_text;
     WizardDialog *p_parent;
     wxWizardPage *p_prev;
Index: vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/updatevlc.cpp
===================================================================
--- vlc-0.8.6-rc1.orig/modules/gui/wxwidgets/dialogs/updatevlc.cpp
+++ vlc-0.8.6-rc1/modules/gui/wxwidgets/dialogs/updatevlc.cpp
@@ -200,7 +200,7 @@ void UpdateVLC::OnChooseItem( wxListEven
                         wxSAVE | wxOVERWRITE_PROMPT );
         if( filedialog->ShowModal() == wxID_OK )
         {
-            update_download( p_uit, filedialog->GetPath().mb_str(wxConvUTF8) );
+            update_download( p_uit, const_cast<char*>((const char*)(filedialog->GetPath().mb_str(wxConvUTF8))) );
         }
         update_iterator_Delete( p_uit );
         delete filedialog;



1.1                  src/patchsets/vlc/0.8.6c/220_all_firefox.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/220_all_firefox.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/220_all_firefox.patch?rev=1.1&content-type=text/plain

Index: 220_all_firefox.patch
===================================================================
Index: vlc-0.8.6-test2/mozilla/vlcshell.cpp
===================================================================
--- vlc-0.8.6-test2.orig/mozilla/vlcshell.cpp
+++ vlc-0.8.6-test2/mozilla/vlcshell.cpp
@@ -35,10 +35,8 @@
 #   include <mozilla-config.h>
 #endif
 
-/* This is from mozilla java, do we really need it? */
-#if 0
+/* This is from mozilla java, needed for jref type */
 #include <jri.h>
-#endif
 
 #include "vlcplugin.h"
 



1.1                  src/patchsets/vlc/0.8.6c/230_all_libcdio-0.78.2.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/230_all_libcdio-0.78.2.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/230_all_libcdio-0.78.2.patch?rev=1.1&content-type=text/plain

Index: 230_all_libcdio-0.78.2.patch
===================================================================
diff -ur vlc-0.8.5-orig/modules/access/cdda/access.c vlc-0.8.5/modules/access/cdda/access.c
--- vlc-0.8.5-orig/modules/access/cdda/access.c	2006-05-06 11:52:18.000000000 -0400
+++ vlc-0.8.5/modules/access/cdda/access.c	2006-11-03 17:00:54.000000000 -0500
@@ -737,14 +737,14 @@
    
       char *psz_paranoia = config_GetPsz( p_access, 
 					  MODULE_STRING "-paranoia" );
-      p_cdda->e_paranoia = paranoia_none;
+      p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
       if( psz_paranoia && *psz_paranoia )
       {
 
 	if( !strncmp( psz_paranoia, "full", strlen("full") )  )
-	  p_cdda->e_paranoia = paranoia_full;
+	  p_cdda->e_paranoia = PARANOIA_MODE_FULL;
 	else if( !strncmp( psz_paranoia, "overlap", strlen("overlap") )  )
-	  p_cdda->e_paranoia = paranoia_overlap;
+	  p_cdda->e_paranoia = PARANOIA_MODE_OVERLAP;
 	
 	/* Use CD Paranoia? */
 	if ( p_cdda->e_paranoia ) {
@@ -755,7 +755,7 @@
 	  if ( 0 != cdio_cddap_open(p_cdda->paranoia_cd) ) {
 	    msg_Warn( p_cdda_input, "unable to get paranoia support - "
 		      "continuing without it." );
-	    p_cdda->e_paranoia = paranoia_none;
+	    p_cdda->e_paranoia = PARANOIA_MODE_DISABLE;
 	  } else {
 	    p_cdda->paranoia = cdio_paranoia_init(p_cdda->paranoia_cd);
 	    cdio_paranoia_seek(p_cdda->paranoia, p_cdda->i_lsn, SEEK_SET);
@@ -763,7 +763,7 @@
 	    /* Set reading mode for full or overlap paranoia, 
 	       but allow skipping sectors. */
 	    cdio_paranoia_modeset(p_cdda->paranoia,
-				  paranoia_full == p_cdda->e_paranoia ?
+				  PARANOIA_MODE_FULL == p_cdda->e_paranoia ?
 				  PARANOIA_MODE_FULL^PARANOIA_MODE_NEVERSKIP :
 				  PARANOIA_MODE_OVERLAP^PARANOIA_MODE_NEVERSKIP
 				  );
diff -ur vlc-0.8.5-orig/modules/access/cdda/cdda.h vlc-0.8.5/modules/access/cdda/cdda.h
--- vlc-0.8.5-orig/modules/access/cdda/cdda.h	2006-05-06 11:52:18.000000000 -0400
+++ vlc-0.8.5/modules/access/cdda/cdda.h	2006-11-03 17:00:54.000000000 -0500
@@ -71,12 +71,13 @@
 #define CdIo_t CdIo
 #endif    
 
+#if LIBCDIO_VERSION_NUM < 78
 typedef enum {
-  paranoia_none    = 0, /* Note: We make use of 0 as being the same as false */
-  paranoia_overlap = 1, 
-  paranoia_full    = 2
+  PARANOIA_MODE_DISABLE = 0x00, /* Note: We make use of 0 as being the same as false */
+  PARANOIA_MODE_OVERLAP = 0x04, 
+  PARANOIA_MODE_FULL    = 0xff
 } paranoia_mode_t;
-
+#endif
   
 /*****************************************************************************
  * cdda_data_t: CD audio information



1.1                  src/patchsets/vlc/0.8.6c/250_all_livepic.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/250_all_livepic.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/250_all_livepic.patch?rev=1.1&content-type=text/plain

Index: 250_all_livepic.patch
===================================================================
Starting from version 2006.12.08, Gentoo installs live555 as a system
library properly. For policy we also build a shared version of it that
uses PIC.
For this reason, we can reasonably force VLC to create a Plugin for
live555 rather than a builtin.Index: vlc-0.8.6/configure.ac
===================================================================
Index: vlc-0.8.6_p18636/configure.ac
===================================================================
--- vlc-0.8.6_p18636.orig/configure.ac
+++ vlc-0.8.6_p18636/configure.ac
@@ -1558,9 +1558,9 @@ if test "${enable_live555}" = "yes"; the
       ], [
         AC_CHECK_LIB(liveMedia, main, [
           # We only have -lliveMedia, do builtins
-          VLC_ADD_BUILTINS([live555])
+          VLC_ADD_PLUGINS([live555])
           VLC_ADD_LDFLAGS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
-        ])
+        ], ,[-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment])
       ])
       if test "${SYS}" = "mingw32"; then
         # add ws2_32 for closesocket, select, recv



1.1                  src/patchsets/vlc/0.8.6c/290_all_altivec.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/290_all_altivec.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/290_all_altivec.patch?rev=1.1&content-type=text/plain

Index: 290_all_altivec.patch
===================================================================
This really disables altivec if not wanted.
Patch from xtophe: https://trac.videolan.org/vlc/ticket/1055
https://bugs.gentoo.org/show_bug.cgi?id=158126
Causes a compile failure because altivec.h is found and -maltivec not appended to cflags
updated to try to fix this
===================================================================
Index: vlc-0.8.6_p18636/configure.ac
===================================================================
--- vlc-0.8.6_p18636.orig/configure.ac
+++ vlc-0.8.6_p18636/configure.ac
@@ -1301,10 +1301,12 @@ AC_CACHE_CHECK([if \$CC groks AltiVec C 
 if test "${ac_cv_c_altivec}" != "no"; then
   CPPFLAGS="${CPPFLAGS_save} ${ac_cv_c_altivec}"
 fi
+if test "${enable_altivec}" != "no"; then
 AC_CHECK_HEADERS(altivec.h)
+fi
 CPPFLAGS="${CPPFLAGS_save}"
 
-if test "${ac_cv_c_altivec}" != "no"; then
+if test "${ac_cv_c_altivec}" != "no" -a "${enable_altivec}" != "no"; then
   AC_DEFINE(CAN_COMPILE_C_ALTIVEC, 1, Define if your compiler groks C AltiVec extensions.)
   VLC_ADD_CFLAGS([vlc],[${ac_cv_c_altivec}])
   VLC_ADD_CFLAGS([idctaltivec motionaltivec],[${ac_cv_c_altivec}])



1.1                  src/patchsets/vlc/0.8.6c/330_all_libdca.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/330_all_libdca.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.8.6c/330_all_libdca.patch?rev=1.1&content-type=text/plain

Index: 330_all_libdca.patch
===================================================================
Index: vlc-0.8.6_p18636/configure.ac
===================================================================
--- vlc-0.8.6_p18636.orig/configure.ac
+++ vlc-0.8.6_p18636/configure.ac
@@ -3064,9 +3064,10 @@ if test "${enable_dts}" != "no"; then
         VLC_ADD_PLUGINS([dtstofloat32])
         VLC_ADD_LDFLAGS([dtstofloat32],[-ldts_pic])
       ],[
-        AC_CHECK_LIB(dts, dts_free, [
+	PKG_CHECK_MODULES([DCA], [libdts >= 0.0.2], [
           VLC_ADD_PLUGINS([dtstofloat32])
-          VLC_ADD_LDFLAGS([dtstofloat32],[-ldts])
+	  VLC_ADD_CPPFLAGS([dtstofloat32], [${DCA_CFLAGS}])
+          VLC_ADD_LDFLAGS([dtstofloat32],[${DCA_LIBS}])
         ],[
           if test "${enable_dts}" = "yes"; then
             AC_MSG_ERROR([Could not find libdts on your system: you may get it from http://www.videolan.org/dtsdec.html])



1.1                  src/patchsets/vlc/0.8.6c/series

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

Index: series
===================================================================
000_all_glide.patch
010_all_freetype-font.patch
110_all_dtspic.patch
130_all_textrels.patch
140_all_directfb.patch
180_all_faad.patch
190_all_strict-aliasing.patch
200_all_nonpermissive.patch
220_all_firefox.patch
230_all_libcdio-0.78.2.patch
250_all_livepic.patch
290_all_altivec.patch
330_all_libdca.patch



-- 
gentoo-commits@g.o mailing list