From 355139aeea0b1c471850e8d8894e5ee7d134954e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Tue, 2 Jul 2013 01:14:48 +0200
Subject: [PATCH] MesaLib: re-apply the llvm-3.3 patches.

---
 .../patches/MesaLib-9.1.3-llvm_fixes-1.patch  | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)
 create mode 100644 srcpkgs/MesaLib/patches/MesaLib-9.1.3-llvm_fixes-1.patch

diff --git a/srcpkgs/MesaLib/patches/MesaLib-9.1.3-llvm_fixes-1.patch b/srcpkgs/MesaLib/patches/MesaLib-9.1.3-llvm_fixes-1.patch
new file mode 100644
index 0000000000..70782550db
--- /dev/null
+++ b/srcpkgs/MesaLib/patches/MesaLib-9.1.3-llvm_fixes-1.patch
@@ -0,0 +1,72 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2013-05-22
+Initial Package Version: 9.1.3
+Upstream Status:         Fixed upstream
+Origin:                  Upstream
+Description:             Fixes building with LLVM 3.3.
+
+--- src/gallium/drivers/r600/llvm_wrapper.cpp	2013-03-05 23:54:28.000000000 +0100
++++ src/gallium/drivers/r600/llvm_wrapper.cpp	2013-05-15 12:53:51.605926357 +0200
+@@ -1,8 +1,16 @@
+ #include <llvm/ADT/OwningPtr.h>
+ #include <llvm/ADT/StringRef.h>
++#if HAVE_LLVM < 0x0303
+ #include <llvm/LLVMContext.h>
+-#include <llvm/PassManager.h>
+ #include <llvm/Support/IRReader.h>
++#else
++#include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/Function.h>
++#include <llvm/IR/DataLayout.h>
++#include <llvm/IRReader/IRReader.h>
++#endif
++#include <llvm/PassManager.h>
+ #include <llvm/Support/MemoryBuffer.h>
+ #include <llvm/Support/SourceMgr.h>
+ #include <llvm/Transforms/IPO.h>
+--- src/gallium/drivers/r600/Makefile.am	2013-03-05 23:54:28.000000000 +0100
++++ src/gallium/drivers/r600/Makefile.am	2013-05-15 12:53:51.605926357 +0200
+@@ -26,7 +26,8 @@
+ 	-I$(top_srcdir)/src/gallium/drivers/radeon/
+ 
+ AM_CXXFLAGS= \
+-	$(LLVM_CXXFLAGS)
++	$(LLVM_CXXFLAGS) \
++	$(DEFINES)
+ endif
+ 
+ if USE_R600_LLVM_COMPILER
+--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp	2013-03-05 23:54:28.000000000 +0100
++++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp	2013-05-15 12:54:13.196319331 +0200
+@@ -25,13 +25,21 @@
+  */
+ #include "radeon_llvm_emit.h"
+ 
++#if HAVE_LLVM < 0x0303
+ #include <llvm/LLVMContext.h>
+ #include <llvm/Module.h>
++#include <llvm/DataLayout.h>
++#else
++#include <llvm/IR/LLVMContext.h>
++#include <llvm/IR/Module.h>
++#include <llvm/IR/DataLayout.h>
++#include <llvm/Support/CBindingWrapping.h>
++#endif
++
+ #include <llvm/PassManager.h>
+ #include <llvm/ADT/Triple.h>
+ #include <llvm/Support/FormattedStream.h>
+ #include <llvm/Support/Host.h>
+-#include <llvm/Support/IRReader.h>
+ #include <llvm/Support/SourceMgr.h>
+ #include <llvm/Support/TargetRegistry.h>
+ #include <llvm/Support/TargetSelect.h>
+@@ -39,7 +47,6 @@
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Transforms/Scalar.h>
+ #include <llvm-c/Target.h>
+-#include <llvm/DataLayout.h>
+ 
+ #include <iostream>
+ #include <stdlib.h>