[arch-commits] Commit in mesa/repos (8 files)
Laurent Carlier
lcarlier at nymeria.archlinux.org
Tue Jan 7 09:20:50 UTC 2014
Date: Tuesday, January 7, 2014 @ 10:20:49
Author: lcarlier
Revision: 203274
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
mesa/repos/staging-i686/
mesa/repos/staging-i686/LICENSE
(from rev 203273, mesa/trunk/LICENSE)
mesa/repos/staging-i686/PKGBUILD
(from rev 203273, mesa/trunk/PKGBUILD)
mesa/repos/staging-i686/revert.remove.GLXContextID.typedef.patch
(from rev 203273, mesa/trunk/revert.remove.GLXContextID.typedef.patch)
mesa/repos/staging-x86_64/
mesa/repos/staging-x86_64/LICENSE
(from rev 203273, mesa/trunk/LICENSE)
mesa/repos/staging-x86_64/PKGBUILD
(from rev 203273, mesa/trunk/PKGBUILD)
mesa/repos/staging-x86_64/revert.remove.GLXContextID.typedef.patch
(from rev 203273, mesa/trunk/revert.remove.GLXContextID.typedef.patch)
---------------------------------------------------------+
staging-i686/LICENSE | 82 +++++++
staging-i686/PKGBUILD | 160 ++++++++++++++
staging-i686/revert.remove.GLXContextID.typedef.patch | 30 ++
staging-x86_64/LICENSE | 82 +++++++
staging-x86_64/PKGBUILD | 160 ++++++++++++++
staging-x86_64/revert.remove.GLXContextID.typedef.patch | 30 ++
6 files changed, 544 insertions(+)
Copied: mesa/repos/staging-i686/LICENSE (from rev 203273, mesa/trunk/LICENSE)
===================================================================
--- staging-i686/LICENSE (rev 0)
+++ staging-i686/LICENSE 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Copied: mesa/repos/staging-i686/PKGBUILD (from rev 203273, mesa/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,160 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.0.1
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
+ 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+ LICENSE
+ revert.remove.GLXContextID.typedef.patch)
+md5sums=('0a72ca5b36046a658bf6038326ff32ed'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ '6e49b4dd4ceb7873610f608f74efbaaf')
+
+prepare() {
+ cd ${srcdir}/?esa-*
+
+ # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
+ patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
+}
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ autoreconf -vfi # our automake is far too new for their build system :)
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --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-gallium-llvm \
+ --enable-egl \
+ --enable-gallium-egl \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-vdpau \
+ # --help
+
+ make
+
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_ati-dri() {
+ pkgdesc="Mesa drivers for AMD/ATI Radeon"
+ depends=('mesa-libgl' "mesa=${pkgver}")
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+ 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/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_intel-dri() {
+ pkgdesc="Mesa drivers for Intel"
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ depends=('mesa-libgl' "mesa=${pkgver}")
+
+ 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/intel-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
+}
+
+package_nouveau-dri() {
+ pkgdesc="Mesa drivers for Nouveau"
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ depends=('mesa-libgl' "mesa=${pkgver}")
+
+ 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/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_svga-dri() {
+ pkgdesc="Gallium3D VMware guest GL driver"
+ depends=('libdrm' 'expat' 'llvm-libs')
+
+ 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/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() {
+ pkgdesc="an open-source implementation of the OpenGL specification"
+ depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages')
+ provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+
+ mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+ # rename libgl.so to not conflict with blobs - may break gl.pc ?
+ mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
+ rm ${pkgdir}/usr/lib/libGL.so{,.1}
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+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"
+
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
+}
Copied: mesa/repos/staging-i686/revert.remove.GLXContextID.typedef.patch (from rev 203273, mesa/trunk/revert.remove.GLXContextID.typedef.patch)
===================================================================
--- staging-i686/revert.remove.GLXContextID.typedef.patch (rev 0)
+++ staging-i686/revert.remove.GLXContextID.typedef.patch 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,30 @@
+From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth at whitecape.org>
+Date: Mon, 30 Dec 2013 07:19:36 +0000
+Subject: Revert "mesa: Remove GLXContextID typedef from glx.h."
+
+This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
+
+According to belak51 on IRC, this commit broke Allegro, which would no
+longer compile. Applications apparently expect the GLXContextID typedef
+to exist in glx.h; removing it breaks them. A bit of searching around
+the internet revealed other complaints since upgrading to Mesa 10.
+
+Cc: "10.0" <mesa-stable at lists.freedesktop.org>
+(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
+---
+diff --git a/include/GL/glx.h b/include/GL/glx.h
+index 62d0ede..234abc0 100644
+--- a/include/GL/glx.h
++++ b/include/GL/glx.h
+@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
+ /* GLX 1.3 and later */
+ typedef struct __GLXFBConfigRec *GLXFBConfig;
+ typedef XID GLXFBConfigID;
++typedef XID GLXContextID;
+ typedef XID GLXWindow;
+ typedef XID GLXPbuffer;
+
+--
+cgit v0.9.0.2-2-gbebe
+
Copied: mesa/repos/staging-x86_64/LICENSE (from rev 203273, mesa/trunk/LICENSE)
===================================================================
--- staging-x86_64/LICENSE (rev 0)
+++ staging-x86_64/LICENSE 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,82 @@
+Disclaimer
+
+Mesa is a 3-D graphics library with an API which is very similar to
+that of OpenGL*
+To the extent that Mesa utilizes the OpenGL command syntax or state
+machine, it is being used with authorization from Silicon Graphics,
+Inc.(SGI). However, the author does not possess an OpenGL license
+from SGI, and makes no claim that Mesa is in any way a compatible
+replacement for OpenGL or associated with SGI. Those who want a
+licensed implementation of OpenGL should contact a licensed
+vendor.
+
+Please do not refer to the library as MesaGL (for legal
+reasons). It's just Mesa or The Mesa 3-D graphics
+library
+
+* OpenGL is a trademark of Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+The Mesa distribution consists of several components. Different copyrights
+and licenses apply to different components. For example, GLUT is copyrighted
+by Mark Kilgard, some demo programs are copyrighted by SGI, some of the Mesa
+device drivers are copyrighted by their authors. See below for a list of
+Mesa's main components and the license for each.
+
+The core Mesa library is licensed according to the terms of the MIT license.
+This allows integration with the XFree86, Xorg and DRI projects.
+
+The default Mesa license is as follows:
+
+Copyright (C) 1999-2007 Brian Paul All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Attention, Contributors
+
+When contributing to the Mesa project you must agree to the licensing terms
+of the component to which you're contributing.
+The following section lists the primary components of the Mesa distribution
+and their respective licenses.
+
+
+Mesa Component Licenses
+
+Component Location Primary Author License
+----------------------------------------------------------------------------
+Main Mesa code src/mesa/ Brian Paul Mesa (MIT)
+
+Device drivers src/mesa/drivers/* See drivers See drivers
+
+Ext headers include/GL/glext.h SGI SGI Free B
+ include/GL/glxext.h
+
+GLUT src/glut/ Mark Kilgard Mark's copyright
+
+Mesa GLU library src/glu/mesa/ Brian Paul GNU-LGPL
+
+SGI GLU library src/glu/sgi/ SGI SGI Free B
+
+demo programs progs/demos/ various see source files
+
+X demos progs/xdemos/ Brian Paul see source files
+
+SGI demos progs/samples/ SGI SGI copyright
+
+RedBook demos progs/redbook/ SGI SGI copyright
Copied: mesa/repos/staging-x86_64/PKGBUILD (from rev 203273, mesa/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,160 @@
+# $Id$
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=mesa
+pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.0.1
+pkgrel=3
+arch=('i686' 'x86_64')
+makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'libxxf86vm' 'libxdamage'
+ 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
+ LICENSE
+ revert.remove.GLXContextID.typedef.patch)
+md5sums=('0a72ca5b36046a658bf6038326ff32ed'
+ '5c65a0fe315dd347e09b1f2826a1df5a'
+ '6e49b4dd4ceb7873610f608f74efbaaf')
+
+prepare() {
+ cd ${srcdir}/?esa-*
+
+ # Cherry picked from mesa branch 10.0, this fix wxgtk rebuild (FS#38392)
+ patch -Np1 -i ../revert.remove.GLXContextID.typedef.patch
+}
+
+build() {
+ cd ${srcdir}/?esa-*
+
+ autoreconf -vfi # our automake is far too new for their build system :)
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib/xorg/modules/dri \
+ --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-gallium-llvm \
+ --enable-egl \
+ --enable-gallium-egl \
+ --enable-shared-glapi \
+ --enable-gbm \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-texture-float \
+ --enable-xa \
+ --enable-vdpau \
+ # --help
+
+ make
+
+ # fake installation
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_ati-dri() {
+ pkgdesc="Mesa drivers for AMD/ATI Radeon"
+ depends=('mesa-libgl' "mesa=${pkgver}")
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ conflicts=('xf86-video-ati<6.9.0-6')
+
+ 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/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_intel-dri() {
+ pkgdesc="Mesa drivers for Intel"
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ depends=('mesa-libgl' "mesa=${pkgver}")
+
+ 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/intel-dri"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/intel-dri/"
+}
+
+package_nouveau-dri() {
+ pkgdesc="Mesa drivers for Nouveau"
+ optdepends=('libtxc_dxtn: S3 Texture Compressed support')
+ depends=('mesa-libgl' "mesa=${pkgver}")
+
+ 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/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_svga-dri() {
+ pkgdesc="Gallium3D VMware guest GL driver"
+ depends=('libdrm' 'expat' 'llvm-libs')
+
+ 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/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() {
+ pkgdesc="an open-source implementation of the OpenGL specification"
+ depends=('libdrm' 'libvdpau' 'wayland' 'libxxf86vm' 'libxdamage' 'systemd' 'elfutils' 'llvm-libs')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages')
+ provides=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+ replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
+
+ mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+ # rename libgl.so to not conflict with blobs - may break gl.pc ?
+ mv ${pkgdir}/usr/lib/libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1.2.0
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/mesa-libGL.so.1
+ rm ${pkgdir}/usr/lib/libGL.so{,.1}
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
+}
+
+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"
+
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1
+ ln -s mesa-libGL.so.1.2.0 ${pkgdir}/usr/lib/libGL.so.1.2.0
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
+}
Copied: mesa/repos/staging-x86_64/revert.remove.GLXContextID.typedef.patch (from rev 203273, mesa/trunk/revert.remove.GLXContextID.typedef.patch)
===================================================================
--- staging-x86_64/revert.remove.GLXContextID.typedef.patch (rev 0)
+++ staging-x86_64/revert.remove.GLXContextID.typedef.patch 2014-01-07 09:20:49 UTC (rev 203274)
@@ -0,0 +1,30 @@
+From 347f1493320e1bc2194c70d4d66bfe2b5883bf1e Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth at whitecape.org>
+Date: Mon, 30 Dec 2013 07:19:36 +0000
+Subject: Revert "mesa: Remove GLXContextID typedef from glx.h."
+
+This reverts commit 136a12ac98868d82c2ae9fcc80d11044a7ec56d1.
+
+According to belak51 on IRC, this commit broke Allegro, which would no
+longer compile. Applications apparently expect the GLXContextID typedef
+to exist in glx.h; removing it breaks them. A bit of searching around
+the internet revealed other complaints since upgrading to Mesa 10.
+
+Cc: "10.0" <mesa-stable at lists.freedesktop.org>
+(cherry picked from commit f425d56ba41382be04366d011536ee78a03a2f33)
+---
+diff --git a/include/GL/glx.h b/include/GL/glx.h
+index 62d0ede..234abc0 100644
+--- a/include/GL/glx.h
++++ b/include/GL/glx.h
+@@ -168,6 +168,7 @@ typedef XID GLXDrawable;
+ /* GLX 1.3 and later */
+ typedef struct __GLXFBConfigRec *GLXFBConfig;
+ typedef XID GLXFBConfigID;
++typedef XID GLXContextID;
+ typedef XID GLXWindow;
+ typedef XID GLXPbuffer;
+
+--
+cgit v0.9.0.2-2-gbebe
+
More information about the arch-commits
mailing list