| 1 |
aballier 08/05/10 11:20:06 |
| 2 |
|
| 3 |
Modified: 000_all_glide.patch 250_all_livepic.patch |
| 4 |
Log: |
| 5 |
sync with trunk |
| 6 |
|
| 7 |
Revision Changes Path |
| 8 |
1.3 src/patchsets/vlc/0.9.0/000_all_glide.patch |
| 9 |
|
| 10 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/000_all_glide.patch?rev=1.3&view=markup |
| 11 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/000_all_glide.patch?rev=1.3&content-type=text/plain |
| 12 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/000_all_glide.patch?r1=1.2&r2=1.3 |
| 13 |
|
| 14 |
Index: 000_all_glide.patch |
| 15 |
=================================================================== |
| 16 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/0.9.0/000_all_glide.patch,v |
| 17 |
retrieving revision 1.2 |
| 18 |
retrieving revision 1.3 |
| 19 |
diff -u -r1.2 -r1.3 |
| 20 |
--- 000_all_glide.patch 22 Oct 2007 11:35:52 -0000 1.2 |
| 21 |
+++ 000_all_glide.patch 10 May 2008 11:20:06 -0000 1.3 |
| 22 |
@@ -38,7 +38,7 @@ |
| 23 |
- CFLAGS="$CFLAGS -I/usr/include/glide" |
| 24 |
+ CFLAGS="$CFLAGS -I/usr/include/glide3" |
| 25 |
AC_CHECK_HEADER(glide.h,[ |
| 26 |
- VLC_ADD_PLUGINS([glide]) |
| 27 |
+ VLC_ADD_PLUGIN([glide]) |
| 28 |
- VLC_ADD_LIBS([glide],[-lglide2x -lm]) |
| 29 |
- VLC_ADD_CPPFLAGS([glide],[-I/usr/include/glide]) |
| 30 |
+ VLC_ADD_LIBS([glide],[-lglide3 -lm]) |
| 31 |
|
| 32 |
|
| 33 |
|
| 34 |
1.3 src/patchsets/vlc/0.9.0/250_all_livepic.patch |
| 35 |
|
| 36 |
file : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/250_all_livepic.patch?rev=1.3&view=markup |
| 37 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/250_all_livepic.patch?rev=1.3&content-type=text/plain |
| 38 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo/src/patchsets/vlc/0.9.0/250_all_livepic.patch?r1=1.2&r2=1.3 |
| 39 |
|
| 40 |
Index: 250_all_livepic.patch |
| 41 |
=================================================================== |
| 42 |
RCS file: /var/cvsroot/gentoo/src/patchsets/vlc/0.9.0/250_all_livepic.patch,v |
| 43 |
retrieving revision 1.2 |
| 44 |
retrieving revision 1.3 |
| 45 |
diff -u -r1.2 -r1.3 |
| 46 |
--- 250_all_livepic.patch 22 Oct 2007 11:35:52 -0000 1.2 |
| 47 |
+++ 250_all_livepic.patch 10 May 2008 11:20:06 -0000 1.3 |
| 48 |
@@ -2,18 +2,15 @@ |
| 49 |
library properly. For policy we also build a shared version of it that |
| 50 |
uses PIC. |
| 51 |
For this reason, we can reasonably force VLC to create a Plugin for |
| 52 |
-live555 rather than a builtin.Index: vlc-0.8.6/configure.ac |
| 53 |
+live555 rather than a builtin. |
| 54 |
=================================================================== |
| 55 |
-Index: vlc-0.8.6_p18636/configure.ac |
| 56 |
+Index: vlc/configure.ac |
| 57 |
=================================================================== |
| 58 |
---- vlc-0.8.6_p18636.orig/configure.ac |
| 59 |
-+++ vlc-0.8.6_p18636/configure.ac |
| 60 |
-@@ -1558,9 +1558,9 @@ if test "${enable_live555}" = "yes"; the |
| 61 |
- ], [ |
| 62 |
- AC_CHECK_LIB(liveMedia, main, [ |
| 63 |
+--- vlc.orig/configure.ac |
| 64 |
++++ vlc/configure.ac |
| 65 |
+@@ -1920,7 +1920,7 @@ if test "${enable_live555}" != "no"; the |
| 66 |
# We only have -lliveMedia, do builtins |
| 67 |
-- VLC_ADD_BUILTINS([live555]) |
| 68 |
-+ VLC_ADD_PLUGINS([live555]) |
| 69 |
+ VLC_ADD_PLUGIN([live555]) |
| 70 |
VLC_ADD_LIBS([live555], [-lliveMedia -lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) |
| 71 |
- ]) |
| 72 |
+ ], ,[-lgroupsock -lBasicUsageEnvironment -lUsageEnvironment]) |
| 73 |
|
| 74 |
|
| 75 |
|
| 76 |
-- |
| 77 |
gentoo-commits@l.g.o mailing list |
Archives