| 1 |
aballier 11/01/26 10:40:09 |
| 2 |
|
| 3 |
Modified: vlc-1.1.9999.ebuild ChangeLog vlc-1.1.6.ebuild |
| 4 |
Log: |
| 5 |
Attempt to fix the pulseaudio vs xlib mess |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.23 media-video/vlc/vlc-1.1.9999.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.23&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?rev=1.23&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild?r1=1.22&r2=1.23 |
| 15 |
|
| 16 |
Index: vlc-1.1.9999.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v |
| 19 |
retrieving revision 1.22 |
| 20 |
retrieving revision 1.23 |
| 21 |
diff -u -r1.22 -r1.23 |
| 22 |
--- vlc-1.1.9999.ebuild 2 Jan 2011 14:40:08 -0000 1.22 |
| 23 |
+++ vlc-1.1.9999.ebuild 26 Jan 2011 10:40:09 -0000 1.23 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2011 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.22 2011/01/02 14:40:08 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.9999.ebuild,v 1.23 2011/01/26 10:40:09 aballier Exp $ |
| 29 |
|
| 30 |
EAPI="3" |
| 31 |
|
| 32 |
@@ -109,8 +109,8 @@ |
| 33 |
opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) ) |
| 34 |
png? ( media-libs/libpng sys-libs/zlib ) |
| 35 |
projectm? ( media-libs/libprojectm ) |
| 36 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11 |
| 37 |
- !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) ) |
| 38 |
+ pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22 |
| 39 |
+ ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) ) |
| 40 |
qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) |
| 41 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 42 |
samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) |
| 43 |
@@ -184,6 +184,7 @@ |
| 44 |
vlc_use_force vlm stream |
| 45 |
vlc_use_force vaapi ffmpeg |
| 46 |
vlc_use_force nsplugin xcb |
| 47 |
+ has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X |
| 48 |
|
| 49 |
# Useflags that will be automagically discarded if deps are not met |
| 50 |
vlc_use_needs bidi truetype |
| 51 |
@@ -338,7 +339,8 @@ |
| 52 |
$(vlc_use_enable_force remoteosd libgcrypt) \ |
| 53 |
$(vlc_use_enable_force gnutls libgcrypt) \ |
| 54 |
$(vlc_use_enable_force vaapi avcodec) \ |
| 55 |
- $(vlc_use_enable_force nsplugin xcb) |
| 56 |
+ $(vlc_use_enable_force nsplugin xcb) \ |
| 57 |
+ $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') |
| 58 |
} |
| 59 |
|
| 60 |
src_install() { |
| 61 |
|
| 62 |
|
| 63 |
|
| 64 |
1.652 media-video/vlc/ChangeLog |
| 65 |
|
| 66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.652&view=markup |
| 67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.652&content-type=text/plain |
| 68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.651&r2=1.652 |
| 69 |
|
| 70 |
Index: ChangeLog |
| 71 |
=================================================================== |
| 72 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v |
| 73 |
retrieving revision 1.651 |
| 74 |
retrieving revision 1.652 |
| 75 |
diff -u -r1.651 -r1.652 |
| 76 |
--- ChangeLog 26 Jan 2011 08:46:46 -0000 1.651 |
| 77 |
+++ ChangeLog 26 Jan 2011 10:40:09 -0000 1.652 |
| 78 |
@@ -1,6 +1,10 @@ |
| 79 |
# ChangeLog for media-video/vlc |
| 80 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 81 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.651 2011/01/26 08:46:46 fauli Exp $ |
| 82 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.652 2011/01/26 10:40:09 aballier Exp $ |
| 83 |
+ |
| 84 |
+ 26 Jan 2011; Alexis Ballier <aballier@g.o> vlc-1.1.6.ebuild, |
| 85 |
+ vlc-1.1.9999.ebuild: |
| 86 |
+ Attempt to fix the pulseaudio vs xlib mess |
| 87 |
|
| 88 |
26 Jan 2011; Christian Faulhammer <fauli@g.o> vlc-1.1.6.ebuild: |
| 89 |
stable x86, security bug 352206 |
| 90 |
|
| 91 |
|
| 92 |
|
| 93 |
1.5 media-video/vlc/vlc-1.1.6.ebuild |
| 94 |
|
| 95 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild?rev=1.5&view=markup |
| 96 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild?rev=1.5&content-type=text/plain |
| 97 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild?r1=1.4&r2=1.5 |
| 98 |
|
| 99 |
Index: vlc-1.1.6.ebuild |
| 100 |
=================================================================== |
| 101 |
RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild,v |
| 102 |
retrieving revision 1.4 |
| 103 |
retrieving revision 1.5 |
| 104 |
diff -u -r1.4 -r1.5 |
| 105 |
--- vlc-1.1.6.ebuild 26 Jan 2011 08:46:46 -0000 1.4 |
| 106 |
+++ vlc-1.1.6.ebuild 26 Jan 2011 10:40:09 -0000 1.5 |
| 107 |
@@ -1,6 +1,6 @@ |
| 108 |
# Copyright 1999-2011 Gentoo Foundation |
| 109 |
# Distributed under the terms of the GNU General Public License v2 |
| 110 |
-# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild,v 1.4 2011/01/26 08:46:46 fauli Exp $ |
| 111 |
+# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-1.1.6.ebuild,v 1.5 2011/01/26 10:40:09 aballier Exp $ |
| 112 |
|
| 113 |
EAPI="3" |
| 114 |
|
| 115 |
@@ -109,8 +109,8 @@ |
| 116 |
opengl? ( virtual/opengl || ( <x11-libs/libX11-1.3.99.901[xcb] >=x11-libs/libX11-1.3.99.901 ) ) |
| 117 |
png? ( media-libs/libpng sys-libs/zlib ) |
| 118 |
projectm? ( media-libs/libprojectm ) |
| 119 |
- pulseaudio? ( >=media-sound/pulseaudio-0.9.11 |
| 120 |
- !X? ( >=media-sound/pulseaudio-0.9.11[-X] ) ) |
| 121 |
+ pulseaudio? ( || ( >=media-sound/pulseaudio-0.9.22 |
| 122 |
+ ( >=media-sound/pulseaudio-0.9.11 x11-libs/libX11 ) ) ) |
| 123 |
qt4? ( x11-libs/qt-gui:4 x11-libs/qt-core:4 x11-libs/libX11 ) |
| 124 |
remoteosd? ( >=dev-libs/libgcrypt-1.2.0 ) |
| 125 |
samba? ( || ( >=net-fs/samba-3.4.6[smbclient] <net-fs/samba-3.4 ) ) |
| 126 |
@@ -184,6 +184,7 @@ |
| 127 |
vlc_use_force vlm stream |
| 128 |
vlc_use_force vaapi ffmpeg |
| 129 |
vlc_use_force nsplugin xcb |
| 130 |
+ has_version '<media-sound/pulseaudio-0.9.22' && vlc_use_force pulseaudio X |
| 131 |
|
| 132 |
# Useflags that will be automagically discarded if deps are not met |
| 133 |
vlc_use_needs bidi truetype |
| 134 |
@@ -338,7 +339,8 @@ |
| 135 |
$(vlc_use_enable_force remoteosd libgcrypt) \ |
| 136 |
$(vlc_use_enable_force gnutls libgcrypt) \ |
| 137 |
$(vlc_use_enable_force vaapi avcodec) \ |
| 138 |
- $(vlc_use_enable_force nsplugin xcb) |
| 139 |
+ $(vlc_use_enable_force nsplugin xcb) \ |
| 140 |
+ $(has_version '<media-sound/pulseaudio-0.9.22' && use pulseaudio && echo '--with-x') |
| 141 |
} |
| 142 |
|
| 143 |
src_install() { |
Archives