rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

Accepting request 176903 from home:-miska-:branches:X11:XOrg

Browse Source 
- fixed compilation against latest lvm: llvm-3.3.patch

OBS-URL: https://build.opensuse.org/request/show/176903
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/Mesa?expand=0&rev=289
This commit is contained in:
Stefan Dirsch 2013-05-29 07:34:52 +00:00 committed by Git OBS Bridge
parent ad64b7c034
commit 42683543da
3 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Mesa.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 28 14:57:52 UTC 2013 - mhrusecky@suse.com
- fixed compilation against latest lvm: llvm-3.3.patch
-------------------------------------------------------------------
Tue May 21 23:50:51 UTC 2013 - hrvoje.senjan@gmail.com

3
Mesa.spec
View File

@ -61,6 +61,7 @@ BuildRequires: llvm-devel
%endif
BuildRequires: libXvMC-devel
BuildRequires: libvdpau-devel
BuildRequires: zlib-devel
Url: http://www.mesa3d.org
Provides: Mesa7 = %{version}
@ -95,6 +96,7 @@ Patch13: u_mesa-8.0.1-fix-16bpp.patch
Patch14: u_mesa-glapi_dispatch.patch
# Patch from Fedora, use shmget when available, under llvmpipe
Patch15: u_mesa-8.0-llvmpipe-shmget.patch
Patch16: llvm-3.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -524,6 +526,7 @@ rm -rf docs/README.{VMS,WIN32,OS2}
%patch13 -p1
%patch14 -p1
%patch15 -p1
%patch16
%build

39
llvm-3.3.patch Normal file
View File

@ -0,0 +1,39 @@
From 4742f9b00b804dd01eb9955dd386a2373cd8eb36 Mon Sep 17 00:00:00 2001
From: Armin K <krejzi@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@amd.com>
---
Index: src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
===================================================================
--- src/gallium/auxiliary/gallivm/lp_bld_misc.cpp.orig
+++ src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -60,6 +60,12 @@
#include <llvm/Target/TargetSelect.h>
#endif /* HAVE_LLVM < 0x0300 */
+#if HAVE_LLVM >= 0x0303
+#include <llvm/IR/IRBuilder.h>
+#include <llvm/IR/Module.h>
+#include <llvm/Support/CBindingWrapping.h>
+#endif
+
#include "pipe/p_config.h"
#include "util/u_debug.h"
#include "util/u_cpu_detect.h"
Index: src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
===================================================================
--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp.orig
+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -55,6 +55,10 @@
#include <llvm/MC/MCRegisterInfo.h>
#endif /* HAVE_LLVM >= 0x0301 */
+#if HAVE_LLVM >= 0x0303
+#include <llvm/ADT/OwningPtr.h>
+#endif
+
#include "util/u_math.h"
#include "util/u_debug.h"