rpms/vlc/devel 300_all_pic.patch, NONE, 1.1 310_all_mmx_pic.patch, NONE, 1.1 vlc-embeddedvideo.patch, NONE, 1.1 sources, 1.5, 1.6 .cvsignore, 1.5, 1.6 vlc.spec, 1.9, 1.10
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29032
Modified Files:
sources .cvsignore vlc.spec
Added Files:
300_all_pic.patch 310_all_mmx_pic.patch
vlc-embeddedvideo.patch
Log Message:
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-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>
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 );
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 8 Oct 2008 02:55:08 -0000 1.5
+++ sources 26 Oct 2008 11:42:50 -0000 1.6
@@ -1 +1 @@
-786628aaf8f30a9b812975b67c88b971 vlc-0.9.4.tar.bz2
+e5be36243e75fff5476c01cc6083d43d vlc-0.9.5.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 8 Oct 2008 02:55:07 -0000 1.5
+++ .cvsignore 26 Oct 2008 11:42:50 -0000 1.6
@@ -1 +1 @@
-vlc-0.9.4.tar.bz2
+vlc-0.9.5.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vlc.spec 8 Oct 2008 02:55:08 -0000 1.9
+++ vlc.spec 26 Oct 2008 11:42:50 -0000 1.10
@@ -8,7 +8,6 @@
%define with_mozilla 1
%define with_dc1394 0
%define with_directfb 1
-%define with_dirac 0
Summary: Multi-platform MPEG, DVD, and DivX player
@@ -18,7 +17,7 @@
%define _version %{version}-git
%define release_tag 0.1.%{vlc_date}git
%else
-Version: 0.9.4
+Version: 0.9.5
%define _version %{version}
%define release_tag 1
%endif
@@ -36,7 +35,9 @@
%endif
Patch0: vlc-trunk-default_font.patch
Patch1: vlc-0.9.2-pulse_default.patch
-Patch2: vlc-0.9.3-libv4l2.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: desktop-file-utils
@@ -51,11 +52,9 @@
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
BuildRequires: dbus-devel
-%if %with_dirac
-BuildRequires: dirac-devel >= 0.6.0
-%endif
+%{?_with_dirac: BuildRequires: dirac-devel >= 1.0.0}
%if %with_directfb
-BuildRequires: directfb-devel
+BuildRequires: directfb-devel >= 1.2.6
%endif
BuildRequires: faac-devel
BuildRequires: faad2-devel
@@ -78,6 +77,7 @@
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
@@ -91,7 +91,7 @@
BuildRequires: libtheora-devel
BuildRequires: libtiff-devel
BuildRequires: libupnp-devel
-%if 0%{?fedora} > 8
+%if 0%{?fedora} > 9
BuildRequires: libv4l-devel
%endif
BuildRequires: libvorbis-devel
@@ -112,10 +112,9 @@
BuildRequires: ncurses-devel
BuildRequires: opencv-devel
BuildRequires: openslp-devel
+BuildRequires: preload
BuildRequires: qt4-devel
BuildRequires: schroedinger-devel
-#Workaround for ^^
-BuildRequires: liboil-devel
BuildRequires: SDL_image-devel
BuildRequires: speex-devel >= 1.1.5
%ifarch %{ix86} x86_64
@@ -128,6 +127,7 @@
BuildRequires: xosd-devel
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
+BuildRequires: zvbi-devel
# X-libs
BuildRequires: libXt-devel
@@ -194,6 +194,11 @@
It can also be used as a server to stream in unicast or multicast in
IPv4 or IPv6 on a high-bandwidth network.
+Non-default rpmbuild options:
+--with dirac: Enable dirac codec support
+--with kate: Enable kate codec support
+--with lua: Enable lua support
+
%description devel
This package contains development files for VLC Media Player.
@@ -223,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
@@ -248,12 +261,14 @@
%endif
%patch0 -p1 -b .default_font
%patch1 -p1 -b .pulse_default
-%if 0%{?fedora} > 8
-%patch2 -p1 -b .libv4l2
-touch -r configure.ac.libv4l2 configure.ac
-touch -r configure.libv4l2 configure
-%endif
+%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
+chmod -x modules/gui/qt4/qt4*
+#./bootstrap
%build
@@ -272,12 +287,11 @@
--disable-dependency-tracking \
--disable-rpath \
--enable-release \
- --with-PIC \
+ --with-tuning=no \
--enable-switcher \
--enable-shout \
%{?_with_lua:--enable-lua --enable-lua} \
--enable-live555 \
- --enable-musicbrainz \
%if %with_internal_live555
--with-live555-tree=live \
%endif
@@ -290,7 +304,7 @@
--enable-pvr \
--enable-gnomevfs \
--enable-cddax \
-%if 0%{?fedora} < 9
+%if 0%{?fedora} < 8
--disable-swscale \
--enable-imgresample \
%endif
@@ -303,9 +317,7 @@
--enable-speex \
--enable-tarkin \
--enable-theora \
-%if %with_dirac
- --enable-dirac \
-%endif
+ %{?_with_dirac:--enable-dirac} \
--enable-svg \
--enable-snapshot \
%ifarch %{ix86} x86_64
@@ -385,6 +397,9 @@
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}
@@ -472,6 +487,10 @@
%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
@@ -484,6 +503,11 @@
%{_libdir}/vlc/
%{_mandir}/man1/vlc.1*
+%files nox
+%defattr(-,root,root,-)
+%{_libdir}/vlc/video_output/libdirectfb_plugin.so
+%{_libdir}/vlc/video_output/libsvgalib_plugin.so
+
%if %with_dc1394
%files plugins-dc1394
%defattr(-,root,root,-)
@@ -509,6 +533,13 @@
%changelog
+* 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.
+
* Wed Oct 8 2008 kwizart < kwizart at gmail.com > - 0.9.4-1
- Update to 0.9.4
15 years, 6 months
rpms/gstreamer-plugins-bad/devel .cvsignore, 1.3, 1.4 gstreamer-plugins-bad.spec, 1.6, 1.7 sources, 1.3, 1.4
by jwrdegoede
Author: jwrdegoede
Update of /cvs/free/rpms/gstreamer-plugins-bad/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26086
Modified Files:
.cvsignore gstreamer-plugins-bad.spec sources
Log Message:
* Sun Oct 26 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.9-1
- New upstream release 0.10.9
- Rebuild for new directfb
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 1 Aug 2008 15:08:37 -0000 1.3
+++ .cvsignore 26 Oct 2008 10:49:08 -0000 1.4
@@ -1 +1 @@
-gst-plugins-bad-0.10.8.tar.bz2
+gst-plugins-bad-0.10.9.tar.bz2
Index: gstreamer-plugins-bad.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/gstreamer-plugins-bad.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- gstreamer-plugins-bad.spec 14 Sep 2008 13:15:18 -0000 1.6
+++ gstreamer-plugins-bad.spec 26 Oct 2008 10:49:08 -0000 1.7
@@ -10,8 +10,8 @@
Summary: GStreamer streaming media framework "bad" plug-ins
Name: gstreamer-plugins-bad
-Version: 0.10.8
-Release: 4%{?dist}
+Version: 0.10.9
+Release: 1%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -63,6 +63,9 @@
BuildRequires: dirac-devel
BuildRequires: libofa-devel
BuildRequires: libdvdnav-devel
+BuildRequires: jasper-devel
+BuildRequires: openssl-devel
+BuildRequires: twolame-devel
%description
GStreamer is a streaming media framework, based on graphs of elements which
@@ -153,29 +156,34 @@
%doc AUTHORS COPYING README REQUIREMENTS
%{_libdir}/libgstapp-0.10.so.*
# Plugins without external dependencies
+%{_libdir}/gstreamer-%{majorminor}/libgstaiffparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstapp.so
%{_libdir}/gstreamer-%{majorminor}/libgstbayer.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdxaparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstdccp.so
%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace.so
%{_libdir}/gstreamer-%{majorminor}/libgstdeinterlace2.so
%{_libdir}/gstreamer-%{majorminor}/libgstdvdspu.so
%{_libdir}/gstreamer-%{majorminor}/libgstfestival.so
%{_libdir}/gstreamer-%{majorminor}/libgstfilter.so
-%{_libdir}/gstreamer-%{majorminor}/libgstflvdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstflv.so
%{_libdir}/gstreamer-%{majorminor}/libgstfreeze.so
%{_libdir}/gstreamer-%{majorminor}/libgsth264parse.so
%{_libdir}/gstreamer-%{majorminor}/libgstrfbsrc.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpeg4videoparse.so
-%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsparse.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmpegdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstmpegtsmux.so
%{_libdir}/gstreamer-%{majorminor}/libgstmpegvideoparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstmve.so
%{_libdir}/gstreamer-%{majorminor}/libgstnsf.so
%{_libdir}/gstreamer-%{majorminor}/libgstnuvdemux.so
+%{_libdir}/gstreamer-%{majorminor}/libgstpcapparse.so
%{_libdir}/gstreamer-%{majorminor}/libgstrawparse.so
%ifarch %{ix86} x86_64
%{_libdir}/gstreamer-%{majorminor}/libgstreal.so
%endif
%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
+%{_libdir}/gstreamer-%{majorminor}/libgstscaletempoplugin.so
%{_libdir}/gstreamer-%{majorminor}/libgstsdpelem.so
%{_libdir}/gstreamer-%{majorminor}/libgstselector.so
%{_libdir}/gstreamer-%{majorminor}/libgstspeed.so
@@ -195,6 +203,7 @@
# Plugins with external dependencies
%{_libdir}/gstreamer-%{majorminor}/libgstalsaspdif.so
+%{_libdir}/gstreamer-%{majorminor}/libgstapexsink.so
%{_libdir}/gstreamer-%{majorminor}/libgstbz2.so
%{_libdir}/gstreamer-%{majorminor}/libgstcdaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstdc1394.so
@@ -204,6 +213,7 @@
%{_libdir}/gstreamer-%{majorminor}/libgstfaac.so
%{_libdir}/gstreamer-%{majorminor}/libgstfaad.so
%{_libdir}/gstreamer-%{majorminor}/libgstgsm.so
+%{_libdir}/gstreamer-%{majorminor}/libgstjp2k.so
%{_libdir}/gstreamer-%{majorminor}/libgstmms.so
%{_libdir}/gstreamer-%{majorminor}/libgstmetadata.so
%{_libdir}/gstreamer-%{majorminor}/libgstmodplug.so
@@ -218,6 +228,7 @@
%{_libdir}/gstreamer-%{majorminor}/libgstsndfile.so
#%{_libdir}/gstreamer-%{majorminor}/libgstswfdec.so
%{_libdir}/gstreamer-%{majorminor}/libgsttimidity.so
+%{_libdir}/gstreamer-%{majorminor}/libgsttwolame.so
%{_libdir}/gstreamer-%{majorminor}/libgstwildmidi.so
%{_libdir}/gstreamer-%{majorminor}/libgstx264.so
%{_libdir}/gstreamer-%{majorminor}/libgstxvid.so
@@ -238,6 +249,10 @@
%changelog
+* Sun Oct 26 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.9-1
+- New upstream release 0.10.9
+- Rebuild for new directfb
+
* Sun Sep 14 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.10.8-4
- Rebuild for new x264 and to generate new magic gstreamer provides
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-bad/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 1 Aug 2008 15:08:37 -0000 1.3
+++ sources 26 Oct 2008 10:49:08 -0000 1.4
@@ -1 +1 @@
-ddc8f92dab0081f131650ad6c95908b8 gst-plugins-bad-0.10.8.tar.bz2
+ff555a86e74a9249e56b43405c8df3e4 gst-plugins-bad-0.10.9.tar.bz2
15 years, 6 months
rpms/vlc/devel vlc-0.9.3-libv4l2.patch,1.2,NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26054
Removed Files:
vlc-0.9.3-libv4l2.patch
Log Message:
-Hans patch is merged upstream
--- vlc-0.9.3-libv4l2.patch DELETED ---
15 years, 6 months
rpms/comical/devel comical.spec,1.5,1.6
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13149
Modified Files:
comical.spec
Log Message:
rel9, this time for real
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- comical.spec 25 Oct 2008 22:29:31 -0000 1.5
+++ comical.spec 25 Oct 2008 22:42:44 -0000 1.6
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
15 years, 6 months
rpms/comical/devel comical-0.8-minizip.patch, NONE, 1.1 comical-0.8-libunrar.patch, 1.2, 1.3 comical.spec, 1.4, 1.5
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12208
Modified Files:
comical-0.8-libunrar.patch comical.spec
Added Files:
comical-0.8-minizip.patch
Log Message:
* Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-9
- Removed use of private miniunzip copy, use system-wide minizip library.
comical-0.8-minizip.patch:
--- NEW FILE comical-0.8-minizip.patch ---
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
--- comical-0.8/Makefile.orig 2008-10-26 00:23:56.000000000 +0200
+++ comical-0.8/Makefile 2008-10-26 00:24:29.000000000 +0200
@@ -1,5 +1,5 @@
CC = `wx-config --cxx`
-LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip
+LDFLAGS = `wx-config --libs` `pkg-config minizip --libs` -lunrar
INSTALL = install
INSTALL_PROGRAM = $(INSTALL)
prefix = /usr/local
@@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
all: comical
-comical: $(OBJS) unzip/libminiunzip.a
+comical: $(OBJS)
$(CC) -o $@ $(OBJS) $(LDFLAGS)
$(OBJS):
$(MAKE) -C src
-unzip/libminiunzip.a:
- $(MAKE) -C unzip
-
install: comical
$(INSTALL_PROGRAM) comical $(DESTDIR)$(bindir)/comical
@@ -36,7 +33,6 @@ clean:
distclean:
$(MAKE) clean
- $(MAKE) clean -C unzip
rm -f $(DEPS) bin2h src/bin2h.o
.PHONY : install install-strip uninstall clean distclean
diff -up comical-0.8/src/ComicBookZIP.cpp.orig comical-0.8/src/ComicBookZIP.cpp
diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile
--- comical-0.8/src/Makefile.orig 2008-10-26 00:24:36.000000000 +0200
+++ comical-0.8/src/Makefile 2008-10-26 00:25:44.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unzip
+INCLUDE = `pkg-config minizip --cflags`
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
comical-0.8-libunrar.patch:
Index: comical-0.8-libunrar.patch
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical-0.8-libunrar.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- comical-0.8-libunrar.patch 25 Oct 2008 21:37:52 -0000 1.2
+++ comical-0.8-libunrar.patch 25 Oct 2008 22:29:31 -0000 1.3
@@ -1,6 +1,13 @@
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
---- comical-0.8/Makefile.orig 2008-10-25 22:51:26.000000000 +0200
-+++ comical-0.8/Makefile 2008-10-25 22:51:37.000000000 +0200
+--- comical-0.8/Makefile.orig 2008-10-25 23:52:38.000000000 +0200
++++ comical-0.8/Makefile 2008-10-25 23:53:11.000000000 +0200
+@@ -1,5 +1,5 @@
+ CC = `wx-config --cxx`
+-LDFLAGS = `wx-config --libs` -Lunrar -lunrar -Lunzip -lminiunzip
++LDFLAGS = `wx-config --libs` -lunrar -Lunzip -lminiunzip
+ INSTALL = install
+ INSTALL_PROGRAM = $(INSTALL)
+ prefix = /usr/local
@@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
all: comical
@@ -26,12 +33,24 @@
$(MAKE) clean -C unzip
rm -f $(DEPS) bin2h src/bin2h.o
+diff -up comical-0.8/src/ComicBookRAR.h.orig comical-0.8/src/ComicBookRAR.h
+--- comical-0.8/src/ComicBookRAR.h.orig 2008-10-25 23:53:32.000000000 +0200
++++ comical-0.8/src/ComicBookRAR.h 2008-10-25 23:53:41.000000000 +0200
+@@ -29,7 +29,7 @@
+ #define _ComicBookRAR_h_
+
+ #include "ComicBook.h"
+-#include "dll.hpp"
++#include "unrar/dll.hpp"
+
+ class ComicBookRAR : public ComicBook {
+
diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile
---- comical-0.8/src/Makefile.orig 2008-10-25 22:51:45.000000000 +0200
-+++ comical-0.8/src/Makefile 2008-10-25 22:52:10.000000000 +0200
+--- comical-0.8/src/Makefile.orig 2008-10-25 23:53:15.000000000 +0200
++++ comical-0.8/src/Makefile 2008-10-25 23:53:22.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unrar -I../unzip
-+INCLUDE = -Iunrar -I../unzip
++INCLUDE = -I../unzip
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- comical.spec 25 Oct 2008 21:24:08 -0000 1.4
+++ comical.spec 25 Oct 2008 22:29:31 -0000 1.5
@@ -12,10 +12,13 @@
Patch1: comical-0.8-optflags.patch
Patch2: comical-0.8-wxicon.patch
Patch3: comical-0.8-libunrar.patch
+Patch4: comical-0.8-minizip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK2-devel
BuildRequires: desktop-file-utils
BuildRequires: libunrar-devel
+BuildRequires: minizip-devel
+BuildRequires: pkgconfig
%description
@@ -29,7 +32,8 @@
%patch1 -p1
%patch2 -p1
%patch3 -p1
-rm -rf unrar
+%patch4 -p1
+rm -rf unrar unzip
%build
@@ -60,8 +64,11 @@
%changelog
+* Sun Oct 26 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-9
+- Removed use of private miniunzip copy, use system-wide minizip library.
+
* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-8
-- Removed use of private libunrar copy, use systemwide one.
+- Removed use of private libunrar copy, use system-wide one.
* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-7
- rebuild
15 years, 6 months
rpms/comical/devel comical-0.8-libunrar.patch,1.1,1.2
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9499
Modified Files:
comical-0.8-libunrar.patch
Log Message:
fixed include dir
comical-0.8-libunrar.patch:
Index: comical-0.8-libunrar.patch
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical-0.8-libunrar.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comical-0.8-libunrar.patch 25 Oct 2008 21:24:08 -0000 1.1
+++ comical-0.8-libunrar.patch 25 Oct 2008 21:37:52 -0000 1.2
@@ -31,7 +31,7 @@
+++ comical-0.8/src/Makefile 2008-10-25 22:52:10.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unrar -I../unzip
-+INCLUDE = -Ilibunrar -I../unzip
++INCLUDE = -Iunrar -I../unzip
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
15 years, 6 months
rpms/comical/devel comical-0.8-libunrar.patch, NONE, 1.1 comical.desktop, 1.1, 1.2 comical.spec, 1.3, 1.4
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/comical/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8612
Modified Files:
comical.desktop comical.spec
Added Files:
comical-0.8-libunrar.patch
Log Message:
* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-8
- Removed use of private libunrar copy, use systemwide one.
comical-0.8-libunrar.patch:
--- NEW FILE comical-0.8-libunrar.patch ---
diff -up comical-0.8/Makefile.orig comical-0.8/Makefile
--- comical-0.8/Makefile.orig 2008-10-25 22:51:26.000000000 +0200
+++ comical-0.8/Makefile 2008-10-25 22:51:37.000000000 +0200
@@ -12,15 +12,12 @@ OBJS = $(patsubst %.cpp,%.o,$(wildcard s
all: comical
-comical: $(OBJS) unrar/libunrar.a unzip/libminiunzip.a
+comical: $(OBJS) unzip/libminiunzip.a
$(CC) -o $@ $(OBJS) $(LDFLAGS)
$(OBJS):
$(MAKE) -C src
-unrar/libunrar.a:
- $(MAKE) lib -C unrar -f makefile.linux
-
unzip/libminiunzip.a:
$(MAKE) -C unzip
@@ -39,7 +36,6 @@ clean:
distclean:
$(MAKE) clean
- $(MAKE) clean -C unrar -f makefile.linux
$(MAKE) clean -C unzip
rm -f $(DEPS) bin2h src/bin2h.o
diff -up comical-0.8/src/Makefile.orig comical-0.8/src/Makefile
--- comical-0.8/src/Makefile.orig 2008-10-25 22:51:45.000000000 +0200
+++ comical-0.8/src/Makefile 2008-10-25 22:52:10.000000000 +0200
@@ -1,4 +1,4 @@
-INCLUDE = -I../unrar -I../unzip
+INCLUDE = -Ilibunrar -I../unzip
CFLAGS = -O2 -Wall -pipe $(RPM_OPT_FLAGS)
CPPFLAGS = `wx-config --cxxflags` $(CFLAGS) -D_UNIX $(INCLUDE)
Index: comical.desktop
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- comical.desktop 3 Aug 2008 14:11:38 -0000 1.1
+++ comical.desktop 25 Oct 2008 21:24:08 -0000 1.2
@@ -8,6 +8,6 @@
StartupNotify=false
Terminal=false
Type=Application
-Categories=Application;Graphics;X-Livna;
+Categories=Application;Graphics;
Version=0.9.4
X-Desktop-File-Install-Version=0.4
Index: comical.spec
===================================================================
RCS file: /cvs/nonfree/rpms/comical/devel/comical.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- comical.spec 16 Oct 2008 18:12:48 -0000 1.3
+++ comical.spec 25 Oct 2008 21:24:08 -0000 1.4
@@ -1,6 +1,6 @@
Name: comical
Version: 0.8
-Release: 7%{?dist}
+Release: 8%{?dist}
Summary: GUI comic book viewer
License: GPLv2
Group: Applications/Multimedia
@@ -11,37 +11,45 @@
Patch0: comical-0.8-jpe.patch
Patch1: comical-0.8-optflags.patch
Patch2: comical-0.8-wxicon.patch
+Patch3: comical-0.8-libunrar.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: wxGTK2-devel
BuildRequires: desktop-file-utils
-Requires: unzip
+BuildRequires: libunrar-devel
+
%description
Comical is a fully featured GUI comic book viewer using wxWidgets. It
can view CBZ and CBR format files.
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+rm -rf unrar
+
%build
make
+
%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m0755 comical $RPM_BUILD_ROOT%{_bindir}
-
-install -p -D -m0644 %{SOURCE1} ${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}.png
-desktop-file-install --vendor livna \
- --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
- --add-category X-Livna \
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_bindir}
+install -m0755 comical %{buildroot}%{_bindir}
+
+install -p -D -m0644 %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/%{name}.png
+desktop-file-install \
+ --dir %{buildroot}%{_datadir}/applications \
%{SOURCE2}
+
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
%files
%defattr(-,root,root)
@@ -50,14 +58,18 @@
%{_datadir}/applications/*.desktop
%{_datadir}/pixmaps/%{name}.png
+
%changelog
-* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-7
+* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 0.8-8
+- Removed use of private libunrar copy, use systemwide one.
+
+* Thu Oct 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-7
- rebuild
* Sat Sep 27 2008 Hans de Goede <j.w.r.degoede(a)hhs.nl> 0.8-6
- Fix building with latest wxWidgets
-* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 0.8-5
+* Sun Aug 03 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.8-5
- rebuild
* Fri Oct 06 2006 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> 0.8-4
15 years, 6 months
rpms/unrar/devel unrar-3.7.8-fixes.patch, NONE, 1.1 unrar.spec, 1.2, 1.3
by Andreas Thienemann
Author: ixs
Update of /cvs/nonfree/rpms/unrar/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8202
Modified Files:
unrar.spec
Added Files:
unrar-3.7.8-fixes.patch
Log Message:
* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
- Added libunrar sub-packages
- Clarified license
- Added unrar robustness patches
unrar-3.7.8-fixes.patch:
--- NEW FILE unrar-3.7.8-fixes.patch ---
diff -up unrar/dll.cpp.fix unrar/dll.cpp
--- unrar/dll.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/dll.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -275,7 +275,8 @@ int PASCAL ProcessFile(HANDLE hArcData,i
strcpy(Data->Cmd.Command,Operation==RAR_EXTRACT ? "X":"T");
Data->Cmd.Test=Operation!=RAR_EXTRACT;
bool Repeat=false;
- Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat);
+ if(Data->Extract.ExtractCurrentFile(&Data->Cmd,Data->Arc,Data->HeaderSize,Repeat) == false)
+ return (ERAR_UNKNOWN);
while (Data->Arc.ReadHeader()!=0 && Data->Arc.GetHeaderType()==NEWSUB_HEAD)
{
diff -up unrar/extract.cpp.fix unrar/extract.cpp
--- unrar/extract.cpp.fix 2007-09-10 13:49:28.000000000 +0200
+++ unrar/extract.cpp 2008-10-25 22:41:06.000000000 +0200
@@ -311,6 +311,7 @@ bool CmdExtract::ExtractCurrentFile(Comm
char CurVolName[NM];
strcpy(CurVolName,ArcName);
+ if(strcmp(ArcName,"")==0) return(false);
VolNameToFirstName(ArcName,ArcName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING));
if (stricomp(ArcName,CurVolName)!=0 && FileExist(ArcName))
{
diff -up unrar/makefile.unix.fix unrar/makefile.unix
--- unrar/makefile.unix.fix 2008-10-25 22:41:06.000000000 +0200
+++ unrar/makefile.unix 2008-10-25 22:42:24.000000000 +0200
@@ -86,7 +86,7 @@ COMPILE=$(CXX) $(CXXFLAGS) $(DEFINES)
LINK=$(CXX)
UNRAR_OBJ=filestr.o recvol.o rs.o scantree.o
-LIB_OBJ=filestr.o scantree.o dll.o
+LIB_OBJ=filestr.o recvol.o rs.o scantree.o dll.o
OBJECTS=rar.o strlist.o strfn.o pathfn.o int64.o savepos.o global.o file.o filefn.o filcreat.o \
archive.o arcread.o unicode.o system.o isnt.o crypt.o crc.o rawread.o encname.o \
@@ -116,4 +116,4 @@ sfx: $(OBJECTS)
lib: WHAT=RARDLL
lib: $(OBJECTS) $(LIB_OBJ)
@rm -f libunrar.so
- $(LINK) -shared -o libunrar.so $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
+ $(LINK) -shared -Wl,-soname,libunrar.so.3.7 -o libunrar.so.3.7 $(LDFLAGS) $(OBJECTS) $(LIB_OBJ)
Index: unrar.spec
===================================================================
RCS file: /cvs/nonfree/rpms/unrar/devel/unrar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- unrar.spec 25 Jul 2008 06:12:22 -0000 1.2
+++ unrar.spec 25 Oct 2008 21:18:43 -0000 1.3
@@ -1,12 +1,16 @@
+# Might be needed to apply fuzzy patches with recent rpm
+#%%define _default_patch_fuzz 2
+
Name: unrar
Version: 3.7.8
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Utility for extracting, testing and viewing RAR archives
-License: Freeware
+License: Freeware with further limitations
Group: Applications/Archiving
URL: http://www.rarlab.com/rar_archiver.htm
Source0: http://www.rarlab.com/rar/unrarsrc-%{version}.tar.gz
Patch0: http://ftp.debian.org/debian/pool/non-free/u/unrar-nonfree/unrar-nonfree_...
+Patch1: unrar-3.7.8-fixes.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -16,24 +20,57 @@
1.50 and above.
+%package -n libunrar
+Summary: Decompress library for RAR v3 archives
+Group: System Environment/Libraries
+
+%description -n libunrar
+The libunrar library allows programs linking against it to decompress
+existing RAR v3 archives.
+
+
+%package -n libunrar-devel
+Summary: Development files for libunrar
+Group: Development/Libraries
+Requires: libunrar = %{version}-%{release}
+Provides: libunrar3-%{version}
+
+%description -n libunrar-devel
+The libunrar-devel package contains libraries and header files for
+developing applications that use libunrar.
+
+
%prep
%setup -q -n %{name}
%patch0 -p1
+%patch1 -p1 -b .fix
%build
make %{?_smp_mflags} -f makefile.unix \
- CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS" STRIP=:
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
+make %{?_smp_mflags} -f makefile.unix lib \
+ CXX="%{__cxx}" CXXFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" STRIP=: RANLIB=ranlib
%install
-rm -rf $RPM_BUILD_ROOT
-install -Dpm 755 unrar $RPM_BUILD_ROOT%{_bindir}/unrar
-install -Dpm 644 debian/unrar.1 $RPM_BUILD_ROOT%{_mandir}/man1/unrar.1
+rm -rf %{buildroot}
+install -Dpm 755 unrar %{buildroot}%{_bindir}/unrar
+install -Dpm 644 debian/unrar.1 %{buildroot}%{_mandir}/man1/unrar.1
+install -Dpm 755 libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3.7
+install -Dpm 644 dll.hpp %{buildroot}/%{_includedir}/unrar/dll.hpp
+ln -s libunrar.so.3.7 %{buildroot}%{_libdir}/libunrar.so.3
+ln -s libunrar.so.3 %{buildroot}%{_libdir}/libunrar.so
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
+
+
+%post -n libunrar -p /sbin/ldconfig
+
+
+%postun -n libunrar -p /sbin/ldconfig
%files
@@ -42,8 +79,24 @@
%{_bindir}/unrar
%{_mandir}/man1/unrar.1*
+%files -n libunrar
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_libdir}/*.so.*
+
+%files -n libunrar-devel
+%defattr(-,root,root,-)
+%doc license.txt readme.txt
+%{_includedir}/*
+%{_libdir}/*.so
+
%changelog
+* Sat Oct 25 2008 Andreas Thienemann <andreas(a)bawue.net> - 3.7.8-3
+- Added libunrar sub-packages
+- Clarified license
+- Added unrar robustness patches
+
* Thu Jul 24 2008 Conrad Meyer <konrad(a)tylerc.org> - 3.7.8-2
- Import into RPM Fusion.
15 years, 6 months
rpms/raine/F-8 raine.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/raine/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29350
Modified Files:
raine.spec
Log Message:
* Sat Oct 25 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.50.11-2.1
- use i386 instead of ix86 for ExcludeArch
Index: raine.spec
===================================================================
RCS file: /cvs/nonfree/rpms/raine/F-8/raine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raine.spec 14 Sep 2008 21:51:06 -0000 1.2
+++ raine.spec 25 Oct 2008 17:45:29 -0000 1.3
@@ -1,6 +1,6 @@
Name: raine
Version: 0.50.11
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Arcade emulator focused on Taito and Jaleco games hardware
Group: Applications/Emulators
License: GPL+ and Distributable
@@ -19,8 +19,11 @@
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: hicolor-icon-theme
-# Only compiles on x86 due to extensive x86 assembly
-ExclusiveArch: %{ix86}
+# Only compiles on x86 due to extensive x86 assembly.
+# There should be a {ix86} instead of i386 in the ExclusiveArch line but
+# that would make plague build the package for athlon, i386, i586 and i686 :-/
+ExclusiveArch: i386
+
%description
Raine emulates some M68000, M68020, Z80 and M68705 arcade games and is mainly
@@ -101,6 +104,9 @@
%changelog
+* Sat Oct 25 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.50.11-2.1
+- use i386 instead of ix86 for ExcludeArch
+
* Sun Sep 14 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.50.11-2
- Update files and rebuild for RPM fusion.
15 years, 6 months
rpms/raine/F-9 raine.spec,1.2,1.3
by Thorsten Leemhuis
Author: thl
Update of /cvs/nonfree/rpms/raine/F-9
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29229
Modified Files:
raine.spec
Log Message:
* Sat Oct 25 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.50.11-2.1
- use i386 instead of ix86 for ExcludeArch
Index: raine.spec
===================================================================
RCS file: /cvs/nonfree/rpms/raine/F-9/raine.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- raine.spec 14 Sep 2008 21:51:06 -0000 1.2
+++ raine.spec 25 Oct 2008 17:45:08 -0000 1.3
@@ -1,6 +1,6 @@
Name: raine
Version: 0.50.11
-Release: 2%{?dist}
+Release: 2%{?dist}.1
Summary: Arcade emulator focused on Taito and Jaleco games hardware
Group: Applications/Emulators
License: GPL+ and Distributable
@@ -19,8 +19,11 @@
BuildRequires: SDL_ttf-devel
BuildRequires: zlib-devel
Requires: hicolor-icon-theme
-# Only compiles on x86 due to extensive x86 assembly
-ExclusiveArch: %{ix86}
+# Only compiles on x86 due to extensive x86 assembly.
+# There should be a {ix86} instead of i386 in the ExclusiveArch line but
+# that would make plague build the package for athlon, i386, i586 and i686 :-/
+ExclusiveArch: i386
+
%description
Raine emulates some M68000, M68020, Z80 and M68705 arcade games and is mainly
@@ -101,6 +104,9 @@
%changelog
+* Sat Oct 25 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 0.50.11-2.1
+- use i386 instead of ix86 for ExcludeArch
+
* Sun Sep 14 2008 Xavier Lamien <lxtnow[at]gmail.com> - 0.50.11-2
- Update files and rebuild for RPM fusion.
15 years, 6 months