diff options
author | Tom Wijsman <tomwij@gentoo.org> | 2013-10-26 08:08:27 +0000 |
---|---|---|
committer | Tom Wijsman <tomwij@gentoo.org> | 2013-10-26 08:08:27 +0000 |
commit | 478b0c2b64d8d9d0885bffaaf3a3756d9815d852 (patch) | |
tree | fc793f1d57d6a665cc793cc9ad006ccea3ffeae4 /media-video/vlc/vlc-9999.ebuild | |
parent | convert to multilib, by Reinis Danne, bug #488278 (diff) | |
download | gentoo-2-478b0c2b64d8d9d0885bffaaf3a3756d9815d852.tar.gz gentoo-2-478b0c2b64d8d9d0885bffaaf3a3756d9815d852.tar.bz2 gentoo-2-478b0c2b64d8d9d0885bffaaf3a3756d9815d852.zip |
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.
(Portage version: HEAD/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Diffstat (limited to 'media-video/vlc/vlc-9999.ebuild')
-rw-r--r-- | media-video/vlc/vlc-9999.ebuild | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index c05b2ebb066c..48ef5fc26009 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.195 2013/10/26 06:24:22 tomwij Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.196 2013/10/26 08:08:27 tomwij Exp $ EAPI="5" @@ -120,7 +120,7 @@ RDEPEND=" qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 ) rdp? ( net-misc/freerdp:0 ) - samba? ( >=net-fs/samba-3.4.6:0[smbclient] ) + samba? ( || ( >=net-fs/samba-3.4.6:0[smbclient] >=net-fs/samba-4.0.0:0[client] ) ) schroedinger? ( >=media-libs/schroedinger-1.0.10:0 ) sdl? ( >=media-libs/libsdl-1.2.8:0 sdl-image? ( media-libs/sdl-image:0 sys-libs/zlib:0 ) ) @@ -247,6 +247,9 @@ src_prepare() { } src_configure() { + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + # Needs libresid-builder from libsidplay:2 which is in another directory... # FIXME! append-ldflags "-L/usr/$(get_libdir)/sidplay/builders/" |