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 79DF11381F3 for ; Wed, 19 Jun 2013 15:15:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 03C06E079E; Wed, 19 Jun 2013 15:15:57 +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 90C56E079E for ; Wed, 19 Jun 2013 15:15:56 +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 921A133E482 for ; Wed, 19 Jun 2013 15:15:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 2D59AE468F for ; Wed, 19 Jun 2013 15:15:54 +0000 (UTC) From: "Chi-Thanh Christopher Nguyen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Chi-Thanh Christopher Nguyen" Message-ID: <1371654938.d047210175bcbb12a50a7bdb018c10c808b2278c.chithead@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 X-VCS-Directories: media-libs/mesa/ X-VCS-Committer: chithead X-VCS-Committer-Name: Chi-Thanh Christopher Nguyen X-VCS-Revision: d047210175bcbb12a50a7bdb018c10c808b2278c X-VCS-Branch: master Date: Wed, 19 Jun 2013 15:15:54 +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: 3b974f0f-d5f9-4a81-b647-f484f0ce076a X-Archives-Hash: 5e93e45ecd3546c09d267394d76b3da2 commit: d047210175bcbb12a50a7bdb018c10c808b2278c Author: Chi-Thanh Christopher Nguyen gentoo org> AuthorDate: Wed Jun 19 15:15:38 2013 +0000 Commit: Chi-Thanh Christopher Nguyen cs tu-berlin de> CommitDate: Wed Jun 19 15:15:38 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=d0472101 media-libs/mesa: improve opencl switching --- media-libs/mesa/mesa-9999.ebuild | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 5c2b81b..ee3ae95 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -366,10 +366,16 @@ src_install() { eend $? fi if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implentation for dynamic switching" + 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}"/usr/$(get_libdir)/OpenCL/vendors/mesa + "${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 @@ -392,6 +398,11 @@ pkg_postinst() { eselect mesa set --auto fi + # Switch to mesa opencl + if use opencl; then + eselect opencl set --use-old ${PN} + fi + # warn about patent encumbered texture-float if use !bindist; then elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"