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

Collapse All | Expand All

(-)/var/portage/media-video/ffmpeg/ffmpeg-0.6.ebuild (-7 / +12 lines)
Lines 32-38 Link Here
32
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
32
IUSE="+3dnow +3dnowext alsa altivec cpudetection custom-cflags debug dirac
33
	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
33
	  doc ieee1394 +encode faac faad gsm jack +mmx +mmxext vorbis test
34
	  theora threads x264 xvid network zlib sdl X mp3 amr
34
	  theora threads x264 xvid network zlib sdl X mp3 amr
35
	  oss pic rtmp schroedinger +hardcoded-tables bindist v4l v4l2
35
	  oss rtmp schroedinger +hardcoded-tables bindist v4l v4l2
36
	  speex +ssse3 jpeg2k vaapi vdpau vpx"
36
	  speex +ssse3 jpeg2k vaapi vdpau vpx"
37
37
38
VIDEO_CARDS="nvidia"
38
VIDEO_CARDS="nvidia"
Lines 159-172 Link Here
159
	use mmxext || myconf="${myconf} --disable-mmx2"
159
	use mmxext || myconf="${myconf} --disable-mmx2"
160
	use 3dnow || myconf="${myconf} --disable-amd3dnow"
160
	use 3dnow || myconf="${myconf} --disable-amd3dnow"
161
	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
161
	use 3dnowext || myconf="${myconf} --disable-amd3dnowext"
162
	# disable mmx accelerated code if PIC is required
162
163
	# as the provided asm decidedly is not PIC.
164
	if gcc-specs-pie ; then
163
	if gcc-specs-pie ; then
165
		myconf="${myconf} --disable-mmx --disable-mmx2"
164
		# On hardened amd64 it compiles fine, but fails tests (and runtime) without pic
166
	fi
165
		# On hardened x86 it does not hurt either
166
		myconf="${myconf} --enable-pic"
167
167
168
	# Option to force building pic
168
		if use x86
169
	use pic && myconf="${myconf} --enable-pic"
169
		then
170
			# Compiles with only --disable-mmx, but fails tests and runtime
171
			# on hardened x86 with textrels if not --disable-asm
172
			myconf="${myconf} --disable-asm"
173
		fi
174
	fi
170
175
171
	# Try to get cpu type based on CFLAGS.
176
	# Try to get cpu type based on CFLAGS.
172
	# Bug #172723
177
	# Bug #172723

Return to bug 290741