[arch-commits] Commit in lib32-mesa/repos/multilib-testing-x86_64 (6 files)
Laurent Carlier
lcarlier at archlinux.org
Mon Sep 21 16:44:57 UTC 2015
Date: Monday, September 21, 2015 @ 18:44:56
Author: lcarlier
Revision: 141396
archrelease: copy trunk to multilib-testing-x86_64
Added:
lib32-mesa/repos/multilib-testing-x86_64/0001-i965-Remove-early-release-of-DRI2-miptree.patch
(from rev 141395, lib32-mesa/trunk/0001-i965-Remove-early-release-of-DRI2-miptree.patch)
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
(from rev 141395, lib32-mesa/trunk/LICENSE)
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
(from rev 141395, lib32-mesa/trunk/PKGBUILD)
Deleted:
lib32-mesa/repos/multilib-testing-x86_64/0001-i965-Remove-early-release-of-DRI2-miptree.patch
lib32-mesa/repos/multilib-testing-x86_64/LICENSE
lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD
------------------------------------------------------+
0001-i965-Remove-early-release-of-DRI2-miptree.patch | 66 +--
LICENSE | 164 ++++-----
PKGBUILD | 287 ++++++++---------
3 files changed, 263 insertions(+), 254 deletions(-)
Deleted: 0001-i965-Remove-early-release-of-DRI2-miptree.patch
===================================================================
--- 0001-i965-Remove-early-release-of-DRI2-miptree.patch 2015-09-21 16:44:49 UTC (rev 141395)
+++ 0001-i965-Remove-early-release-of-DRI2-miptree.patch 2015-09-21 16:44:56 UTC (rev 141396)
@@ -1,33 +0,0 @@
-From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
-From: Chris Wilson <chris at chris-wilson.co.uk>
-Date: Fri, 10 Jul 2015 10:41:35 +0100
-Subject: [PATCH] i965: Remove early release of DRI2 miptree
-
-intel_update_winsys_renderbuffer_miptree() will release the existing
-miptree when wrapping a new DRI2 buffer, so we can remove the early
-release and so prevent a NULL mt dereference should importing the new
-DRI2 name fail for any reason. (Reusing the old DRI2 name will result
-in the rendering going astray, to a stale buffer, and not shown on the
-screen, but it allows us to issue a warning and not crash much later in
-innocent code.)
-
-Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
----
- src/mesa/drivers/dri/i965/brw_context.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
-index e8d1396..72f3897 100644
---- a/src/mesa/drivers/dri/i965/brw_context.c
-+++ b/src/mesa/drivers/dri/i965/brw_context.c
-@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
- buffer->cpp, buffer->pitch);
- }
-
-- intel_miptree_release(&rb->mt);
- bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
- buffer->name);
- if (!bo) {
---
-2.5.0
-
Copied: lib32-mesa/repos/multilib-testing-x86_64/0001-i965-Remove-early-release-of-DRI2-miptree.patch (from rev 141395, lib32-mesa/trunk/0001-i965-Remove-early-release-of-DRI2-miptree.patch)
===================================================================
--- 0001-i965-Remove-early-release-of-DRI2-miptree.patch (rev 0)
+++ 0001-i965-Remove-early-release-of-DRI2-miptree.patch 2015-09-21 16:44:56 UTC (rev 141396)
@@ -0,0 +1,33 @@
+From e2a696a4cd93c2dbe445243de48ed478fbdb8009 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris at chris-wilson.co.uk>
+Date: Fri, 10 Jul 2015 10:41:35 +0100
+Subject: [PATCH] i965: Remove early release of DRI2 miptree
+
+intel_update_winsys_renderbuffer_miptree() will release the existing
+miptree when wrapping a new DRI2 buffer, so we can remove the early
+release and so prevent a NULL mt dereference should importing the new
+DRI2 name fail for any reason. (Reusing the old DRI2 name will result
+in the rendering going astray, to a stale buffer, and not shown on the
+screen, but it allows us to issue a warning and not crash much later in
+innocent code.)
+
+Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
+---
+ src/mesa/drivers/dri/i965/brw_context.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
+index e8d1396..72f3897 100644
+--- a/src/mesa/drivers/dri/i965/brw_context.c
++++ b/src/mesa/drivers/dri/i965/brw_context.c
+@@ -1388,7 +1388,6 @@ intel_process_dri2_buffer(struct brw_context *brw,
+ buffer->cpp, buffer->pitch);
+ }
+
+- intel_miptree_release(&rb->mt);
+ bo = drm_intel_bo_gem_create_from_name(brw->bufmgr, buffer_name,
+ buffer->name);
+ if (!bo) {
+--
+2.5.0
+
Deleted: LICENSE
===================================================================
--- LICENSE 2015-09-21 16:44:49 UTC (rev 141395)
+++ LICENSE 2015-09-21 16:44:56 UTC (rev 141396)
@@ -1,82 +0,0 @@
-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: lib32-mesa/repos/multilib-testing-x86_64/LICENSE (from rev 141395, lib32-mesa/trunk/LICENSE)
===================================================================
--- LICENSE (rev 0)
+++ LICENSE 2015-09-21 16:44:56 UTC (rev 141396)
@@ -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
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2015-09-21 16:44:49 UTC (rev 141395)
+++ PKGBUILD 2015-09-21 16:44:56 UTC (rev 141396)
@@ -1,139 +0,0 @@
-# $Id$
-# Contributor: Jan de Groot <jgc at archlinux.org>
-# Contributor: Andreas Radke <andyrtr at archlinux.org>
-
-pkgbase=lib32-mesa
-pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=11.0.0
-pkgrel=1
-arch=('x86_64')
-makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
- 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
- 'lib32-libvdpau' 'lib32-wayland')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
- LICENSE)
-sha256sums=('e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32'
- 'SKIP'
- '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
-
-build() {
- export CC="gcc -m32"
- export CXX="g++ -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
- export LLVM_CONFIG="/usr/bin/llvm-config32"
-
- cd ${srcdir}/?esa-*
-
- # our automake is far too new for their build system :)
- # autoreconf -vfi
-
- ./configure \
- --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \
- --libdir=/usr/lib32 \
- --prefix=/usr \
- --sysconfdir=/etc \
- --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
- --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
- --with-egl-platforms=x11,drm,wayland \
- --enable-llvm-shared-libs \
- --enable-egl \
- --enable-gbm \
- --enable-gallium-llvm \
- --enable-shared-glapi \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
- --enable-texture-float \
- --enable-nine \
- --enable-vdpau
-
- make
-
- mkdir $srcdir/fakeinstall
- make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_lib32-mesa-vdpau() {
- pkgdesc="Mesa VDPAU drivers (32-bit)"
- depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils')
-
- install -m755 -d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
-
- install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
- install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
-}
-
-package_lib32-mesa() {
- pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
- depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
- 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa')
- optdepends=('opengl-man-pages: for the OpenGL API man pages'
- 'lib32-mesa-vdpau: for accelerated video playback')
- provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
- 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
- conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
- 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
- replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
- 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
-
- install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- # ati-dri, nouveay-dri, intel-dri, swrast
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
-
- install -m755 -d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
- mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/
-
- mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
-
- install -m755 -d ${pkgdir}/usr/lib32/mesa
- # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
- mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/
- mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/
- mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
-
- # keep symlinks until pacman 4.2 FS#42046
- #install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
- #install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
-}
-
-package_lib32-mesa-libgl() {
- pkgdesc="Mesa 3-D graphics library (32-bit)"
- depends=('lib32-mesa')
- provides=('lib32-libgl')
- replaces=('lib32-libgl')
-
- install -m755 -d ${pkgdir}/usr/lib32
-
- ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
- ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
- ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
-
- ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
- ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
-
- ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
- ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
-
- ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
- ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
-
- # keep symlinks until pacman 4.2 FS#42046
- #install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
- #install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
-}
Copied: lib32-mesa/repos/multilib-testing-x86_64/PKGBUILD (from rev 141395, lib32-mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2015-09-21 16:44:56 UTC (rev 141396)
@@ -0,0 +1,148 @@
+# $Id$
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Andreas Radke <andyrtr at archlinux.org>
+
+pkgbase=lib32-mesa
+pkgname=('lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
+pkgver=11.0.0
+pkgrel=2
+arch=('x86_64')
+makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
+ 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
+ 'lib32-libvdpau' 'lib32-wayland')
+url="http://mesa3d.sourceforge.net"
+license=('custom')
+source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/mesa-${pkgver}.tar.xz{,.sig}
+ LICENSE
+ 0001-i965-Remove-early-release-of-DRI2-miptree.patch)
+sha256sums=('e095a3eb2eca9dfde7efca8946527c8ae20a0cc938a8c78debc7f158ad44af32'
+ 'SKIP'
+ '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
+ 'a3f520ea13c923841c646a5b1627927744938ff691aa08e1aeaf14cce12bd1f7')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
+
+prepare() {
+ cd ${srcdir}/?esa-*
+
+ # Should fix FS#45750, tested by heftig - Not merged upstream
+ patch -Np1 -i ../0001-i965-Remove-early-release-of-DRI2-miptree.patch
+}
+
+build() {
+ export CC="gcc -m32"
+ export CXX="g++ -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ export LLVM_CONFIG="/usr/bin/llvm-config32"
+
+ cd ${srcdir}/?esa-*
+
+ # our automake is far too new for their build system :)
+ # autoreconf -vfi
+
+ ./configure \
+ --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \
+ --libdir=/usr/lib32 \
+ --prefix=/usr \
+ --sysconfdir=/etc \
+ --with-dri-driverdir=/usr/lib32/xorg/modules/dri \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
+ --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+ --with-egl-platforms=x11,drm,wayland \
+ --enable-llvm-shared-libs \
+ --enable-egl \
+ --enable-gbm \
+ --enable-gallium-llvm \
+ --enable-shared-glapi \
+ --enable-glx-tls \
+ --enable-dri \
+ --enable-glx \
+ --enable-osmesa \
+ --enable-gles1 \
+ --enable-gles2 \
+ --enable-texture-float \
+ --enable-nine \
+ --enable-vdpau
+
+ make
+
+ mkdir $srcdir/fakeinstall
+ make DESTDIR=${srcdir}/fakeinstall install
+}
+
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
+
+ install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau"
+ install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau/"
+}
+
+package_lib32-mesa() {
+ pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
+ depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
+ 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa')
+ optdepends=('opengl-man-pages: for the OpenGL API man pages'
+ 'lib32-mesa-vdpau: for accelerated video playback')
+ provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+ 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+ conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+ 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+ replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
+ 'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri')
+
+ install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
+ # ati-dri, nouveay-dri, intel-dri, swrast
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/* ${pkgdir}/usr/lib32/xorg/modules/dri
+
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/d3d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/*.so* ${pkgdir}/usr/lib32/
+
+ mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+
+ install -m755 -d ${pkgdir}/usr/lib32/mesa
+ # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
+ mv -v ${pkgdir}/usr/lib32/libGL.so* ${pkgdir}/usr/lib32/mesa/
+ mv -v ${pkgdir}/usr/lib32/libEGL.so* ${pkgdir}/usr/lib32/mesa/
+ mv -v ${pkgdir}/usr/lib32/libGLES*.so* ${pkgdir}/usr/lib32/mesa/
+
+ # keep symlinks until pacman 4.2 FS#42046
+ #install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
+ #install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
+ install -m755 -d "${pkgdir}/usr/share/licenses"
+ ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa"
+}
+
+package_lib32-mesa-libgl() {
+ pkgdesc="Mesa 3-D graphics library (32-bit)"
+ depends=('lib32-mesa')
+ provides=('lib32-libgl')
+ replaces=('lib32-libgl')
+
+ install -m755 -d ${pkgdir}/usr/lib32
+
+ ln -s /usr/lib32/mesa/libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1.2.0
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so.1
+ ln -s libGL.so.1.2.0 ${pkgdir}/usr/lib32/libGL.so
+
+ ln -s /usr/lib32/mesa/libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1.0.0
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so.1
+ ln -s libEGL.so.1.0.0 ${pkgdir}/usr/lib32/libEGL.so
+
+ ln -s /usr/lib32/mesa/libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1.1.0
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so.1
+ ln -s libGLESv1_CM.so.1.1.0 ${pkgdir}/usr/lib32/libGLESv1_CM.so
+
+ ln -s /usr/lib32/mesa/libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2.0.0
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so.2
+ ln -s libGLESv2.so.2.0.0 ${pkgdir}/usr/lib32/libGLESv2.so
+
+ # keep symlinks until pacman 4.2 FS#42046
+ #install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+ #install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
+ install -m755 -d "${pkgdir}/usr/share/licenses"
+ ln -s lib32-mesa "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
+}
More information about the arch-commits
mailing list