Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 359493 | Differences between
and this patch

Collapse All | Expand All

(-)orig/ffmpeg-9999.ebuild (-2 / +8 lines)
Lines 7-13 EAPI="2" Link Here
7
SCM=""
7
SCM=""
8
if [ "${PV#9999}" != "${PV}" ] ; then
8
if [ "${PV#9999}" != "${PV}" ] ; then
9
	SCM="git"
9
	SCM="git"
10
	EGIT_REPO_URI="git://git.ffmpeg.org/ffmpeg.git"
10
	EGIT_BRANCH="master"
11
	EGIT_REPO_URI="git://git.videolan.org/ffmpeg.git"
11
fi
12
fi
12
13
13
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
14
inherit eutils flag-o-matic multilib toolchain-funcs ${SCM}
Lines 28-34 SLOT="0" Link Here
28
if [ "${PV#9999}" = "${PV}" ] ; then
29
if [ "${PV#9999}" = "${PV}" ] ; then
29
	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
30
	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
30
fi
31
fi
31
IUSE="+3dnow +3dnowext alsa altivec amr bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
32
IUSE="+3dnow +3dnowext alsa altivec amr avx bindist +bzip2 cpudetection custom-cflags debug dirac doc +encode faac frei0r gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network oss pic qt-faststart rtmp schroedinger sdl speex +ssse3 static-libs test theora threads truetype v4l v4l2 vaapi vdpau vorbis vpx X x264 xvid +zlib"
32
33
33
VIDEO_CARDS="nvidia"
34
VIDEO_CARDS="nvidia"
34
35
Lines 58-63 RDEPEND=" Link Here
58
	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
59
	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
59
	schroedinger? ( media-libs/schroedinger )
60
	schroedinger? ( media-libs/schroedinger )
60
	speex? ( >=media-libs/speex-1.2_beta3 )
61
	speex? ( >=media-libs/speex-1.2_beta3 )
62
	truetype? ( media-libs/freetype:2 )
61
	vaapi? ( x11-libs/libva )
63
	vaapi? ( x11-libs/libva )
62
	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
64
	video_cards_nvidia? ( vdpau? ( x11-libs/libvdpau ) )
63
	vpx? ( media-libs/libvpx )
65
	vpx? ( media-libs/libvpx )
Lines 144-149 src_configure() { Link Here
144
		use ${i} && myconf="${myconf} --enable-lib${i}"
146
		use ${i} && myconf="${myconf} --enable-lib${i}"
145
	done
147
	done
146
	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
148
	use jpeg2k && myconf="${myconf} --enable-libopenjpeg"
149
	use truetype && myconf="${myconf} --enable-libfreetype"
147
150
148
	# CPU features
151
	# CPU features
149
	for i in mmx ssse3 altivec ; do
152
	for i in mmx ssse3 altivec ; do
Lines 157-162 src_configure() { Link Here
157
	if use pic && use x86 ; then
160
	if use pic && use x86 ; then
158
		myconf="${myconf} --disable-mmx --disable-mmx2"
161
		myconf="${myconf} --disable-mmx --disable-mmx2"
159
	fi
162
	fi
163
	if use x86 || use amd64; then
164
		use avx || myconf="${myconf} --disable-avx"
165
	fi
160
166
161
	# Option to force building pic
167
	# Option to force building pic
162
	use pic && myconf="${myconf} --enable-pic"
168
	use pic && myconf="${myconf} --enable-pic"

Return to bug 359493