Author: kwizart Update of /cvs/free/rpms/vlc/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv31327/F-9 Modified Files: .cvsignore sources vlc.spec Added Files: 300_all_pic.patch 310_all_mmx_pic.patch vlc-0.9.2-pulse_default.patch vlc-embeddedvideo.patch vlc-trunk-default_font.patch Removed Files: vlc-0.8.6-font_dejavu.patch vlc-0.8.6-vlvc_0.8.patch vlc-0.8.6-vlvcfix.patch vlc-0.8.6-wx28compat.patch vlc-0.8.6c-dts_to_dca_api.patch vlc-0.8.6c-ffmpeg_fix_for_compat.patch vlc-0.8.6c-python_destdir.patch vlc-0.8.6c-python_libtool.patch vlc-0.8.6e-pulse.patch vlc-0.8.6e-pulse_default.patch vlc-0.8.6e-xulrunner.patch vlc-0.8.6f-all_plugin.patch vlc-0.8.6f-shared_live555.patch vlc-0.8.6f-wx28iccfixes.patch vlc-0.8.6i-ffmpeg-compat.patch vlc-0.8.7-rpmfusion2_head.patch vlc-trunk-dirac_0_8_0-api.patch vlc-trunk-dirac_0_9_0-api.patch Log Message: Update to 0.9.5 300_all_pic.patch: --- NEW FILE 300_all_pic.patch --- Index: vlc-0.9.0-svn/libs/loader/Makefile.am =================================================================== --- vlc-0.9.0-svn.orig/libs/loader/Makefile.am +++ vlc-0.9.0-svn/libs/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.9.0-svn/libs/loader/module.c =================================================================== --- vlc-0.9.0-svn.orig/libs/loader/module.c +++ vlc-0.9.0-svn/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-0.9.0-svn/libs/loader/stubs.s =================================================================== --- vlc-0.9.0-svn.orig/libs/loader/stubs.s +++ vlc-0.9.0-svn/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-0.9.0-svn/libs/loader/wrapper.S =================================================================== --- vlc-0.9.0-svn.orig/libs/loader/wrapper.S +++ vlc-0.9.0-svn/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-0.9.0-svn/libs/loader/wrapper.h =================================================================== --- vlc-0.9.0-svn.orig/libs/loader/wrapper.h +++ vlc-0.9.0-svn/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); 310_all_mmx_pic.patch: --- NEW FILE 310_all_mmx_pic.patch --- Index: vlc-0.9.0-svn/modules/video_chroma/i420_rgb_mmx.h =================================================================== --- vlc-0.9.0-svn.orig/modules/video_chroma/i420_rgb_mmx.h +++ vlc-0.9.0-svn/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\ vlc-0.9.2-pulse_default.patch: --- NEW FILE vlc-0.9.2-pulse_default.patch --- diff -up vlc-0.9.2/modules/audio_output/pulse.c.pulse_default vlc-0.9.2/modules/audio_output/pulse.c --- vlc-0.9.2/modules/audio_output/pulse.c.pulse_default 2008-09-15 11:05:23.000000000 +0200 +++ vlc-0.9.2/modules/audio_output/pulse.c 2008-09-15 11:05:52.000000000 +0200 @@ -95,7 +95,7 @@ static void uninit(aout_instance_t *p_ao vlc_module_begin(); set_shortname( "Pulse Audio" ); set_description( N_("Pulseaudio audio output") ); - set_capability( "audio output", 40 ); + set_capability( "audio output", 200 ); set_category( CAT_AUDIO ); set_subcategory( SUBCAT_AUDIO_AOUT ); add_shortcut( "pulseaudio" ); vlc-embeddedvideo.patch: --- NEW FILE vlc-embeddedvideo.patch --- Re-enable the embedded video; Patch ported from this commit: commit 9c26b8e2a04468aa4b4a158f072d760a991932db Author: Rémi Denis-Courmont <rdenis(a)simphalempin.com&gt; Date: Thu Oct 9 23:06:21 2008 +0300 Enable embedded video with Qt >= 4.3 - hopefully fixes #2136 Index: vlc-0.9.4/modules/gui/qt4/qt4.cpp =================================================================== --- vlc-0.9.4.orig/modules/gui/qt4/qt4.cpp +++ vlc-0.9.4/modules/gui/qt4/qt4.cpp @@ -213,7 +213,7 @@ vlc_module_begin(); set_callbacks( OpenDialogs, Close ); -#ifdef WIN32 +#if !defined (Q_WS_X11) || HAS_QT43 add_submodule(); set_capability( "vout window", 50 ); set_callbacks( WindowOpen, WindowClose ); vlc-trunk-default_font.patch: Index: vlc-trunk-default_font.patch =================================================================== RCS file: vlc-trunk-default_font.patch diff -N vlc-trunk-default_font.patch --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ vlc-trunk-default_font.patch 29 Oct 2008 15:09:04 -0000 1.3 @@ -0,0 +1,12 @@ +diff -up vlc-0.9.0-svn/modules/misc/freetype.c.default_font vlc-0.9.0-svn/modules/misc/freetype.c +--- vlc-0.9.0-svn/modules/misc/freetype.c.default_font 2007-11-21 22:58:06.000000000 +0100 ++++ vlc-0.9.0-svn/modules/misc/freetype.c 2007-11-21 23:00:54.000000000 +0100 +@@ -61,7 +61,7 @@ + #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 DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSerif-Bold.ttf" + #define FC_DEFAULT_FONT "Serif Bold" + #endif + Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 8 Sep 2008 15:51:21 -0000 1.5 +++ .cvsignore 29 Oct 2008 15:09:03 -0000 1.6 @@ -1,3 +1 @@ -vlc-0.8.6i.tar.bz2 -vlvc_source-0.8.tgz -vlc-0.8.7-git_head-20080908.patch.tar.bz2 +vlc-0.9.5.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 8 Sep 2008 15:51:21 -0000 1.5 +++ sources 29 Oct 2008 15:09:04 -0000 1.6 @@ -1,3 +1 @@ -3c90520c9f22a68d287458d5a8af989e vlc-0.8.6i.tar.bz2 -64521246371c2706eb8375cc38e5233b vlvc_source-0.8.tgz -952d793a977eefe9de3cdad97d7dfd60 vlc-0.8.7-git_head-20080908.patch.tar.bz2 +e5be36243e75fff5476c01cc6083d43d vlc-0.9.5.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-9/vlc.spec,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- vlc.spec 23 Sep 2008 13:33:59 -0000 1.9 +++ vlc.spec 29 Oct 2008 15:09:04 -0000 1.10 @@ -1,98 +1,72 @@ -# TODO: libdc1394(juju), java-vlc, modularization (vlc-plugin-foo) -# Patches needed: wxGTK28 - libdc1394-2.0.1 -%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} +# TODO: libdc1394(juju), modularization (vlc-plugin-foo) +%define _default_patch_fuzz 2 - -%define with_intern_ffmpeg 0 -%define with_ffmpeg_compat 1 -%define ffmpeg_date 20080113 %define with_internal_live555 0 -%define live555_date 2008.04.03 +%define live555_date 2008.07.25 +%define vlc_git 0 +%define vlc_date 20080915 %define with_mozilla 1 -%define with_python_vlc 1 %define with_dc1394 0 %define with_directfb 1 -%define with_dirac 1 -%define with_vlvc 1 Summary: Multi-platform MPEG, DVD, and DivX player Name: vlc -Version: 0.8.7 -%define _version 0.8.6i -Release: 0.4%{?dist} +%if %vlc_git +Version: 1.0.0 +%define _version %{version}-git +%define release_tag 0.1.%{vlc_date}git +%else +Version: 0.9.5 +%define _version %{version} +%define release_tag 3 +%endif +Release: %{release_tag}%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org/ -Source0: http://download.videolan.org/pub/videolan/vlc/%{_version}/vlc-%{_version}... -%if %with_intern_ffmpeg -Source1: http://rpm.greysector.net/livna/ffmpeg-%{ffmpeg_date}.tar.bz2 +%if %vlc_git +Source0: http://nightlies.videolan.org/build/source/trunk-%{vlc_date}-0024/vlc-sna... +%else +Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{_version}.... %endif %if %with_internal_live555 Source2: http://www.live555.com/liveMedia/public/live.%{live555_date}.tar.gz %endif -%if %with_vlvc -Source3: https://pfe.epitech.net/frs/download.php/747/vlvc_source-0.8.tgz -%endif -Patch3: vlc-0.8.6-wx28compat.patch -Patch4: vlc-0.8.6f-shared_live555.patch -Patch5: vlc-0.8.6f-all_plugin.patch -Patch7: vlc-0.8.6f-wx28iccfixes.patch -Patch9: vlc-0.8.6c-python_destdir.patch -Patch10: vlc-0.8.6c-python_libtool.patch -Patch12: vlc-0.8.6-font_dejavu.patch -Patch16: vlc-trunk-dirac_0_8_0-api.patch -Patch17: vlc-0.8.6c-dts_to_dca_api.patch -Patch19: vlc-0.8.6e-pulse.patch -Patch20: vlc-0.8.6e-pulse_default.patch -Patch50: vlc-0.8.6i-ffmpeg-compat.patch -Patch63: vlc-trunk-dirac_0_9_0-api.patch -Patch80: vlc-0.8.6e-xulrunner.patch -Patch90: vlc-0.8.6-vlvc_0.8.patch -Patch91: vlc-0.8.6-vlvcfix.patch -# git-diff tags/vlc-0.8.6i HEAD > vlc-0.8.7-git_head-$(date +%Y%m%d ).patch -# tar cjvf vlc-0.8.7-git_head-$(date +%Y%m%d ).patch.tar.bz2 -Patch99: vlc-0.8.7-git_head-20080908.patch.tar.bz2 -Patch100: vlc-0.8.7-rpmfusion2_head.patch +Patch0: vlc-trunk-default_font.patch +Patch1: vlc-0.9.2-pulse_default.patch +Patch2: vlc-embeddedvideo.patch +Patch3: 300_all_pic.patch +Patch4: 310_all_mmx_pic.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: automake -BuildRequires: gettext-devel BuildRequires: desktop-file-utils +%if 0 +BuildRequires: gettext-devel BuildRequires: libtool +%endif BuildRequires: a52dec-devel BuildRequires: aalib-devel BuildRequires: alsa-lib-devel -%{?_with_amr:BuildRequires: amrnb-devel amrwb-devel} BuildRequires: avahi-devel BuildRequires: cdparanoia-devel -%{?_with_clinkcc:BuildRequires: clinkcc} -%if %with_dirac -BuildRequires: dirac-devel >= 0.6.0 -%endif +BuildRequires: dbus-devel +%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0} %if %with_directfb -BuildRequires: directfb-devel -%endif -%if 0%{?fedora} < 9 -BuildRequires: esound-devel -BuildRequires: arts-devel +BuildRequires: directfb-devel >= 1.2.6 %endif BuildRequires: faac-devel BuildRequires: faad2-devel +BuildRequires: ffmpeg-devel >= 0.4.9-0 BuildRequires: flac-devel +BuildRequires: fluidsynth-devel BuildRequires: fribidi-devel -# Broken with 0.8.6x -#BuildRequires: Glide3-devel -#BuildRequires: Glide3-libGL BuildRequires: gnome-vfs2-devel BuildRequires: gnutls-devel >= 1.0.17 BuildRequires: gsm-devel -BuildRequires: gtk2-devel BuildRequires: hal-devel BuildRequires: jack-audio-connection-kit-devel -BuildRequires: lame-devel BuildRequires: libavc1394-devel BuildRequires: libcaca-devel BuildRequires: libcddb-devel @@ -103,14 +77,13 @@ BuildRequires: libdvdnav-devel BuildRequires: libebml-devel BuildRequires: libid3tag-devel +%{?_with_kate: BuildRequires: libkate-devel} BuildRequires: libmad-devel BuildRequires: libmatroska-devel >= 0.7.6 BuildRequires: libmodplug-devel BuildRequires: libmp4v2-devel BuildRequires: libmpcdec-devel BuildRequires: libnotify-devel -BuildRequires: libopendaap-devel -BuildRequires: libpng-devel BuildRequires: librsvg2-devel >= 2.5.0 BuildRequires: libsysfs-devel BuildRequires: libshout-devel @@ -118,6 +91,9 @@ BuildRequires: libtheora-devel BuildRequires: libtiff-devel BuildRequires: libupnp-devel +%if 0%{?fedora} > 9 +BuildRequires: libv4l-devel +%endif BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lirc-devel @@ -130,24 +106,28 @@ BuildRequires: kernel-headers >= 2.6.20 BuildRequires: libGL-devel BuildRequires: libGLU-devel +BuildRequires: libmusicbrainz-devel +%{?_with_lua:BuildRequires: lua-devel} BuildRequires: mpeg2dec-devel >= 0.3.2 BuildRequires: ncurses-devel +BuildRequires: opencv-devel BuildRequires: openslp-devel -%if %with_python_vlc -BuildRequires: python-devel -%endif +BuildRequires: prelink +BuildRequires: qt4-devel +BuildRequires: schroedinger-devel BuildRequires: SDL_image-devel BuildRequires: speex-devel >= 1.1.5 %ifarch %{ix86} x86_64 BuildRequires: svgalib-devel %endif +BuildRequires: taglib-devel BuildRequires: twolame-devel BuildRequires: vcdimager-devel >= 0.7.21 -BuildRequires: wxGTK-devel >= 2.6 BuildRequires: x264-devel >= 0-0.8.20061028 BuildRequires: xosd-devel BuildRequires: xvidcore-devel BuildRequires: zlib-devel +BuildRequires: zvbi-devel # X-libs BuildRequires: libXt-devel @@ -156,6 +136,10 @@ BuildRequires: libX11-devel BuildRequires: libXext-devel BuildRequires: libXpm-devel +%ifarch %{ix86} x86_64 +BuildRequires: libXvMC-devel +%endif +BuildRequires: xorg-x11-proto-devel %if 0%{?fedora} > 6 BuildRequires: libsmbclient-devel @@ -175,25 +159,15 @@ Obsoletes: mozilla-vlc < %{version}-%{release} %endif -%if %with_intern_ffmpeg -## Static version already bundle it -BuildConflicts: ffmpeg-devel -%else -%if %{with_ffmpeg_compat} -BuildRequires: ffmpeg-compat-devel >= 0.4.9-0 -%else -BuildRequires: ffmpeg-devel >= 0.4.9-0 -%endif -%endif - # Now obsoleted as it will be built externally -Obsoletes: java-vlc < %{version} - -#Not in repos -#BuildRequires: libgoom2-devel -#BuildRequires: libggi-devel +Obsoletes: java-vlc < 0.9.0 +Obsoletes: python-vlc < 0.9.0 +%if 0 +BuildRequires: libgoom2-devel +BuildRequires: libggi-devel +%endif %if %with_dc1394 BuildRequires: compat-libdc1394-devel @@ -202,6 +176,7 @@ BuildRequires: libraw1394-devel %endif + Requires: vlc-core = %{version}-%{release} Requires: dejavu-fonts @@ -219,9 +194,10 @@ It can also be used as a server to stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network. -!!!BIG FAT WARNING!!! -This vlc-0.8.7 pre-version is based on vlc-0.8.6-bugfix branch -See http://mailman.videolan.org/pipermail/vlc/2008-August/015827.html +Non-default rpmbuild options: +--with dirac: Enable dirac codec support +--with kate: Enable kate codec support +--with lua: Enable lua support %description devel @@ -233,17 +209,6 @@ It can also be used as a server to stream in unicast or multicast in IPv4 or IPv6 on a high-bandwidth network. -%if %with_python_vlc -%package -n python-vlc -Summary: VLC Media Player binding for Python -Group: Applications/Multimedia -Requires: %{name}-core = %{version}-%{release} - -%description -n python-vlc -VLC Media Player binding for Python -%endif - - %if %with_mozilla %package -n mozilla-vlc Summary: VLC Media Player plugin for Mozilla compatible web browsers @@ -263,12 +228,20 @@ %endif %package core -Summary: VLC Media Player without Xorg +Summary: VLC Media Player core Group: Applications/Multimedia -Provides: vlc-nox = %{version}-%{release} %description core -VLC Media Player without X.org for server +VLC Media Player core components + +%package nox +Summary: VLC Media Player without Xorg +Group: Applications/Multimedia +Requires: vlc-core = %{version}-%{release} + +%description nox +VLC Media Player with framebuffer support for X-less server. + %if %with_dc1394 %package plugins-dc1394 @@ -283,117 +256,22 @@ %prep %setup -q -n %{name}-%{_version} -%if %with_intern_ffmpeg -%setup -q -D -T -a 1 -n %{name}-%{_version} -%endif %if %with_internal_live555 %setup -q -D -T -a 2 -n %{name}-%{_version} %endif -%if %with_vlvc -%setup -q -D -T -a 3 -n %{name}-%{_version} -find vlvc_source-0.8 -type f -exec chmod 644 {} ";" -cp -pR vlvc_source-0.8/* . -cp -p vlvc_readme-0.8_fr.txt vlvc_readme-0.8_fr.txt.noutf8 -iconv -f ISO-8859-1 -t UTF-8 vlvc_readme-0.8_fr.txt.noutf8 > vlvc_readme-0.8_fr.txt -touch -r vlvc_readme-0.8_fr.txt.noutf8 vlvc_readme-0.8_fr.txt -%endif - - -%patch3 -p1 -b .wxGTK28compat -%patch4 -p1 -b .shared_live555 -%patch5 -p1 -b .all_plugin -%patch7 -p1 -b .wx28iccfixes -%patch9 -p1 -b .python_destdir -%patch10 -p1 -b .python_libtool -%patch12 -p1 -b .font_dejavu -%if 0%{?fedora} > 7 -%patch16 -p1 -b .dirac8 -%patch17 -p1 -b .dts_dca -%patch19 -p1 -b .pulse -%patch20 -p1 -b .pulse_default -%endif +%patch0 -p1 -b .default_font +%patch1 -p1 -b .pulse_default +%patch2 -p1 -b .embedded +#http://trac.videolan.org/vlc/ticket/1383 +%patch3 -p1 -b .dmo_pic +sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in +%patch4 -p1 -b .mmx_pic -%if %{with_ffmpeg_compat} -%patch50 -p1 -b .compat -%endif - -%if 0%{?fedora} > 8 -%patch63 -p1 -b .dirac9 -%patch80 -p1 -b .libxul -%endif - -%if %with_vlvc -%patch90 -p1 -b .vlvc -%patch91 -p1 -b .vlvcfix -%endif -%patch99 -p1 -b .vlc87_1 -%patch100 -p1 -b .vlc87_2 - -%{?_with_clinkcc: -#hack for clinkcc support - optional feature - under testing. -mkdir -p clinkcc/{lib/unix,include} -cp -pR %{_includedir}/cybergarage clinkcc/include -cp -pR %{_libdir}/libclink.a clinkcc/lib/unix -sed -i -e 's|MediaServer.h|media/server/MediaServer.h|' configure.ac configure -} - -# Fix perms issues -chmod 644 mozilla/control/* -chmod 644 src/control/log.c -sed -i 's/\r//' mozilla/control/* - - -sh bootstrap +chmod -x modules/gui/qt4/qt4* +#./bootstrap %build -%if %with_intern_ffmpeg -export CFLAGS="%{optflags}" -# Build bundeled ffmpeg first -pushd ffmpeg-%{ffmpeg_date} -./configure \ -%ifarch x86_64 - --extra-cflags="-fPIC -DPIC" \ -%else - --extra-cflags="-fPIC -DPIC -fomit-frame-pointer" \ -%endif - --disable-static \ - --enable-pthreads \ - --enable-shared \ - --disable-ffmpeg \ - --disable-ffserver \ - --disable-vhook \ - --disable-ffplay \ - --disable-optimizations \ - --disable-strip \ - --disable-protocols \ - --enable-liba52 \ - --enable-libmp3lame \ - --enable-libfaac \ - --enable-libfaad \ - --enable-libgsm \ - --enable-libtheora \ - --enable-libvorbis \ - --enable-libx264 \ - --enable-libxvid \ - --enable-pp \ - --enable-gpl \ -%{?_with_amr:--enable-libamr-nb --enable-libamr-wb } - -# Watch http://trac.videolan.org/vlc/ticket/865 -# Planned to be enabled for 0.9.x - - make %{?_smp_mflags} - -# Hack for PKG_CONFIG_PATH -for pc in theora vorbis vorbisenc ogg ;do - ln -s %{_libdir}/pkgconfig/${pc}.pc -done - -popd -%endif - - %if %with_internal_live555 # Then bundled live555 - not needed pushd live @@ -405,55 +283,31 @@ %endif -# Altivec compiler flags aren't set properly (0.8.2) -%ifarch ppc ppc64 -export CFLAGS="$CFLAGS -maltivec -mabi=altivec" -%endif - -%if %{with_ffmpeg_compat} -mkdir -p temp -# Fake the ffmpeg installation -ln -sf %{_includedir}/ffmpeg-compat temp/ffmpeg -ln -sf %{_includedir}/postproc-compat temp/postproc -export FFMPEG_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" -export POSTPROC_CFLAGS="-I%{_builddir}/%{name}-%{_version}/temp -I%{_builddir}/%{name}-%{_version}/temp/ffmpeg" -export FFMPEG_LDFLAGS="$(pkg-config --libs libpostproc-compat libavcodec-compat libavutil-compat libavformat-compat)" -%endif - %configure \ --disable-dependency-tracking \ --disable-rpath \ - --enable-shout \ --enable-release \ + --with-tuning=no \ + --enable-switcher \ + --enable-shout \ + %{?_with_lua:--enable-lua --enable-lua} \ --enable-live555 \ %if %with_internal_live555 --with-live555-tree=live \ %endif %if %with_dc1394 --enable-dc1394 \ -%endif --enable-dv \ - --enable-ffmpeg --with-ffmpeg-mp3lame --with-ffmpeg-faac \ -%if %with_intern_ffmpeg - --with-ffmpeg-tree=ffmpeg-%{ffmpeg_date} \ -%{?_with_amr:--enable-libamr-nb --enable-libamr-wb } \ - --with-ffmpeg-faac --with-ffmpeg-vorbis \ - --with-ffmpeg-theora --with-ffmpeg-ogg --with-ffmpeg-zlib \ - --with-ffmpeg-a52 --with-ffmpeg-x264 \ -%endif - --enable-libtool \ - --with-gnu-ld \ - --with-PIC \ - --disable-static \ - --enable-shared \ - --disable-pth \ - --enable-dvdread \ +%endif + --enable-opencv \ --enable-v4l \ --enable-pvr \ - --enable-libcdio \ - --enable-cddax \ - --enable-vcdx \ - --enable-dvb \ + --enable-gnomevfs \ + --enable-cddax \ +%if 0%{?fedora} < 8 + --disable-swscale \ + --enable-imgresample \ +%endif --enable-faad \ --enable-twolame \ --enable-real \ @@ -463,13 +317,12 @@ --enable-speex \ --enable-tarkin \ --enable-theora \ -%if %with_dirac - --enable-dirac \ -%endif + %{?_with_dirac:--enable-dirac} \ --enable-svg \ --enable-snapshot \ %ifarch %{ix86} x86_64 --enable-svgalib \ + --enable-xvmc \ %endif %if %with_directfb --enable-directfb \ @@ -481,41 +334,32 @@ --enable-arts \ %endif --enable-jack \ -%{?_with_clinkcc:--enable-cyberlink --with-cyberlink-tree=clinkcc } \ - --enable-upnp \ %if 0%{?fedora} > 7 --enable-portaudio \ --enable-pulse \ %endif --enable-ncurses \ --enable-xosd \ + --enable-fbosd \ --enable-galaktos \ - --enable-slp \ --enable-lirc \ - --disable-corba \ -%if %with_vlvc - --enable-vlvc \ -%endif -%if %with_python_vlc - --enable-mediacontrol-python-bindings \ -%endif %ifarch %{ix86} --enable-loader \ -%endif +%else --without-contrib \ +%endif %if %with_mozilla --enable-mozilla \ %endif - --with-x264-tree=%{_includedir} +# remove rpath from libtool +sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool +sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool + +%if 0 # clean unused-direct-shlib-dependencies sed -i -e 's! -shared ! -Wl,--as-needed\0!g' libtool - -%if %{with_ffmpeg_compat} -sed -i -e 's|cflags="${cflags} -I/usr/include/ffmpeg-compat"|cflags="${cflags} -I%{_includedir}/ffmpeg-compat -I%{_includedir}/postproc-compat/"|' vlc-config -%else -sed -i -e 's|cflags="${cflags} -I/usr/include/ffmpeg"|cflags="${cflags} -I%{_includedir}/ffmpeg -I%{_includedir}/postproc/"|' vlc-config %endif @@ -546,10 +390,15 @@ --mode 644 \ $RPM_BUILD_ROOT%{_datadir}/applications/vlc.desktop -%if %with_python_vlc -# Fix python shebang -sed -i -e 's|"""Wrapper|#!/usr/bin/python\n"""Wrapper|' $RPM_BUILD_ROOT%{_bindir}/vlcwrapper.py -%endif +# Remove installed fonts for skin2 - needs +rm -rf $RPM_BUILD_ROOT%{_datadir}/vlc/skin2/fonts/*.ttf +ln -sf ../../../fonts/dejavu/DejaVuSans.ttf \ + $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSans.ttf +ln -sf ../../../fonts/dejavu/DejaVuSans-Bold.ttf \ + $RPM_BUILD_ROOT%{_datadir}/vlc/skins2/fonts/FreeSansBold.ttf + +#Clear execstak +execstack -c $RPM_BUILD_ROOT%{_bindir}/vlc %find_lang %{name} @@ -582,15 +431,19 @@ %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog MAINTAINERS NEWS README THANKS %doc %{_docdir}/vlc/* -%if %with_vlvc -%doc vlvc_readme-0.8_en.txt vlvc_readme-0.8_fr.txt -%endif %{_datadir}/applications/*%{name}.desktop %{_datadir}/icons/hicolor/*/apps/vlc.png -%{_bindir}/wxvlc -%{_libdir}/vlc/gui/libwxwidgets_plugin.so +%{_datadir}/vlc/skins2/ +%{_bindir}/cvlc +%{_bindir}/nvlc +%{_bindir}/qvlc +%{_bindir}/rvlc +%{_bindir}/svlc +%{_bindir}/vlc-wrapper +%{_libdir}/vlc/gui/libqt4_plugin.so %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so %{_libdir}/vlc/access/libscreen_plugin.so +%{_libdir}/vlc/codec/libfluidsynth_plugin.so %{_libdir}/vlc/misc/libsvg_plugin.so %{_libdir}/vlc/misc/libnotify_plugin.so %{_libdir}/vlc/video_output/libaa_plugin.so @@ -600,22 +453,27 @@ %{_libdir}/vlc/video_output/libx11_plugin.so %{_libdir}/vlc/video_output/libxvideo_plugin.so %{_libdir}/vlc/visualization/libgalaktos_plugin.so -%{_libdir}/vlc/audio_output/libpulse_plugin.so -%{_libdir}/vlc/visualization/libxosd_plugin.so +%{_libdir}/vlc/misc/libxosd_plugin.so +%ifarch %{ix86} x86_64 +%{_libdir}/vlc/codec/libxvmc_plugin.so +%{_libdir}/vlc/video_output/libxvmc_plugin.so +%endif %{_libdir}/vlc/gui/libskins2_plugin.so -%{_datadir}/vlc/skins2/ +%{_libdir}/vlc/video_filter/libopencv_example_plugin.so +%{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so +%{_libdir}/vlc/video_filter/libpanoramix_plugin.so +%{_libdir}/vlc/audio_output/libpulse_plugin.so %files core -f %{name}.lang %defattr(-,root,root,-) %{_bindir}/vlc +%exclude %{_datadir}/vlc/skins2 %{_datadir}/vlc/ %{_libdir}/*.so.* -%{_bindir}/svlc -%exclude %{_libdir}/vlc/gui/libwxwidgets_plugin.so -%exclude %{_libdir}/vlc/gui/libskins2_plugin.so -%exclude %{_datadir}/vlc/skins2 +%exclude %{_libdir}/vlc/gui/libqt4_plugin.so %exclude %{_libdir}/vlc/access/libaccess_gnomevfs_plugin.so %exclude %{_libdir}/vlc/access/libscreen_plugin.so +%exclude %{_libdir}/vlc/codec/libfluidsynth_plugin.so %exclude %{_libdir}/vlc/misc/libsvg_plugin.so %exclude %{_libdir}/vlc/misc/libnotify_plugin.so %exclude %{_libdir}/vlc/video_output/libaa_plugin.so @@ -625,14 +483,33 @@ %exclude %{_libdir}/vlc/video_output/libx11_plugin.so %exclude %{_libdir}/vlc/video_output/libxvideo_plugin.so %exclude %{_libdir}/vlc/visualization/libgalaktos_plugin.so +%exclude %{_libdir}/vlc/misc/libxosd_plugin.so +%ifarch %{ix86} x86_64 +%exclude %{_libdir}/vlc/codec/libxvmc_plugin.so +%exclude %{_libdir}/vlc/video_output/libxvmc_plugin.so +%exclude %{_libdir}/vlc/video_output/libsvgalib_plugin.so +%endif +%if %with_directfb +%exclude %{_libdir}/vlc/video_output/libdirectfb_plugin.so +%endif +%exclude %{_libdir}/vlc/gui/libskins2_plugin.so +%exclude %{_libdir}/vlc/video_filter/libopencv_example_plugin.so +%exclude %{_libdir}/vlc/video_filter/libopencv_wrapper_plugin.so +%exclude %{_libdir}/vlc/video_filter/libpanoramix_plugin.so %exclude %{_libdir}/vlc/audio_output/libpulse_plugin.so -%exclude %{_libdir}/vlc/visualization/libxosd_plugin.so %if %with_dc1394 %exclude %{_libdir}/vlc/access/libdc1394_plugin.so %endif %{_libdir}/vlc/ %{_mandir}/man1/vlc.1* +%files nox +%defattr(-,root,root,-) +%{_libdir}/vlc/video_output/libdirectfb_plugin.so +%ifarch %{ix86} x86_64 +%{_libdir}/vlc/video_output/libsvgalib_plugin.so +%endif + %if %with_dc1394 %files plugins-dc1394 %defattr(-,root,root,-) @@ -646,7 +523,8 @@ %{_includedir}/vlc/* %{_mandir}/man1/vlc-config.1* %{_libdir}/*.so -%{_bindir}/vlc-config +%{_libdir}/pkgconfig/vlc-plugin.pc +%{_libdir}/pkgconfig/libvlc.pc %if %with_mozilla %files -n mozilla-vlc @@ -654,54 +532,48 @@ %{_libdir}/mozilla/plugins/libvlcplugin.so %endif -%if %with_python_vlc -%files -n python-vlc -%defattr(-,root,root,-) -%{python_sitearch}/* -%{_bindir}/vlcwrapper.py -%exclude %{_bindir}/vlcwrapper.py? -%endif - %changelog -* Tue Sep 23 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.4 -- libaccess_gnomevfs_plugin is no more in -core -- More HEAD bugfixes (live555) - -* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.3 -- Update to 20080915 from 0.8.6-bugfix -- BR live555-devel only +* Tue Oct 28 2008 kwizart < kwizart at gmail.com > - 0.9.5-3 +- Rebuild for dependency -* Mon Sep 8 2008 kwizart < kwizart at gmail.com > - 0.8.7-0.2 -- Update to 0.8.6-bugfix -Security updates: - * Fixed overflow in TTA demuxer (CVE-2008-3732) - * Fixed overflow in MMS module (CVE-2008-3794) - * Fixed overflow in Ogg demuxer -Various bugfixes: - * Fixed support for large URLs in HTTPd scripts -- Drop vlc-git support from this spec file -- Remove patch11 - -* Thu Aug 28 2008 kwizart < kwizart at gmail.com > - 0.8.6i-3 -- Import for RPMFusion -- Switch for live555 +* Mon Oct 27 2008 kwizart < kwizart at gmail.com > - 0.9.5-2 +- Fix ppc/ppc64 build -* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-2 -- Fix compilation with ffmpeg-compat +* Fri Oct 24 2008 kwizart < kwizart at gmail.com > - 0.9.5-1 +- Update to 0.9.5 +- Use non-default rpmbuild options for dirac kate lua +- Split core/nox (nox bundles directfb/svgalib) +- Fix Selinux denials (patches from gentoo). +- Fix spurious perms on qt4 sources. -* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6i-1 -- Update to 0.8.6i -Security updates: - * Fixed integer overflow in WAV demuxer (CVE-2008-2430) +* Wed Oct 8 2008 kwizart < kwizart at gmail.com > - 0.9.4-1 +- Update to 0.9.4 -Various bugfixes: - * Fixed option to use shared memory within the GLX video output module - * Miscellaneous bugfixes in multiple modules and in libvlc - (transcode stream output, OSD menu video filter, VCD input, - SAP services discovery, http control interface) - * Updated Polish translation +* Mon Sep 29 2008 kwizart < kwizart at gmail.com > - 0.9.3-2 +- Add libv4l2 patch from Hans de Goede + +* Fri Sep 26 2008 kwizart < kwizart at gmail.com > - 0.9.3-1 +- Update to 0.9.3 (final) +- Few others move from core to main + +* Mon Sep 15 2008 kwizart < kwizart at gmail.com > - 0.9.2-1 +- Update to 0.9.2 (final) + +* Sat Aug 2 2008 kwizart < kwizart at gmail.com > - 0.9.0-0.5.20080802git +- Update to 0.9.0-20080802git + +* Sun Jul 13 2008 kwizart < kwizart at gmail.com > - 0.9.0-0.4.20080713git +- Update to 0.9.0-20080713git + +* Thu Jul 3 2008 kwizart < kwizart at gmail.com > - 0.9.0-0.3.20080703git +- Update to 0.9.0-20080703git + http://mailman.videolan.org/pipermail/vlc-devel/2008-July/045911.html +- Conditionalize xvmc to exclude ppc + +* Thu Jun 12 2008 kwizart < kwizart at gmail.com > - 0.8.6h-2 +- Fix libdvdnav (only) use. * Fri Jun 6 2008 kwizart < kwizart at gmail.com > - 0.8.6h-1 - Update to 0.8.6h --- vlc-0.8.6-font_dejavu.patch DELETED --- --- vlc-0.8.6-vlvc_0.8.patch DELETED --- --- vlc-0.8.6-vlvcfix.patch DELETED --- --- vlc-0.8.6-wx28compat.patch DELETED --- --- vlc-0.8.6c-dts_to_dca_api.patch DELETED --- --- vlc-0.8.6c-ffmpeg_fix_for_compat.patch DELETED --- --- vlc-0.8.6c-python_destdir.patch DELETED --- --- vlc-0.8.6c-python_libtool.patch DELETED --- --- vlc-0.8.6e-pulse.patch DELETED --- --- vlc-0.8.6e-pulse_default.patch DELETED --- --- vlc-0.8.6e-xulrunner.patch DELETED --- --- vlc-0.8.6f-all_plugin.patch DELETED --- --- vlc-0.8.6f-shared_live555.patch DELETED --- --- vlc-0.8.6f-wx28iccfixes.patch DELETED --- --- vlc-0.8.6i-ffmpeg-compat.patch DELETED --- --- vlc-0.8.7-rpmfusion2_head.patch DELETED --- --- vlc-trunk-dirac_0_8_0-api.patch DELETED --- --- vlc-trunk-dirac_0_9_0-api.patch DELETED ---