MesaLib: update to 10.3.0.

This commit is contained in:
Juan RP 2014-09-19 22:58:33 +02:00
parent 4a71188d7c
commit 91bd1cb21c
3 changed files with 5 additions and 46 deletions

View File

@ -1,16 +0,0 @@
See http://patchwork.freedesktop.org/patch/18053/
--- src/gallium/drivers/svga/svga_resource_texture.c
+++ src/gallium/drivers/svga/svga_resource_texture.c
@@ -205,7 +205,10 @@ svga_texture_get_handle(struct pipe_screen *screen,
struct svga_winsys_screen *sws = svga_winsys_screen(texture->screen);
unsigned stride;
- assert(svga_texture(texture)->key.cachable == 0);
+ if (svga_texture(texture)->key.cachable) {
+ debug_warn_once("svga: texture->key.cachable=1");
+ }
+
svga_texture(texture)->key.cachable = 0;
stride = util_format_get_nblocksx(texture->format, texture->width0) *
util_format_get_blocksize(texture->format);

View File

@ -1,26 +0,0 @@
From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
From: Aaron Watry <awatry@gmail.com>
Date: Fri, 20 Jun 2014 19:13:30 -0500
Subject: gallivm: Fix build after LLVM commit 211259
Signed-off-by: Aaron Watry <awatry@gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard@amd.com>
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index df26883..413a0c2 100644
--- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -51,7 +51,9 @@
#include <llvm/MC/MCInstPrinter.h>
#include <llvm/MC/MCRegisterInfo.h>
-#if HAVE_LLVM >= 0x0303
+#if HAVE_LLVM >= 0x0305
+#define OwningPtr std::unique_ptr
+#elif HAVE_LLVM >= 0x0303
#include <llvm/ADT/OwningPtr.h>
#endif
--
cgit v0.10.2

View File

@ -1,7 +1,7 @@
# Template build file for 'MesaLib'.
pkgname=MesaLib
version=10.2.7
revision=2
version=10.3.0
revision=1
wrksrc="Mesa-${version}"
build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
@ -12,8 +12,8 @@ short_desc="Graphics library similar to SGI's OpenGL"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version}/${pkgname}-${version}.tar.bz2"
checksum=27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version%.*}/${pkgname}-${version}.tar.bz2"
checksum=0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5
hostmakedepends="
automake libtool flex pkg-config llvm libxml2-python wayland-devel"
@ -151,6 +151,7 @@ mesa-swraster-dri_package() {
replaces="mesa-swraster-dri-git>=0"
pkg_install() {
vmove "usr/lib/xorg/modules/drivers/swrast*"
vmove usr/lib/xorg/modules/drivers/kms_swrast_dri.so
# XXX
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*)