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 D0DDE138247 for ; Thu, 7 Nov 2013 02:06:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB1BBE0AD1; Thu, 7 Nov 2013 02:06:28 +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 3E21BE0AD1 for ; Thu, 7 Nov 2013 02:06:28 +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 4C6DF33F10B for ; Thu, 7 Nov 2013 02:06:27 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id C9BB5E545C for ; Thu, 7 Nov 2013 02:06:24 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1383788308.9ef8eb41c721e98ff12fc98e04d5f4d6bda5bdf2.mattst88@gentoo> Subject: [gentoo-commits] proj/x11:master commit in: media-libs/mesa/ X-VCS-Repository: proj/x11 X-VCS-Files: media-libs/mesa/mesa-9999.ebuild media-libs/mesa/metadata.xml X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 9ef8eb41c721e98ff12fc98e04d5f4d6bda5bdf2 X-VCS-Branch: master Date: Thu, 7 Nov 2013 02:06:24 +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: ecf9294e-9c1b-44f5-b7ec-73b120871405 X-Archives-Hash: 41b81bb3b44cc0acd72c0725d19782a1 commit: 9ef8eb41c721e98ff12fc98e04d5f4d6bda5bdf2 Author: Matt Turner gmail com> AuthorDate: Thu Nov 7 01:33:53 2013 +0000 Commit: Matt Turner gentoo org> CommitDate: Thu Nov 7 01:38:28 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=9ef8eb41 media-libs/mesa: Drop "xorg" USE flag. The xorg state tracker is going away upstream. --- media-libs/mesa/mesa-9999.ebuild | 12 +++--------- media-libs/mesa/metadata.xml | 1 - 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index b188a19..f8fc19f 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -51,7 +51,7 @@ done IUSE="${IUSE_VIDEO_CARDS} bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl opencl openvg osmesa pax_kernel pic r600-llvm-compiler selinux vdpau - wayland xvmc xa xorg kernel_FreeBSD" + wayland xvmc xa kernel_FreeBSD" REQUIRED_USE=" llvm? ( gallium ) @@ -67,7 +67,6 @@ REQUIRED_USE=" r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi video_cards_radeon ) ) wayland? ( egl ) xa? ( gallium ) - xorg? ( gallium ) video_cards_freedreno? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) @@ -106,10 +105,6 @@ RDEPEND=" ) vdpau? ( >=x11-libs/libvdpau-0.4.1[${MULTILIB_USEDEP}] ) wayland? ( >=dev-libs/wayland-1.2.0[${MULTILIB_USEDEP}] ) - xorg? ( - x11-base/xorg-server:= - x11-libs/libdrm[libkms] - ) xvmc? ( >=x11-libs/libXvMC-1.0.6[${MULTILIB_USEDEP}] ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vmware?,${MULTILIB_USEDEP}] " @@ -280,8 +275,7 @@ multilib_src_configure() { use userland_GNU || export INDENT=cat if ! multilib_is_native_abi; then - myconf+="--disable-xorg - LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" + myconf+="LLVM_CONFIG=${EPREFIX}/usr/bin/llvm-config.${ABI}" fi econf \ @@ -298,7 +292,7 @@ multilib_src_configure() { $(use_enable osmesa) \ $(use_enable !pic asm) \ $(use_enable xa) \ - $(use_enable xorg) \ + --disable-xorg \ --with-dri-drivers=${DRI_DRIVERS} \ --with-gallium-drivers=${GALLIUM_DRIVERS} \ --with-llvm-shared-libs \ diff --git a/media-libs/mesa/metadata.xml b/media-libs/mesa/metadata.xml index 1bc2962..33ad0fe 100644 --- a/media-libs/mesa/metadata.xml +++ b/media-libs/mesa/metadata.xml @@ -20,7 +20,6 @@ Enable the VDPAU acceleration interface for the Gallium3D Video Layer. Enable support for dev-libs/wayland Enable the XA (X Acceleration) API for Gallium3D. - Enable the Xorg state tracker for Gallium3D. This is not required for OpenGL acceleration in X. Enable the XvMC acceleration interface for the Gallium3D Video Layer.