[arch-commits] Commit in mesa/trunk (PKGBUILD)
Laurent Carlier
lcarlier at archlinux.org
Thu Feb 23 09:26:29 UTC 2017
Date: Thursday, February 23, 2017 @ 09:26:28
Author: lcarlier
Revision: 289415
upgpkg: mesa 17.0.0-3
enable gallium osmesa (FS#52940)
Modified:
mesa/trunk/PKGBUILD
----------+
PKGBUILD | 42 ++++--------------------------------------
1 file changed, 4 insertions(+), 38 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-23 09:18:56 UTC (rev 289414)
+++ PKGBUILD 2017-02-23 09:26:28 UTC (rev 289415)
@@ -3,9 +3,9 @@
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
pkgbase=mesa
-pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa') # 'mesa-libgl')
+pkgname=('opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
pkgver=17.0.0
-pkgrel=2
+pkgrel=3
arch=('i686' 'x86_64')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'elfutils' 'llvm'
@@ -75,7 +75,7 @@
--enable-gles2 \
--enable-gbm \
--enable-dri \
- --enable-osmesa \
+ --enable-gallium-osmesa \
--enable-texture-float \
--enable-xa \
--enable-vdpau \
@@ -172,7 +172,7 @@
'libva-mesa-driver: for accelerated video playback')
provides=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl' 'opengl-driver')
conflicts=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl')
- replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri') #'mesa-libgl')
+ replaces=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa-dri' 'mesa-libgl')
install -m755 -d ${pkgdir}/etc
cp -rv ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
@@ -197,12 +197,6 @@
# remove vulkan headers
rm -rf ${pkgdir}/usr/include/vulkan
- #install -m755 -d ${pkgdir}/usr/lib/mesa
- # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
- #cp -rv ${srcdir}/fakeinstall/usr/lib/libGL.so* ${pkgdir}/usr/lib/mesa/
- #cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL.so* ${pkgdir}/usr/lib/mesa/
- #cp -rv ${srcdir}/fakeinstall/usr/lib/libGLES*.so* ${pkgdir}/usr/lib/mesa/
-
# libglvnd support
cp -rv ${srcdir}/fakeinstall/usr/lib/libGLX_mesa.so* ${pkgdir}/usr/lib/
cp -rv ${srcdir}/fakeinstall/usr/lib/libEGL_mesa.so* ${pkgdir}/usr/lib/
@@ -210,31 +204,3 @@
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')
-# provides=('libgl' 'libgles' 'libegl')
-# conflicts=('libgl' 'libgles' 'libegl')
-#
-# install -m755 -d "${pkgdir}/usr/lib/"
-#
-# 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/"
-# }
More information about the arch-commits
mailing list