From d3e94cf61caae530c5267d674dfd411730e0085b Mon Sep 17 00:00:00 2001 From: Kevin Mihelich Date: Sun, 5 May 2013 20:12:20 +0000 Subject: [PATCH] extra/mesa to 9.1.2-1 --- extra/mesa/PKGBUILD | 11 ++++---- extra/mesa/git-fixes.patch | 52 -------------------------------------- 2 files changed, 5 insertions(+), 58 deletions(-) delete mode 100644 extra/mesa/git-fixes.patch diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD index 29e4a051f..933c9e381 100644 --- a/extra/mesa/PKGBUILD +++ b/extra/mesa/PKGBUILD @@ -9,19 +9,18 @@ pkgbase=mesa pkgname=('mesa' 'mesa-libgl') -pkgver=9.1.1 +pkgver=9.1.2 pkgrel=1 arch=('i686' 'x86_64') makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage' - 'libvdpau' 'wayland') + 'libvdpau' 'wayland' 'systemd') url="http://mesa3d.sourceforge.net" license=('custom') options=('!libtool') 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 - git-fixes.patch + #ftp://ftp.freedesktop.org/pub/mesa/9.1/MesaLib-9.1-rc2.tar.bz2 # for RC testing LICENSE) -md5sums=('6ea2bdc3b7ecfb4257b39814b4182580' +md5sums=('df2aab86ff4a510ce5b0d074caa0a59f' 'c3e45fe7287bbf8f620c209a872330dc' '5c65a0fe315dd347e09b1f2826a1df5a') @@ -31,7 +30,7 @@ build() { # 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 + #patch -Np1 -i ${srcdir}/git-fixes.patch autoreconf -vfi # our automake is far too new for their build system :) diff --git a/extra/mesa/git-fixes.patch b/extra/mesa/git-fixes.patch deleted file mode 100644 index 84efe610e..000000000 --- a/extra/mesa/git-fixes.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 17f1cb1d99e66227d1e05925ef937643f5c1089a Mon Sep 17 00:00:00 2001 -From: Jan de Groot -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 -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 -Reviewed-by: Eric Anholt ---- -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