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

Collapse All | Expand All

(-)a/gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild (-4 / +24 lines)
Lines 5-27 Link Here
5
EAPI=5
5
EAPI=5
6
inherit emul-linux-x86
6
inherit emul-linux-x86
7
7
8
LICENSE="BSD MIT LGPL-3 SGI-B-2.0"
8
SRC_URI="!abi_x86_32? ( ${SRC_URI} )"
9
9
LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )"
10
KEYWORDS="-* amd64 ~amd64-linux"
10
KEYWORDS="-* ~amd64 ~amd64-linux"
11
IUSE="abi_x86_32"
11
12
12
DEPEND="app-admin/eselect-opengl
13
DEPEND="app-admin/eselect-opengl
13
	>=app-admin/eselect-mesa-0.0.9"
14
	>=app-admin/eselect-mesa-0.0.9"
14
RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
15
RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611
15
	!<app-emulation/emul-linux-x86-xlibs-20100611
16
	!<app-emulation/emul-linux-x86-xlibs-20100611
16
	media-libs/mesa"
17
	media-libs/mesa
18
19
	!abi_x86_32? (
20
		!media-libs/freeglut[abi_x86_32(-)]
21
		!media-libs/glew[abi_x86_32(-)]
22
		!media-libs/glu[abi_x86_32(-)]
23
		!media-libs/mesa[abi_x86_32(-)]
24
	)
25
	abi_x86_32? (
26
		media-libs/freeglut[abi_x86_32(-)]
27
		media-libs/glew[abi_x86_32(-)]
28
		media-libs/glu[abi_x86_32(-)]
29
		media-libs/mesa[abi_x86_32(-)]
30
	)"
17
31
18
src_prepare() {
32
src_prepare() {
33
	use abi_x86_32 && return
19
	emul-linux-x86_src_prepare
34
	emul-linux-x86_src_prepare
20
	rm -f "${S}/usr/lib32/libGL.so" || die
35
	rm -f "${S}/usr/lib32/libGL.so" || die
21
	rm -f "${S}/usr/lib32/libGL.so.1" || die
36
	rm -f "${S}/usr/lib32/libGL.so.1" || die
22
}
37
}
23
38
39
src_install() {
40
	use abi_x86_32 || emul-linux-x86_src_install
41
}
42
24
pkg_postinst() {
43
pkg_postinst() {
44
	use abi_x86_32 && return
25
	# Update GL symlinks
45
	# Update GL symlinks
26
	eselect opengl set --use-old || die
46
	eselect opengl set --use-old || die
27
	# And the same for mesa (bug #355393)
47
	# And the same for mesa (bug #355393)
(-)a/gx86/dev-libs/wayland/wayland-1.2.1.ebuild (-12 / +12 lines)
Lines 8-16 if [[ ${PV} = 9999* ]]; then Link Here
8
	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
8
	EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}"
9
	GIT_ECLASS="git-2"
9
	GIT_ECLASS="git-2"
10
	EXPERIMENTAL="true"
10
	EXPERIMENTAL="true"
11
	AUTOTOOLS_AUTORECONF=1
11
fi
12
fi
12
13
13
inherit autotools toolchain-funcs $GIT_ECLASS
14
inherit autotools-multilib toolchain-funcs $GIT_ECLASS
14
15
15
DESCRIPTION="Wayland protocol libraries"
16
DESCRIPTION="Wayland protocol libraries"
16
HOMEPAGE="http://wayland.freedesktop.org/"
17
HOMEPAGE="http://wayland.freedesktop.org/"
Lines 33-51 DEPEND="${RDEPEND} Link Here
33
	doc? ( app-doc/doxygen )
34
	doc? ( app-doc/doxygen )
34
	virtual/pkgconfig"
35
	virtual/pkgconfig"
35
36
36
src_prepare() {
37
	if [[ ${PV} = 9999* ]]; then
38
		eautoreconf
39
	fi
40
}
41
42
src_configure() {
37
src_configure() {
43
	myconf="$(use_enable static-libs static) \
38
	local myeconfargs=(
44
			$(use_enable doc documentation)"
39
		$(use_enable doc documentation)
40
	)
45
	if tc-is-cross-compiler ; then
41
	if tc-is-cross-compiler ; then
46
		myconf+=" --disable-scanner"
42
		myeconfargs+=( --disable-scanner )
47
	fi
43
	fi
48
	econf ${myconf}
44
	if ! multilib_is_native_abi; then
45
		myeconfargs+=( --disable-documentation )
46
	fi
47
48
	autotools-multilib_src_configure
49
}
49
}
50
50
51
src_test() {
51
src_test() {
Lines 53-57 src_test() { Link Here
53
	mkdir "${XDG_RUNTIME_DIR}" || die
53
	mkdir "${XDG_RUNTIME_DIR}" || die
54
	chmod 0700 "${XDG_RUNTIME_DIR}" || die
54
	chmod 0700 "${XDG_RUNTIME_DIR}" || die
55
55
56
	default
56
	autotools-multilib_src_test
57
}
57
}
(-)a/gx86/media-libs/freeglut/freeglut-2.8.1.ebuild (-30 / +16 lines)
Lines 3-9 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.1.ebuild,v 1.1 2013/04/20 20:48:50 chithanh Exp $
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.1.ebuild,v 1.1 2013/04/20 20:48:50 chithanh Exp $
4
4
5
EAPI=5
5
EAPI=5
6
inherit eutils libtool
6
inherit autotools-multilib
7
7
8
DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
8
DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library"
9
HOMEPAGE="http://freeglut.sourceforge.net/"
9
HOMEPAGE="http://freeglut.sourceforge.net/"
Lines 14-50 SLOT="0" Link Here
14
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
14
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
15
IUSE="debug static-libs"
15
IUSE="debug static-libs"
16
16
17
RDEPEND="virtual/glu
17
RDEPEND="virtual/glu[${MULTILIB_USEDEP}]
18
	virtual/opengl
18
	virtual/opengl[${MULTILIB_USEDEP}]
19
	x11-libs/libX11
19
	x11-libs/libX11[${MULTILIB_USEDEP}]
20
	x11-libs/libXext
20
	x11-libs/libXext[${MULTILIB_USEDEP}]
21
	>=x11-libs/libXi-1.3
21
	>=x11-libs/libXi-1.3[${MULTILIB_USEDEP}]
22
	x11-libs/libXrandr
22
	x11-libs/libXrandr[${MULTILIB_USEDEP}]
23
	x11-libs/libXxf86vm"
23
	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
24
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
24
DEPEND="${RDEPEND}
25
DEPEND="${RDEPEND}
25
	x11-proto/inputproto
26
	virtual/pkgconfig
26
	x11-proto/xproto"
27
	x11-proto/inputproto[${MULTILIB_USEDEP}]
28
	x11-proto/xproto[${MULTILIB_USEDEP}]"
27
29
28
DOCS="AUTHORS ChangeLog NEWS README TODO"
30
PATCHES=(
29
30
src_prepare() {
31
	# Please read the comments in the patch before thinking about dropping it
31
	# Please read the comments in the patch before thinking about dropping it
32
	# yet again...
32
	# yet again...
33
	epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
33
	"${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch
34
34
)
35
	# Needed for sane .so versionning on bsd, please don't drop
36
	elibtoolize
37
}
38
39
src_configure() {
40
	econf \
41
		$(use_enable static-libs static) \
42
		--enable-replace-glut \
43
		$(use_enable debug)
44
}
45
35
46
src_install() {
36
HTML_DOCS=( doc/. )
47
	default
48
	dohtml -r doc
49
	find "${ED}" -name '*.la' -exec rm -f {} +
50
}
(-)a/gx86/media-libs/glew/glew-1.10.0-r1.ebuild (-21 / +26 lines)
Lines 3-9 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.10.0-r1.ebuild,v 1.1 2013/07/23 23:48:01 radhermit Exp $
3
# $Header: /var/cvsroot/gentoo-x86/media-libs/glew/glew-1.10.0-r1.ebuild,v 1.1 2013/07/23 23:48:01 radhermit Exp $
4
4
5
EAPI=5
5
EAPI=5
6
inherit multilib toolchain-funcs versionator
6
inherit multilib multilib-minimal toolchain-funcs versionator
7
7
8
DESCRIPTION="The OpenGL Extension Wrangler Library"
8
DESCRIPTION="The OpenGL Extension Wrangler Library"
9
HOMEPAGE="http://glew.sourceforge.net/"
9
HOMEPAGE="http://glew.sourceforge.net/"
Lines 14-39 SLOT="0/$(get_version_component_range 1-2)" Link Here
14
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
14
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
15
IUSE="doc static-libs"
15
IUSE="doc static-libs"
16
16
17
RDEPEND="virtual/glu
17
RDEPEND="virtual/glu[${MULTILIB_USEDEP}]
18
	virtual/opengl
18
	virtual/opengl[${MULTILIB_USEDEP}]
19
	x11-libs/libX11
19
	x11-libs/libX11[${MULTILIB_USEDEP}]
20
	x11-libs/libXext
20
	x11-libs/libXext[${MULTILIB_USEDEP}]
21
	x11-libs/libXi
21
	x11-libs/libXi[${MULTILIB_USEDEP}]
22
	x11-libs/libXmu"
22
	x11-libs/libXmu[${MULTILIB_USEDEP}]
23
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
23
DEPEND=${RDEPEND}
24
DEPEND=${RDEPEND}
24
25
25
pkg_setup() {
26
	myglewopts=(
27
		AR="$(tc-getAR)"
28
		STRIP=true
29
		CC="$(tc-getCC)"
30
		LD="$(tc-getCC) ${LDFLAGS}"
31
		M_ARCH=""
32
		LDFLAGS.EXTRA=""
33
		POPT="${CFLAGS}"
34
	)
35
}
36
37
src_prepare() {
26
src_prepare() {
38
	sed -i \
27
	sed -i \
39
		-e '/INSTALL/s:-s::' \
28
		-e '/INSTALL/s:-s::' \
Lines 53-65 src_prepare() { Link Here
53
	cp config/Makefile.linux config/Makefile.solaris || die
42
	cp config/Makefile.linux config/Makefile.solaris || die
54
	# and let freebsd be built as on linux too
43
	# and let freebsd be built as on linux too
55
	cp config/Makefile.linux config/Makefile.freebsd || die
44
	cp config/Makefile.linux config/Makefile.freebsd || die
45
46
	multilib_copy_sources
47
}
48
49
set_opts() {
50
	myglewopts=(
51
		AR="$(tc-getAR)"
52
		STRIP=true
53
		CC="$(tc-getCC)"
54
		LD="$(tc-getCC) ${LDFLAGS}"
55
		M_ARCH=""
56
		LDFLAGS.EXTRA=""
57
		POPT="${CFLAGS}"
58
	)
56
}
59
}
57
60
58
src_compile(){
61
multilib_src_compile() {
62
	set_opts
59
	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
63
	emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}"
60
}
64
}
61
65
62
src_install() {
66
multilib_src_install() {
67
	set_opts
63
	emake \
68
	emake \
64
		GLEW_DEST="${ED}/usr" \
69
		GLEW_DEST="${ED}/usr" \
65
		LIBDIR="${ED}/usr/$(get_libdir)" \
70
		LIBDIR="${ED}/usr/$(get_libdir)" \
(-)a/gx86/media-libs/glu/glu-9.0.0-r1.ebuild (-2 / +2 lines)
Lines 28-37 SLOT="0" Link Here
28
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
28
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
29
IUSE="static-libs"
29
IUSE="static-libs"
30
30
31
DEPEND="virtual/opengl"
31
DEPEND="virtual/opengl[${MULTILIB_USEDEP}]"
32
RDEPEND="${DEPEND}
32
RDEPEND="${DEPEND}
33
	!<media-libs/mesa-9
33
	!<media-libs/mesa-9
34
	abi_x86_32? ( !<=app-emulation/emul-linux-x86-opengl-20130224 )"
34
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
35
35
36
src_unpack() {
36
src_unpack() {
37
	default
37
	default
(-)a/gx86/media-libs/mesa/mesa-9.2.0.ebuild (-38 / +45 lines)
Lines 13-19 fi Link Here
13
13
14
PYTHON_COMPAT=( python{2_6,2_7} )
14
PYTHON_COMPAT=( python{2_6,2_7} )
15
15
16
inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS}
16
inherit base autotools multilib multilib-minimal flag-o-matic \
17
	python-single-r1 toolchain-funcs ${GIT_ECLASS}
17
18
18
OPENGL_DIR="xorg-x11"
19
OPENGL_DIR="xorg-x11"
19
20
Lines 88-115 LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46" Link Here
88
RDEPEND="
89
RDEPEND="
89
	!<x11-base/xorg-server-1.7
90
	!<x11-base/xorg-server-1.7
90
	!<=x11-proto/xf86driproto-2.0.3
91
	!<=x11-proto/xf86driproto-2.0.3
92
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
91
	classic? ( app-admin/eselect-mesa )
93
	classic? ( app-admin/eselect-mesa )
92
	gallium? ( app-admin/eselect-mesa )
94
	gallium? ( app-admin/eselect-mesa )
93
	>=app-admin/eselect-opengl-1.2.7
95
	>=app-admin/eselect-opengl-1.2.7
94
	dev-libs/expat
96
	dev-libs/expat[${MULTILIB_USEDEP}]
95
	gbm? ( virtual/udev )
97
	gbm? ( virtual/udev[${MULTILIB_USEDEP}] )
96
	>=x11-libs/libX11-1.3.99.901
98
	>=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}]
97
	x11-libs/libXdamage
99
	x11-libs/libXdamage[${MULTILIB_USEDEP}]
98
	x11-libs/libXext
100
	x11-libs/libXext[${MULTILIB_USEDEP}]
99
	x11-libs/libXxf86vm
101
	x11-libs/libXxf86vm[${MULTILIB_USEDEP}]
100
	>=x11-libs/libxcb-1.8.1
102
	>=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}]
101
	opencl? (
103
	opencl? (
102
				app-admin/eselect-opencl
104
				app-admin/eselect-opencl
103
				dev-libs/libclc
105
				>=dev-libs/libclc-0.0.1_pre20130524-r1
104
			)
106
			)
105
	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
107
	vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] )
106
	wayland? ( >=dev-libs/wayland-1.0.3 )
108
	wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] )
107
	xorg? (
109
	xorg? (
108
		x11-base/xorg-server:=
110
		x11-base/xorg-server:=
109
		x11-libs/libdrm[libkms]
111
		x11-libs/libdrm[libkms]
110
	)
112
	)
111
	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
113
	xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] )
112
	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?]
114
	${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}]
113
"
115
"
114
for card in ${INTEL_CARDS}; do
116
for card in ${INTEL_CARDS}; do
115
	RDEPEND="${RDEPEND}
117
	RDEPEND="${RDEPEND}
Lines 125-137 done Link Here
125
127
126
DEPEND="${RDEPEND}
128
DEPEND="${RDEPEND}
127
	llvm? (
129
	llvm? (
128
		>=sys-devel/llvm-2.9
130
		~sys-devel/llvm-3.3[${MULTILIB_USEDEP}]
129
		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
131
		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
130
		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
132
		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
131
	)
133
	)
132
	opencl? (
134
	opencl? (
133
				>=sys-devel/llvm-3.3-r1[video_cards_radeon]
135
				~sys-devel/llvm-3.3[video_cards_radeon,${MULTILIB_USEDEP}]
134
				>=sys-devel/clang-3.3
136
				~sys-devel/clang-3.3[${MULTILIB_USEDEP}]
135
				>=sys-devel/gcc-4.6
137
				>=sys-devel/gcc-4.6
136
	)
138
	)
137
	${PYTHON_DEPS}
139
	${PYTHON_DEPS}
Lines 139-149 DEPEND="${RDEPEND} Link Here
139
	sys-devel/bison
141
	sys-devel/bison
140
	sys-devel/flex
142
	sys-devel/flex
141
	virtual/pkgconfig
143
	virtual/pkgconfig
142
	>=x11-proto/dri2proto-2.6
144
	>=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}]
143
	>=x11-proto/glproto-1.4.15-r1
145
	>=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}]
144
	>=x11-proto/xextproto-7.0.99.1
146
	>=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}]
145
	x11-proto/xf86driproto
147
	x11-proto/xf86driproto[${MULTILIB_USEDEP}]
146
	x11-proto/xf86vidmodeproto
148
	x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}]
147
"
149
"
148
150
149
S="${WORKDIR}/${MY_P}"
151
S="${WORKDIR}/${MY_P}"
Lines 187-201 src_prepare() { Link Here
187
		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
189
		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
188
	fi
190
	fi
189
191
190
	# Tests fail against python-3, bug #407887
191
	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
192
193
	base_src_prepare
192
	base_src_prepare
194
193
195
	eautoreconf
194
	eautoreconf
195
	multilib_copy_sources
196
}
196
}
197
197
198
src_configure() {
198
multilib_src_configure() {
199
	local myconf
199
	local myconf
200
200
201
	if use classic; then
201
	if use classic; then
Lines 261-267 src_configure() { Link Here
261
			myconf+="
261
			myconf+="
262
				$(use_enable opencl)
262
				$(use_enable opencl)
263
				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
263
				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
264
				--with-clang-libdir="${EPREFIX}/usr/$(get_libdir)"
264
				--with-clang-libdir="${EPREFIX}/usr/lib"
265
				"
265
				"
266
		fi
266
		fi
267
	fi
267
	fi
Lines 276-281 src_configure() { Link Here
276
	# build fails with BSD indent, bug #428112
276
	# build fails with BSD indent, bug #428112
277
	use userland_GNU || export INDENT=cat
277
	use userland_GNU || export INDENT=cat
278
278
279
	if ! multilib_is_native_abi; then
280
		myconf+="--disable-xorg
281
			LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}"
282
	fi
283
279
	econf \
284
	econf \
280
		--enable-dri \
285
		--enable-dri \
281
		--enable-glx \
286
		--enable-glx \
Lines 297-314 src_configure() { Link Here
297
		${myconf}
302
		${myconf}
298
}
303
}
299
304
300
src_install() {
305
multilib_src_install() {
301
	base_src_install
306
	emake DESTDIR="${D}" install
302
303
	find "${ED}" -name '*.la' -exec rm -f {} + || die
304
305
	if use !bindist; then
306
		dodoc docs/patents.txt
307
	fi
308
309
	# Install config file for eselect mesa
310
	insinto /usr/share/mesa
311
	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
312
307
313
	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
308
	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
314
	# because user can eselect desired GL provider.
309
	# because user can eselect desired GL provider.
Lines 385-390 src_install() { Link Here
385
	fi
380
	fi
386
}
381
}
387
382
383
multilib_src_install_all() {
384
	find "${ED}" -name '*.la' -exec rm -f {} + || die
385
386
	if use !bindist; then
387
		dodoc docs/patents.txt
388
	fi
389
390
	# Install config file for eselect mesa
391
	insinto /usr/share/mesa
392
	newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
393
}
394
388
pkg_postinst() {
395
pkg_postinst() {
389
	# Switch to the xorg implementation.
396
	# Switch to the xorg implementation.
390
	echo
397
	echo
(-)a/gx86/virtual/glu/glu-9.0-r1.ebuild (+24 lines)
Line 0 Link Here
1
# Copyright 1999-2013 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.12 2013/03/03 11:51:43 vapier Exp $
4
5
EAPI=5
6
7
inherit multilib-build
8
9
DESCRIPTION="Virtual for OpenGL utility library"
10
HOMEPAGE=""
11
SRC_URI=""
12
13
LICENSE=""
14
SLOT="0"
15
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
16
IUSE=""
17
18
RDEPEND="
19
	|| (
20
		media-libs/glu[${MULTILIB_USEDEP}]
21
		<media-libs/mesa-9[${MULTILIB_USEDEP}]
22
		media-libs/opengl-apple[${MULTILIB_USEDEP}]
23
	)"
24
DEPEND=""
(-)a/gx86/virtual/opencl/opencl-0-r3.ebuild (-4 / +8 lines)
Lines 4-9 Link Here
4
4
5
EAPI=5
5
EAPI=5
6
6
7
inherit multilib-build
8
7
DESCRIPTION="Virtual for OpenCL implementations"
9
DESCRIPTION="Virtual for OpenCL implementations"
8
HOMEPAGE=""
10
HOMEPAGE=""
9
SRC_URI=""
11
SRC_URI=""
Lines 17-24 IUSE="${CARDS[@]/#/video_cards_}" Link Here
17
DEPEND=""
19
DEPEND=""
18
RDEPEND="app-admin/eselect-opencl
20
RDEPEND="app-admin/eselect-opencl
19
	|| (
21
	|| (
20
		media-libs/mesa[opencl]
22
		media-libs/mesa[opencl,${MULTILIB_USEDEP}]
21
		video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 )
23
		video_cards_fglrx? (
22
		video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 )
24
			>=x11-drivers/ati-drivers-12.1-r1[${MULTILIB_USEDEP}] )
23
		dev-util/intel-ocl-sdk
25
		video_cards_nvidia? (
26
			>=x11-drivers/nvidia-drivers-290.10-r2[${MULTILIB_USEDEP}] )
27
		dev-util/intel-ocl-sdk[${MULTILIB_USEDEP}]
24
	)"
28
	)"
(-)a/gx86/virtual/opengl/opengl-7.0-r1.ebuild (+23 lines)
Line 0 Link Here
1
# Copyright 1999-2013 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/virtual/opengl/opengl-7.0.ebuild,v 1.16 2013/03/03 10:13:32 vapier Exp $
4
5
EAPI=5
6
7
inherit multilib-build
8
9
DESCRIPTION="Virtual for OpenGL implementation"
10
HOMEPAGE=""
11
SRC_URI=""
12
13
LICENSE=""
14
SLOT="0"
15
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
16
IUSE=""
17
18
RDEPEND="
19
	|| (
20
		media-libs/mesa[${MULTILIB_USEDEP}]
21
		media-libs/opengl-apple[${MULTILIB_USEDEP}]
22
	)"
23
DEPEND=""
(-)a/gx86/x11-libs/libdrm/libdrm-2.4.46.ebuild (-2 / +5 lines)
Lines 3-8 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.46.ebuild,v 1.1 2013/07/02 21:49:21 chithanh Exp $
3
# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.46.ebuild,v 1.1 2013/07/02 21:49:21 chithanh Exp $
4
4
5
EAPI=5
5
EAPI=5
6
7
XORG_MULTILIB=yes
6
inherit xorg-2
8
inherit xorg-2
7
9
8
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
10
EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
Lines 25-32 IUSE="${IUSE_VIDEO_CARDS} libkms" Link Here
25
REQUIRED_USE="video_cards_exynos? ( libkms )"
27
REQUIRED_USE="video_cards_exynos? ( libkms )"
26
RESTRICT="test" # see bug #236845
28
RESTRICT="test" # see bug #236845
27
29
28
RDEPEND="dev-libs/libpthread-stubs
30
RDEPEND="dev-libs/libpthread-stubs[${MULTILIB_USEDEP}]
29
	video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )"
31
	video_cards_intel? ( >=x11-libs/libpciaccess-0.10[${MULTILIB_USEDEP}] )
32
	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
30
DEPEND="${RDEPEND}"
33
DEPEND="${RDEPEND}"
31
34
32
PATCHES=(
35
PATCHES=(
(-)a/gx86/x11-proto/dri2proto/dri2proto-2.8.ebuild (-2 / +4 lines)
Lines 2-13 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.8.ebuild,v 1.12 2013/02/27 05:50:20 zmedico Exp $
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.8.ebuild,v 1.12 2013/02/27 05:50:20 zmedico Exp $
4
4
5
EAPI=4
5
EAPI=5
6
7
XORG_MULTILIB=yes
6
inherit xorg-2
8
inherit xorg-2
7
9
8
DESCRIPTION="X.Org DRI2 protocol headers"
10
DESCRIPTION="X.Org DRI2 protocol headers"
9
11
10
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
12
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
11
IUSE=""
13
IUSE=""
12
14
13
RDEPEND=""
15
RDEPEND=""
(-)a/gx86/x11-proto/glproto/glproto-1.4.15-r1.ebuild (-4 / +7 lines)
Lines 1-11 Link Here
1
# Copyright 1999-2012 Gentoo Foundation
1
# Copyright 1999-2013 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.15-r1.ebuild,v 1.1 2012/06/05 11:48:30 lu_zero Exp $
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.16.ebuild,v 1.9 2013/02/27 05:52:29 zmedico Exp $
4
4
5
EAPI=4
5
EAPI=5
6
7
XORG_MULTILIB=yes
6
inherit xorg-2
8
inherit xorg-2
9
7
DESCRIPTION="X.Org GL protocol headers"
10
DESCRIPTION="X.Org GL protocol headers"
8
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
11
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
9
LICENSE="SGI-B-2.0"
12
LICENSE="SGI-B-2.0"
10
IUSE=""
13
IUSE=""
11
14
(-)a/gx86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild (-2 / +3 lines)
Lines 2-14 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild,v 1.9 2013/02/27 05:51:40 zmedico Exp $
3
# $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild,v 1.9 2013/02/27 05:51:40 zmedico Exp $
4
4
5
EAPI=3
5
EAPI=5
6
6
7
XORG_MULTILIB=yes
7
inherit xorg-2
8
inherit xorg-2
8
9
9
DESCRIPTION="X.Org XF86DRI protocol headers"
10
DESCRIPTION="X.Org XF86DRI protocol headers"
10
11
11
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
12
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
12
IUSE=""
13
IUSE=""
13
14
14
RDEPEND=""
15
RDEPEND=""

Return to bug 468102