From 3e0f934b1e16add915ca142be4270147c0683a6f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Tue, 2 Jul 2013 10:00:48 +0200 Subject: [PATCH] - up to 9.1.4 --- Mesa-llvm.patch | 51 ------------------------------------------------- Mesa.spec | 8 ++++---- 2 files changed, 4 insertions(+), 55 deletions(-) diff --git a/Mesa-llvm.patch b/Mesa-llvm.patch index 6a2add3..b7aea5d 100644 --- a/Mesa-llvm.patch +++ b/Mesa-llvm.patch @@ -81,21 +81,6 @@ 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_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index ac8e10b..86617d4 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -56,6 +56,10 @@ - #include - #endif /* HAVE_LLVM >= 0x0301 */ - -+#if HAVE_LLVM >= 0x0303 -+#include -+#endif -+ - #include "util/u_math.h" - #include "util/u_debug.h" - 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 @@ -237,42 +222,6 @@ index 55dad9b..fb974f9 100644 #include #include --- -cgit v0.9.0.2-2-gbebe -From b86646754f5e29553adb734ab54cb607eb02ff33 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ch=C3=AD-Thanh=20Christopher=20Nguy=E1=BB=85n?= - -Date: Mon, 6 May 2013 20:18:22 +0200 -Subject: [PATCH] targets/dri-i915: Force c++ linker in all cases - -Bugzilla: https://bugs.gentoo.org/show_bug.cgi?id=461696 ---- - src/gallium/targets/dri-i915/Makefile.am | 10 ++-------- - 1 file changed, 2 insertions(+), 8 deletions(-) - -diff --git a/src/gallium/targets/dri-i915/Makefile.am b/src/gallium/targets/dri-i915/Makefile.am -index f4f9030..ce6be78 100644 ---- a/src/gallium/targets/dri-i915/Makefile.am -+++ b/src/gallium/targets/dri-i915/Makefile.am -@@ -62,17 +62,11 @@ i915_dri_la_LIBADD = \ - $(GALLIUM_DRI_LIB_DEPS) \ - $(INTEL_LIBS) - --if HAVE_MESA_LLVM --i915_dri_la_LINK = $(CXXLINK) $(i915_dri_la_LDFLAGS) --# Mention a dummy pure C++ file to trigger generation of the $(LINK) variable --nodist_EXTRA_i915_dri_la_SOURCES = dummy-cpp.cpp -+nodist_EXTRA_i915_dri_la_SOURCES = dummy.cpp - -+if HAVE_MESA_LLVM - AM_CPPFLAGS += -DGALLIUM_LLVMPIPE - i915_dri_la_LIBADD += $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la $(LLVM_LIBS) --else --i915_dri_la_LINK = $(LINK) $(i915_dri_la_LDFLAGS) --# Mention a dummy pure C file to trigger generation of the $(LINK) variable --nodist_EXTRA_i915_dri_la_SOURCES = dummy-c.c - endif - # Provide compatibility with scripts for the old Mesa build system for -- 1.8.1.5 diff --git a/Mesa.spec b/Mesa.spec index b2b0791..c8825fc 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.3 +%define int_sover 9.1.4 # minimal supported xserver version %define xserver_ver 1.5.0 # other packages @@ -32,12 +32,12 @@ Summary: Free OpenGL implementation Summary(pl.UTF-8): Wolnodostępna implementacja standardu OpenGL Name: Mesa -Version: 9.1.3 -Release: 3 +Version: 9.1.4 +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: 952ccd03547ed72333b64e1746cf8ada +# Source0-md5: a2c4e25d0e27918bc67f61bae04d0cb8 Patch0: %{name}-link.patch Patch1: %{name}-llvm.patch URL: http://www.mesa3d.org/ -- 2.44.0