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

Collapse All | Expand All

(-)xine-lib-1.0.ebuild.orig (-4 / +23 lines)
Lines 16-22 Link Here
16
SLOT="1"
16
SLOT="1"
17
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
17
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
18
IUSE="aalib libcaca arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
18
IUSE="aalib libcaca arts esd avi nls dvd X directfb oggvorbis alsa gnome sdl speex
19
	theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0 samba dxr3 vidix png mng"
19
	theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0 samba dxr3 vidix png mng
20
	cle266"
20
RESTRICT="nostrip"
21
RESTRICT="nostrip"
21
22
22
RDEPEND="oggvorbis? ( media-libs/libvorbis )
23
RDEPEND="oggvorbis? ( media-libs/libvorbis )
Lines 164-175 Link Here
164
	use !png && export ac_cv_lib_png_png_create_read_struct=no
165
	use !png && export ac_cv_lib_png_png_create_read_struct=no
165
	use !mng && export ac_cv_header_libmng_h=no
166
	use !mng && export ac_cv_header_libmng_h=no
166
167
168
	# The configure script misses certain headers if --x-includes is not set
169
	if use X; then
170
		if [ -f "${ROOT}/usr/include/X11/X.h" ]; then
171
			myconf="${myconf} --x-includes=${ROOT}/usr/include"
172
		elif [ -f "${ROOT}/usr/X11R6/include/X11/X.h" ]; then
173
			myconf="${myconf} --x-includes=${ROOT}/usr/X11R6/include"
174
		else
175
			eerror "Couldn't find your X header files."
176
			die "Couldn't find X headers."
177
		fi
178
	fi
179
	
167
	if use xvmc; then
180
	if use xvmc; then
168
		if use nvidia && use i8x0; then
181
		count="0"
182
		use nvidia && count="`expr ${count} + 1`" 
183
		use i8x0 && count="`expr ${count} + 1`" 
184
		use cle266 && count="`expr ${count} + 1`" 
185
		if [ "${count}" -gt "1" ]; then
169
			eerror "Invalid combination of USE flags"
186
			eerror "Invalid combination of USE flags"
170
			eerror "When building support for xvmc, you may only"
187
			eerror "When building support for xvmc, you may only"
171
			eerror "include support for one video card:"
188
			eerror "include support for one video card:"
172
			eerror "   nvidia, i8x0"
189
			eerror "   nvidia, i8x0, cle266"
173
			eerror ""
190
			eerror ""
174
			eerror "Emerge again with different USE flags"
191
			eerror "Emerge again with different USE flags"
175
192
Lines 178-190 Link Here
178
			xvmclib="XvMCNVIDIA"
195
			xvmclib="XvMCNVIDIA"
179
		elif use i8x0; then
196
		elif use i8x0; then
180
			xvmclib="I810XvMC"
197
			xvmclib="I810XvMC"
198
		elif use cle266; then
199
			xvmclib="viaXvMC"
181
		else
200
		else
182
			ewarn "You tried to build with xvmc support."
201
			ewarn "You tried to build with xvmc support."
183
			ewarn "No supported graphics hardware was specified."
202
			ewarn "No supported graphics hardware was specified."
184
			ewarn ""
203
			ewarn ""
185
			ewarn "No xvmc support will be included."
204
			ewarn "No xvmc support will be included."
186
			ewarn "Please one appropriate USE flag and re-emerge:"
205
			ewarn "Please one appropriate USE flag and re-emerge:"
187
			ewarn "   nvidia or i8x0"
206
			ewarn "   nvidia, i8x0 or cle266"
188
		fi
207
		fi
189
208
190
		if [ -n "${xvmclib}" ]; then
209
		if [ -n "${xvmclib}" ]; then

Return to bug 71099