* [gentoo-commits] gentoo commit in src/patchsets/vlc/master: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 300_all_pic.patch 320_all_cachegen.patch
@ 2010-07-18 10:12 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2010-07-18 10:12 UTC (permalink / raw
To: gentoo-commits
aballier 10/07/18 10:12:45
Modified: 010_all_freetype-font.patch
020_all_check_headers_regexps.patch
300_all_pic.patch 320_all_cachegen.patch
Log:
update and refresh the patchset for master
Revision Changes Path
1.4 src/patchsets/vlc/master/010_all_freetype-font.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.3&r2=1.4
Index: 010_all_freetype-font.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 010_all_freetype-font.patch 24 Feb 2010 12:23:21 -0000 1.3
+++ 010_all_freetype-font.patch 18 Jul 2010 10:12:45 -0000 1.4
@@ -2,11 +2,11 @@
we use DejaVU, and add it to the dependencies, as anyway many people have that
font installed.
-Index: vlc-clean/modules/misc/freetype.c
+Index: vlc/modules/misc/freetype.c
===================================================================
---- vlc-clean.orig/modules/misc/freetype.c
-+++ vlc-clean/modules/misc/freetype.c
-@@ -67,8 +67,8 @@
+--- vlc.orig/modules/misc/freetype.c
++++ vlc/modules/misc/freetype.c
+@@ -66,8 +66,8 @@
#define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
#define FC_DEFAULT_FONT "Nokia Sans Bold"
#else
1.3 src/patchsets/vlc/master/020_all_check_headers_regexps.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?r1=1.2&r2=1.3
Index: 020_all_check_headers_regexps.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 020_all_check_headers_regexps.patch 1 Sep 2009 08:36:30 -0000 1.2
+++ 020_all_check_headers_regexps.patch 18 Jul 2010 10:12:45 -0000 1.3
@@ -3,10 +3,10 @@
src/check_headers | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: vlc-clean/src/check_headers
+Index: vlc/src/check_headers
===================================================================
---- vlc-clean.orig/src/check_headers
-+++ vlc-clean/src/check_headers
+--- vlc.orig/src/check_headers
++++ vlc/src/check_headers
@@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
# Look for configure #defines in public headers.
# There are incorrect, as external users don't have our <config.h>.
1.3 src/patchsets/vlc/master/300_all_pic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?r1=1.2&r2=1.3
Index: 300_all_pic.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/300_all_pic.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 300_all_pic.patch 1 Sep 2009 08:36:30 -0000 1.2
+++ 300_all_pic.patch 18 Jul 2010 10:12:45 -0000 1.3
@@ -1,7 +1,7 @@
-Index: vlc-clean/libs/loader/module.c
+Index: vlc/libs/loader/module.c
===================================================================
---- vlc-clean.orig/libs/loader/module.c
-+++ vlc-clean/libs/loader/module.c
+--- vlc.orig/libs/loader/module.c
++++ vlc/libs/loader/module.c
@@ -63,8 +63,8 @@
#ifdef EMU_QTX_API
@@ -49,10 +49,10 @@
wrapper_target=(void(*)(void))retproc;
retproc=(FARPROC)wrapper;
}
-Index: vlc-clean/libs/loader/stubs.s
+Index: vlc/libs/loader/stubs.s
===================================================================
---- vlc-clean.orig/libs/loader/stubs.s
-+++ vlc-clean/libs/loader/stubs.s
+--- vlc.orig/libs/loader/stubs.s
++++ vlc/libs/loader/stubs.s
@@ -33,3 +33,6 @@ exp_EH_prolog:
leal 12(%esp), %ebp
pushl %eax
@@ -60,10 +60,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc-clean/libs/loader/wrapper.S
+Index: vlc/libs/loader/wrapper.S
===================================================================
---- vlc-clean.orig/libs/loader/wrapper.S
-+++ vlc-clean/libs/loader/wrapper.S
+--- vlc.orig/libs/loader/wrapper.S
++++ vlc/libs/loader/wrapper.S
@@ -1,17 +1,19 @@
.section .data
-.globl caller_return
@@ -179,10 +179,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc-clean/libs/loader/wrapper.h
+Index: vlc/libs/loader/wrapper.h
===================================================================
---- vlc-clean.orig/libs/loader/wrapper.h
-+++ vlc-clean/libs/loader/wrapper.h
+--- vlc.orig/libs/loader/wrapper.h
++++ vlc/libs/loader/wrapper.h
@@ -7,10 +7,6 @@ typedef struct {
uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
} reg386_t;
@@ -194,10 +194,10 @@
extern void (*wrapper_target)(void);
extern int wrapper(void);
-Index: vlc-clean/libs/loader/Makefile.am
+Index: vlc/libs/loader/Makefile.am
===================================================================
---- vlc-clean.orig/libs/loader/Makefile.am
-+++ vlc-clean/libs/loader/Makefile.am
+--- vlc.orig/libs/loader/Makefile.am
++++ vlc/libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
# TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
1.3 src/patchsets/vlc/master/320_all_cachegen.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?r1=1.2&r2=1.3
Index: 320_all_cachegen.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- 320_all_cachegen.patch 10 Mar 2010 11:34:37 -0000 1.2
+++ 320_all_cachegen.patch 18 Jul 2010 10:12:45 -0000 1.3
@@ -1,10 +1,10 @@
Do not try to generate the plugin cache at build time. We will handle this in
pkg_postinst
-Index: vlc-clean/modules/Makefile.am
+Index: vlc/modules/Makefile.am
===================================================================
---- vlc-clean.orig/modules/Makefile.am
-+++ vlc-clean/modules/Makefile.am
+--- vlc.orig/modules/Makefile.am
++++ vlc/modules/Makefile.am
@@ -62,16 +62,4 @@ MOSTLYCLEANFILES = stamp-cache plugins-*
.PHONY: stamp-cache
@@ -17,7 +17,7 @@
$(AM_V_at)touch stamp-cache
-
-install-exec-hook:
-- if test -z "$(DESTDIR)"; then \
+- if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
- ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
- else \
- echo "Staged installation: cache generation skipped!" ; \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo commit in src/patchsets/vlc/master: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 300_all_pic.patch 320_all_cachegen.patch
@ 2010-10-15 19:19 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2010-10-15 19:19 UTC (permalink / raw
To: gentoo-commits
aballier 10/10/15 19:19:59
Modified: 010_all_freetype-font.patch
020_all_check_headers_regexps.patch
300_all_pic.patch 320_all_cachegen.patch
Log:
refresh patches and fix the cachegen patch
Revision Changes Path
1.5 src/patchsets/vlc/master/010_all_freetype-font.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.4&r2=1.5
Index: 010_all_freetype-font.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 010_all_freetype-font.patch 18 Jul 2010 10:12:45 -0000 1.4
+++ 010_all_freetype-font.patch 15 Oct 2010 19:19:59 -0000 1.5
@@ -2,10 +2,10 @@
we use DejaVU, and add it to the dependencies, as anyway many people have that
font installed.
-Index: vlc/modules/misc/freetype.c
+Index: vlc-master/modules/misc/freetype.c
===================================================================
---- vlc.orig/modules/misc/freetype.c
-+++ vlc/modules/misc/freetype.c
+--- vlc-master.orig/modules/misc/freetype.c
++++ vlc-master/modules/misc/freetype.c
@@ -66,8 +66,8 @@
#define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
#define FC_DEFAULT_FONT "Nokia Sans Bold"
1.4 src/patchsets/vlc/master/020_all_check_headers_regexps.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?r1=1.3&r2=1.4
Index: 020_all_check_headers_regexps.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 020_all_check_headers_regexps.patch 18 Jul 2010 10:12:45 -0000 1.3
+++ 020_all_check_headers_regexps.patch 15 Oct 2010 19:19:59 -0000 1.4
@@ -3,10 +3,10 @@
src/check_headers | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: vlc/src/check_headers
+Index: vlc-master/src/check_headers
===================================================================
---- vlc.orig/src/check_headers
-+++ vlc/src/check_headers
+--- vlc-master.orig/src/check_headers
++++ vlc-master/src/check_headers
@@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
# Look for configure #defines in public headers.
# There are incorrect, as external users don't have our <config.h>.
1.4 src/patchsets/vlc/master/300_all_pic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?r1=1.3&r2=1.4
Index: 300_all_pic.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/300_all_pic.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 300_all_pic.patch 18 Jul 2010 10:12:45 -0000 1.3
+++ 300_all_pic.patch 15 Oct 2010 19:19:59 -0000 1.4
@@ -1,7 +1,7 @@
-Index: vlc/libs/loader/module.c
+Index: vlc-master/libs/loader/module.c
===================================================================
---- vlc.orig/libs/loader/module.c
-+++ vlc/libs/loader/module.c
+--- vlc-master.orig/libs/loader/module.c
++++ vlc-master/libs/loader/module.c
@@ -63,8 +63,8 @@
#ifdef EMU_QTX_API
@@ -49,10 +49,10 @@
wrapper_target=(void(*)(void))retproc;
retproc=(FARPROC)wrapper;
}
-Index: vlc/libs/loader/stubs.s
+Index: vlc-master/libs/loader/stubs.s
===================================================================
---- vlc.orig/libs/loader/stubs.s
-+++ vlc/libs/loader/stubs.s
+--- vlc-master.orig/libs/loader/stubs.s
++++ vlc-master/libs/loader/stubs.s
@@ -33,3 +33,6 @@ exp_EH_prolog:
leal 12(%esp), %ebp
pushl %eax
@@ -60,10 +60,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc/libs/loader/wrapper.S
+Index: vlc-master/libs/loader/wrapper.S
===================================================================
---- vlc.orig/libs/loader/wrapper.S
-+++ vlc/libs/loader/wrapper.S
+--- vlc-master.orig/libs/loader/wrapper.S
++++ vlc-master/libs/loader/wrapper.S
@@ -1,17 +1,19 @@
.section .data
-.globl caller_return
@@ -179,10 +179,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc/libs/loader/wrapper.h
+Index: vlc-master/libs/loader/wrapper.h
===================================================================
---- vlc.orig/libs/loader/wrapper.h
-+++ vlc/libs/loader/wrapper.h
+--- vlc-master.orig/libs/loader/wrapper.h
++++ vlc-master/libs/loader/wrapper.h
@@ -7,10 +7,6 @@ typedef struct {
uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
} reg386_t;
@@ -194,10 +194,10 @@
extern void (*wrapper_target)(void);
extern int wrapper(void);
-Index: vlc/libs/loader/Makefile.am
+Index: vlc-master/libs/loader/Makefile.am
===================================================================
---- vlc.orig/libs/loader/Makefile.am
-+++ vlc/libs/loader/Makefile.am
+--- vlc-master.orig/libs/loader/Makefile.am
++++ vlc-master/libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
# TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
1.4 src/patchsets/vlc/master/320_all_cachegen.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?r1=1.3&r2=1.4
Index: 320_all_cachegen.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 320_all_cachegen.patch 18 Jul 2010 10:12:45 -0000 1.3
+++ 320_all_cachegen.patch 15 Oct 2010 19:19:59 -0000 1.4
@@ -1,11 +1,10 @@
Do not try to generate the plugin cache at build time. We will handle this in
pkg_postinst
-
-Index: vlc/modules/Makefile.am
+Index: vlc-master/modules/Makefile.am
===================================================================
---- vlc.orig/modules/Makefile.am
-+++ vlc/modules/Makefile.am
-@@ -62,16 +62,4 @@ MOSTLYCLEANFILES = stamp-cache plugins-*
+--- vlc-master.orig/modules/Makefile.am
++++ vlc-master/modules/Makefile.am
+@@ -61,15 +61,7 @@ MOSTLYCLEANFILES = plugins-*-*.dat
.PHONY: stamp-cache
stamp-cache:
@@ -14,11 +13,12 @@
- else \
- echo "Cross-compilation: cache generation skipped!" ; \
- fi
- $(AM_V_at)touch stamp-cache
--
--install-exec-hook:
++ echo "Cross-compilation: cache generation skipped!" ;
+
+ install-exec-hook:
- if test -z "$(DESTDIR)" -a "$(build)" = "$(host)"; then \
- ../bin/vlc-cache-gen$(EXEEXT) "$(vlclibdir)/plugins" ; \
- else \
- echo "Staged installation: cache generation skipped!" ; \
- fi
++ echo "Staged installation: cache generation skipped!" ;
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo commit in src/patchsets/vlc/master: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 300_all_pic.patch 320_all_cachegen.patch
@ 2011-05-12 13:54 Alexis Ballier (aballier)
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier (aballier) @ 2011-05-12 13:54 UTC (permalink / raw
To: gentoo-commits
aballier 11/05/12 13:54:56
Modified: 010_all_freetype-font.patch
020_all_check_headers_regexps.patch
300_all_pic.patch 320_all_cachegen.patch
Log:
update freetype patch and refresh the others
Revision Changes Path
1.8 src/patchsets/vlc/master/010_all_freetype-font.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch?r1=1.7&r2=1.8
Index: 010_all_freetype-font.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/010_all_freetype-font.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- 010_all_freetype-font.patch 20 Apr 2011 15:24:52 -0000 1.7
+++ 010_all_freetype-font.patch 12 May 2011 13:54:56 -0000 1.8
@@ -2,17 +2,17 @@
we use DejaVU, and add it to the dependencies, as anyway many people have that
font installed.
-Index: vlc-master/modules/misc/text_renderer/freetype.c
+Index: vlc/modules/misc/text_renderer/freetype.c
===================================================================
---- vlc-master.orig/modules/misc/text_renderer/freetype.c
-+++ vlc-master/modules/misc/text_renderer/freetype.c
+--- vlc.orig/modules/misc/text_renderer/freetype.c
++++ vlc/modules/misc/text_renderer/freetype.c
@@ -52,8 +52,8 @@
- # define DEFAULT_FONT "/usr/share/fonts/nokia/nosnb.ttf"
+ # define DEFAULT_FONT_FILE "/usr/share/fonts/nokia/nosnb.ttf"
# define DEFAULT_FAMILY "Nokia Sans Bold"
#else
--# define DEFAULT_FONT "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
+-# define DEFAULT_FONT_FILE "/usr/share/fonts/truetype/freefont/FreeSerifBold.ttf"
-# define DEFAULT_FAMILY "Serif Bold"
-+# define DEFAULT_FONT "/usr/share/fonts/dejavu/DejaVuSans.ttf"
++# define DEFAULT_FONT_FILE "/usr/share/fonts/dejavu/DejaVuSans.ttf"
+# define DEFAULT_FAMILY "Sans"
#endif
1.6 src/patchsets/vlc/master/020_all_check_headers_regexps.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch?r1=1.5&r2=1.6
Index: 020_all_check_headers_regexps.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/020_all_check_headers_regexps.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 020_all_check_headers_regexps.patch 30 Mar 2011 12:57:14 -0000 1.5
+++ 020_all_check_headers_regexps.patch 12 May 2011 13:54:56 -0000 1.6
@@ -3,10 +3,10 @@
src/check_headers | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
-Index: vlc-master/src/check_headers
+Index: vlc/src/check_headers
===================================================================
---- vlc-master.orig/src/check_headers
-+++ vlc-master/src/check_headers
+--- vlc.orig/src/check_headers
++++ vlc/src/check_headers
@@ -6,7 +6,7 @@ cd "$(dirname "$0")" || exit $?
# Look for configure #defines in public headers.
# There are incorrect, as external users don't have our <config.h>.
@@ -14,5 +14,5 @@
- sed -n -e 's/^#undef \([A-Z0-9_]*\)$/\1/p' | \
+ sed -n -e 's/^#undef \([[:upper:][:digit:]_]*\)$/\1/p' | \
grep -v 'WORDS_BIGENDIAN' | \
+ grep -v '__LIBVLC__' | \
xargs | \
- sed -e 's/ /\\\(\\s\\\|$\\\)\\\| /g')"
1.5 src/patchsets/vlc/master/300_all_pic.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/300_all_pic.patch?r1=1.4&r2=1.5
Index: 300_all_pic.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/300_all_pic.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- 300_all_pic.patch 15 Oct 2010 19:19:59 -0000 1.4
+++ 300_all_pic.patch 12 May 2011 13:54:56 -0000 1.5
@@ -1,7 +1,7 @@
-Index: vlc-master/libs/loader/module.c
+Index: vlc/libs/loader/module.c
===================================================================
---- vlc-master.orig/libs/loader/module.c
-+++ vlc-master/libs/loader/module.c
+--- vlc.orig/libs/loader/module.c
++++ vlc/libs/loader/module.c
@@ -63,8 +63,8 @@
#ifdef EMU_QTX_API
@@ -49,10 +49,10 @@
wrapper_target=(void(*)(void))retproc;
retproc=(FARPROC)wrapper;
}
-Index: vlc-master/libs/loader/stubs.s
+Index: vlc/libs/loader/stubs.s
===================================================================
---- vlc-master.orig/libs/loader/stubs.s
-+++ vlc-master/libs/loader/stubs.s
+--- vlc.orig/libs/loader/stubs.s
++++ vlc/libs/loader/stubs.s
@@ -33,3 +33,6 @@ exp_EH_prolog:
leal 12(%esp), %ebp
pushl %eax
@@ -60,10 +60,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc-master/libs/loader/wrapper.S
+Index: vlc/libs/loader/wrapper.S
===================================================================
---- vlc-master.orig/libs/loader/wrapper.S
-+++ vlc-master/libs/loader/wrapper.S
+--- vlc.orig/libs/loader/wrapper.S
++++ vlc/libs/loader/wrapper.S
@@ -1,17 +1,19 @@
.section .data
-.globl caller_return
@@ -179,10 +179,10 @@
+
+.section .note.GNU-stack,"",@progbits
+
-Index: vlc-master/libs/loader/wrapper.h
+Index: vlc/libs/loader/wrapper.h
===================================================================
---- vlc-master.orig/libs/loader/wrapper.h
-+++ vlc-master/libs/loader/wrapper.h
+--- vlc.orig/libs/loader/wrapper.h
++++ vlc/libs/loader/wrapper.h
@@ -7,10 +7,6 @@ typedef struct {
uint32_t edi, esi, ebp, esp, ebx, edx, ecx, eax;
} reg386_t;
@@ -194,10 +194,10 @@
extern void (*wrapper_target)(void);
extern int wrapper(void);
-Index: vlc-master/libs/loader/Makefile.am
+Index: vlc/libs/loader/Makefile.am
===================================================================
---- vlc-master.orig/libs/loader/Makefile.am
-+++ vlc-master/libs/loader/Makefile.am
+--- vlc.orig/libs/loader/Makefile.am
++++ vlc/libs/loader/Makefile.am
@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
# TODO: real check for vsscanf() and <sys/mmap.h>
AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
1.6 src/patchsets/vlc/master/320_all_cachegen.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch?r1=1.5&r2=1.6
Index: 320_all_cachegen.patch
===================================================================
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/master/320_all_cachegen.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- 320_all_cachegen.patch 30 Mar 2011 12:57:14 -0000 1.5
+++ 320_all_cachegen.patch 12 May 2011 13:54:56 -0000 1.6
@@ -1,9 +1,9 @@
Do not try to generate the plugin cache at build time. We will handle this in
pkg_postinst
-Index: vlc-master/modules/Makefile.am
+Index: vlc/modules/Makefile.am
===================================================================
---- vlc-master.orig/modules/Makefile.am
-+++ vlc-master/modules/Makefile.am
+--- vlc.orig/modules/Makefile.am
++++ vlc/modules/Makefile.am
@@ -66,15 +66,7 @@ MOSTLYCLEANFILES = plugins-*-*.dat
.PHONY: stamp-cache
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-05-12 13:55 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-05-12 13:54 [gentoo-commits] gentoo commit in src/patchsets/vlc/master: 010_all_freetype-font.patch 020_all_check_headers_regexps.patch 300_all_pic.patch 320_all_cachegen.patch Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2010-10-15 19:19 Alexis Ballier (aballier)
2010-07-18 10:12 Alexis Ballier (aballier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox