From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1849A1381F3 for ; Sun, 11 Aug 2013 13:41:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6584CE0AC2; Sun, 11 Aug 2013 13:41:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id DFBECE0AC2 for ; Sun, 11 Aug 2013 13:41:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1EC5C33EBFC for ; Sun, 11 Aug 2013 13:41:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 79831E545D for ; Sun, 11 Aug 2013 13:41:01 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1376228454.02c6dc8573963ecbc973225e22108e7ccc66e0a6.mgorny@gentoo> Subject: [gentoo-commits] proj/x11:multilib-opengl commit in: media-libs/mesa/ X-VCS-Repository: proj/x11 X-VCS-Files: media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 02c6dc8573963ecbc973225e22108e7ccc66e0a6 X-VCS-Branch: multilib-opengl Date: Sun, 11 Aug 2013 13:41:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f847ad5c-dcbd-463d-9341-55e29e704471 X-Archives-Hash: 366147d07ea59fbb47e3e1177c1e4ae3 commit: 02c6dc8573963ecbc973225e22108e7ccc66e0a6 Author: Michał Górny gentoo org> AuthorDate: Sun Aug 11 10:28:34 2013 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Aug 11 13:40:54 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=02c6dc85 media-libs/mesa: Multilibify. Package-Manager: portage-2.2.0_alpha196 --- media-libs/mesa/mesa-9999.ebuild | 81 ++++++++++++++++++++++------------------ 1 file changed, 44 insertions(+), 37 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 4891d83..7cd736a 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.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=" !=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 ) - 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-2.9[${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-r1[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}" @@ -182,15 +184,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 @@ -256,7 +256,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 @@ -271,6 +271,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 \ @@ -292,18 +297,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 install DESTDIR="${D}" # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib # because user can eselect desired GL provider. @@ -380,6 +375,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