summaryrefslogtreecommitdiffstats
path: root/abs/core
diff options
context:
space:
mode:
Diffstat (limited to 'abs/core')
-rw-r--r--abs/core/mesa/PKGBUILD331
-rw-r--r--abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch46
-rw-r--r--abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch15
3 files changed, 129 insertions, 263 deletions
diff --git a/abs/core/mesa/PKGBUILD b/abs/core/mesa/PKGBUILD
index 7e54fe4..1cd06e1 100644
--- a/abs/core/mesa/PKGBUILD
+++ b/abs/core/mesa/PKGBUILD
@@ -1,276 +1,173 @@
-# $Id: PKGBUILD 163468 2012-07-12 16:40:51Z andyrtr $
+# $Id$
# Maintainer: Jan de Groot <jgc@archlinux.org>
# Maintainer: Andreas Radke <andyrtr@archlinux.org>
pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri')
-
-#_git=true
-_gitdate=20111031
-_git=false
-
-if [ "${_git}" = "true" ]; then
- pkgver=7.10.99.git20110709
- #pkgver=7.11
- else
- pkgver=8.0.4
-fi
+pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.1.1
pkgrel=2
arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
- 'gcc-libs>=4.6.1' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'udev>=183')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(LICENSE
- mesa-8.0.3-llvm-3.1-fixes.patch)
-if [ "${_git}" = "true" ]; then
- # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
- #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
- source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
- else
- source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${pkgver}/MesaLib-${pkgver}.tar.bz2"
- #source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
- #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
-)
-fi
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+ LICENSE
+ workaround-for-robustness-and-reset-with-intel.patch)
+md5sums=('1fde7ed079df7aeb9b6a744ca033de8d'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ 'b6b744a948b0de9cd14a2a971b7472de')
+
+prepare () {
+ cd ${srcdir}/?esa-*
+
+ # workaround for FS#39803 - https://bugs.freedesktop.org/show_bug.cgi?id=75723
+ patch -Np1 -i ../workaround-for-robustness-and-reset-with-intel.patch
+}
build() {
- cd ${srcdir}/?esa-*
+ cd ${srcdir}/?esa-*
- patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+ autoreconf -vfi # our automake is far too new for their build system :)
-if [ "${_git}" = "true" ]; then
- autoreconf -vfi
- ./autogen.sh --prefix=/usr \
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
- --enable-gallium-llvm \
- --enable-gallium-egl \
- --enable-shared-glapi \
- --enable-gbm \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --with-egl-platforms=x11,drm,wayland \
+ --with-llvm-shared-libs \
--enable-egl \
- --enable-texture-float \
- --enable-xa \
- --enable-shared-dricore
- #--enable-gbm \
- # --enable-gallium-svga \
-
- else
- autoreconf -vfi
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,svga,swrast \
- --with-dri-drivers=i915,i965,r200,radeon,swrast \
+ --disable-gallium-egl \
+ --enable-gbm \
+ --enable-gallium-gbm \
--enable-gallium-llvm \
- --enable-gallium-egl \
--enable-shared-glapi \
- --enable-gbm \
--enable-glx-tls \
--enable-dri \
--enable-glx \
--enable-osmesa \
--enable-gles1 \
--enable-gles2 \
- --enable-egl \
--enable-texture-float \
--enable-xa \
- --enable-shared-dricore
-fi
+ --enable-vdpau \
+ --enable-dri3
+ # --help
+ # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096)
make
-}
-
-package_libgl() {
- depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
- pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
- #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
- bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
-
- cd src/mesa/drivers/dri
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
-
- ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libgl"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgl/"
-}
-
-package_osmesa() {
- depends=('mesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages')
- pkgdesc="Mesa 3D off-screen rendering library"
-
- make -C ${srcdir}/?esa-*/src/mesa DESTDIR="${pkgdir}" install-osmesa
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
}
-package_libglapi() {
- depends=('glibc')
- pkgdesc="free implementation of the GL API -- shared library. The Mesa GL API module is responsible for dispatching all the gl* functions"
-
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- bin/minstall lib/libglapi.so* "${pkgdir}/usr/lib/"
-
- install -m755 -d "${pkgdir}/usr/share/licenses/libglapi"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libglapi/"
-}
-
-package_libgbm() {
- depends=('glibc')
- pkgdesc="Mesa gbm library"
+package_ati-dri() {
+ pkgdesc="Mesa drivers for AMD/ATI Radeon"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+ conflicts=('xf86-video-ati<6.9.0-6')
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- bin/minstall lib/libgbm.so* "${pkgdir}/usr/lib/"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- bin/minstall src/gbm/main/gbm.pc "${pkgdir}/usr/lib/pkgconfig/"
+ install -m755 -d ${pkgdir}/usr/lib/vdpau/
+ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib/vdpau/
- install -m755 -d "${pkgdir}/usr/share/licenses/libgbm"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgbm/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
}
-package_libgles() {
- depends=('libglapi' 'khrplatform-devel')
- pkgdesc="Mesa GLES libraries and headers"
+package_intel-dri() {
+ pkgdesc="Mesa drivers for Intel"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m755 -d "${pkgdir}/usr/include"
- install -m755 -d "${pkgdir}/usr/include/GLES"
- install -m755 -d "${pkgdir}/usr/include/GLES2"
- bin/minstall lib/libGLESv* "${pkgdir}/usr/lib/"
- bin/minstall src/mapi/es1api/glesv1_cm.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall src/mapi/es2api/glesv2.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall include/GLES/* "${pkgdir}/usr/include/GLES/"
- bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
- bin/minstall include/GLES2/* "${pkgdir}/usr/include/GLES2/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
- install -m755 -d "${pkgdir}/usr/share/licenses/libgles"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libgles/"
+ install -m755 -d "${pkgdir}/usr/share/licenses/intel-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
}
-package_libegl() {
- depends=('libglapi' 'libdrm' 'libxext' 'libxfixes' 'udev' 'khrplatform-devel')
- pkgdesc="Mesa EGL libraries and headers"
+package_nouveau-dri() {
+ pkgdesc="Mesa drivers for Nouveau"
+ depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
- cd ${srcdir}/?esa-*
- make -C src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
- install -m755 -d "${pkgdir}/usr/lib"
- install -m755 -d "${pkgdir}/usr/lib/pkgconfig"
- install -m755 -d "${pkgdir}/usr/include"
- install -m755 -d "${pkgdir}/usr/include/"
- install -m755 -d "${pkgdir}/usr/include/EGL"
- install -m755 -d "${pkgdir}/usr/share"
- install -m755 -d "${pkgdir}/usr/share/doc"
- install -m755 -d "${pkgdir}/usr/share/doc/libegl"
- bin/minstall lib/libEGL.so* "${pkgdir}/usr/lib/"
- install -m755 -d "${pkgdir}/usr/lib/egl"
- bin/minstall lib/egl/* "${pkgdir}/usr/lib/egl/"
- bin/minstall src/egl/main/egl.pc "${pkgdir}/usr/lib/pkgconfig/"
- bin/minstall include/EGL/* "${pkgdir}/usr/include/EGL/"
- bin/minstall docs/egl.html "${pkgdir}/usr/share/doc/libegl/"
+ install -m755 -d ${pkgdir}/usr/lib/vdpau/
+ mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
- install -m755 -d "${pkgdir}/usr/share/licenses/libegl"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libegl/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib/xorg/modules/dri/
+
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
}
-package_khrplatform-devel() {
- #depends=('')
- pkgdesc="Khronos platform development package"
+package_svga-dri() {
+ pkgdesc="Gallium3D VMware guest GL driver"
+ depends=('libdrm' 'expat' 'llvm-libs')
- cd ${srcdir}/?esa-*
- install -m755 -d "${pkgdir}/usr/include/KHR"
- bin/minstall include/KHR/khrplatform.h "${pkgdir}/usr/include/KHR/"
+ install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+ mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/vmwgfx_dri.so ${pkgdir}/usr/lib/xorg/modules/dri/
- install -m755 -d "${pkgdir}/usr/share/licenses/khrplatform-devel"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/khrplatform-devel/"
+ install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
+ mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_vmwgfx* ${pkgdir}/usr/lib/gallium-pipe/
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/svga-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/svga-dri/"
}
package_mesa() {
- depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
+ pkgdesc="an open-source implementation of the OpenGL specification"
+ depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 'llvm-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
- pkgdesc="Mesa 3-D graphics libraries and include files"
-
- cd ${srcdir}/?esa-*
- make DESTDIR="${pkgdir}" install
+ provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
- rm -f "${pkgdir}/usr/lib/libGL.so"*
- rm -f "${pkgdir}/usr/lib/libglapi.so"*
- rm -f "${pkgdir}/usr/lib/libgbm.so"*
- rm -f "${pkgdir}/usr/lib/libGLESv"*
- rm -f "${pkgdir}/usr/lib/libEGL"*
- rm -rf "${pkgdir}/usr/lib/egl"
- rm -f "${pkgdir}/usr/lib/libOSMesa"*
- rm -f ${pkgdir}/usr/lib/pkgconfig/{glesv1_cm.pc,glesv2.pc,egl.pc,osmesa.pc,gbm.pc}
- rm -rf "${pkgdir}/usr/lib/xorg"
- rm -f "${pkgdir}/usr/include/GL/glew.h"
- rm -f "${pkgdir}/usr/include/GL/glxew.h"
- rm -f "${pkgdir}/usr/include/GL/wglew.h"
- rm -f "${pkgdir}/usr/include/GL/glut.h"
- rm -rf ${pkgdir}/usr/include/{GLES,GLES2,EGL,KHR}
-
- #remove glu files
- rm -f "${pkgdir}/usr/include/GL/glu.h"
- rm -f "${pkgdir}/usr/include/GL/glu_mangle.h"
- rm -f "${pkgdir}/usr/lib/libGLU.so"
- rm -f "${pkgdir}/usr/lib/libGLU.so.1"
- rm -f "${pkgdir}/usr/lib/pkgconfig/glu.pc"
+ mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+ install -m755 -d ${pkgdir}/usr/lib/mesa
+ # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+ mv -v ${pkgdir}/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/
+ mv -v ${pkgdir}/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/
+ mv -v ${pkgdir}/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/
install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
}
-package_ati-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI radeon/r200 + Gallium3D r300,r600 drivers for AMD/ATI Radeon"
- conflicts=('xf86-video-ati<6.9.0-6')
-
- # classic mesa drivers for radeon,r200
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/radeon DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/r200 DESTDIR="${pkgdir}" install
- # gallium3D driver for r300,r600
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r300 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-r600 DESTDIR="${pkgdir}" install
-}
-
-package_intel-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa DRI drivers for Intel"
+package_mesa-libgl() {
+ pkgdesc="Mesa 3-D graphics library"
+ depends=("mesa=${pkgver}")
+ provides=("libgl=${pkgver}")
+ replaces=('libgl')
+
+ # See FS#26284
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+ ln -s libglx.xorg "${pkgdir}/usr/lib/xorg/modules/extensions/libglx.so"
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i915 DESTDIR="${pkgdir}" install
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/i965 DESTDIR="${pkgdir}" install
-}
+ ln -s /usr/lib/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
-package_nouveau-dri() {
- depends=("libgl=${pkgver}")
- pkgdesc="Mesa classic DRI + Gallium3D drivers for Nouveau"
+ ln -s /usr/lib/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1.0.0
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so.1
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib/libEGL.so
- # classic mesa driver for nv10 , nv20 nouveau_vieux_dri.so
- make -C ${srcdir}/?esa-*/src/mesa/drivers/dri/nouveau DESTDIR="${pkgdir}" install
- # gallium3D driver for nv30 - nv40 - nv50 nouveau_dri.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-nouveau DESTDIR="${pkgdir}" install
-}
+ ln -s /usr/lib/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1.1.0
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so.1
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib/libGLESv1_CM.so
-package_svga-dri() {
- depends=("mesa=${pkgver}")
- pkgdesc="Gallium3D VMware guest GL driver"
+ ln -s /usr/lib/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2.0.0
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so.2
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib/libGLESv2.so
- make -C ${srcdir}/?esa-*/src/gallium/targets/dri-vmwgfx DESTDIR="${pkgdir}" install
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
}
-md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'c452ed3392468170726c004c2f4e02ca'
- 'd546f988adfdf986cff45b1efa2d8a46')
diff --git a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index a567b59..0000000
--- a/abs/core/mesa/mesa-8.0.3-llvm-3.1-fixes.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index a50a51d..f1bb4d9 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -235,7 +235,24 @@ lp_disassemble(const void* func)
- int AsmPrinterVariant = AsmInfo->getAssemblerDialect();
- #endif
-
--#if HAVE_LLVM >= 0x0300
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple));
-+ if (!MRI) {
-+ debug_printf("error: no register info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+
-+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo());
-+ if (!MII) {
-+ debug_printf("error: no instruction info for target %s\n", Triple.c_str());
-+ return;
-+ }
-+#endif
-+
-+#if HAVE_LLVM >= 0x0301
-+ OwningPtr<MCInstPrinter> Printer(
-+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI));
-+#elif HAVE_LLVM == 0x0300
- OwningPtr<MCInstPrinter> Printer(
- T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI));
- #elif HAVE_LLVM >= 0x0208
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-index fe7616b..68f8808 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
-@@ -62,7 +62,11 @@
- extern "C" void
- lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE)
- {
-+#if HAVE_LLVM >= 0x0301
-+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener());
-+#else
- llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener());
-+#endif
- }
-
-
diff --git a/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch b/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch
new file mode 100644
index 0000000..dc4a213
--- /dev/null
+++ b/abs/core/mesa/workaround-for-robustness-and-reset-with-intel.patch
@@ -0,0 +1,15 @@
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index e113654..5790680 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -645,7 +645,7 @@ brwCreateContext(gl_api api,
+
+ brw_init_driver_functions(brw, &functions);
+
+- if (notify_reset)
++ if (notify_reset && brw->gen >= 6)
+ functions.GetGraphicsResetStatus = brw_get_graphics_reset_status;
+
+ struct gl_context *ctx = &brw->ctx;
+
+
generated by cgit v0.12 at 2024-11-17 09:43:52 (GMT)