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

Collapse All | Expand All

(-)/usr/portage/media-video/mjpegtools/mjpegtools-1.6.2-r3.ebuild (-12 / +8 lines)
Lines 14-20 Link Here
14
LICENSE="as-is"
14
LICENSE="as-is"
15
SLOT="1"
15
SLOT="1"
16
KEYWORDS="x86 ppc amd64 ~sparc ppc64"
16
KEYWORDS="x86 ppc amd64 ~sparc ppc64"
17
IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga"
17
IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse v4l dga pic"
18
18
19
RDEPEND="media-libs/jpeg
19
RDEPEND="media-libs/jpeg
20
	x86? ( media-libs/libmovtar
20
	x86? ( media-libs/libmovtar
Lines 43-48 Link Here
43
	epatch ${FILESDIR}/${P}-configure.patch
43
	epatch ${FILESDIR}/${P}-configure.patch
44
	epatch ${FILESDIR}/${P}-fPIC.patch
44
	epatch ${FILESDIR}/${P}-fPIC.patch
45
	epatch ${FILESDIR}/${P}-gcc34.patch
45
	epatch ${FILESDIR}/${P}-gcc34.patch
46
	# fixup mmx assembler for PIC compliance
47
	# 1) Clobber esi instead of ebx in yudvdenoise/{deinterlace,motion}.c
48
	# 2) Make data references GOT-relative in mpeg2enc/quant_mmx.s,
49
	#    utils/mmxsse/mblock_sumsq_mmx.s
50
	# The latter has a small impact on performance, so the patch
51
	# is applied conditionally.
52
	use pic && epatch ${FILESDIR}/${P}-mmx-fPIC.patch
46
53
47
	if use ppc; then
54
	if use ppc; then
48
		# Fix an error in the detection of the altivec-support
55
		# Fix an error in the detection of the altivec-support
Lines 73-79 Link Here
73
	if use x86; then
80
	if use x86; then
74
		if use mmx || use 3dnow || use sse; then
81
		if use mmx || use 3dnow || use sse; then
75
			myconf="${myconf} --enable-simd-accel"
82
			myconf="${myconf} --enable-simd-accel"
76
			strip-flags -fstack-protector
77
		fi
83
		fi
78
		if use mmx; then
84
		if use mmx; then
79
			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
85
			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
Lines 96-111 Link Here
96
		$(use_with dv dv /usr) \
102
		$(use_with dv dv /usr) \
97
		${myconf} || die
103
		${myconf} || die
98
104
99
	if has_pie; then
100
		pie_magic="$(test_flag -fno-pic) $(test_flag -nopie)"
101
102
		find "${S}" -name Makefile | xargs sed -i \
103
			-e "s:CC = gcc:CC = gcc ${pie_magic}:g" \
104
			-e "s:CXX = gcc:CXX = g++ ${pie_magic}:g" \
105
			-e "s:CXXCPP = gcc -E:CXX = g++ -E ${pie_magic}:g" \
106
			|| die "sed failed"
107
	fi
108
109
	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
105
	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "emake failed"
110
	cd docs
106
	cd docs
111
	local infofile
107
	local infofile

Return to bug 78404