Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Tom Wijsman (tomwij)" <tomwij@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/vlc: vlc-9999.ebuild vlc-2.1.9999.ebuild vlc-2.0.9999.ebuild ChangeLog
Date: Sat, 26 Oct 2013 08:08:33
Message-Id: 20131026080827.981EC20047@flycatcher.gentoo.org
1 tomwij 13/10/26 08:08:27
2
3 Modified: vlc-9999.ebuild vlc-2.1.9999.ebuild
4 vlc-2.0.9999.ebuild ChangeLog
5 Log:
6 Support Samba 4; reported and patch provided by Torsten Kurbad, patch slightly adapted to keep minimal version restriction in place (USE flags will differentiate between both), fixes bug #452048.
7
8 (Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
9
10 Revision Changes Path
11 1.196 media-video/vlc/vlc-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.196&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?rev=1.196&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-9999.ebuild?r1=1.195&r2=1.196
16
17 Index: vlc-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v
20 retrieving revision 1.195
21 retrieving revision 1.196
22 diff -u -r1.195 -r1.196
23 --- vlc-9999.ebuild 26 Oct 2013 06:24:22 -0000 1.195
24 +++ vlc-9999.ebuild 26 Oct 2013 08:08:27 -0000 1.196
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2013 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.195 2013/10/26 06:24:22 tomwij Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.196 2013/10/26 08:08:27 tomwij Exp $
30
31 EAPI="5"
32
33 @@ -120,7 +120,7 @@
34 qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
35 qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
36 rdp? ( net-misc/freerdp:0 )
37 - samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
38 + samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
39 schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
40 sdl? ( >=media-libs/libsdl-1.2.8:0
41 sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
42 @@ -247,6 +247,9 @@
43 }
44
45 src_configure() {
46 + # Compatibility fix for Samba 4.
47 + use samba && append-cppflags "-I/usr/include/samba-4.0"
48 +
49 # Needs libresid-builder from libsidplay:2 which is in another directory...
50 # FIXME!
51 append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
52
53
54
55 1.3 media-video/vlc/vlc-2.1.9999.ebuild
56
57 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.3&view=markup
58 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?rev=1.3&content-type=text/plain
59 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild?r1=1.2&r2=1.3
60
61 Index: vlc-2.1.9999.ebuild
62 ===================================================================
63 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v
64 retrieving revision 1.2
65 retrieving revision 1.3
66 diff -u -r1.2 -r1.3
67 --- vlc-2.1.9999.ebuild 26 Oct 2013 06:24:22 -0000 1.2
68 +++ vlc-2.1.9999.ebuild 26 Oct 2013 08:08:27 -0000 1.3
69 @@ -1,6 +1,6 @@
70 # Copyright 1999-2013 Gentoo Foundation
71 # Distributed under the terms of the GNU General Public License v2
72 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.2 2013/10/26 06:24:22 tomwij Exp $
73 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.1.9999.ebuild,v 1.3 2013/10/26 08:08:27 tomwij Exp $
74
75 EAPI="5"
76
77 @@ -120,7 +120,7 @@
78 pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
79 qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
80 qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
81 - samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
82 + samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
83 schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
84 sdl? ( >=media-libs/libsdl-1.2.8:0
85 sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
86 @@ -242,6 +242,9 @@
87 }
88
89 src_configure() {
90 + # Compatibility fix for Samba 4.
91 + use samba && append-cppflags "-I/usr/include/samba-4.0"
92 +
93 # Needs libresid-builder from libsidplay:2 which is in another directory...
94 # FIXME!
95 append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
96
97
98
99 1.29 media-video/vlc/vlc-2.0.9999.ebuild
100
101 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?rev=1.29&view=markup
102 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?rev=1.29&content-type=text/plain
103 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild?r1=1.28&r2=1.29
104
105 Index: vlc-2.0.9999.ebuild
106 ===================================================================
107 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v
108 retrieving revision 1.28
109 retrieving revision 1.29
110 diff -u -r1.28 -r1.29
111 --- vlc-2.0.9999.ebuild 26 Oct 2013 07:39:02 -0000 1.28
112 +++ vlc-2.0.9999.ebuild 26 Oct 2013 08:08:27 -0000 1.29
113 @@ -1,6 +1,6 @@
114 # Copyright 1999-2013 Gentoo Foundation
115 # Distributed under the terms of the GNU General Public License v2
116 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.28 2013/10/26 07:39:02 tomwij Exp $
117 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-2.0.9999.ebuild,v 1.29 2013/10/26 08:08:27 tomwij Exp $
118
119 EAPI="5"
120
121 @@ -119,7 +119,7 @@
122 projectm? ( media-libs/libprojectm:0 media-fonts/dejavu:0 )
123 pulseaudio? ( >=media-sound/pulseaudio-0.9.22:0 )
124 qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
125 - samba? ( >=net-fs/samba-3.4.6:0[smbclient] )
126 + samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) )
127 schroedinger? ( >=media-libs/schroedinger-1.0.10:0 )
128 sdl? ( >=media-libs/libsdl-1.2.8:0
129 sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) )
130 @@ -240,6 +240,9 @@
131 }
132
133 src_configure() {
134 + # Compatibility fix for Samba 4.
135 + use samba && append-cppflags "-I/usr/include/samba-4.0"
136 +
137 # Needs libresid-builder from libsidplay:2 which is in another directory...
138 # FIXME!
139 append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/"
140
141
142
143 1.863 media-video/vlc/ChangeLog
144
145 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.863&view=markup
146 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?rev=1.863&content-type=text/plain
147 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/vlc/ChangeLog?r1=1.862&r2=1.863
148
149 Index: ChangeLog
150 ===================================================================
151 RCS file: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v
152 retrieving revision 1.862
153 retrieving revision 1.863
154 diff -u -r1.862 -r1.863
155 --- ChangeLog 26 Oct 2013 07:39:02 -0000 1.862
156 +++ ChangeLog 26 Oct 2013 08:08:27 -0000 1.863
157 @@ -1,6 +1,12 @@
158 # ChangeLog for media-video/vlc
159 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
160 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.862 2013/10/26 07:39:02 tomwij Exp $
161 +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/ChangeLog,v 1.863 2013/10/26 08:08:27 tomwij Exp $
162 +
163 + 26 Oct 2013; Tom Wijsman <TomWij@g.o> vlc-2.0.9999.ebuild,
164 + vlc-2.1.9999.ebuild, vlc-9999.ebuild:
165 + Support Samba 4; reported and patch provided by Torsten Kurbad, patch slightly
166 + adapted to keep minimal version restriction in place (USE flags will
167 + differentiate between both), fixes bug #452048.
168
169 26 Oct 2013; Tom Wijsman <TomWij@g.o>
170 +files/vlc-2.0.8-support-uclibc.patch, vlc-2.0.9999.ebuild,
Report Message
Find on MARC Find on Google Groups