Update to 11.0.0-devel

3 files changed, 157 insertions, 75 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33094bf504d7..83dab9e2c1d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,5 @@
-# Generated by makepkg 4.2.0
-# Thu Jan 15 21:43:50 UTC 2015
 pkgbase = lib32-mesa-git
-	pkgver = 10.5.0_devel.67557
+	pkgver = 11.0.0_devel.72046.1af0641
 	pkgrel = 1
 	url = http://mesa3d.sourceforge.net
 	arch = x86_64
@@ -20,22 +18,34 @@ pkgbase = lib32-mesa-git
 	makedepends = lib32-libxdamage
 	makedepends = gcc-multilib
 	makedepends = lib32-elfutils
-	makedepends = lib32-llvm
+	makedepends = lib32-llvm-libs-svn
+	makedepends = lib32-llvm-svn
 	makedepends = lib32-systemd
 	makedepends = lib32-libvdpau
 	makedepends = lib32-wayland
 	makedepends = python2-mako
+	makedepends = lib32-libtxc_dxtn
 	makedepends = git
+	makedepends = mesa-git
+	makedepends = libva-mesa-driver-git
+	makedepends = mesa-vdpau-git
+	makedepends = mesa-libgl-git
+	makedepends = lib32-gnutls
+	makedepends = lib32-openssl
 	source = mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master
+	source = LICENSE
 	md5sums = SKIP
+	md5sums = 5c65a0fe315dd347e09b1f2826a1df5a
 
 pkgname = lib32-mesa-vdpau-git
 	pkgdesc = Mesa VDPAU drivers (32-bit)
 	depends = lib32-libdrm
 	depends = lib32-libx11
 	depends = lib32-expat
-	depends = lib32-llvm-libs
+	depends = lib32-llvm-libs-svn
 	depends = lib32-elfutils
+	depends = mesa-vdpau-git
+	depends = lib32-nettle
 	provides = lib32-mesa-vdpau
 	conflicts = lib32-mesa-vdpau
 	replaces = lib32-mesa-vdpau
@@ -48,61 +58,40 @@ pkgname = lib32-mesa-git
 	depends = lib32-libxshmfence
 	depends = lib32-systemd
 	depends = lib32-elfutils
-	depends = lib32-llvm-libs
+	depends = lib32-llvm-libs-svn
 	depends = lib32-wayland
 	depends = lib32-libtxc_dxtn
 	depends = lib32-expat
-	depends = mesa
+	depends = mesa-git
 	optdepends = opengl-man-pages: for the OpenGL API man pages
 	optdepends = lib32-mesa-vdpau-git: for accelerated video playback
-	provides = lib32-mesa=10.5.0-devel
-	provides = lib32-libglapi
-	provides = lib32-osmesa
-	provides = lib32-libgbm
-	provides = lib32-libgles
-	provides = lib32-libegl
-	provides = lib32-ati-dri
-	provides = lib32-intel-dri
-	provides = lib32-nouveau-dri
+	provides = lib32-mesa=
 	provides = lib32-mesa-dri
-	provides = lib32-ati-dri-git
-	provides = lib32-intel-dri-git
-	provides = lib32-nouveau-dri-git
-	provides = lib32-mesa-dri-git
+	provides = lib32-mesa-r300-r600-radeonsi-git
 	conflicts = lib32-mesa
-	conflicts = lib32-libglapi
-	conflicts = lib32-osmesa
-	conflicts = lib32-libgbm
-	conflicts = lib32-libgles
-	conflicts = lib32-libegl
-	conflicts = lib32-ati-dri
-	conflicts = lib32-intel-dri
-	conflicts = lib32-nouveau-dri
 	conflicts = lib32-mesa-dri
-	conflicts = lib32-ati-dri-git
-	conflicts = lib32-intel-dri-git
-	conflicts = lib32-nouveau-dri-git
-	conflicts = lib32-mesa-dri-git
+	conflicts = lib32-mesa-r300-r600-radeonsi-git
 	replaces = lib32-mesa
-	replaces = lib32-libglapi
-	replaces = lib32-osmesa
-	replaces = lib32-libgbm
-	replaces = lib32-libgles
-	replaces = lib32-libegl
-	replaces = lib32-ati-dri
-	replaces = lib32-intel-dri
-	replaces = lib32-nouveau-dri
 	replaces = lib32-mesa-dri
-	replaces = lib32-ati-dri-git
-	replaces = lib32-intel-dri-git
-	replaces = lib32-nouveau-dri-git
-	replaces = lib32-mesa-dri-git
+	replaces = lib32-mesa-r300-r600-radeonsi-git
 
 pkgname = lib32-mesa-libgl-git
 	pkgdesc = Mesa 3-D graphics library (32-bit)
-	depends = lib32-mesa=10.5.0-devel
-	provides = lib32-mesa-libgl=10.5.0-devel
-	provides = lib32-libgl=10.5.0-devel
+	depends = lib32-mesa-git
+	provides = lib32-mesa-libgl=
+	provides = lib32-libgl=
 	conflicts = lib32-mesa-libgl
 	replaces = lib32-mesa-libgl
 
+pkgname = lib32-libva-mesa-driver-git
+	pkgdesc = VA-API implementation for gallium (32-bit)
+	depends = lib32-libdrm
+	depends = lib32-libx11
+	depends = lib32-llvm-libs-svn
+	depends = lib32-expat
+	depends = lib32-elfutils
+	depends = lib32-nettle
+	depends = libva-mesa-driver-git
+	provides = lib32-libva-mesa-driver=
+	conflicts = lib32-libva-mesa-driver
+
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000000000000..ae33d2709c44
--- /dev/null
+++ b/LICENSE
@@ -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
diff --git a/PKGBUILD b/PKGBUILD
index 3b7d1f51b818..e343566e97f5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
-# Maintainer: Armin K. <krejzi at email dot com>
+# Maintainer: Lone_Wolf <lonewolf at xs4all dot nl>
+# Contributor: Armin K. <krejzi at email dot com>
 # Contributor: Jesse Jaara <jesse.jaara@gmail.com>
 # Contributor: Kristian Klausen <klausenbusk@hotmail.com>
 # Contributor: Egon Ashrafinia <e.ashrafinia@gmail.com>
@@ -10,21 +11,23 @@
 # Contributor: Diego Jose <diegoxter1006@gmail.com>
 
 pkgbase=lib32-mesa-git
-pkgname=('lib32-mesa-vdpau-git' 'lib32-mesa-git' 'lib32-mesa-libgl-git')
-pkgver=10.5.0_devel.67557
+pkgname=('lib32-mesa-vdpau-git' 'lib32-mesa-git' 'lib32-mesa-libgl-git' 'lib32-libva-mesa-driver-git')
+pkgver=11.0.0_devel.72046.1af0641
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2' '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' 'python2-mako' 'git')
+             'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm-libs-svn' 'lib32-llvm-svn' 'lib32-systemd'
+             'lib32-libvdpau' 'lib32-wayland' 'python2-mako' 'lib32-libtxc_dxtn' 'git' 'mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-libgl-git' 'lib32-gnutls' 'lib32-openssl')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
-source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master')
-md5sums=('SKIP')
+source=('mesa::git://anongit.freedesktop.org/mesa/mesa#branch=master'
+        'LICENSE')
+md5sums=('SKIP'
+         '5c65a0fe315dd347e09b1f2826a1df5a')
 
 pkgver() {
     cd "${srcdir}/mesa"
-    echo $(cat VERSION | tr "-" "_").$(git rev-list --count HEAD)
+    echo $(cat VERSION | tr "-" "_").$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
 _mesaver() {
@@ -48,7 +51,8 @@ build() {
                --with-gallium-drivers=r300,r600,radeonsi,nouveau,swrast \
                --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
                --with-egl-platforms=x11,drm,wayland \
-               --disable-va \
+               --enable-va \
+               --with-va-libdir=/usr/lib32/dri \
                --disable-xvmc \
                --enable-llvm-shared-libs \
                --enable-egl \
@@ -72,9 +76,22 @@ build() {
   make DESTDIR="${srcdir}/fakeinstall" install
 }
 
+package_lib32-libva-mesa-driver-git() {
+  pkgdesc="VA-API implementation for gallium (32-bit)"
+  depends=('lib32-libdrm' 'lib32-libx11' 'lib32-llvm-libs-svn' 'lib32-expat' 'lib32-elfutils' 'lib32-nettle' 'libva-mesa-driver-git')
+  provides=("lib32-libva-mesa-driver=$(_mesaver)")
+  conflicts=('lib32-libva-mesa-driver')
+
+  install -v -m755 -d "${pkgdir}/usr/lib32"
+  mv -v "${srcdir}/fakeinstall/usr/lib32/dri" "${pkgdir}/usr/lib32/"
+
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-libva-mesa-driver-git/"
+}
+
 package_lib32-mesa-vdpau-git() {
   pkgdesc="Mesa VDPAU drivers (32-bit)"
-  depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs' 'lib32-elfutils')
+  depends=('lib32-libdrm' 'lib32-libx11' 'lib32-expat' 'lib32-llvm-libs-svn' 'lib32-elfutils' 'mesa-vdpau-git' 'lib32-nettle')
   provides=('lib32-mesa-vdpau')
   replaces=('lib32-mesa-vdpau')
   conflicts=('lib32-mesa-vdpau')
@@ -82,26 +99,20 @@ package_lib32-mesa-vdpau-git() {
   install -v -m755 -d "${pkgdir}/usr/lib32"
   mv -v "${srcdir}/fakeinstall/usr/lib32/vdpau" "${pkgdir}/usr/lib32/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses"
-  ln -sfv mesa-vdpau "$pkgdir/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-vdpau-git/"
 }
 
 package_lib32-mesa-git() {
   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')
+           'lib32-elfutils' 'lib32-llvm-libs-svn' 'lib32-wayland' 'lib32-libtxc_dxtn' 'lib32-expat' 'mesa-git')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
               'lib32-mesa-vdpau-git: for accelerated video playback')
-  provides=("lib32-mesa=$(_mesaver)" 'lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri'
-            'lib32-ati-dri-git' 'lib32-intel-dri-git' 'lib32-nouveau-dri-git' 'lib32-mesa-dri-git')
-  replaces=('lib32-mesa' 'lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri'
-            'lib32-ati-dri-git' 'lib32-intel-dri-git' 'lib32-nouveau-dri-git' 'lib32-mesa-dri-git')
-  conflicts=('lib32-mesa' 'lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl'
-            'lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri'
-            'lib32-ati-dri-git' 'lib32-intel-dri-git' 'lib32-nouveau-dri-git' 'lib32-mesa-dri-git')
-
+  provides=("lib32-mesa=$(_mesaver)" 'lib32-mesa-dri' 'lib32-mesa-r300-r600-radeonsi-git')
+  replaces=('lib32-mesa' 'lib32-mesa-dri' 'lib32-mesa-r300-r600-radeonsi-git' )
+  conflicts=('lib32-mesa' 'lib32-mesa-dri' 'lib32-mesa-r300-r600-radeonsi-git' )
+  
   install -v -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/"
@@ -118,13 +129,13 @@ package_lib32-mesa-git() {
   mv -v "${pkgdir}"/usr/lib32/libEGL.so*   "${pkgdir}/usr/lib32/mesa/"
   mv -v "${pkgdir}"/usr/lib32/libGLES*.so* "${pkgdir}/usr/lib32/mesa/"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses"
-  ln -sfv mesa "$pkgdir/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-git/"
 }
 
 package_lib32-mesa-libgl-git() {
   pkgdesc="Mesa 3-D graphics library (32-bit)"
-  depends=("lib32-mesa=$(_mesaver)")
+  depends=('lib32-mesa-git')
   provides=("lib32-mesa-libgl=$(_mesaver)" "lib32-libgl=$(_mesaver)")
   replaces=('lib32-mesa-libgl')
   conflicts=('lib32-mesa-libgl')
@@ -147,6 +158,6 @@ package_lib32-mesa-libgl-git() {
   ln -sv libGLESv2.so.2.0.0                 "${pkgdir}/usr/lib32/libGLESv2.so.2"
   ln -sv libGLESv2.so.2.0.0                 "${pkgdir}/usr/lib32/libGLESv2.so"
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses"
-  ln -sfv mesa-libgl "$pkgdir/usr/share/licenses/${pkgname}"
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl-git"
+  install -v -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl-git/"
 }