Gentoo Archives: gentoo-commits

From: "Alexis Ballier (aballier)" <aballier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo commit in src/patchsets/vlc/1.1.7: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 300_all_pic.patch 320_all_cachegen.patch 330_all_libmatroska-1.1.0.patch series
Date: Thu, 03 Feb 2011 14:07:51
Message-Id: 20110203140742.1629B20054@flycatcher.gentoo.org
1 aballier 11/02/03 14:07:42
2
3 Added: 010_all_freetype-font.patch
4 020_all_check_headers_regexps.patch
5 300_all_pic.patch 320_all_cachegen.patch
6 330_all_libmatroska-1.1.0.patch series
7 Log:
8 add patches for 1.1.7
9
10 Revision Changes Path
11 1.1 src/patchsets/vlc/1.1.7/010_all_freetype-font.patch
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/010_all_freetype-font.patch?rev=1.1&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/010_all_freetype-font.patch?rev=1.1&content-type=text/plain
15
16 Index: 010_all_freetype-font.patch
17 ===================================================================
18 The default font used by VLC does not exists on every system, instead of that,
19 we use DejaVU, and add it to the dependencies, as anyway many people have that
20 font installed.
21
22 Index: vlc-1.1.7/modules/misc/freetype.c
23 ===================================================================
24 --- vlc-1.1.7.orig/modules/misc/freetype.c
25 +++ vlc-1.1.7/modules/misc/freetype.c
26 @@ -67,8 +67,8 @@
27 #define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
28 #define FC_DEFAULT_FONT "Nokia Sans Bold"
29 #else
30 -#define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
31 -#define FC_DEFAULT_FONT "Serif Bold"
32 +#define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf"
33 +#define FC_DEFAULT_FONT "Sans"
34 #endif
35
36 #if defined(HAVE_FRIBIDI)
37
38
39
40 1.1 src/patchsets/vlc/1.1.7/020_all_check_headers_regexps.patch
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/020_all_check_headers_regexps.patch?rev=1.1&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/020_all_check_headers_regexps.patch?rev=1.1&content-type=text/plain
44
45 Index: 020_all_check_headers_regexps.patch
46 ===================================================================
47 This fixes weird check_headers failures when it also matches things like 'const' which are obviously allowed in the public headers and cause check failures due to these false positives.
48 ---
49 src/check_headers | 2 +-
50 1 files changed, 1 insertions(+), 1 deletions(-)
51
52 Index: vlc-1.1.7/src/check_headers
53 ===================================================================
54 --- vlc-1.1.7.orig/src/check_headers
55 +++ vlc-1.1.7/src/check_headers
56 @@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
57 # Look for configure #defines in public headers.
58 # There are incorrect, as external users don't have our <config.h>.
59 regexp="$(cat ../config.h.in | \
60 - sed -n -e 's/^#undef \([A-Z0-9_]*\)$/\1/p' | \
61 + sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \
62 grep -v 'WORDS_BIGENDIAN' | \
63 xargs | \
64 sed -e 's/ /\\\|/g')"
65
66
67
68 1.1 src/patchsets/vlc/1.1.7/300_all_pic.patch
69
70 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/300_all_pic.patch?rev=1.1&view=markup
71 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/300_all_pic.patch?rev=1.1&content-type=text/plain
72
73 Index: 300_all_pic.patch
74 ===================================================================
75 Index: vlc-1.1.7/libs/loader/module.c
76 ===================================================================
77 --- vlc-1.1.7.orig/libs/loader/module.c
78 +++ vlc-1.1.7/libs/loader/module.c
79 @@ -63,8 +63,8 @@
80
81 #ifdef EMU_QTX_API
82 #include "wrapper.h"
83 -static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
84 -static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
85 +int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
86 +int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
87 #endif
88
89 //#undef TRACE
90 @@ -572,8 +572,6 @@ HMODULE WINAPI LoadLibraryExA(LPCSTR lib
91 fprintf(stderr,"QuickTime.qts patched!!! old entry=%p\n",ptr[0]);
92
93 #ifdef EMU_QTX_API
94 - report_entry = report_func;
95 - report_ret = report_func_ret;
96 wrapper_target=ptr[0];
97 ptr[0]=wrapper;
98 #endif
99 @@ -754,7 +752,7 @@ static int dump_component(char* name,int
100 static uint32_t ret_array[4096];
101 static int ret_i=0;
102
103 -static int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
104 +int report_func(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
105 {
106 #ifdef DEBUG_QTX_API
107 int i;
108 @@ -953,7 +951,7 @@ static int report_func(void *stack_base,
109 return 0;
110 }
111
112 -static int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
113 +int report_func_ret(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags)
114 {
115 int i;
116 short err;
117 @@ -1066,8 +1064,6 @@ FARPROC MODULE_GetProcAddress(
118 // || !strcmp(function,"_CallComponent")
119 ){
120 fprintf(stderr,"theQuickTimeDispatcher catched -> %p\n",retproc);
121 - report_entry = report_func;
122 - report_ret = report_func_ret;
123 wrapper_target=(void(*)(void))retproc;
124 retproc=(FARPROC)wrapper;
125 }
126 Index: vlc-1.1.7/libs/loader/stubs.s
127 ===================================================================
128 --- vlc-1.1.7.orig/libs/loader/stubs.s
129 +++ vlc-1.1.7/libs/loader/stubs.s
130 @@ -33,3 +33,6 @@ exp_EH_prolog:
131 leal 12(%esp), %ebp
132 pushl %eax
133 ret
134 +
135 +.section .note.GNU-stack,"",@progbits
136 +
137 Index: vlc-1.1.7/libs/loader/wrapper.S
138 ===================================================================
139 --- vlc-1.1.7.orig/libs/loader/wrapper.S
140 +++ vlc-1.1.7/libs/loader/wrapper.S
141 @@ -1,17 +1,19 @@
142 .section .data
143 -.globl caller_return
144 caller_return:
145 .long 0
146 -.globl report_entry
147 -report_entry:
148 - .long null_call
149 -.globl report_ret
150 -report_ret:
151 - .long null_call
152 .global wrapper_target
153 wrapper_target:
154 .long null_call
155
156 +#undef __i686 /* gcc define gets in our way */
157 + .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
158 +.globl __i686.get_pc_thunk.bx
159 + .hidden __i686.get_pc_thunk.bx
160 + .type __i686.get_pc_thunk.bx,@function
161 +__i686.get_pc_thunk.bx:
162 + movl (%esp), %ebx
163 + ret
164 +
165 .section .text
166 .globl null_call
167 .type null_call, @function
168 @@ -22,46 +24,60 @@ null_call:
169 .type wrapper, @function
170 .balign 16,0x90
171 wrapper:
172 + pushl $0
173 pusha # store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI)
174 pushf # store flags
175
176 push %ebp # set up a stack frame
177 movl %esp, %ebp
178
179 + call __i686.get_pc_thunk.bx
180 + addl $_GLOBAL_OFFSET_TABLE_, %ebx
181 +
182 leal 4(%ebp), %eax # push flags addr
183 push %eax
184 leal 8(%ebp), %eax # push registers addr
185 push %eax
186 -
187 - leal 40(%ebp), %edx
188 +
189 + leal 44(%ebp), %edx
190 movl (%ebp), %eax
191 subl %edx, %eax
192 push %eax
193 push %edx
194 -
195 - call *report_entry # report entry
196 -
197 +
198 + call report_func@PLT # report entry
199 +
200 test %eax, %eax
201 jnz .Ldone
202
203 + movl 44(%ebp), %eax # switch return addresses
204 + movl %eax, caller_return@GOTOFF(%ebx)
205 + leal .Lwrapper_return@GOTOFF(%ebx), %eax
206 + movl %eax, 40(%ebp)
207 +
208 + movl wrapper_target@GOTOFF(%ebx), %eax
209 + mov %eax, 40(%ebp) # wrapper_target should return at .Lwrapper_return
210 +
211 leave # restore %esp, %ebp
212 popf # restore flags
213 popa # restore registers
214 -
215 - popl caller_return # switch return addresses
216 - pushl $.Lwrapper_return
217 -
218 - jmp *wrapper_target # wrapper_target should return at .Lwrapper_return
219 +
220 + ret
221
222 .balign 16, 0x90
223 .Lwrapper_return:
224 - pushl caller_return # restore the original return address
225 + pushl $0 # restore the original return address
226 pusha # more for reference sake here
227 pushf
228
229 push %ebp # set up a stack frame
230 movl %esp, %ebp
231
232 + call __i686.get_pc_thunk.bx
233 + addl $_GLOBAL_OFFSET_TABLE_, %ebx
234 + movl caller_return@GOTOFF(%ebx), %eax
235 + movl %eax, 40(%ebp) # restore the original return address
236 +
237 leal 4(%ebp), %eax # push flags addr
238 push %eax
239 leal 8(%ebp), %eax # push registers addr
240 @@ -73,11 +89,13 @@ wrapper:
241 push %eax
242 push %edx
243
244 - call *report_ret # report the return information (same args)
245 + call report_func_ret@PLT# report the return information (same args)
246 .Ldone:
247
248 leave
249 popf
250 popa
251 ret
252 -
253 +
254 +.section .note.GNU-stack,"",@progbits
255 +
256 Index: vlc-1.1.7/libs/loader/wrapper.h
257 ===================================================================
258 --- vlc-1.1.7.orig/libs/loader/wrapper.h
259 +++ vlc-1.1.7/libs/loader/wrapper.h
260 @@ -7,10 +7,6 @@ typedef struct {
261 uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
262 } reg386_t;
263
264 -typedef int (*wrapper_func_t)(void *stack_base, int stack_size, reg386_t *reg, uint32_t *flags);
265 -
266 -extern wrapper_func_t report_entry, report_ret;
267 -
268 extern void (*wrapper_target)(void);
269
270 extern int wrapper(void);
271 Index: vlc-1.1.7/libs/loader/Makefile.am
272 ===================================================================
273 --- vlc-1.1.7.orig/libs/loader/Makefile.am
274 +++ vlc-1.1.7/libs/loader/Makefile.am
275 @@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
276 # TODO: real check for vsscanf() and <sys/mmap.h>
277 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
278 -DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
279 -AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \
280 +AM_CFLAGS = -fPIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \
281 -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
282
283 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \
284
285
286
287 1.1 src/patchsets/vlc/1.1.7/320_all_cachegen.patch
288
289 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/320_all_cachegen.patch?rev=1.1&view=markup
290 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/320_all_cachegen.patch?rev=1.1&content-type=text/plain
291
292 Index: 320_all_cachegen.patch
293 ===================================================================
294 Do not try to generate the plugin cache at build time. We will handle this in
295 pkg_postinst
296
297 Index: vlc-1.1.7/modules/Makefile.am
298 ===================================================================
299 --- vlc-1.1.7.orig/modules/Makefile.am
300 +++ vlc-1.1.7/modules/Makefile.am
301 @@ -62,16 +62,4 @@ MOSTLYCLEANFILES = stamp-cache plugins-*
302 .PHONY: stamp-cache
303
304 stamp-cache:
305 - $(AM_V_GEN)if test "$(build)" = "$(host)"; then \
306 - ../bin/vlc-cache-gen$(EXEEXT) . ; \
307 - else \
308 - echo "Cross-compilation: cache generation skipped!" ; \
309 - fi
310 $(AM_V_at)touch stamp-cache
311 -
312 -install-exec-hook:
313 - if test -z "$(DESTDIR)"; then \
314 - ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
315 - else \
316 - echo "Staged installation: cache generation skipped!" ; \
317 - fi
318
319
320
321 1.1 src/patchsets/vlc/1.1.7/330_all_libmatroska-1.1.0.patch
322
323 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/330_all_libmatroska-1.1.0.patch?rev=1.1&view=markup
324 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/330_all_libmatroska-1.1.0.patch?rev=1.1&content-type=text/plain
325
326 Index: 330_all_libmatroska-1.1.0.patch
327 ===================================================================
328 Fix build with libmatroska-1.1.0 by Ambroz Bizjak
329 https://bugs.gentoo.org/show_bug.cgi?id=353491
330
331 Index: vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp
332 ===================================================================
333 --- vlc-1.1.7.orig/modules/demux/mkv/matroska_segment.cpp
334 +++ vlc-1.1.7/modules/demux/mkv/matroska_segment.cpp
335 @@ -220,74 +220,6 @@ void matroska_segment_c::LoadTags( KaxTa
336 }
337 ep->Up();
338 }
339 - else if( MKV_IS_ID( el, KaxTagGeneral ) )
340 - {
341 - msg_Dbg( &sys.demuxer, "| + General" );
342 - ep->Down();
343 - while( ( el = ep->Get() ) != NULL )
344 - {
345 - msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
346 - }
347 - ep->Up();
348 - }
349 - else if( MKV_IS_ID( el, KaxTagGenres ) )
350 - {
351 - msg_Dbg( &sys.demuxer, "| + Genres" );
352 - ep->Down();
353 - while( ( el = ep->Get() ) != NULL )
354 - {
355 - msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
356 - }
357 - ep->Up();
358 - }
359 - else if( MKV_IS_ID( el, KaxTagAudioSpecific ) )
360 - {
361 - msg_Dbg( &sys.demuxer, "| + Audio Specific" );
362 - ep->Down();
363 - while( ( el = ep->Get() ) != NULL )
364 - {
365 - msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
366 - }
367 - ep->Up();
368 - }
369 - else if( MKV_IS_ID( el, KaxTagImageSpecific ) )
370 - {
371 - msg_Dbg( &sys.demuxer, "| + Images Specific" );
372 - ep->Down();
373 - while( ( el = ep->Get() ) != NULL )
374 - {
375 - msg_Dbg( &sys.demuxer, "| | + Unknown (%s)", typeid( *el ).name() );
376 - }
377 - ep->Up();
378 - }
379 - else if( MKV_IS_ID( el, KaxTagMultiComment ) )
380 - {
381 - msg_Dbg( &sys.demuxer, "| + Multi Comment" );
382 - }
383 - else if( MKV_IS_ID( el, KaxTagMultiCommercial ) )
384 - {
385 - msg_Dbg( &sys.demuxer, "| + Multi Commercial" );
386 - }
387 - else if( MKV_IS_ID( el, KaxTagMultiDate ) )
388 - {
389 - msg_Dbg( &sys.demuxer, "| + Multi Date" );
390 - }
391 - else if( MKV_IS_ID( el, KaxTagMultiEntity ) )
392 - {
393 - msg_Dbg( &sys.demuxer, "| + Multi Entity" );
394 - }
395 - else if( MKV_IS_ID( el, KaxTagMultiIdentifier ) )
396 - {
397 - msg_Dbg( &sys.demuxer, "| + Multi Identifier" );
398 - }
399 - else if( MKV_IS_ID( el, KaxTagMultiLegal ) )
400 - {
401 - msg_Dbg( &sys.demuxer, "| + Multi Legal" );
402 - }
403 - else if( MKV_IS_ID( el, KaxTagMultiTitle ) )
404 - {
405 - msg_Dbg( &sys.demuxer, "| + Multi Title" );
406 - }
407 else
408 {
409 msg_Dbg( &sys.demuxer, "| + LoadTag Unknown (%s)", typeid( *el ).name() );
410 Index: vlc-1.1.7/modules/demux/mkv/mkv.hpp
411 ===================================================================
412 --- vlc-1.1.7.orig/modules/demux/mkv/mkv.hpp
413 +++ vlc-1.1.7/modules/demux/mkv/mkv.hpp
414 @@ -92,7 +92,6 @@
415 #include "matroska/KaxSegment.h"
416 #include "matroska/KaxTag.h"
417 #include "matroska/KaxTags.h"
418 -#include "matroska/KaxTagMulti.h"
419 #include "matroska/KaxTracks.h"
420 #include "matroska/KaxTrackAudio.h"
421 #include "matroska/KaxTrackVideo.h"
422
423
424
425 1.1 src/patchsets/vlc/1.1.7/series
426
427 file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/series?rev=1.1&view=markup
428 plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/1.1.7/series?rev=1.1&content-type=text/plain
429
430 Index: series
431 ===================================================================
432 010_all_freetype-font.patch
433 020_all_check_headers_regexps.patch
434 300_all_pic.patch
435 320_all_cachegen.patch
436 330_all_libmatroska-1.1.0.patch