add mesa package to [libre] and remove mesa-{git,vanilla}

8 files changed, 64 insertions, 308 deletions

diff --git a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch b/libre/mesa/0001-Fix-linkage-against-shared-glapi.patch
index 7f8f7164c..7f8f7164c 100644
--- a/pcr/mesa-vanilla/0001-Fix-linkage-against-shared-glapi.patch
+++ b/libre/mesa/0001-Fix-linkage-against-shared-glapi.patch
diff --git a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch b/libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch
index 376828e67..376828e67 100644
--- a/pcr/mesa-vanilla/0001-glapi-Link-with-glapi-when-built-shared.patch
+++ b/libre/mesa/0001-glapi-Link-with-glapi-when-built-shared.patch
diff --git a/pcr/mesa-git/LICENSE b/libre/mesa/LICENSE
index ae33d2709..ae33d2709 100644
--- a/pcr/mesa-git/LICENSE
+++ b/libre/mesa/LICENSE
diff --git a/pcr/mesa-vanilla/PKGBUILD b/libre/mesa/PKGBUILD
index 45c654dc8..48390936f 100644
--- a/pcr/mesa-vanilla/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -3,10 +3,11 @@
 # Maintainer: Márcio Silva <coadde@parabola.nu>
 
 pkgbase=mesa
-pkgname=('opencl-mesa-vanilla' 'vulkan-vanilla-intel' 'vulkan-vanilla-radeon' 'libva-mesa-vanilla-driver'
-         'mesa-vanilla-vdpau' 'mesa-vanilla' 'mesa-vanilla-libgl' 'mesa-vanilla-libcl-icd')
+pkgname=('opencl-mesa' 'libva-mesa-driver' 'mesa-vdpau' 'mesa'
+         'mesa-libgl' 'mesa-libcl-icd' 'vulkan-radeon')
+[[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]] && pkgname+=('vulkan-intel')
 pkgver=17.0.1
-pkgrel=1
+pkgrel=2.parabola1
 arch=('i686' 'x86_64' 'armv7h')
 makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
              'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -47,13 +48,24 @@ build() {
 
   cd ${srcdir}/mesa-${pkgver}
 
+  # softpipe,llvmpipe
+  if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then
+    DRI=i915,i965,r200,radeon,nouveau,swrast
+    GALLIUM=r300,r600,radeonsi,nouveau,svga,swrast,virgl,swr
+    VULKAN=intel,radeon
+  elif [[ "${CARCH}" = 'armv7h' ]]; then
+    DRI=r200,radeon,nouveau,swrast
+    GALLIUM=freedreno,etnaviv,vc4,imx,r300,r600,radeonsi,nouveau,svga,swrast,virgl
+    VULKAN=radeon
+  fi
+
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
     --with-dri-driverdir=/usr/lib/xorg/modules/dri \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+    --with-gallium-drivers=${GALLIUM} \
+    --with-dri-drivers=${DRI} \
     --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=intel,radeon \
+    --with-vulkan-drivers=${VULKAN} \
     --disable-xvmc \
     --enable-gallium-llvm \
     --enable-llvm-shared-libs \
@@ -89,10 +101,10 @@ build() {
 
   ./configure --prefix=/usr \
     --sysconfdir=/etc \
-    --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast,virgl \
-    --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
+    --with-gallium-drivers=${GALLIUM} \
+    --with-dri-drivers=${DRI} \
     --with-egl-platforms=x11,drm,wayland \
-    --with-vulkan-drivers=intel,radeon \
+    --with-vulkan-drivers=${VULKAN} \
     --disable-xvmc \
     --enable-gallium-llvm \
     --enable-llvm-shared-libs \
@@ -123,12 +135,11 @@ build() {
   make DESTDIR=${srcdir}/openclinstall install
 }
 
-package_opencl-mesa-vanilla() {
+package_opencl-mesa() {
   pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
   depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'lm_sensors')
   optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver' 'opencl-mesa')
-  conflicts=('opencl-mesa')
+  provides=('opencl-driver')
 
   install -m755 -d ${pkgdir}/etc
   cp -rv ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
@@ -137,15 +148,14 @@ package_opencl-mesa-vanilla() {
   cp -rv ${srcdir}/fakeinstall/usr/lib/libMesaOpenCL* ${pkgdir}/usr/lib/
   cp -rv ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa-vanilla"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa-vanilla/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
 }
 
-package_vulkan-vanilla-intel() {
+package_vulkan-intel() {
   pkgdesc="Intel's Vulkan mesa driver"
   depends=('wayland' 'libx11' 'libxshmfence')
-  provides=('vulkan-driver' 'vulkan-intel')
-  conflicts=('vulkan-intel')
+  provides=('vulkan-driver')
 
   install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
   cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
@@ -154,15 +164,14 @@ package_vulkan-vanilla-intel() {
   cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_intel.so ${pkgdir}/usr/lib/
   cp -rv ${srcdir}/fakeinstall/usr/include/vulkan/vulkan_intel.h ${pkgdir}/usr/include/vulkan
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-vanilla-intel"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-vanilla-intel/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-intel"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-intel/"
 }
 
-package_vulkan-vanilla-radeon() {
+package_vulkan-radeon() {
   pkgdesc="Radeon's Vulkan mesa driver"
   depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
-  provides=('vulkan-driver' 'vulkan-radeon')
-  conflicts=('vulkan-radeon')
+  provides=('vulkan-driver')
  
   install -m755 -d ${pkgdir}/usr/share/vulkan/icd.d
   cp -rv ${srcdir}/fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json ${pkgdir}/usr/share/vulkan/icd.d/
@@ -170,45 +179,48 @@ package_vulkan-vanilla-radeon() {
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/libvulkan_radeon.so ${pkgdir}/usr/lib/
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-vanilla-radeon"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-vanilla-radeon/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/vulkan-radeon"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/vulkan-radeon/"
 }
 
-package_libva-mesa-vanilla-driver() {
+package_libva-mesa-driver() {
   pkgdesc="VA-API implementation for gallium"
   depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  provides=('libva-mesa-driver')
-  conflicts=('libva-mesa-driver')
 
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-vanilla-driver"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-vanilla-driver/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
 }
 
-package_mesa-vanilla-vdpau() {
+package_mesa-vdpau() {
   pkgdesc="Mesa VDPAU drivers"
   depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'lm_sensors')
-  provides=('mesa-vdpau')
-  conflicts=('mesa-vdpau')
 
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vanilla-vdpau"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-vdpau/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
 }
 
-package_mesa-vanilla() {
+package_mesa() {
   pkgdesc="A free implementation of the OpenGL specification"
   depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf' 
-           'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-vanilla-libgl' 'lm_sensors')
+           'libomxil-bellagio' 'libtxc_dxtn' 'llvm-libs' 'mesa-libgl' 'lm_sensors')
   optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vanilla-vdpau: for accelerated video playback'
-              'libva-mesa-vanilla-driver: for accelerated video playback')
-  provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver' 'mesa')
-  conflicts=('mesa')
+              'mesa-vdpau: for accelerated video playback'
+              'libva-mesa-driver: for accelerated video playback')
+  if [[ "${CARCH}" = 'x86_64' || "${CARCH}" = 'i686' ]]; then
+    provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver')
+    conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+    replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+  elif [[ "${CARCH}" = 'armv7h' ]]; then
+    provides=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'opengl-driver')
+    conflicts=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+    replaces=('ati-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
+  fi
 
   install -m755 -d ${pkgdir}/etc
   cp -rv ${srcdir}/drirc ${pkgdir}/etc
@@ -230,35 +242,35 @@ package_mesa-vanilla() {
   # remove vulkan headers
   rm -rf ${pkgdir}/usr/include/vulkan
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vanilla"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
 }
 
-package_mesa-vanilla-libgl() {
+package_mesa-libgl() {
   pkgdesc="Mesa 3-D graphics library"
   depends=('libdrm' 'libxdamage' 'libxshmfence' 'libxxf86vm' 'wayland')
-  provides=('libgl' 'libegl' 'libgles' 'libglvnd' 'mesa-libgl')
-  conflicts=('libglvnd' 'mesa-libgl')
+  provides=('libgl' 'libegl' 'libgles' 'libglvnd')
+  conflicts=('libglvnd')
 
   install -m755 -d "${pkgdir}/usr/lib/"
   cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so*        ${pkgdir}/usr/lib/
   cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so*       ${pkgdir}/usr/lib/
   cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so*     ${pkgdir}/usr/lib/
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vanilla-libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-libgl/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
 }
 
-package_mesa-vanilla-libcl-icd() {
+package_mesa-libcl-icd() {
   pkgdesc="Mesa OpenCL ICD Bindings"
   depends=('expat' 'gcc-libs' 'libdrm' 'libedit' 'libelf' 'libffi' 'llvm-libs' 'ncurses' 'zlib')
   optdepends=('opencl-driver: packaged opencl driver')
-  provides=('opencl-icd-loader' 'ocl-icd' 'libcl' 'mesa-libcl')
-  conflicts=('ocl-icd' 'libcl' 'mesa-libcl')
+  provides=('opencl-icd-loader' 'ocl-icd' 'libcl')
+  conflicts=('ocl-icd' 'libcl')
 
   install -m755 -d ${pkgdir}/usr/lib
   cp -rv ${srcdir}/openclinstall/usr/lib/libOpenCL* ${pkgdir}/usr/lib/
 
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vanilla-libcl-icd"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vanilla-libcl-icd/"
+  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libcl-icd"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libcl-icd/"
 }
diff --git a/pcr/mesa-vanilla/drirc b/libre/mesa/drirc
index 946cbc803..946cbc803 100644
--- a/pcr/mesa-vanilla/drirc
+++ b/libre/mesa/drirc
diff --git a/pcr/mesa-vanilla/remove-libpthread-stubs.patch b/libre/mesa/remove-libpthread-stubs.patch
index efe8aaddd..efe8aaddd 100644
--- a/pcr/mesa-vanilla/remove-libpthread-stubs.patch
+++ b/libre/mesa/remove-libpthread-stubs.patch
diff --git a/pcr/mesa-git/PKGBUILD b/pcr/mesa-git/PKGBUILD
deleted file mode 100644
index c40851e43..000000000
--- a/pcr/mesa-git/PKGBUILD
+++ /dev/null
@@ -1,174 +0,0 @@
-# Maintainer (Arch): Jan de Groot <jgc@archlinux.org>
-# Maintainer (Arch): Andreas Radke <andyrtr@archlinux.org>
-# Maintainer: Márcio Silva <coadde@parabola.nu>
-
-_gitcommit=7ac946e5
-
-pkgbase=mesa-git
-pkgname=('opencl-mesa-git' 'libva-mesa-driver-git' 'mesa-vdpau-git' 'mesa-git' 'mesa-libgl-git')
-pkgver=11.0.git1.$_gitcommit
-pkgrel=1
-arch=('i686' 'x86_64')
-makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
-             'systemd' 'libomxil-bellagio' 'libclc' 'clang' 'git')
-url="http://mesa3d.sourceforge.net"
-license=('custom')
-source=("$pkgbase-$pkgver::git://anongit.freedesktop.org/mesa/mesa#commit=$_gitcommit"
-        LICENSE)
-sha256sums=('SKIP'
-            '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
-
-build() {
-  #cd ${srcdir}/?esa-*
-  cd $pkgbase-$pkgver
-
-  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 \
-    --enable-llvm-shared-libs \
-    --enable-egl \
-    --enable-gbm \
-    --enable-gallium-llvm \
-    --enable-shared-glapi \
-    --enable-glx \
-    --enable-glx-tls \
-    --enable-dri \
-    --enable-osmesa \
-    --enable-gles1 \
-    --enable-gles2 \
-    --enable-texture-float \
-    --enable-xa \
-    --enable-vdpau \
-    --enable-omx \
-    --enable-nine \
-    --enable-opencl --enable-opencl-icd \
-    --with-clang-libdir=/usr/lib
-
-    # --help
-
-  make
-
-  # fake installation
-  mkdir $srcdir/fakeinstall
-  make DESTDIR=${srcdir}/fakeinstall install
-}
-
-package_opencl-mesa-git() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('expat' 'libdrm' 'elfutils' 'libxfixes' 'libxext' 'opencl-icd-loader' 'libclc' 'clang')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-mesa')
-  conflicts=('opencl-mesa')
-  
-  install -m755 -d ${pkgdir}/etc
-  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
-  
-  install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
-  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
-  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r600,radeonsi}.so ${pkgdir}/usr/lib/gallium-pipe/
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
-}
-
-package_libva-mesa-driver-git() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
-  provides=('libva-mesa-driver')
-  conflicts=('libva-mesa-driver')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/dri ${pkgdir}/usr/lib
-   
-  install -m755 -d "${pkgdir}/usr/share/licenses/libva-mesa-driver"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/libva-mesa-driver/"
-}
-
-package_mesa-vdpau-git() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'elfutils')
-  provides=('mesa-vdpau')
-  conflicts=('mesa-vdpau')
-
-  install -m755 -d ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/vdpau ${pkgdir}/usr/lib
-   
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-vdpau"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-vdpau/"
-}
-
-package_mesa-git() {
-  pkgdesc="an open-source implementation of the OpenGL specification"
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'systemd' 'elfutils' 
-           'libomxil-bellagio' 'expat' 'libtxc_dxtn' 'llvm-libs')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau-git: for accelerated video playback'
-              'libva-mesa-driver-git: for accelerated video playback')
-  provides=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  conflicts=('mesa' 'libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-             'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-  replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel'
-            'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri')
-
-  install -m755 -d ${pkgdir}/etc
-  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
-  
-  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast
-  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/* ${pkgdir}/usr/lib/xorg/modules/dri
-   
-  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio  ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/d3d  ${pkgdir}/usr/lib
-  mv -v ${srcdir}/fakeinstall/usr/lib/*.so* ${pkgdir}/usr/lib/
-
-  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
-  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
-  
-  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_mesa-libgl-git() {
-  pkgdesc="Mesa 3-D graphics library"
-  depends=('mesa')
-  provides=('mesa-libgl' 'libgl')
-  conflicts=('mesa-libgl')
-  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 /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
-
-  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
-
-  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
-
-  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
-
-  install -m755 -d "${pkgdir}/usr/share/licenses/mesa-libgl"
-  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-libgl/"
-}
diff --git a/pcr/mesa-vanilla/LICENSE b/pcr/mesa-vanilla/LICENSE
deleted file mode 100644
index ae33d2709..000000000
--- a/pcr/mesa-vanilla/LICENSE
+++ /dev/null
@@ -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