| 1 |
aballier 09/09/01 08:36:31 |
| 2 |
|
| 3 |
Modified: 010_all_freetype-font.patch |
| 4 |
020_all_check_headers_regexps.patch |
| 5 |
300_all_pic.patch 310_all_mmx_pic.patch |
| 6 |
Log: |
| 7 |
refresh and update the patchset with latest upstream changes |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 src/patchsets/vlc/master/010_all_freetype-font.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: 010_all_freetype-font.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- 010_all_freetype-font.patch 23 Jul 2009 18:31:23 -0000 1.1 |
| 23 |
+++ 010_all_freetype-font.patch 1 Sep 2009 08:36:30 -0000 1.2 |
| 24 |
@@ -2,11 +2,11 @@ |
| 25 |
we use DejaVU, and add it to the dependencies, as anyway many people have that |
| 26 |
font installed. |
| 27 |
|
| 28 |
-Index: vlc-1.0.0/modules/misc/freetype.c |
| 29 |
+Index: vlc-clean/modules/misc/freetype.c |
| 30 |
=================================================================== |
| 31 |
---- vlc-1.0.0.orig/modules/misc/freetype.c |
| 32 |
-+++ vlc-1.0.0/modules/misc/freetype.c |
| 33 |
-@@ -60,8 +60,8 @@ |
| 34 |
+--- vlc-clean.orig/modules/misc/freetype.c |
| 35 |
++++ vlc-clean/modules/misc/freetype.c |
| 36 |
+@@ -63,8 +63,8 @@ |
| 37 |
#define DEFAULT_FONT "" /* Default font found at run-time */ |
| 38 |
#define FC_DEFAULT_FONT "Arial" |
| 39 |
#else |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.2 src/patchsets/vlc/master/020_all_check_headers_regexps.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.2&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.2&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?r1=1.1&r2=1.2 |
| 48 |
|
| 49 |
Index: 020_all_check_headers_regexps.patch |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch,v |
| 52 |
retrieving revision 1.1 |
| 53 |
retrieving revision 1.2 |
| 54 |
diff -u -r1.1 -r1.2 |
| 55 |
--- 020_all_check_headers_regexps.patch 23 Jul 2009 18:31:23 -0000 1.1 |
| 56 |
+++ 020_all_check_headers_regexps.patch 1 Sep 2009 08:36:30 -0000 1.2 |
| 57 |
@@ -3,10 +3,10 @@ |
| 58 |
src/check_headers | 2 +- |
| 59 |
1 files changed, 1 insertions(+), 1 deletions(-) |
| 60 |
|
| 61 |
-Index: vlc-1.0.0/src/check_headers |
| 62 |
+Index: vlc-clean/src/check_headers |
| 63 |
=================================================================== |
| 64 |
---- vlc-1.0.0.orig/src/check_headers |
| 65 |
-+++ vlc-1.0.0/src/check_headers |
| 66 |
+--- vlc-clean.orig/src/check_headers |
| 67 |
++++ vlc-clean/src/check_headers |
| 68 |
@@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $? |
| 69 |
# Look for configure #defines in public headers. |
| 70 |
# There are incorrect, as external users don't have our <config.h>. |
| 71 |
|
| 72 |
|
| 73 |
|
| 74 |
1.2 src/patchsets/vlc/master/300_all_pic.patch |
| 75 |
|
| 76 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.2&view=markup |
| 77 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.2&content-type=text/plain |
| 78 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/300_all_pic.patch?r1=1.1&r2=1.2 |
| 79 |
|
| 80 |
Index: 300_all_pic.patch |
| 81 |
=================================================================== |
| 82 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/300_all_pic.patch,v |
| 83 |
retrieving revision 1.1 |
| 84 |
retrieving revision 1.2 |
| 85 |
diff -u -r1.1 -r1.2 |
| 86 |
--- 300_all_pic.patch 23 Jul 2009 18:31:23 -0000 1.1 |
| 87 |
+++ 300_all_pic.patch 1 Sep 2009 08:36:30 -0000 1.2 |
| 88 |
@@ -1,20 +1,7 @@ |
| 89 |
-Index: vlc-1.0.0/libs/loader/Makefile.am |
| 90 |
+Index: vlc-clean/libs/loader/module.c |
| 91 |
=================================================================== |
| 92 |
---- vlc-1.0.0.orig/libs/loader/Makefile.am |
| 93 |
-+++ vlc-1.0.0/libs/loader/Makefile.am |
| 94 |
-@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la |
| 95 |
- # TODO: real check for vsscanf() and <sys/mmap.h> |
| 96 |
- AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \ |
| 97 |
- -DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0 |
| 98 |
--AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \ |
| 99 |
-+AM_CFLAGS = -fPIC `$(top_builddir)/vlc-config --cflags` -U_FILE_OFFSET_BITS \ |
| 100 |
- -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer |
| 101 |
- |
| 102 |
- noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \ |
| 103 |
-Index: vlc-1.0.0/libs/loader/module.c |
| 104 |
-=================================================================== |
| 105 |
---- vlc-1.0.0.orig/libs/loader/module.c |
| 106 |
-+++ vlc-1.0.0/libs/loader/module.c |
| 107 |
+--- vlc-clean.orig/libs/loader/module.c |
| 108 |
++++ vlc-clean/libs/loader/module.c |
| 109 |
@@ -63,8 +63,8 @@ |
| 110 |
|
| 111 |
#ifdef EMU_QTX_API |
| 112 |
@@ -62,10 +49,10 @@ |
| 113 |
wrapper_target=(void(*)(void))retproc; |
| 114 |
retproc=(FARPROC)wrapper; |
| 115 |
} |
| 116 |
-Index: vlc-1.0.0/libs/loader/stubs.s |
| 117 |
+Index: vlc-clean/libs/loader/stubs.s |
| 118 |
=================================================================== |
| 119 |
---- vlc-1.0.0.orig/libs/loader/stubs.s |
| 120 |
-+++ vlc-1.0.0/libs/loader/stubs.s |
| 121 |
+--- vlc-clean.orig/libs/loader/stubs.s |
| 122 |
++++ vlc-clean/libs/loader/stubs.s |
| 123 |
@@ -33,3 +33,6 @@ exp_EH_prolog: |
| 124 |
leal 12(%esp), %ebp |
| 125 |
pushl %eax |
| 126 |
@@ -73,10 +60,10 @@ |
| 127 |
+ |
| 128 |
+.section .note.GNU-stack,"",@progbits |
| 129 |
+ |
| 130 |
-Index: vlc-1.0.0/libs/loader/wrapper.S |
| 131 |
+Index: vlc-clean/libs/loader/wrapper.S |
| 132 |
=================================================================== |
| 133 |
---- vlc-1.0.0.orig/libs/loader/wrapper.S |
| 134 |
-+++ vlc-1.0.0/libs/loader/wrapper.S |
| 135 |
+--- vlc-clean.orig/libs/loader/wrapper.S |
| 136 |
++++ vlc-clean/libs/loader/wrapper.S |
| 137 |
@@ -1,17 +1,19 @@ |
| 138 |
.section .data |
| 139 |
-.globl caller_return |
| 140 |
@@ -192,10 +179,10 @@ |
| 141 |
+ |
| 142 |
+.section .note.GNU-stack,"",@progbits |
| 143 |
+ |
| 144 |
-Index: vlc-1.0.0/libs/loader/wrapper.h |
| 145 |
+Index: vlc-clean/libs/loader/wrapper.h |
| 146 |
=================================================================== |
| 147 |
---- vlc-1.0.0.orig/libs/loader/wrapper.h |
| 148 |
-+++ vlc-1.0.0/libs/loader/wrapper.h |
| 149 |
+--- vlc-clean.orig/libs/loader/wrapper.h |
| 150 |
++++ vlc-clean/libs/loader/wrapper.h |
| 151 |
@@ -7,10 +7,6 @@ typedef struct { |
| 152 |
uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax; |
| 153 |
} reg386_t; |
| 154 |
@@ -207,3 +194,16 @@ |
| 155 |
extern void (*wrapper_target)(void); |
| 156 |
|
| 157 |
extern int wrapper(void); |
| 158 |
+Index: vlc-clean/libs/loader/Makefile.am |
| 159 |
+=================================================================== |
| 160 |
+--- vlc-clean.orig/libs/loader/Makefile.am |
| 161 |
++++ vlc-clean/libs/loader/Makefile.am |
| 162 |
+@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la |
| 163 |
+ # TODO: real check for vsscanf() and <sys/mmap.h> |
| 164 |
+ AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \ |
| 165 |
+ -DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0 |
| 166 |
+-AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \ |
| 167 |
++AM_CFLAGS = -fPIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \ |
| 168 |
+ -fno-omit-frame-pointer -mno-omit-leaf-frame-pointer |
| 169 |
+ |
| 170 |
+ noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \ |
| 171 |
|
| 172 |
|
| 173 |
|
| 174 |
1.2 src/patchsets/vlc/master/310_all_mmx_pic.patch |
| 175 |
|
| 176 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?rev=1.2&view=markup |
| 177 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?rev=1.2&content-type=text/plain |
| 178 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch?r1=1.1&r2=1.2 |
| 179 |
|
| 180 |
Index: 310_all_mmx_pic.patch |
| 181 |
=================================================================== |
| 182 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/310_all_mmx_pic.patch,v |
| 183 |
retrieving revision 1.1 |
| 184 |
retrieving revision 1.2 |
| 185 |
diff -u -r1.1 -r1.2 |
| 186 |
--- 310_all_mmx_pic.patch 23 Jul 2009 18:31:23 -0000 1.1 |
| 187 |
+++ 310_all_mmx_pic.patch 1 Sep 2009 08:36:30 -0000 1.2 |
| 188 |
@@ -2,10 +2,10 @@ |
| 189 |
http://trac.videolan.org/vlc/ticket/1383 |
| 190 |
Let gcc choose how to reference memory addresses |
| 191 |
|
| 192 |
-Index: vlc-1.0.0/modules/video_chroma/i420_rgb_mmx.h |
| 193 |
+Index: vlc-clean/modules/video_chroma/i420_rgb_mmx.h |
| 194 |
=================================================================== |
| 195 |
---- vlc-1.0.0.orig/modules/video_chroma/i420_rgb_mmx.h |
| 196 |
-+++ vlc-1.0.0/modules/video_chroma/i420_rgb_mmx.h |
| 197 |
+--- vlc-clean.orig/modules/video_chroma/i420_rgb_mmx.h |
| 198 |
++++ vlc-clean/modules/video_chroma/i420_rgb_mmx.h |
| 199 |
@@ -34,18 +34,18 @@ |
| 200 |
#define USED_U64(foo) \ |
| 201 |
static const uint64_t foo __asm__ (#foo) __attribute__((unused)) |
Archives