From 91bd1cb21cfa22a8e227b6684ede727eed59d011 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 19 Sep 2014 22:58:33 +0200 Subject: [PATCH] MesaLib: update to 10.3.0. --- ...ga-replace-an-assertion-with-warning.patch | 16 ------------ .../MesaLib/patches/llvm-3.5-build-fix.patch | 26 ------------------- srcpkgs/MesaLib/template | 9 ++++--- 3 files changed, 5 insertions(+), 46 deletions(-) delete mode 100644 srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch delete mode 100644 srcpkgs/MesaLib/patches/llvm-3.5-build-fix.patch diff --git a/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch b/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch deleted file mode 100644 index caf53f6bf50..00000000000 --- a/srcpkgs/MesaLib/patches/Mesa-dev-1-2-svga-replace-an-assertion-with-warning.patch +++ /dev/null @@ -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); diff --git a/srcpkgs/MesaLib/patches/llvm-3.5-build-fix.patch b/srcpkgs/MesaLib/patches/llvm-3.5-build-fix.patch deleted file mode 100644 index 199e702dba2..00000000000 --- a/srcpkgs/MesaLib/patches/llvm-3.5-build-fix.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001 -From: Aaron Watry -Date: Fri, 20 Jun 2014 19:13:30 -0500 -Subject: gallivm: Fix build after LLVM commit 211259 - -Signed-off-by: Aaron Watry -Reviewed-by: Tom Stellard - -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 - #include - --#if HAVE_LLVM >= 0x0303 -+#if HAVE_LLVM >= 0x0305 -+#define OwningPtr std::unique_ptr -+#elif HAVE_LLVM >= 0x0303 - #include - #endif - --- -cgit v0.10.2 - diff --git a/srcpkgs/MesaLib/template b/srcpkgs/MesaLib/template index fa29c4dace4..d9b51096879 100644 --- a/srcpkgs/MesaLib/template +++ b/srcpkgs/MesaLib/template @@ -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 " 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*)