[gentoo-commits] proj/x11:opencl commit in: media-libs/mesa/, media-libs/mesa/files/

[Alexey Shvetsov]

commit:     4f6e677ca64557ef18d1245a893df206ac89d735
Author:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  3 10:17:57 2012 +0000
Commit:     Alexey Shvetsov <alexxy <AT> gentoo <DOT> org>
CommitDate: Sun Jun  3 10:17:57 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=4f6e677c

add few patches to make opencl work

(Portage version: 2.2.0_alpha109/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 ...adeong-clover-add-clang-path-to-configure.patch |   48 ++++++++++++++++++++
 ...ncl-rename-target-from-r600-to-r600-amd-n.patch |   26 +++++++++++
 ...building-and-add-standart-locations-for-l.patch |   48 ++++++++++++++++++++
 media-libs/mesa/mesa-9999.ebuild                   |    8 +++
 4 files changed, 130 insertions(+), 0 deletions(-)

diff --git a/media-libs/mesa/files/0001-radeong-clover-add-clang-path-to-configure.patch b/media-libs/mesa/files/0001-radeong-clover-add-clang-path-to-configure.patch
new file mode 100644
index 0000000..bcfd425
--- /dev/null
+++ b/media-libs/mesa/files/0001-radeong-clover-add-clang-path-to-configure.patch
@@ -0,0 +1,48 @@
+From 932b4a03d17aad57090835d9559b99475f504d31 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@g.o>
+Date: Sun, 3 Jun 2012 14:05:35 +0400
+Subject: [PATCH 1/3] radeong/clover add clang path to configure
+
+---
+ configure.ac                                  |   11 +++++++++++
+ src/gallium/state_trackers/clover/Makefile.am |    2 +-
+ 2 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index fc1c28e..3414a66 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1629,6 +1629,17 @@ AC_ARG_WITH([libclc-path],
+ 
+ AC_SUBST([LIBCLC_PATH])
+ 
++dnl
++dnl Also we need path to clang includes
++dnl
++
++AC_ARG_WITH([clang-path],
++	    [AS_HELP_STRING([--with-clang-path],
++			    [Path to clang base dir.  Example: --with-clang-path=/usr/lib])],
++			    [CLANG_PATH="$withval"],
++			    [CLANG_PATH=""])
++AC_SUBST([CLANG_PATH])
++
+ if test "x$enable_opencl" = xyes; then
+     if test "x$with_gallium_drivers" = x; then
+         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
+diff --git a/src/gallium/state_trackers/clover/Makefile.am b/src/gallium/state_trackers/clover/Makefile.am
+index 818ced6..bc37c4e 100644
+--- a/src/gallium/state_trackers/clover/Makefile.am
++++ b/src/gallium/state_trackers/clover/Makefile.am
+@@ -24,7 +24,7 @@ libclllvm_la_CXXFLAGS = \
+ 	$(LLVM_CPPFLAGS) \
+ 	$(DEFINES) \
+ 	-DLIBCLC_PATH=\"$(LIBCLC_PATH)/\" \
+-	-DCLANG_RESOURCE_DIR=\"$(LLVM_LIBDIR)/clang/$(LLVM_VERSION)/\"
++	-DCLANG_RESOURCE_DIR=\"$(CLANG_PATH)/clang/$(LLVM_VERSION)/\"
+ 
+ libclllvm_la_SOURCES = \
+ 	llvm/invocation.cpp
+-- 
+1.7.10.2
+

diff --git a/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch b/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch
new file mode 100644
index 0000000..2eebc9c
--- /dev/null
+++ b/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch
@@ -0,0 +1,26 @@
+From 7c4d0a88c45acedfd47eba93646bf5ea7435472c Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@g.o>
+Date: Sun, 3 Jun 2012 13:52:00 +0400
+Subject: [PATCH 2/3] radeong/opencl rename target from r600-- to
+ r600-amd-none
+
+---
+ src/gallium/drivers/r600/r600_pipe.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c
+index e0ee823..790afcc 100644
+--- a/src/gallium/drivers/r600/r600_pipe.c
++++ b/src/gallium/drivers/r600/r600_pipe.c
+@@ -582,7 +582,7 @@ static int r600_get_compute_param(struct pipe_screen *screen,
+ 	switch (param) {
+ 	case PIPE_COMPUTE_CAP_IR_TARGET:
+ 		if (ret) {
+-			strcpy(ret, "r600--");
++			strcpy(ret, "r600-amd-none");
+ 		}
+ 		return 7 * sizeof(char);
+ 
+-- 
+1.7.10.2
+

diff --git a/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch b/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch
new file mode 100644
index 0000000..3a78505
--- /dev/null
+++ b/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch
@@ -0,0 +1,48 @@
+From 3d4239edd2c89d3b67aef11786f0846fba96d718 Mon Sep 17 00:00:00 2001
+From: Alexey Shvetsov <alexxy@g.o>
+Date: Sun, 3 Jun 2012 04:35:51 +0400
+Subject: [PATCH 3/3] clover fix building and add standart locations for
+ libclc
+
+---
+ src/gallium/state_trackers/clover/llvm/invocation.cpp |    4 ++--
+ src/gallium/targets/opencl/Makefile.am                |    1 +
+ 2 files changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/gallium/state_trackers/clover/llvm/invocation.cpp b/src/gallium/state_trackers/clover/llvm/invocation.cpp
+index 27276bc..78c8670 100644
+--- a/src/gallium/state_trackers/clover/llvm/invocation.cpp
++++ b/src/gallium/state_trackers/clover/llvm/invocation.cpp
+@@ -107,7 +107,7 @@ namespace {
+       c.getHeaderSearchOpts().ResourceDir = CLANG_RESOURCE_DIR;
+ 
+       // Add libclc generic search path
+-      c.getHeaderSearchOpts().AddPath(LIBCLC_PATH "/generic/include/",
++      c.getHeaderSearchOpts().AddPath(LIBCLC_PATH "/include/",
+                                       clang::frontend::Angled,
+                                       false, false, false);
+ 
+@@ -142,7 +142,7 @@ namespace {
+       llvm::Linker linker("clover", mod);
+ 
+       // Link the kernel with libclc
+-      linker.LinkInFile(llvm::sys::Path(LIBCLC_PATH + triple + "/lib/builtins.bc"), isNative);
++      linker.LinkInFile(llvm::sys::Path(LIBCLC_PATH + "/lib/clc/" +triple + "/builtins.bc"), isNative);
+       mod = linker.releaseModule();
+ 
+       // Run link time optimizations
+diff --git a/src/gallium/targets/opencl/Makefile.am b/src/gallium/targets/opencl/Makefile.am
+index d55b21e..4c89e36 100644
+--- a/src/gallium/targets/opencl/Makefile.am
++++ b/src/gallium/targets/opencl/Makefile.am
+@@ -3,6 +3,7 @@ AUTOMAKE_OPTIONS = subdir-objects
+ lib_LTLIBRARIES = libOpenCL.la
+ 
+ libOpenCL_la_LDFLAGS = \
++	$(LLVM_LDFLAGS) \
+ 	-version-number 1:0
+ 
+ libOpenCL_la_LIBADD = \
+-- 
+1.7.10.2
+

diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 7e39bae..46d4861 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -147,6 +147,12 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+PATCHES=(
+		"${FILESDIR}/0001-radeong-clover-add-clang-path-to-configure.patch"
+		"${FILESDIR}/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch"
+		"${FILESDIR}/0003-clover-fix-building-and-add-standart-locations-for-l.patch"
+		)
+
 # It is slow without texrels, if someone wants slow
 # mesa without texrels +pic use is worth the shot
 QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
@@ -256,6 +262,8 @@ src_configure() {
 			myconf+="
 				$(use_enable opencl)
 				--with-opencl-libdir="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/mesa"
+				--with-libclc-path="${EPREFIX}/usr"
+				--with-clang-path="${EPREFIX}/usr/$(get_libdir)"
 				"
 		fi
 	fi