[packages/Mesa] - up to 9.2.0
arekm
arekm at pld-linux.org
Wed Aug 28 10:05:39 CEST 2013
commit 5b8e9162438e1b9370203f6ceafd0b9d3101a2f4
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Aug 28 10:05:34 2013 +0200
- up to 9.2.0
Mesa-link.patch | 10 --
Mesa-llvm.patch | 376 --------------------------------------------------------
Mesa.spec | 43 ++-----
3 files changed, 8 insertions(+), 421 deletions(-)
---
diff --git a/Mesa.spec b/Mesa.spec
index c9d11e7..c08726e 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -21,7 +21,7 @@
# (until they start to be somehow versioned themselves)
%define glapi_ver 7.1.0
# internal API version (libdricore); a.b.c for Mesa-a.b.c, a.b.0 for Mesa-a.b
-%define int_sover 9.1.6
+%define int_sover 9.2.0
# minimal supported xserver version
%define xserver_ver 1.5.0
# other packages
@@ -32,14 +32,13 @@
Summary: Free OpenGL implementation
Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL
Name: Mesa
-Version: 9.1.6
+Version: 9.2.0
Release: 1
License: MIT (core) and others - see license.html file
Group: X11/Libraries
-Source0: ftp://ftp.freedesktop.org/pub/mesa/%{version}/%{name}Lib-%{version}.tar.bz2
-# Source0-md5: 443a2a352667294b53d56cb1a74114e9
+Source0: ftp://ftp.freedesktop.org/pub/mesa/9.2/%{name}Lib-%{version}.tar.bz2
+# Source0-md5: 4185b6aae890bc62a964f4b24cc1aca8
Patch0: %{name}-link.patch
-Patch1: %{name}-llvm.patch
URL: http://www.mesa3d.org/
BuildRequires: autoconf >= 2.60
BuildRequires: automake
@@ -469,7 +468,6 @@ Summary: Mesa implementation of XvMC API for ATI Radeon R600 series adapters
Summary(pl.UTF-8): Implementacja Mesa API XvMC dla kart ATI Radeon z serii R600
License: MIT
Group: Libraries
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Requires: libdrm >= %{libdrm_ver}
Requires: xorg-lib-libXvMC >= 1.0.6
Conflicts: Mesa-libXvMC
@@ -577,7 +575,6 @@ Summary: r600 driver for Mesa GBM framework
Summary(pl.UTF-8): Sterownik r600 dla szkieletu Mesa GBM
Group: Libraries
Requires: %{name}-libgbm = %{version}-%{release}
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Obsoletes: Mesa-opencl-driver-r600
%description gbm-driver-r600
@@ -594,8 +591,8 @@ Summary: radeonsi driver for Mesa GBM framework
Summary(pl.UTF-8): Sterownik radeonsi dla szkieletu Mesa GBM
Group: Libraries
Requires: %{name}-libgbm = %{version}-%{release}
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Obsoletes: Mesa-opencl-driver-radeonsi
+Obsoletes: Mesa-libllvmradeon
%description gbm-driver-radeonsi
radeonsi driver for Mesa Graphics Buffer Manager. It supports ATI
@@ -648,17 +645,6 @@ Mesa GL API shared library, common for various APIs (EGL, GL, GLES).
Biblioteka współdzielona Mesa GL API, wspólna dla różnych API (EGL,
GL, GLES).
-%package libllvmradeon
-Summary: LLVM radeon target library
-Summary(pl.UTF-8): Biblioteka platformy radeon dla LLVM-a
-Group: Libraries
-
-%description libllvmradeon
-LLVM radeon target library.
-
-%description libllvmradeon -l pl.UTF-8
-Biblioteka platformy radeon dla LLVM-a.
-
%package libwayland-egl
Summary: Wayland EGL library
Summary(pl.UTF-8): Biblioteka Wayland EGL
@@ -791,7 +777,6 @@ Summary: X.org DRI driver for ATI R600 card family
Summary(pl.UTF-8): Sterownik X.org DRI dla rodziny kart ATI R600
License: MIT
Group: X11/Libraries
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Requires: radeon-ucode
Requires: xorg-driver-video-ati
Requires: xorg-xserver-libglx(glapi) = %{glapi_ver}
@@ -808,7 +793,6 @@ Summary: X.org DRI driver for ATI Southern Islands card family
Summary(pl.UTF-8): Sterownik X.org DRI dla rodziny kart ATI Southern Islands
License: MIT
Group: X11/Libraries
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Requires: radeon-ucode
Requires: xorg-driver-video-ati
Requires: xorg-xserver-libglx(glapi) = %{glapi_ver}
@@ -947,7 +931,6 @@ Summary: Mesa r600 driver for the vdpau API
Summary(pl.UTF-8): Sterownik Mesa r600 dla API vdpau
License: MIT
Group: X11/Libraries
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Requires: libdrm >= %{libdrm_ver}
Requires: libvdpau >= 0.4.1
Conflicts: libvdpau-driver-mesa
@@ -965,10 +948,10 @@ Summary: Mesa radeonsi driver for the vdpau API
Summary(pl.UTF-8): Sterownik Mesa radeonsi dla API vdpau
License: MIT
Group: X11/Libraries
-Requires: %{name}-libllvmradeon = %{version}-%{release}
Requires: libdrm >= %{libdrm_ver}
Requires: libvdpau >= 0.4.1
Conflicts: libvdpau-driver-mesa
+Obsoletes: Mesa-libllvmradeon
%description -n libvdpau-driver-mesa-radeonsi
Mesa radeonsi driver for the vdpau API. It supports ATI Radeon
@@ -996,7 +979,6 @@ Sterownik Mesa softpipe dla API vdpau.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
@@ -1126,9 +1108,6 @@ rm -rf $RPM_BUILD_ROOT
%post libglapi -p /sbin/ldconfig
%postun libglapi -p /sbin/ldconfig
-%post libllvmradeon -p /sbin/ldconfig
-%postun libllvmradeon -p /sbin/ldconfig
-
%post libwayland-egl -p /sbin/ldconfig
%postun libwayland-egl -p /sbin/ldconfig
@@ -1167,7 +1146,7 @@ rm -rf $RPM_BUILD_ROOT
%files libGL
%defattr(644,root,root,755)
-%doc docs/{*.html,README.{MITS,QUAKE,THREADS},RELNOTES*}
+%doc docs/{*.html,README.{MITS,QUAKE,THREADS,UVD},relnotes/*.html}
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%attr(755,root,root) %ghost %{_libdir}/libGL.so.1
# symlink for binary apps which fail to conform Linux OpenGL ABI
@@ -1176,7 +1155,7 @@ rm -rf $RPM_BUILD_ROOT
%files libGL-devel
%defattr(644,root,root,755)
-%doc docs/*.spec
+%doc docs/specs/*
%dir %{_includedir}/GL
%{_includedir}/GL/gl.h
%{_includedir}/GL/glext.h
@@ -1337,12 +1316,6 @@ rm -rf $RPM_BUILD_ROOT
# libglapi-devel? nothing seems to need it atm.
#%attr(755,root,root) %{_libdir}/libglapi.so
-%if %{with gallium}
-%files libllvmradeon
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libllvmradeon%{int_sover}.so
-%endif
-
%if %{with wayland}
%files libwayland-egl
%defattr(644,root,root,755)
diff --git a/Mesa-link.patch b/Mesa-link.patch
index 18819f8..37b5734 100644
--- a/Mesa-link.patch
+++ b/Mesa-link.patch
@@ -21,16 +21,6 @@
if HAVE_EGL_PLATFORM_WAYLAND
AM_CPPFLAGS = -DHAVE_WAYLAND_PLATFORM
---- Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100
-+++ Mesa-9.1/src/gallium/targets/xvmc-nouveau/Makefile.am 2013-02-27 20:42:00.199549898 +0100
-@@ -48,6 +48,7 @@
- $(top_builddir)/src/gallium/auxiliary/libgallium.la \
- $(top_builddir)/src/gallium/state_trackers/xvmc/libxvmctracker.la \
- $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \
-+ $(top_builddir)/src/gallium/drivers/nv30/libnv30.la \
- $(top_builddir)/src/gallium/drivers/nv50/libnv50.la \
- $(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \
- $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \
--- Mesa-9.1/src/mesa/libdricore/Makefile.am.orig 2013-02-20 01:26:22.000000000 +0100
+++ Mesa-9.1/src/mesa/libdricore/Makefile.am 2013-02-27 20:43:01.806214222 +0100
@@ -42,6 +42,7 @@
diff --git a/Mesa-llvm.patch b/Mesa-llvm.patch
deleted file mode 100644
index 1b0e690..0000000
--- a/Mesa-llvm.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-From 7cd248aa7938a068663fcd605169b7d4e21636bf Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Wed, 13 Feb 2013 20:59:41 +0000
-Subject: radeon/llvm: Fix build with LLVM 3.3
-
----
-diff --git a/src/gallium/drivers/r600/llvm_wrapper.cpp b/src/gallium/drivers/r600/llvm_wrapper.cpp
-index 81f5397..ae2f4d2 100644
---- a/src/gallium/drivers/r600/llvm_wrapper.cpp
-+++ b/src/gallium/drivers/r600/llvm_wrapper.cpp
-@@ -1,6 +1,10 @@
- #include <llvm/ADT/OwningPtr.h>
- #include <llvm/ADT/StringRef.h>
-+#if HAVE_LLVM < 0x0303
- #include <llvm/LLVMContext.h>
-+#else
-+#include <llvm/IR/LLVMContext.h>
-+#endif
- #include <llvm/PassManager.h>
- #include <llvm/Support/IRReader.h>
- #include <llvm/Support/MemoryBuffer.h>
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 903e102..0491e64 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -25,8 +25,16 @@
- */
- #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>
-+#endif
-+
- #include <llvm/PassManager.h>
- #include <llvm/ADT/Triple.h>
- #include <llvm/Support/FormattedStream.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>
---
-cgit v0.9.0.2-2-gbebe
-From 1f006717db5258e703d83b37772b85ad25bf3319 Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Wed, 13 Feb 2013 20:57:25 +0000
-Subject: r600g: Add $(DEFINES) to AM_CXXFLAGS
-
-This way llvm_wrapper.cpp is compiled with -DHAVE_LLVM=0x....
----
-(limited to 'src/gallium')
-
-diff --git a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
-index 6f48b56..e1c8574 100644
---- a/src/gallium/drivers/r600/Makefile.am
-+++ b/src/gallium/drivers/r600/Makefile.am
-@@ -26,7 +26,8 @@ AM_CFLAGS += \
- -I$(top_srcdir)/src/gallium/drivers/radeon/
-
- AM_CXXFLAGS= \
-- $(LLVM_CXXFLAGS)
-+ $(LLVM_CXXFLAGS) \
-+ $(DEFINES)
- endif
-
- if USE_R600_LLVM_COMPILER
---
-cgit v0.9.0.2-2-gbebe
-From ead4db420e9e5408f41c70768a290592a384aedb Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Tue, 23 Apr 2013 14:57:54 +0000
-Subject: gallivm: Fix build with LLVM >= r180063
-
----
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 024819e..717afa7 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -67,6 +67,10 @@
- #include <llvm/Target/TargetSelect.h>
- #endif /* HAVE_LLVM < 0x0300 */
-
-+#if HAVE_LLVM >= 0x0303
-+#include <llvm/Wrap.h>
-+#endif
-+
- #include "pipe/p_config.h"
- #include "util/u_debug.h"
- #include "util/u_cpu_detect.h"
---
-cgit v0.9.0.2-2-gbebe
-From a0c8942bb4742b4bd22f494cea4dcd59d9ca99ab Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Tue, 23 Apr 2013 14:58:38 +0000
-Subject: radeon/llvm: Fix build with LLVM >= r180063
-
----
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index d2dc035..5b770d0 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -47,6 +47,7 @@
- #include <llvm/Support/Threading.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Transforms/Scalar.h>
-+#include <llvm/Wrap.h>
- #include <llvm-c/Target.h>
-
- #include <iostream>
---
-cgit v0.9.0.2-2-gbebe
-From 6249db73ea580e6a54874235ffb3a7d42ac63bb4 Mon Sep 17 00:00:00 2001
-From: Christian König <christian.koenig at amd.com>
-Date: Tue, 26 Mar 2013 10:37:45 +0000
-Subject: radeon/llvm: remove uneeded inclusion
-
-The include isn't needed and the file has moved with LLVM master.
-
-Signed-off-by: Christian König <christian.koenig at amd.com>
-Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>
----
-(limited to 'src/gallium/drivers/radeon/radeon_llvm_emit.cpp')
-
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index ee82a90..a23532b 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -41,7 +41,6 @@
- #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>
---
-cgit v0.9.0.2-2-gbebe
-diff -ur a/src/gallium/drivers/r600/llvm_wrapper.cpp b/src/gallium/drivers/r600/llvm_wrapper.cpp
---- a/src/gallium/drivers/r600/llvm_wrapper.cpp 2013-03-05 23:54:28.000000000 +0100
-+++ b/src/gallium/drivers/r600/llvm_wrapper.cpp 2013-05-02 17:46:36.411226826 +0200
-@@ -2,7 +2,12 @@
- #include <llvm/ADT/StringRef.h>
- #include <llvm/LLVMContext.h>
- #include <llvm/PassManager.h>
-+#if HAVE_LLVM < 0x0303
- #include <llvm/Support/IRReader.h>
-+#else
-+#include <llvm/IRReader/IRReader.h>
-+#include <llvm/Support/CBindingWrapping.h>
-+#endif /* HAVE_LLVM < 0x0303 */
- #include <llvm/Support/MemoryBuffer.h>
- #include <llvm/Support/SourceMgr.h>
- #include <llvm/Transforms/IPO.h>
-diff -ur a/src/gallium/drivers/r600/Makefile.am b/src/gallium/drivers/r600/Makefile.am
---- a/src/gallium/drivers/r600/Makefile.am 2013-03-05 23:54:28.000000000 +0100
-+++ b/src/gallium/drivers/r600/Makefile.am 2013-05-02 18:00:20.035242047 +0200
-@@ -23,6 +23,7 @@
-
- AM_CFLAGS += \
- $(LLVM_CFLAGS) \
-+ -lLLVMIRReader \
- -I$(top_srcdir)/src/gallium/drivers/radeon/
-
- AM_CXXFLAGS= \
-From 4742f9b00b804dd01eb9955dd386a2373cd8eb36 Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi at email.com>
-Date: Thu, 02 May 2013 10:55:04 +0000
-Subject: gallivm: Fix build with LLVM 3.3
-
-Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
----
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index 717afa7..a531d98 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -68,7 +68,9 @@
- #endif /* HAVE_LLVM < 0x0300 */
-
- #if HAVE_LLVM >= 0x0303
--#include <llvm/Wrap.h>
-+#include <llvm/IR/IRBuilder.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/Support/CBindingWrapping.h>
- #endif
-
- #include "pipe/p_config.h"
---
-cgit v0.9.0.2-2-gbebe
-From cd84353d576246273d1c6ae8e96b65217be15ebc Mon Sep 17 00:00:00 2001
-From: Armin K <krejzi at email.com>
-Date: Thu, 02 May 2013 10:55:05 +0000
-Subject: radeon: Fix build with LLVM 3.3
-
-Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
----
-diff --git a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-index 55dad9b..fb974f9 100644
---- a/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-+++ b/src/gallium/drivers/radeon/radeon_llvm_emit.cpp
-@@ -39,6 +39,7 @@
-
- #include <llvm/PassManager.h>
- #include <llvm/ADT/Triple.h>
-+#include <llvm/Support/CBindingWrapping.h>
- #include <llvm/Support/FormattedStream.h>
- #include <llvm/Support/Host.h>
- #include <llvm/Support/SourceMgr.h>
-@@ -47,7 +48,6 @@
- #include <llvm/Support/Threading.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Transforms/Scalar.h>
--#include <llvm/Wrap.h>
- #include <llvm-c/Target.h>
-
- #include <iostream>
- # Provide compatibility with scripts for the old Mesa build system for
---
-1.8.1.5
-
-Signed-off-by: Vinson Lee <vlee at freedesktop.org>
----
- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index 86617d4..1c886ea 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -212,7 +212,9 @@ disassemble(const void* func, llvm::raw_ostream & Out)
- std::string Error;
- const Target *T = TargetRegistry::lookupTarget(Triple, Error);
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0304
-+ OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(*T->createMCRegInfo(Triple), Triple));
-+#elif HAVE_LLVM >= 0x0300
- OwningPtr<const MCAsmInfo> AsmInfo(T->createMCAsmInfo(Triple));
- #else
- OwningPtr<const MCAsmInfo> AsmInfo(T->createAsmInfo(Triple));
---
-1.8.2.1
---- x/src/gallium/state_trackers/clover/llvm/invocation.cpp.org 2013-06-19 12:06:31.055563544 +0200
-+++ x/src/gallium/state_trackers/clover/llvm/invocation.cpp 2013-06-19 12:16:58.645029877 +0200
-@@ -28,10 +28,18 @@
- #include <clang/CodeGen/CodeGenAction.h>
- #include <llvm/Bitcode/BitstreamWriter.h>
- #include <llvm/Bitcode/ReaderWriter.h>
-+#if HAVE_LLVM < 0x0303
- #include <llvm/DerivedTypes.h>
--#include <llvm/Linker.h>
- #include <llvm/LLVMContext.h>
- #include <llvm/Module.h>
-+#else
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/LLVMContext.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/Support/SourceMgr.h>
-+#include <llvm/IRReader/IRReader.h>
-+#endif
-+#include <llvm/Linker.h>
- #include <llvm/PassManager.h>
- #include <llvm/Support/TargetSelect.h>
- #include <llvm/Support/MemoryBuffer.h>
-@@ -41,8 +49,10 @@
-
- #if HAVE_LLVM < 0x0302
- #include <llvm/Target/TargetData.h>
--#else
-+#elif HAVE_LLVM < 0x0303
- #include <llvm/DataLayout.h>
-+#else
-+#include <llvm/IR/DataLayout.h>
- #endif
-
- #include "pipe/p_state.h"
-@@ -151,7 +161,11 @@
- // Add libclc generic search path
- c.getHeaderSearchOpts().AddPath(LIBCLC_INCLUDEDIR,
- clang::frontend::Angled,
-- false, false, false);
-+ false, false
-+#if HAVE_LLVM < 0x0303
-+ , false
-+#endif
-+ );
-
- // Add libclc include
- c.getPreprocessorOpts().Includes.push_back("clc/clc.h");
-@@ -167,8 +181,12 @@
- c.getInvocation().setLangDefaults(c.getLangOpts(), clang::IK_OpenCL,
- clang::LangStandard::lang_opencl11);
- #endif
-- c.createDiagnostics(0, NULL, new clang::TextDiagnosticPrinter(
-- s_log,
-+ c.createDiagnostics(
-+#if HAVE_LLVM < 0x0303
-+ 0, NULL,
-+#endif
-+ new clang::TextDiagnosticPrinter(
-+ s_log,
- #if HAVE_LLVM <= 0x0301
- c.getDiagnosticOpts()));
- #else
-@@ -201,12 +219,26 @@
-
- llvm::PassManager PM;
- llvm::PassManagerBuilder Builder;
-- bool isNative;
-- llvm::Linker linker("clover", mod);
-+ llvm::sys::Path libclc_path =
-+ llvm::sys::Path(LIBCLC_LIBEXECDIR + triple + ".bc");
-
- // Link the kernel with libclc
-- linker.LinkInFile(llvm::sys::Path(LIBCLC_LIBEXECDIR + triple + ".bc"), isNative);
-+#if HAVE_LLVM < 0x0303
-+ bool isNative;
-+ llvm::Linker linker("clover", mod);
-+ linker.LinkInFile(libclc_path, isNative);
- mod = linker.releaseModule();
-+#else
-+ std::string err_str;
-+ llvm::SMDiagnostic err;
-+ llvm::Module *libclc_mod = llvm::ParseIRFile(libclc_path.str(), err,
-+ mod->getContext());
-+ if (llvm::Linker::LinkModules(mod, libclc_mod,
-+ llvm::Linker::DestroySource,
-+ &err_str)) {
-+ throw build_error(err_str);
-+ }
-+#endif
-
- // Add a function internalizer pass.
- //
---- ./src/gallium/drivers/r600/llvm_wrapper.cpp~ 2013-06-19 12:24:15.000000000 +0200
-+++ ./src/gallium/drivers/r600/llvm_wrapper.cpp 2013-06-19 12:29:10.363799511 +0200
-@@ -11,6 +11,7 @@
- #else
- #include <llvm/IRReader/IRReader.h>
- #include <llvm/Support/CBindingWrapping.h>
-+#include <llvm/LinkAllIR.h>
- #endif /* HAVE_LLVM < 0x0303 */
- #include <llvm/Support/MemoryBuffer.h>
- #include <llvm/Support/SourceMgr.h>
---- Mesa-9.1.3/src/gallium/targets/opencl/Makefile.am~ 2013-03-05 23:54:28.000000000 +0100
-+++ Mesa-9.1.3/src/gallium/targets/opencl/Makefile.am 2013-06-19 12:38:56.722221012 +0200
-@@ -21,9 +21,9 @@
- -lclangSema \
- -lclangAnalysis \
- -lclangAST \
-+ -lclangEdit \
- -lclangLex \
- -lclangBasic \
-- -lclangEdit \
- $(LLVM_LIBS)
-
-
---- Mesa-9.1.6/configure.ac~ 2013-08-01 23:14:58.000000000 +0200
-+++ Mesa-9.1.6/configure.ac 2013-08-02 09:44:02.661826293 +0200
-@@ -1779,7 +1779,7 @@
-
- radeon_llvm_check() {
- LLVM_REQUIRED_VERSION_MAJOR="3"
-- LLVM_REQUIRED_VERSION_MINOR="2"
-+ LLVM_REQUIRED_VERSION_MINOR="3"
- if test "$LLVM_VERSION_INT" -ne "${LLVM_REQUIRED_VERSION_MAJOR}0${LLVM_REQUIRED_VERSION_MINOR}"; then
- AC_MSG_ERROR([LLVM $LLVM_REQUIRED_VERSION_MAJOR.$LLVM_REQUIRED_VERSION_MINOR with R600 target enabled is required.
- To use the r600/radeonsi LLVM backend, you need to fetch the LLVM source from:
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/Mesa.git/commitdiff/5b8e9162438e1b9370203f6ceafd0b9d3101a2f4
More information about the pld-cvs-commit
mailing list