Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488646
Collapse All | Expand All

(-)file_not_specified_in_diff (-7 / +14 lines)
Line  Link Here
0
-- a/vlc-9999.ebuild
0
++ b/vlc-9999.ebuild
Lines 1-8 Link Here
1
# Copyright 1999-2013 Gentoo Foundation
1
# Copyright 1999-2013 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/media-video/vlc/vlc-9999.ebuild,v 1.191 2013/09/20 23:30:16 scarabeus Exp $
3
# $Header: $
4
4
5
EAPI="5"
5
EAPI=5
6
6
7
SCM=""
7
SCM=""
8
if [ "${PV%9999}" != "${PV}" ] ; then
8
if [ "${PV%9999}" != "${PV}" ] ; then
Lines 52-58 Link Here
52
	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
52
	+macosx-audio +macosx-dialog-provider +macosx-eyetv +macosx-quartztext
53
	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
53
	+macosx-qtkit +macosx-vout matroska media-library mmx modplug mp3 mpeg
54
	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png
54
	mtp musepack ncurses neon ogg omxil opengl optimisememory oss png
55
	+postproc projectm pulseaudio +qt4 rtsp run-as-root samba schroedinger
55
	+postproc projectm pulseaudio qt4 +qt5 rtsp run-as-root samba schroedinger
56
	sdl sdl-image shine shout sid skins speex sse svg +swscale
56
	sdl sdl-image shine shout sid skins speex sse svg +swscale
57
	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
57
	taglib theora truetype twolame udev upnp vaapi v4l vcdx vlm vorbis waveout
58
	wma-fixed +X x264 +xcb xml xv zvbi"
58
	wma-fixed +X x264 +xcb xml xv zvbi"
Lines 113-119 Link Here
113
		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
113
		postproc? ( || ( media-video/ffmpeg:0 media-libs/libpostproc ) )
114
		projectm? ( media-libs/libprojectm media-fonts/dejavu )
114
		projectm? ( media-libs/libprojectm media-fonts/dejavu )
115
		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
115
		pulseaudio? ( >=media-sound/pulseaudio-0.9.22 )
116
		qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
116
		qt4? (	dev-qt/qtgui:4 dev-qt/qtcore:4
117
				!dev-qt/qtgui:5 !dev-qt/qtcore:5 )
118
		qt5? ( dev-qt/qtgui:5 dev-qt/qtcore:5 )
117
		samba? ( >=net-fs/samba-3.4.6[smbclient] )
119
		samba? ( >=net-fs/samba-3.4.6[smbclient] )
118
		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
120
		schroedinger? ( >=media-libs/schroedinger-1.0.10 )
119
		sdl? ( >=media-libs/libsdl-1.2.8
121
		sdl? ( >=media-libs/libsdl-1.2.8
Lines 164-171 Link Here
164
	libtar? ( skins )
166
	libtar? ( skins )
165
	libtiger? ( kate )
167
	libtiger? ( kate )
166
	qt4? ( X )
168
	qt4? ( X )
169
	qt5? ( !qt4 )
167
	sdl? ( X )
170
	sdl? ( X )
168
	skins? ( truetype qt4 X )
171
	skins? ( truetype X || ( qt4 qt5 ) )
169
	vaapi? ( avcodec X )
172
	vaapi? ( avcodec X )
170
	vlm? ( encode )
173
	vlm? ( encode )
171
	xv? ( xcb )
174
	xv? ( xcb )
Lines 180-189 Link Here
180
}
183
}
181
184
182
src_prepare() {
185
src_prepare() {
186
	if use qt5; then
187
		export UIC="/usr/lib64/qt5/bin/uic"
188
		export MOC="/usr/lib64/qt5/bin/moc"
189
	fi
183
	# Make it build with libtool 1.5
190
	# Make it build with libtool 1.5
184
	rm -f m4/lt* m4/libtool.m4
191
	rm -f m4/lt* m4/libtool.m4
185
192
186
#	EPATCH_SUFFIX="patch" epatch "${WORKDIR}/patches"
187
	eautoreconf
193
	eautoreconf
188
}
194
}
189
195
Lines 278-283 Link Here
278
		$(use_enable projectm) \
284
		$(use_enable projectm) \
279
		$(use_enable pulseaudio pulse) \
285
		$(use_enable pulseaudio pulse) \
280
		$(use_enable qt4 qt) \
286
		$(use_enable qt4 qt) \
287
		$(use_enable qt5 qt) \
281
		$(use_enable rtsp realrtsp) \
288
		$(use_enable rtsp realrtsp) \
282
		$(use_enable run-as-root) \
289
		$(use_enable run-as-root) \
283
		$(use_enable samba smbclient) \
290
		$(use_enable samba smbclient) \

Return to bug 488646