Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 355866 Details for
Bug 468102
app-emulation/emul-linux-x86-opengl: migrate to multilib eclasses
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch for all the involved packages
0001-opengl-multilib.patch (text/plain), 28.02 KB, created by
Michał Górny
on 2013-08-13 12:49:52 UTC
(
hide
)
Description:
Patch for all the involved packages
Filename:
MIME Type:
Creator:
Michał Górny
Created:
2013-08-13 12:49:52 UTC
Size:
28.02 KB
patch
obsolete
>From 9fb45c1dc75e54850f205c170a149632f1f2c6a9 Mon Sep 17 00:00:00 2001 >From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org> >Date: Tue, 13 Aug 2013 13:26:24 +0200 >Subject: [PATCH] opengl multilib > >--- > ...ld => emul-linux-x86-opengl-20130224-r1.ebuild} | 28 ++++++-- > ...4.ebuild => libclc-0.0.1_pre20130524-r1.ebuild} | 3 +- > ...ayland-1.2.0.ebuild => wayland-1.2.0-r1.ebuild} | 22 +++--- > ...eglut-2.8.1.ebuild => freeglut-2.8.1-r2.ebuild} | 45 ++++-------- > ...glew-1.10.0-r1.ebuild => glew-1.10.0-r2.ebuild} | 47 ++++++------ > gx86/media-libs/glu/glu-9.0.0-r1.ebuild | 4 +- > .../{mesa-9.1.6.ebuild => mesa-9.1.6-r1.ebuild} | 75 ++++++++++--------- > ...30725.ebuild => mesa-9.2_pre20130725-r1.ebuild} | 83 ++++++++++++---------- > gx86/virtual/glu/glu-9.0-r1.ebuild | 24 +++++++ > .../{opencl-0-r3.ebuild => opencl-0-r4.ebuild} | 12 ++-- > gx86/virtual/opengl/opengl-7.0-r1.ebuild | 23 ++++++ > ...ibdrm-2.4.46.ebuild => libdrm-2.4.46-r1.ebuild} | 7 +- > ...ri2proto-2.8.ebuild => dri2proto-2.8-r1.ebuild} | 6 +- > ...o-1.4.15-r1.ebuild => glproto-1.4.16-r1.ebuild} | 11 +-- > ...o-2.1.1.ebuild => xf86driproto-2.1.1-r1.ebuild} | 5 +- > 15 files changed, 239 insertions(+), 156 deletions(-) > copy gx86/app-emulation/emul-linux-x86-opengl/{emul-linux-x86-opengl-20130224.ebuild => emul-linux-x86-opengl-20130224-r1.ebuild} (54%) > copy gx86/dev-libs/libclc/{libclc-0.0.1_pre20130524.ebuild => libclc-0.0.1_pre20130524-r1.ebuild} (92%) > copy gx86/dev-libs/wayland/{wayland-1.2.0.ebuild => wayland-1.2.0-r1.ebuild} (78%) > copy gx86/media-libs/freeglut/{freeglut-2.8.1.ebuild => freeglut-2.8.1-r2.ebuild} (55%) > copy gx86/media-libs/glew/{glew-1.10.0-r1.ebuild => glew-1.10.0-r2.ebuild} (78%) > copy gx86/media-libs/mesa/{mesa-9.1.6.ebuild => mesa-9.1.6-r1.ebuild} (88%) > copy gx86/media-libs/mesa/{mesa-9.2_pre20130725.ebuild => mesa-9.2_pre20130725-r1.ebuild} (88%) > create mode 100644 gx86/virtual/glu/glu-9.0-r1.ebuild > copy gx86/virtual/opencl/{opencl-0-r3.ebuild => opencl-0-r4.ebuild} (61%) > create mode 100644 gx86/virtual/opengl/opengl-7.0-r1.ebuild > copy gx86/x11-libs/libdrm/{libdrm-2.4.46.ebuild => libdrm-2.4.46-r1.ebuild} (88%) > copy gx86/x11-proto/dri2proto/{dri2proto-2.8.ebuild => dri2proto-2.8-r1.ebuild} (57%) > copy gx86/x11-proto/glproto/{glproto-1.4.15-r1.ebuild => glproto-1.4.16-r1.ebuild} (81%) > copy gx86/x11-proto/xf86driproto/{xf86driproto-2.1.1.ebuild => xf86driproto-2.1.1-r1.ebuild} (58%) > >diff --git a/gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild b/gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild >similarity index 54% >copy from gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild >copy to gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild >index 5d2764d..dfb2be7 100644 >--- a/gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224.ebuild >+++ b/gx86/app-emulation/emul-linux-x86-opengl/emul-linux-x86-opengl-20130224-r1.ebuild >@@ -5,23 +5,43 @@ > EAPI=5 > inherit emul-linux-x86 > >-LICENSE="BSD MIT LGPL-3 SGI-B-2.0" >- >-KEYWORDS="-* amd64 ~amd64-linux" >+SRC_URI="!abi_x86_32? ( ${SRC_URI} )" >+LICENSE="!abi_x86_32? ( BSD MIT LGPL-3 SGI-B-2.0 ) abi_x86_32? ( metapackage )" >+KEYWORDS="-* ~amd64 ~amd64-linux" >+IUSE="abi_x86_32" > > DEPEND="app-admin/eselect-opengl > >=app-admin/eselect-mesa-0.0.9" > RDEPEND=">=app-emulation/emul-linux-x86-xlibs-20100611 > !<app-emulation/emul-linux-x86-xlibs-20100611 >- media-libs/mesa" >+ media-libs/mesa >+ >+ !abi_x86_32? ( >+ !media-libs/freeglut[abi_x86_32(-)] >+ !media-libs/glew[abi_x86_32(-)] >+ !media-libs/glu[abi_x86_32(-)] >+ !media-libs/mesa[abi_x86_32(-)] >+ ) >+ abi_x86_32? ( >+ media-libs/freeglut[abi_x86_32(-)] >+ media-libs/glew[abi_x86_32(-)] >+ media-libs/glu[abi_x86_32(-)] >+ media-libs/mesa[abi_x86_32(-)] >+ )" > > src_prepare() { >+ use abi_x86_32 && return > emul-linux-x86_src_prepare > rm -f "${S}/usr/lib32/libGL.so" || die > rm -f "${S}/usr/lib32/libGL.so.1" || die > } > >+src_install() { >+ use abi_x86_32 || emul-linux-x86_src_install >+} >+ > pkg_postinst() { >+ use abi_x86_32 && return > # Update GL symlinks > eselect opengl set --use-old || die > # And the same for mesa (bug #355393) >diff --git a/gx86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild b/gx86/dev-libs/libclc/libclc-0.0.1_pre20130524-r1.ebuild >similarity index 92% >copy from gx86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild >copy to gx86/dev-libs/libclc/libclc-0.0.1_pre20130524-r1.ebuild >index 0534a96..1a2dea6 100644 >--- a/gx86/dev-libs/libclc/libclc-0.0.1_pre20130524.ebuild >+++ b/gx86/dev-libs/libclc/libclc-0.0.1_pre20130524-r1.ebuild >@@ -45,5 +45,6 @@ src_unpack() { > src_configure() { > ./configure.py \ > --with-llvm-config="${EPREFIX}/usr/bin/llvm-config" \ >- --prefix="${EPREFIX}/usr" >+ --prefix="${EPREFIX}/usr" \ >+ --pkgconfigdir="${EPREFIX}/usr/share/pkgconfig" > } >diff --git a/gx86/dev-libs/wayland/wayland-1.2.0.ebuild b/gx86/dev-libs/wayland/wayland-1.2.0-r1.ebuild >similarity index 78% >copy from gx86/dev-libs/wayland/wayland-1.2.0.ebuild >copy to gx86/dev-libs/wayland/wayland-1.2.0-r1.ebuild >index b52d119..e0d06b1 100644 >--- a/gx86/dev-libs/wayland/wayland-1.2.0.ebuild >+++ b/gx86/dev-libs/wayland/wayland-1.2.0-r1.ebuild >@@ -8,9 +8,10 @@ if [[ ${PV} = 9999* ]]; then > EGIT_REPO_URI="git://anongit.freedesktop.org/git/${PN}/${PN}" > GIT_ECLASS="git-2" > EXPERIMENTAL="true" >+ AUTOTOOLS_AUTORECONF=1 > fi > >-inherit autotools toolchain-funcs $GIT_ECLASS >+inherit autotools-multilib toolchain-funcs $GIT_ECLASS > > DESCRIPTION="Wayland protocol libraries" > HOMEPAGE="http://wayland.freedesktop.org/" >@@ -33,19 +34,16 @@ DEPEND="${RDEPEND} > doc? ( app-doc/doxygen ) > virtual/pkgconfig" > >-src_prepare() { >- if [[ ${PV} = 9999* ]]; then >- eautoreconf >- fi >-} >- > src_configure() { >- myconf="$(use_enable static-libs static) \ >- $(use_enable doc documentation)" >+ local myeconfargs=( >+ $(use_enable static-libs static) >+ $(use_enable doc documentation) >+ ) > if tc-is-cross-compiler ; then >- myconf+=" --disable-scanner" >+ myeconfargs+=( --disable-scanner ) > fi >- econf ${myconf} >+ >+ autotools-multilib_src_configure > } > > src_test() { >@@ -53,5 +51,5 @@ src_test() { > mkdir "${XDG_RUNTIME_DIR}" || die > chmod 0700 "${XDG_RUNTIME_DIR}" || die > >- default >+ autotools-multilib_src_test > } >diff --git a/gx86/media-libs/freeglut/freeglut-2.8.1.ebuild b/gx86/media-libs/freeglut/freeglut-2.8.1-r2.ebuild >similarity index 55% >copy from gx86/media-libs/freeglut/freeglut-2.8.1.ebuild >copy to gx86/media-libs/freeglut/freeglut-2.8.1-r2.ebuild >index c622a32..c87e3bb 100644 >--- a/gx86/media-libs/freeglut/freeglut-2.8.1.ebuild >+++ b/gx86/media-libs/freeglut/freeglut-2.8.1-r2.ebuild >@@ -3,7 +3,7 @@ > # $Header: /var/cvsroot/gentoo-x86/media-libs/freeglut/freeglut-2.8.1.ebuild,v 1.1 2013/04/20 20:48:50 chithanh Exp $ > > EAPI=5 >-inherit eutils libtool >+inherit autotools-multilib > > DESCRIPTION="A completely OpenSourced alternative to the OpenGL Utility Toolkit (GLUT) library" > HOMEPAGE="http://freeglut.sourceforge.net/" >@@ -14,37 +14,22 @@ SLOT="0" > 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" > IUSE="debug static-libs" > >-RDEPEND="virtual/glu >- virtual/opengl >- x11-libs/libX11 >- x11-libs/libXext >- >=x11-libs/libXi-1.3 >- x11-libs/libXrandr >- x11-libs/libXxf86vm" >+RDEPEND="virtual/glu[${MULTILIB_USEDEP}] >+ virtual/opengl[${MULTILIB_USEDEP}] >+ x11-libs/libX11[${MULTILIB_USEDEP}] >+ x11-libs/libXext[${MULTILIB_USEDEP}] >+ >=x11-libs/libXi-1.3[${MULTILIB_USEDEP}] >+ x11-libs/libXrandr[${MULTILIB_USEDEP}] >+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" > DEPEND="${RDEPEND} >- x11-proto/inputproto >- x11-proto/xproto" >+ x11-proto/inputproto[${MULTILIB_USEDEP}] >+ x11-proto/xproto[${MULTILIB_USEDEP}]" > >-DOCS="AUTHORS ChangeLog NEWS README TODO" >- >-src_prepare() { >+PATCHES=( > # Please read the comments in the patch before thinking about dropping it > # yet again... >- epatch "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch >- >- # Needed for sane .so versionning on bsd, please don't drop >- elibtoolize >-} >- >-src_configure() { >- econf \ >- $(use_enable static-libs static) \ >- --enable-replace-glut \ >- $(use_enable debug) >-} >+ "${FILESDIR}"/${PN}-2.4.0-bsd-usb-joystick.patch >+) > >-src_install() { >- default >- dohtml -r doc >- find "${ED}" -name '*.la' -exec rm -f {} + >-} >+HTML_DOCS=( doc/. ) >diff --git a/gx86/media-libs/glew/glew-1.10.0-r1.ebuild b/gx86/media-libs/glew/glew-1.10.0-r2.ebuild >similarity index 78% >copy from gx86/media-libs/glew/glew-1.10.0-r1.ebuild >copy to gx86/media-libs/glew/glew-1.10.0-r2.ebuild >index 0dfe07c..70a6b26 100644 >--- a/gx86/media-libs/glew/glew-1.10.0-r1.ebuild >+++ b/gx86/media-libs/glew/glew-1.10.0-r2.ebuild >@@ -3,7 +3,7 @@ > # $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 $ > > EAPI=5 >-inherit multilib toolchain-funcs versionator >+inherit multilib multilib-minimal toolchain-funcs versionator > > DESCRIPTION="The OpenGL Extension Wrangler Library" > HOMEPAGE="http://glew.sourceforge.net/" >@@ -14,26 +14,15 @@ SLOT="0/$(get_version_component_range 1-2)" > 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" > IUSE="doc static-libs" > >-RDEPEND="virtual/glu >- virtual/opengl >- x11-libs/libX11 >- x11-libs/libXext >- x11-libs/libXi >- x11-libs/libXmu" >+RDEPEND="virtual/glu[${MULTILIB_USEDEP}] >+ virtual/opengl[${MULTILIB_USEDEP}] >+ x11-libs/libX11[${MULTILIB_USEDEP}] >+ x11-libs/libXext[${MULTILIB_USEDEP}] >+ x11-libs/libXi[${MULTILIB_USEDEP}] >+ x11-libs/libXmu[${MULTILIB_USEDEP}] >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" > DEPEND=${RDEPEND} > >-pkg_setup() { >- myglewopts=( >- AR="$(tc-getAR)" >- STRIP=true >- CC="$(tc-getCC)" >- LD="$(tc-getCC) ${LDFLAGS}" >- M_ARCH="" >- LDFLAGS.EXTRA="" >- POPT="${CFLAGS}" >- ) >-} >- > src_prepare() { > sed -i \ > -e '/INSTALL/s:-s::' \ >@@ -53,13 +42,29 @@ src_prepare() { > cp config/Makefile.linux config/Makefile.solaris || die > # and let freebsd be built as on linux too > cp config/Makefile.linux config/Makefile.freebsd || die >+ >+ multilib_copy_sources >+} >+ >+set_opts() { >+ myglewopts=( >+ AR="$(tc-getAR)" >+ STRIP=true >+ CC="$(tc-getCC)" >+ LD="$(tc-getCC) ${LDFLAGS}" >+ M_ARCH="" >+ LDFLAGS.EXTRA="" >+ POPT="${CFLAGS}" >+ ) > } > >-src_compile(){ >+multilib_src_compile() { >+ set_opts > emake GLEW_DEST="${EPREFIX}/usr" LIBDIR="${EPREFIX}/usr/$(get_libdir)" "${myglewopts[@]}" > } > >-src_install() { >+multilib_src_install() { >+ set_opts > emake \ > GLEW_DEST="${ED}/usr" \ > LIBDIR="${ED}/usr/$(get_libdir)" \ >diff --git a/gx86/media-libs/glu/glu-9.0.0-r1.ebuild b/gx86/media-libs/glu/glu-9.0.0-r1.ebuild >index a88f7fc..2d93358 100644 >--- a/gx86/media-libs/glu/glu-9.0.0-r1.ebuild >+++ b/gx86/media-libs/glu/glu-9.0.0-r1.ebuild >@@ -28,10 +28,10 @@ SLOT="0" > 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" > IUSE="static-libs" > >-DEPEND="virtual/opengl" >+DEPEND="virtual/opengl[${MULTILIB_USEDEP}]" > RDEPEND="${DEPEND} > !<media-libs/mesa-9 >- abi_x86_32? ( !<=app-emulation/emul-linux-x86-opengl-20130224 )" >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" > > src_unpack() { > default >diff --git a/gx86/media-libs/mesa/mesa-9.1.6.ebuild b/gx86/media-libs/mesa/mesa-9.1.6-r1.ebuild >similarity index 88% >copy from gx86/media-libs/mesa/mesa-9.1.6.ebuild >copy to gx86/media-libs/mesa/mesa-9.1.6-r1.ebuild >index 8e14017..5d61570 100644 >--- a/gx86/media-libs/mesa/mesa-9.1.6.ebuild >+++ b/gx86/media-libs/mesa/mesa-9.1.6-r1.ebuild >@@ -13,7 +13,8 @@ fi > > PYTHON_COMPAT=( python{2_6,2_7} ) > >-inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS} >+inherit base autotools multilib multilib-minimal flag-o-matic \ >+ python-single-r1 toolchain-funcs ${GIT_ECLASS} > > OPENGL_DIR="xorg-x11" > >@@ -81,24 +82,25 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42" > RDEPEND=" > !<x11-base/xorg-server-1.7 > !<=x11-proto/xf86driproto-2.0.3 >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) > classic? ( app-admin/eselect-mesa ) > gallium? ( app-admin/eselect-mesa ) > >=app-admin/eselect-opengl-1.2.7 >- dev-libs/expat >- gbm? ( virtual/udev ) >- >=x11-libs/libX11-1.3.99.901 >- x11-libs/libXdamage >- x11-libs/libXext >- x11-libs/libXxf86vm >- >=x11-libs/libxcb-1.8.1 >- vdpau? ( >=x11-libs/libvdpau-0.4.1 ) >- wayland? ( >=dev-libs/wayland-1.0.3 ) >+ dev-libs/expat[${MULTILIB_USEDEP}] >+ gbm? ( virtual/udev[${MULTILIB_USEDEP}] ) >+ >=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}] >+ x11-libs/libXdamage[${MULTILIB_USEDEP}] >+ x11-libs/libXext[${MULTILIB_USEDEP}] >+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] >+ >=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}] >+ vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) >+ wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] ) > xorg? ( > x11-base/xorg-server:=[-minimal] > x11-libs/libdrm[libkms] > ) >- xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >- ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?] >+ xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) >+ ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] > " > for card in ${INTEL_CARDS}; do > RDEPEND="${RDEPEND} >@@ -114,7 +116,7 @@ done > > DEPEND="${RDEPEND} > llvm? ( >- >=sys-devel/llvm-2.9 >+ ~sys-devel/llvm-3.3[${MULTILIB_USEDEP}] > r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) > video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) > ) >@@ -123,11 +125,11 @@ DEPEND="${RDEPEND} > sys-devel/bison > sys-devel/flex > virtual/pkgconfig >- >=x11-proto/dri2proto-2.6 >- >=x11-proto/glproto-1.4.15-r1 >- >=x11-proto/xextproto-7.0.99.1 >- x11-proto/xf86driproto >- x11-proto/xf86vidmodeproto >+ >=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}] >+ >=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}] >+ >=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}] >+ x11-proto/xf86driproto[${MULTILIB_USEDEP}] >+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] > " > > S="${WORKDIR}/${MY_P}" >@@ -171,15 +173,13 @@ src_prepare() { > sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die > fi > >- # Tests fail against python-3, bug #407887 >- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die >- > base_src_prepare > > eautoreconf >+ multilib_copy_sources > } > >-src_configure() { >+multilib_src_configure() { > local myconf > > if use classic; then >@@ -248,6 +248,11 @@ src_configure() { > # build fails with BSD indent, bug #428112 > use userland_GNU || export INDENT=cat > >+ if ! multilib_is_native_abi; then >+ myconf+="--disable-xorg >+ LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" >+ fi >+ > econf \ > --enable-dri \ > --enable-glx \ >@@ -269,18 +274,8 @@ src_configure() { > ${myconf} > } > >-src_install() { >- base_src_install >- >- find "${ED}" -name '*.la' -exec rm -f {} + || die >- >- if use !bindist; then >- dodoc docs/patents.txt >- fi >- >- # Install config file for eselect mesa >- insinto /usr/share/mesa >- newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf >+multilib_src_install() { >+ emake install DESTDIR="${D}" > > # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib > # because user can eselect desired GL provider. >@@ -343,6 +338,18 @@ src_install() { > fi > } > >+multilib_src_install_all() { >+ find "${ED}" -name '*.la' -exec rm -f {} + || die >+ >+ if use !bindist; then >+ dodoc docs/patents.txt >+ fi >+ >+ # Install config file for eselect mesa >+ insinto /usr/share/mesa >+ newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf >+} >+ > pkg_postinst() { > # Switch to the xorg implementation. > echo >diff --git a/gx86/media-libs/mesa/mesa-9.2_pre20130725.ebuild b/gx86/media-libs/mesa/mesa-9.2_pre20130725-r1.ebuild >similarity index 88% >copy from gx86/media-libs/mesa/mesa-9.2_pre20130725.ebuild >copy to gx86/media-libs/mesa/mesa-9.2_pre20130725-r1.ebuild >index 133038d..d61df0d 100644 >--- a/gx86/media-libs/mesa/mesa-9.2_pre20130725.ebuild >+++ b/gx86/media-libs/mesa/mesa-9.2_pre20130725-r1.ebuild >@@ -13,7 +13,8 @@ fi > > PYTHON_COMPAT=( python{2_6,2_7} ) > >-inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS} >+inherit base autotools multilib multilib-minimal flag-o-matic \ >+ python-single-r1 toolchain-funcs ${GIT_ECLASS} > > OPENGL_DIR="xorg-x11" > >@@ -83,28 +84,29 @@ LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.46" > RDEPEND=" > !<x11-base/xorg-server-1.7 > !<=x11-proto/xf86driproto-2.0.3 >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) > classic? ( app-admin/eselect-mesa ) > gallium? ( app-admin/eselect-mesa ) > >=app-admin/eselect-opengl-1.2.7 >- dev-libs/expat >- gbm? ( virtual/udev ) >- >=x11-libs/libX11-1.3.99.901 >- x11-libs/libXdamage >- x11-libs/libXext >- x11-libs/libXxf86vm >- >=x11-libs/libxcb-1.8.1 >+ dev-libs/expat[${MULTILIB_USEDEP}] >+ gbm? ( virtual/udev[${MULTILIB_USEDEP}] ) >+ >=x11-libs/libX11-1.3.99.901[${MULTILIB_USEDEP}] >+ x11-libs/libXdamage[${MULTILIB_USEDEP}] >+ x11-libs/libXext[${MULTILIB_USEDEP}] >+ x11-libs/libXxf86vm[${MULTILIB_USEDEP}] >+ >=x11-libs/libxcb-1.8.1[${MULTILIB_USEDEP}] > opencl? ( > app-admin/eselect-opencl >- dev-libs/libclc >+ >=dev-libs/libclc-0.0.1_pre20130524-r1 > ) >- vdpau? ( >=x11-libs/libvdpau-0.4.1 ) >- wayland? ( >=dev-libs/wayland-1.0.3 ) >+ vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) >+ wayland? ( >=dev-libs/wayland-1.0.3[${MULTILIB_USEDEP}] ) > xorg? ( > x11-base/xorg-server:= > x11-libs/libdrm[libkms] > ) >- xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >- ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?] >+ xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) >+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] > " > for card in ${INTEL_CARDS}; do > RDEPEND="${RDEPEND} >@@ -120,13 +122,13 @@ done > > DEPEND="${RDEPEND} > llvm? ( >- >=sys-devel/llvm-2.9 >+ ~sys-devel/llvm-3.3[${MULTILIB_USEDEP}] > r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) > video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) > ) > opencl? ( >- >=sys-devel/llvm-3.3-r1[video_cards_radeon] >- >=sys-devel/clang-3.3 >+ ~sys-devel/llvm-3.3[video_cards_radeon,${MULTILIB_USEDEP}] >+ ~sys-devel/clang-3.3[${MULTILIB_USEDEP}] > >=sys-devel/gcc-4.6 > ) > ${PYTHON_DEPS} >@@ -134,11 +136,11 @@ DEPEND="${RDEPEND} > sys-devel/bison > sys-devel/flex > virtual/pkgconfig >- >=x11-proto/dri2proto-2.6 >- >=x11-proto/glproto-1.4.15-r1 >- >=x11-proto/xextproto-7.0.99.1 >- x11-proto/xf86driproto >- x11-proto/xf86vidmodeproto >+ >=x11-proto/dri2proto-2.6[${MULTILIB_USEDEP}] >+ >=x11-proto/glproto-1.4.15-r1[${MULTILIB_USEDEP}] >+ >=x11-proto/xextproto-7.0.99.1[${MULTILIB_USEDEP}] >+ x11-proto/xf86driproto[${MULTILIB_USEDEP}] >+ x11-proto/xf86vidmodeproto[${MULTILIB_USEDEP}] > " > > S="${WORKDIR}/${MY_P}" >@@ -183,15 +185,13 @@ src_prepare() { > sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die > fi > >- # Tests fail against python-3, bug #407887 >- sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die >- > base_src_prepare > > eautoreconf >+ multilib_copy_sources > } > >-src_configure() { >+multilib_src_configure() { > local myconf > > if use classic; then >@@ -257,7 +257,7 @@ src_configure() { > myconf+=" > $(use_enable opencl) > --with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa" >- --with-clang-libdir="${EPREFIX}/usr/$(get_libdir)" >+ --with-clang-libdir="${EPREFIX}/usr/lib" > " > fi > fi >@@ -272,6 +272,11 @@ src_configure() { > # build fails with BSD indent, bug #428112 > use userland_GNU || export INDENT=cat > >+ if ! multilib_is_native_abi; then >+ myconf+="--disable-xorg >+ LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" >+ fi >+ > econf \ > --enable-dri \ > --enable-glx \ >@@ -293,18 +298,8 @@ src_configure() { > ${myconf} > } > >-src_install() { >- base_src_install >- >- find "${ED}" -name '*.la' -exec rm -f {} + || die >- >- if use !bindist; then >- dodoc docs/patents.txt >- fi >- >- # Install config file for eselect mesa >- insinto /usr/share/mesa >- newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf >+multilib_src_install() { >+ emake DESTDIR="${D}" install > > # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib > # because user can eselect desired GL provider. >@@ -381,6 +376,18 @@ src_install() { > fi > } > >+multilib_src_install_all() { >+ find "${ED}" -name '*.la' -exec rm -f {} + || die >+ >+ if use !bindist; then >+ dodoc docs/patents.txt >+ fi >+ >+ # Install config file for eselect mesa >+ insinto /usr/share/mesa >+ newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf >+} >+ > pkg_postinst() { > # Switch to the xorg implementation. > echo >diff --git a/gx86/virtual/glu/glu-9.0-r1.ebuild b/gx86/virtual/glu/glu-9.0-r1.ebuild >new file mode 100644 >index 0000000..ad4c2a8 >--- /dev/null >+++ b/gx86/virtual/glu/glu-9.0-r1.ebuild >@@ -0,0 +1,24 @@ >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/virtual/glu/glu-9.0.ebuild,v 1.12 2013/03/03 11:51:43 vapier Exp $ >+ >+EAPI=5 >+ >+inherit multilib-build >+ >+DESCRIPTION="Virtual for OpenGL utility library" >+HOMEPAGE="" >+SRC_URI="" >+ >+LICENSE="" >+SLOT="0" >+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" >+IUSE="" >+ >+RDEPEND=" >+ || ( >+ media-libs/glu[${MULTILIB_USEDEP}] >+ <media-libs/mesa-9[${MULTILIB_USEDEP}] >+ media-libs/opengl-apple[${MULTILIB_USEDEP}] >+ )" >+DEPEND="" >diff --git a/gx86/virtual/opencl/opencl-0-r3.ebuild b/gx86/virtual/opencl/opencl-0-r4.ebuild >similarity index 61% >copy from gx86/virtual/opencl/opencl-0-r3.ebuild >copy to gx86/virtual/opencl/opencl-0-r4.ebuild >index 90c1d62..a2a5116 100644 >--- a/gx86/virtual/opencl/opencl-0-r3.ebuild >+++ b/gx86/virtual/opencl/opencl-0-r4.ebuild >@@ -4,6 +4,8 @@ > > EAPI=5 > >+inherit multilib-build >+ > DESCRIPTION="Virtual for OpenCL implementations" > HOMEPAGE="" > SRC_URI="" >@@ -17,8 +19,10 @@ IUSE="${CARDS[@]/#/video_cards_}" > DEPEND="" > RDEPEND="app-admin/eselect-opencl > || ( >- media-libs/mesa[opencl] >- video_cards_fglrx? ( >=x11-drivers/ati-drivers-12.1-r1 ) >- video_cards_nvidia? ( >=x11-drivers/nvidia-drivers-290.10-r2 ) >- dev-util/intel-ocl-sdk >+ media-libs/mesa[opencl,${MULTILIB_USEDEP}] >+ video_cards_fglrx? ( >+ >=x11-drivers/ati-drivers-12.1-r1[${MULTILIB_USEDEP}] ) >+ video_cards_nvidia? ( >+ >=x11-drivers/nvidia-drivers-290.10-r2[${MULTILIB_USEDEP}] ) >+ dev-util/intel-ocl-sdk[${MULTILIB_USEDEP}] > )" >diff --git a/gx86/virtual/opengl/opengl-7.0-r1.ebuild b/gx86/virtual/opengl/opengl-7.0-r1.ebuild >new file mode 100644 >index 0000000..87a4198 >--- /dev/null >+++ b/gx86/virtual/opengl/opengl-7.0-r1.ebuild >@@ -0,0 +1,23 @@ >+# Copyright 1999-2013 Gentoo Foundation >+# Distributed under the terms of the GNU General Public License v2 >+# $Header: /var/cvsroot/gentoo-x86/virtual/opengl/opengl-7.0.ebuild,v 1.16 2013/03/03 10:13:32 vapier Exp $ >+ >+EAPI=5 >+ >+inherit multilib-build >+ >+DESCRIPTION="Virtual for OpenGL implementation" >+HOMEPAGE="" >+SRC_URI="" >+ >+LICENSE="" >+SLOT="0" >+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" >+IUSE="" >+ >+RDEPEND=" >+ || ( >+ media-libs/mesa[${MULTILIB_USEDEP}] >+ media-libs/opengl-apple[${MULTILIB_USEDEP}] >+ )" >+DEPEND="" >diff --git a/gx86/x11-libs/libdrm/libdrm-2.4.46.ebuild b/gx86/x11-libs/libdrm/libdrm-2.4.46-r1.ebuild >similarity index 88% >copy from gx86/x11-libs/libdrm/libdrm-2.4.46.ebuild >copy to gx86/x11-libs/libdrm/libdrm-2.4.46-r1.ebuild >index 0fab670..080aba2 100644 >--- a/gx86/x11-libs/libdrm/libdrm-2.4.46.ebuild >+++ b/gx86/x11-libs/libdrm/libdrm-2.4.46-r1.ebuild >@@ -3,6 +3,8 @@ > # $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.46.ebuild,v 1.1 2013/07/02 21:49:21 chithanh Exp $ > > EAPI=5 >+ >+XORG_MULTILIB=yes > inherit xorg-2 > > EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm" >@@ -25,8 +27,9 @@ IUSE="${IUSE_VIDEO_CARDS} libkms" > REQUIRED_USE="video_cards_exynos? ( libkms )" > RESTRICT="test" # see bug #236845 > >-RDEPEND="dev-libs/libpthread-stubs >- video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )" >+RDEPEND="dev-libs/libpthread-stubs[${MULTILIB_USEDEP}] >+ video_cards_intel? ( >=x11-libs/libpciaccess-0.10[${MULTILIB_USEDEP}] ) >+ abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )" > DEPEND="${RDEPEND}" > > PATCHES=( >diff --git a/gx86/x11-proto/dri2proto/dri2proto-2.8.ebuild b/gx86/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild >similarity index 57% >copy from gx86/x11-proto/dri2proto/dri2proto-2.8.ebuild >copy to gx86/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild >index 237d930..974e12d 100644 >--- a/gx86/x11-proto/dri2proto/dri2proto-2.8.ebuild >+++ b/gx86/x11-proto/dri2proto/dri2proto-2.8-r1.ebuild >@@ -2,12 +2,14 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/x11-proto/dri2proto/dri2proto-2.8.ebuild,v 1.12 2013/02/27 05:50:20 zmedico Exp $ > >-EAPI=4 >+EAPI=5 >+ >+XORG_MULTILIB=yes > inherit xorg-2 > > DESCRIPTION="X.Org DRI2 protocol headers" > >-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" >+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" > IUSE="" > > RDEPEND="" >diff --git a/gx86/x11-proto/glproto/glproto-1.4.15-r1.ebuild b/gx86/x11-proto/glproto/glproto-1.4.16-r1.ebuild >similarity index 81% >copy from gx86/x11-proto/glproto/glproto-1.4.15-r1.ebuild >copy to gx86/x11-proto/glproto/glproto-1.4.16-r1.ebuild >index 194d790..0879251 100644 >--- a/gx86/x11-proto/glproto/glproto-1.4.15-r1.ebuild >+++ b/gx86/x11-proto/glproto/glproto-1.4.16-r1.ebuild >@@ -1,11 +1,14 @@ >-# Copyright 1999-2012 Gentoo Foundation >+# Copyright 1999-2013 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 >-# $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 $ >+# $Header: /var/cvsroot/gentoo-x86/x11-proto/glproto/glproto-1.4.16.ebuild,v 1.9 2013/02/27 05:52:29 zmedico Exp $ > >-EAPI=4 >+EAPI=5 >+ >+XORG_MULTILIB=yes > inherit xorg-2 >+ > DESCRIPTION="X.Org GL protocol headers" >-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" >+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" > LICENSE="SGI-B-2.0" > IUSE="" > >diff --git a/gx86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild b/gx86/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild >similarity index 58% >copy from gx86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild >copy to gx86/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild >index 504ab34..b88bf30 100644 >--- a/gx86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild >+++ b/gx86/x11-proto/xf86driproto/xf86driproto-2.1.1-r1.ebuild >@@ -2,13 +2,14 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/x11-proto/xf86driproto/xf86driproto-2.1.1.ebuild,v 1.9 2013/02/27 05:51:40 zmedico Exp $ > >-EAPI=3 >+EAPI=5 > >+XORG_MULTILIB=yes > inherit xorg-2 > > DESCRIPTION="X.Org XF86DRI protocol headers" > >-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" >+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" > IUSE="" > > RDEPEND="" >-- >1.8.3.2 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 468102
:
355866
|
355888
|
358806