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

(-)mjpegtools-1.6.2-r3.ebuild.orig (-21 / +30 lines)
Lines 11-17 Link Here
11
LICENSE="as-is"
11
LICENSE="as-is"
12
SLOT="1"
12
SLOT="1"
13
KEYWORDS="x86 ppc amd64 ~sparc ppc64"
13
KEYWORDS="x86 ppc amd64 ~sparc ppc64"
14
IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse"
14
IUSE="gtk avi dv quicktime sdl X yv12 3dnow mmx sse pic"
15
15
16
DEPEND="media-libs/jpeg
16
DEPEND="media-libs/jpeg
17
	>=sys-apps/sed-4
17
	>=sys-apps/sed-4
Lines 30-55 Link Here
30
	X? ( virtual/x11 )"
30
	X? ( virtual/x11 )"
31
31
32
src_unpack() {
32
src_unpack() {
33
	unpack ${A} ; cd ${S}
33
	local autoreconfflags="" autoreconf=""
34
	unpack ${A}
35
	cd ${S}
36
34
	cp -rf ${S}{,.orig}
37
	cp -rf ${S}{,.orig}
35
38
36
	epatch ${FILESDIR}/${P}-fPIC.patch
39
	# Add 'const' to aggregate elements of vectors
37
	epatch ${FILESDIR}/${P}-gcc34.patch
38
	epatch ${FILESDIR}/${P}-gcc34-altivec.patch
40
	epatch ${FILESDIR}/${P}-gcc34-altivec.patch
39
41
40
	# remove checks for gtk in configure in
42
	if use !gtk; then
41
	use gtk || epatch ${FILESDIR}/${P}-nogtk.patch
43
		# Force no gtk; alters configure.in, autoreconf required
44
		epatch ${FILESDIR}/${P}-nogtk.patch
45
		autoreconf="yes"
46
	fi
42
47
43
	if use ppc; then
48
	if use ppc; then
44
		# Fix an error in the detection of the altivec-support
49
		# Fix an error in the detection of the altivec-support
45
		# in the compiler
50
		# in the compiler; alters configure.in, autoreconf required
46
		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
51
		epatch "${FILESDIR}/altivec-fix-${PV}.patch"
47
		sed -i 's:-O3::' configure.in
52
		sed -i 's:-O3::' configure.in
53
		autoreconf="yes"
48
	fi
54
	fi
49
55
50
	aclocal
56
	if use pic || use amd64; then
51
	libtoolize --copy --force
57
		# Build libmjpegutils as shared library; alters Makefile.am
52
	autoreconf || die
58
		# so autoreconf required including libtoolize
59
		epatch ${FILESDIR}/${P}-fPIC.patch
60
		epatch ${FILESDIR}/${P}-mmx-fPIC.patch
61
		autoreconfflags="--install --force"
62
		autoreconf="yes"
63
	fi
64
	if [[ ${autoreconf} = "yes" ]]; then
65
		einfo Auto-reconfiguring
66
		autoreconf ${autoreconfflags} || diefunc "$FUNCNAME" "$LINENO" "$?"
67
	fi
68
69
	# Configure patch to remove -mcpu settings; alters configure
70
	# so must be after any autoreconf.
71
	epatch ${FILESDIR}/${P}-gcc34.patch
53
72
54
	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
73
	use X || epatch "${FILESDIR}/no-x11-lib-2.patch"
55
}
74
}
Lines 78-84 Link Here
78
	if use x86; then
97
	if use x86; then
79
		if use mmx || use 3dnow || use sse; then
98
		if use mmx || use 3dnow || use sse; then
80
			myconf="${myconf} --enable-simd-accel"
99
			myconf="${myconf} --enable-simd-accel"
81
			strip-flags -fstack-protector
100
			#strip-flags -fstack-protector
82
		fi
101
		fi
83
		if use mmx; then
102
		if use mmx; then
84
			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
103
			myconf="${myconf} --with-jpeg-mmx=/usr/include/jpeg-mmx"
Lines 87-102 Link Here
87
106
88
	econf ${myconf} || die
107
	econf ${myconf} || die
89
108
90
	if has_pie ; then
91
		pie_magic="`test_flag -fno-pic` `test_flag -nopie`"
92
		for i in `find "${S}" -name "Makefile"` ; do
93
			sed -e "s:CC = gcc:CC = gcc ${pie_magic}:g" \
94
				-e "s:CXX = gcc:CXX = g++ ${pie_magic}:g" \
95
				-e "s:CXXCPP = gcc -E:CXX = g++ -E ${pie_magic}:g" \
96
				-i "${i}" || die "sed failed"
97
		done
98
	fi
99
100
	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "compile problem"
109
	emake CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" -j1 || die "compile problem"
101
	cd docs
110
	cd docs
102
	local infofile
111
	local infofile

Return to bug 78404