archlinuxarm/PKGBUILDs
1
0
Fork 0
mirror of https://github.com/archlinuxarm/PKGBUILDs.git synced 2024-11-28 22:57:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

extra/mesa to 9.1-3

Browse source
This commit is contained in:
Kevin Mihelich 2013-03-14 18:18:42 +00:00
parent e4eb7802d5
commit 058ce697ba
2 changed files with 60 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
extra/mesa/PKGBUILD
View file

@ -10,7 +10,7 @@
pkgbase=mesa pkgbase=mesa
pkgname=('mesa' 'mesa-libgl') pkgname=('mesa' 'mesa-libgl')
pkgver=9.1 pkgver=9.1
pkgrel=2.1 pkgrel=3
arch=('i686' 'x86_64') arch=('i686' 'x86_64')
makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
'libvdpau' 'wayland') 'libvdpau' 'wayland')
@ -19,13 +19,20 @@ license=('custom')
options=('!libtool') options=('!libtool')
source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
#ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing
git-fixes.patch
LICENSE) LICENSE)
md5sums=('d3891e02215422e120271d976ff1947e' md5sums=('d3891e02215422e120271d976ff1947e'
'c3e45fe7287bbf8f620c209a872330dc'
'5c65a0fe315dd347e09b1f2826a1df5a') '5c65a0fe315dd347e09b1f2826a1df5a')
build() { build() {
cd ${srcdir}/?esa-* cd ${srcdir}/?esa-*
# pick 2 commits from master to
# fix a nouveau crash: http://cgit.freedesktop.org/mesa/mesa/commit/?id=17f1cb1d99e66227d1e05925ef937643f5c1089a
# and intel kwin slowness http://cgit.freedesktop.org/mesa/mesa/commit/?id=e062a4187d8ea518a39c913ae7562cf1d8ac3205
patch -Np1 -i ${srcdir}/git-fixes.patch
autoreconf -vfi # our automake is far too new for their build system :) autoreconf -vfi # our automake is far too new for their build system :)
./configure --prefix=/usr \ ./configure --prefix=/usr \

52
extra/mesa/git-fixes.patch Normal file
View file

@ -0,0 +1,52 @@
From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001
From: Jan de Groot <jan@jgc.homeip.net>
Date: Thu, 07 Mar 2013 18:48:13 +0000
Subject: dri/nouveau: fix crash in nouveau_flush
https://bugs.freedesktop.org/show_bug.cgi?id=61947
Note: this is a candidate for the stable branches
---
diff --git a/src/mesa/drivers/dri/nouveau/nouveau_driver.c b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
index f56b3b2..6c119d5 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_driver.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_driver.c
@@ -69,7 +69,8 @@ nouveau_flush(struct gl_context *ctx)
__DRIdri2LoaderExtension *dri2 = screen->dri2.loader;
__DRIdrawable *drawable = nctx->dri_context->driDrawablePriv;
- dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
+ if (drawable && drawable->loaderPrivate)
+ dri2->flushFrontBuffer(drawable, drawable->loaderPrivate);
}
}
--
cgit v0.9.0.2-2-gbebe
From e062a4187d8ea518a39c913ae7562cf1d8ac3205 Mon Sep 17 00:00:00 2001
From: Tapani Pälli <tapani.palli@intel.com>
Date: Mon, 28 Jan 2013 06:53:56 +0000
Subject: intel: Fix regression in intel_create_image_from_name stride handling
Strangely, the DRIimage interface we have passes the pitch in pixels
instead of bytes, which anholt missed in the change to using bytes for
region pitch.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
---
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c
index defcd73..d223a0b 100644
--- a/src/mesa/drivers/dri/intel/intel_screen.c
+++ b/src/mesa/drivers/dri/intel/intel_screen.c
@@ -377,7 +377,7 @@ intel_create_image_from_name(__DRIscreen *screen,
cpp = _mesa_get_format_bytes(image->format);
image->region = intel_region_alloc_for_handle(intelScreen,
cpp, width, height,
- pitch, name, "image");
+ pitch * cpp, name, "image");
if (image->region == NULL) {
free(image);
return NULL;
--
cgit v0.9.0.2-2-gbebe