Drop unneded patches

Package-Manager: portage-2.2.0_alpha171

4 files changed, 1 insertions, 136 deletions

diff --git a/media-libs/mesa/files/0001-XXX-Hacks-for-R600-rename.patch b/media-libs/mesa/files/0001-XXX-Hacks-for-R600-rename.patch
deleted file mode 100644
index 5e3375a3..00000000
--- a/media-libs/mesa/files/0001-XXX-Hacks-for-R600-rename.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From b2ec8e889fa9005cd9a6a81116171083f709e769 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard@amd.com>
-Date: Mon, 26 Nov 2012 21:18:19 +0000
-Subject: [PATCH] XXX: Hacks for R600 rename
-
----
- configure.ac                                    | 12 ++++++------
- src/gallium/drivers/radeon/radeon_llvm_emit.cpp |  7 +++++++
- 2 files changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 228f464..b848503 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1784,20 +1784,20 @@ radeon_llvm_check() {
-     LLVM_AVAILABLE_VERSION_MAJOR=`echo $LLVM_VERSION | cut -d. -f1`
-     LLVM_AVAILABLE_VERSION_MINOR=`echo $LLVM_VERSION | cut -d. -f2`
-     if test "$LLVM_AVAILABLE_VERSION_MAJOR" -lt "$LLVM_REQUIRED_VERSION_MAJOR" -o [ "$LLVM_AVAILABLE_VERSION_MAJOR" -eq "$LLVM_REQUIRED_VERSION_MAJOR" -a "$LLVM_AVAILABLE_VERSION_MINOR" -lt "$LLVM_REQUIRED_VERSION_MINOR" ] ; then
--        AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer with AMDGPU target enabled is required.
-+        AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR or newer with R600 target enabled is required.
-                      To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
-                      git://people.freedesktop.org/~tstellar/llvm master
--                     and build with --enable-experimental-targets=AMDGPU])
-+                     and build with --enable-experimental-targets=R600])
-     fi
--    if test true && $LLVM_CONFIG --targets-built | grep -qv '\<AMDGPU\>' ; then
--        AC_MSG_ERROR([LLVM AMDGPU Target not enabled.
-+    if test true && $LLVM_CONFIG --targets-built | grep -qv '\<R600\>' ; then
-+        AC_MSG_ERROR([LLVM R600 Target not enabled.
-                       To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
-                       git://people.freedesktop.org/~tstellar/llvm master
--                      and build with --enable-experimental-targets=AMDGPU])
-+                      and build with --enable-experimental-targets=R600])
-     fi
-     AC_MSG_WARN([Please ensure you use the latest llvm tree from git://people.freedesktop.org/~tstellar/llvm master before submitting a bug])
-     if test "x$LLVM_VERSION" = "x3.2"; then
--        LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs amdgpu`"
-+        LLVM_LIBS="$LLVM_LIBS `$LLVM_CONFIG --libs R600`"
-     fi
- }
- 
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 21661a0..9914228 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -89,11 +89,18 @@ radeon_llvm_compile(LLVMModuleRef M, unsigned char ** bytes,
- 
-    Triple AMDGPUTriple(sys::getDefaultTargetTriple());
- 
-+#if 0
-    LLVMInitializeAMDGPUTargetInfo();
-    LLVMInitializeAMDGPUTarget();
-    LLVMInitializeAMDGPUTargetMC();
-    LLVMInitializeAMDGPUAsmPrinter();
-+#else
-+   LLVMInitializeR600TargetInfo();
-+   LLVMInitializeR600Target();
-+   LLVMInitializeR600TargetMC();
-+   LLVMInitializeR600AsmPrinter();
- 
-+#endif
-    std::string err;
-    const Target * AMDGPUTarget = TargetRegistry::lookupTarget("r600", err);
-    if(!AMDGPUTarget) {
--- 
-1.7.11.4
-
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
deleted file mode 100644
index 2eebc9c8..00000000
--- a/media-libs/mesa/files/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7c4d0a88c45acedfd47eba93646bf5ea7435472c Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@gentoo.org>
-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
deleted file mode 100644
index 2b188069..00000000
--- a/media-libs/mesa/files/0003-clover-fix-building-and-add-standart-locations-for-l.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 3d4239edd2c89d3b67aef11786f0846fba96d718 Mon Sep 17 00:00:00 2001
-From: Alexey Shvetsov <alexxy@gentoo.org>
-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
--- 
-1.7.10.2
-
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index c2d9368c..6243eedd 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -123,7 +123,7 @@ DEPEND="${RDEPEND}
 		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
 	)
 	opencl? (
-				>=sys-devel/llvm[video_cards_radeon]
+				>=sys-devel/llvm-3.3[video_cards_radeon]
 				>=sys-devel/clang-3.3
 				>=sys-devel/gcc-4.6
 	)
@@ -141,10 +141,6 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
-PATCHES=(
-		"${FILESDIR}/0002-radeong-opencl-rename-target-from-r600-to-r600-amd-n.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*"