diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/mesa/APKBUILD | 22 | ||||
| -rw-r--r-- | main/mesa/fix-glx1.3-crash-xorg19.patch | 73 | ||||
| -rw-r--r-- | main/mesa/musl-fixes.patch | 22 |
3 files changed, 35 insertions, 82 deletions
diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD index a831f20a7f..23628acac7 100644 --- a/main/mesa/APKBUILD +++ b/main/mesa/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=mesa -pkgver=10.0.4 +pkgver=10.1.1 pkgrel=0 pkgdesc="Mesa DRI OpenGL library" url="http://www.mesa3d.org" @@ -17,13 +17,14 @@ subpackages="$pkgname-dev " depends_dev="libdrm-dev dri2proto libx11-dev libxext-dev libxxf86vm-dev - libxdamage-dev libxfixes-dev libxcb-dev glproto" + libxdamage-dev libxfixes-dev libxcb-dev glproto dri3proto presentproto" makedepends="$depends_dev expat-dev xextproto python libxt-dev makedepend talloc-dev py-libxml2 flex bison llvm-dev udev-dev libvdpau-dev - libxvmc-dev gettext zlib-dev + libxshmfence-dev libxvmc-dev gettext zlib-dev autoconf automake libtool" source="ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2 glx_ro_text_segm.patch + musl-fixes.patch " _dri_driverdir=/usr/lib/xorg/modules/dri @@ -202,9 +203,12 @@ nouveau() { _mv_dri nouveau_dri nouveau_vieux_dri \ swrast() { _mv_dri swrast_dri && _mv_gpipe swrast; } vmwgfx() { _mv_dri vmwgfx_dri && _mv_gpipe vmwgfx; } -md5sums="8b148869d2620b0720c8a8d2b7eb3e38 MesaLib-10.0.4.tar.bz2 -a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch" -sha256sums="ff6eb552becb25a318e53ac56b95a8c2d49e83ad674d87f52e811c0a20c25a40 MesaLib-10.0.4.tar.bz2 -004f52adefaeccfd4553e0b1d09ad769891d69d05880094c7a45d19623e674a6 glx_ro_text_segm.patch" -sha512sums="5e5d42def9b867436beaa1f1a2a73e80ce098efcbb840a37c2977410be87dbf88dab994dc5ebbca90b4dc9d13966742924dc73893d3f93bc3d95b61c9149fae5 MesaLib-10.0.4.tar.bz2 -c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch" +md5sums="1fde7ed079df7aeb9b6a744ca033de8d MesaLib-10.1.1.tar.bz2 +a1a766b4c6a96d67cad9bd7ad5c578e8 glx_ro_text_segm.patch +2e1cb6c497f6ef254c638a180e8ff406 musl-fixes.patch" +sha256sums="f3ae730ed81fffcb1ec59076813f9955157da7a1dd9ba23a6b1b8ff8cf6798b0 MesaLib-10.1.1.tar.bz2 +004f52adefaeccfd4553e0b1d09ad769891d69d05880094c7a45d19623e674a6 glx_ro_text_segm.patch +c0ac7cbc13b264f59910644b0e5fd9c590c0f57cc6b50f71a0560bccfd9d2342 musl-fixes.patch" +sha512sums="f136d25f6da47bb9f582eafa2f89804b1eae9f0b834a1513cf9f940ef5bd8f438b72600d992d4d9436d2899e0a91d48f4eaabb24bd149c71d3192af5e386dec7 MesaLib-10.1.1.tar.bz2 +c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a glx_ro_text_segm.patch +4b30e1cbbc97f05a4ff47f6cfb7f58f3ce5d584f3b1be5aabe598e40e985f3476c9599a556c00851f25d4c58467118b755e4b6ac7e5226a007031117504f3889 musl-fixes.patch" diff --git a/main/mesa/fix-glx1.3-crash-xorg19.patch b/main/mesa/fix-glx1.3-crash-xorg19.patch deleted file mode 100644 index bd09b9e71a..0000000000 --- a/main/mesa/fix-glx1.3-crash-xorg19.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 8f13c69e7658df3a97e388f210dae175639d6d8d Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Fri, 16 Jul 2010 12:24:53 +0100 -Subject: [PATCH] intel: Fix invalidate before initialisation - -Fixes: - - Bug 29091 - 1.9RC5 server crash when starting GLX 1.3 app with mesa 7.8 - Intel dri2 driver. - https://bugs.freedesktop.org/show_bug.cgi?id=29091 - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - src/mesa/drivers/dri/common/dri_util.c | 2 +- - src/mesa/drivers/dri/intel/intel_screen.c | 19 +++++++++++++++---- - 2 files changed, 16 insertions(+), 5 deletions(-) - -diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c -index 75c9882..9a9bfed 100644 ---- a/src/mesa/drivers/dri/common/dri_util.c -+++ b/src/mesa/drivers/dri/common/dri_util.c -@@ -432,7 +432,7 @@ driCreateNewDrawable(__DRIscreen *psp, const __DRIconfig *config, - */ - (void) attrs; - -- pdp = malloc(sizeof *pdp); -+ pdp = calloc(1, sizeof *pdp); - if (!pdp) { - return NULL; - } -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 6e4bb64..083b7bb 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -102,10 +102,21 @@ static const __DRItexBufferExtension intelTexBufferExtension = { - intelSetTexBuffer2, - }; - -+static inline struct intel_context * -+to_intel_context(__DRIdrawable *drawable) -+{ -+ if (drawable->driContextPriv == NULL) -+ return NULL; -+ -+ return drawable->driContextPriv->driverPrivate; -+} -+ - static void - intelDRI2Flush(__DRIdrawable *drawable) - { -- struct intel_context *intel = drawable->driContextPriv->driverPrivate; -+ struct intel_context *intel = to_intel_context(drawable); -+ if (!intel) -+ return; - - if (intel->gen < 4) - INTEL_FIREVERTICES(intel); -@@ -117,9 +128,9 @@ intelDRI2Flush(__DRIdrawable *drawable) - static void - intelDRI2Invalidate(__DRIdrawable *drawable) - { -- struct intel_context *intel = drawable->driContextPriv->driverPrivate; -- -- intel->using_dri2_swapbuffers = GL_TRUE; -+ struct intel_context *intel = to_intel_context(drawable); -+ if (intel) -+ intel->using_dri2_swapbuffers = GL_TRUE; - dri2InvalidateDrawable(drawable); - } - --- -1.7.1 - diff --git a/main/mesa/musl-fixes.patch b/main/mesa/musl-fixes.patch new file mode 100644 index 0000000000..3c4893e584 --- /dev/null +++ b/main/mesa/musl-fixes.patch @@ -0,0 +1,22 @@ +--- ./include/c11/threads_posix.h.orig ++++ ./include/c11/threads_posix.h +@@ -178,7 +178,7 @@ + return thrd_error; + pthread_mutexattr_init(&attr); + if ((type & mtx_recursive) != 0) { +-#if defined(__linux__) || defined(__linux) ++#if defined(__GLIBC__) + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE_NP); + #else + pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); +--- ./src/gallium/winsys/svga/drm/vmw_screen.h.orig ++++ ./src/gallium/winsys/svga/drm/vmw_screen.h +@@ -34,7 +34,7 @@ + #ifndef VMW_SCREEN_H_ + #define VMW_SCREEN_H_ + +- ++#include <sys/stat.h> + #include "pipe/p_compiler.h" + #include "pipe/p_state.h" + |