From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B6FF3138334 for ; Mon, 8 Oct 2018 15:43:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F37C2E08F7; Mon, 8 Oct 2018 15:43:36 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B0991E08F7 for ; Mon, 8 Oct 2018 15:43:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8A1C0335CEF for ; Mon, 8 Oct 2018 15:43:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4B43391 for ; Mon, 8 Oct 2018 15:43:31 +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: <1539013393.e276a5eab8552202db5988843c41ef7007759475.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mesa/mesa-18.2.2-r1.ebuild media-libs/mesa/mesa-9999.ebuild X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: e276a5eab8552202db5988843c41ef7007759475 X-VCS-Branch: master Date: Mon, 8 Oct 2018 15:43:31 +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: 51dc2188-5ae5-4920-a2eb-c9f28a5521c9 X-Archives-Hash: 5d13378259a1a847fb9dc2dd2fe89234 commit: e276a5eab8552202db5988843c41ef7007759475 Author: Jan Vesely gmail com> AuthorDate: Sat Oct 6 17:06:24 2018 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Oct 8 15:43:13 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e276a5ea media-libs/mesa: Use ICD version of OpenCL Closes: https://github.com/gentoo/gentoo/pull/9836 Closes: https://bugs.gentoo.org/546320 Signed-off-by: Jan Vesely gmail.com> Signed-off-by: Matt Turner gentoo.org> .../{mesa-9999.ebuild => mesa-18.2.2-r1.ebuild} | 38 +++++----------------- media-libs/mesa/mesa-9999.ebuild | 34 ++++--------------- 2 files changed, 14 insertions(+), 58 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-18.2.2-r1.ebuild similarity index 94% copy from media-libs/mesa/mesa-9999.ebuild copy to media-libs/mesa/mesa-18.2.2-r1.ebuild index 2fd5700404f..5d286e7f051 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-18.2.2-r1.ebuild @@ -3,7 +3,7 @@ EAPI=6 -PYTHON_COMPAT=( python3_4 python3_5 python3_6 python3_7 ) +PYTHON_COMPAT=( python2_7 ) inherit llvm meson multilib-minimal pax-utils python-any-r1 @@ -95,7 +95,7 @@ RDEPEND=" ) lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] ) opencl? ( - app-eselect/eselect-opencl + dev-libs/ocl-icd dev-libs/libclc virtual/libelf:0=[${MULTILIB_USEDEP}] ) @@ -134,9 +134,9 @@ RDEPEND="${RDEPEND} # 1. List all the working slots (with min versions) in ||, newest first. # 2. Update the := to specify *max* version, e.g. < 7. # 3. Specify LLVM_MAX_SLOT, e.g. 6. +LLVM_MAX_SLOT="7" LLVM_DEPSTR=" || ( - sys-devel/llvm:8[${MULTILIB_USEDEP}] sys-devel/llvm:7[${MULTILIB_USEDEP}] sys-devel/llvm:6[${MULTILIB_USEDEP}] sys-devel/llvm:5[${MULTILIB_USEDEP}] @@ -424,14 +424,12 @@ multilib_src_configure() { fi gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - emesonargs+=( - -Dgallium-opencl="$(usex opencl standalone disabled)" - ) - fi - gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) fi if use vulkan; then @@ -488,21 +486,6 @@ multilib_src_compile() { multilib_src_install() { meson_src_install - - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi } multilib_src_install_all() { @@ -517,11 +500,6 @@ pkg_postinst() { # Switch to the xorg implementation. echo eselect opengl set --use-old ${OPENGL_DIR} - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi } # $1 - VIDEO_CARDS flag (check skipped for "--") diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 2fd5700404f..f07bda10516 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -95,7 +95,7 @@ RDEPEND=" ) lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] ) opencl? ( - app-eselect/eselect-opencl + dev-libs/ocl-icd dev-libs/libclc virtual/libelf:0=[${MULTILIB_USEDEP}] ) @@ -424,14 +424,12 @@ multilib_src_configure() { fi gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - emesonargs+=( - -Dgallium-opencl="$(usex opencl standalone disabled)" - ) - fi - gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) fi if use vulkan; then @@ -488,21 +486,6 @@ multilib_src_compile() { multilib_src_install() { meson_src_install - - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi } multilib_src_install_all() { @@ -517,11 +500,6 @@ pkg_postinst() { # Switch to the xorg implementation. echo eselect opengl set --use-old ${OPENGL_DIR} - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi } # $1 - VIDEO_CARDS flag (check skipped for "--")