[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD)
Laurent Carlier
lcarlier at archlinux.org
Thu Feb 23 09:34:18 UTC 2017
Date: Thursday, February 23, 2017 @ 09:34:17
Author: lcarlier
Revision: 213602
upgpkg: lib32-mesa 17.0.0-3
enable gallium osmesa (FS#52940)
Modified:
lib32-mesa/trunk/PKGBUILD
----------+
PKGBUILD | 43 ++++---------------------------------------
1 file changed, 4 insertions(+), 39 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2017-02-23 09:19:36 UTC (rev 213601)
+++ PKGBUILD 2017-02-23 09:34:17 UTC (rev 213602)
@@ -4,9 +4,9 @@
# Contributor: Andreas Radke <andyrtr at archlinux.org>
pkgbase=lib32-mesa
-pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-mesa-vdpau' 'lib32-mesa') # 'lib32-mesa-libgl')
+pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-mesa-vdpau' 'lib32-mesa')
pkgver=17.0.0
-pkgrel=2
+pkgrel=3
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-libelf' 'lib32-llvm' 'lib32-libvdpau'
@@ -86,7 +86,7 @@
--enable-gles2 \
--enable-gbm \
--enable-dri \
- --enable-osmesa \
+ --enable-gallium-osmesa \
--enable-texture-float \
--enable-nine \
--enable-vdpau
@@ -147,7 +147,7 @@
'lib32-mesa-vdpau: for accelerated video playback')
provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl' 'lib32-opengl-driver')
conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
- replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri') # 'lib32-mesa-libgl')
+ replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa-dri' 'lib32-mesa-libgl')
install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
# ati-dri, nouveay-dri, intel-dri, swrast
@@ -161,12 +161,6 @@
cp -rv ${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/
-
# libglvnd support
cp -rv ${srcdir}/fakeinstall/usr/lib32/libGLX_mesa.so* ${pkgdir}/usr/lib32/
cp -rv ${srcdir}/fakeinstall/usr/lib32/libEGL_mesa.so* ${pkgdir}/usr/lib32/
@@ -174,32 +168,3 @@
install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa/"
}
-
-# package_lib32-mesa-libgl() {
-# pkgdesc="Mesa 3-D graphics library (32-bit)"
-# depends=('lib32-mesa')
-# provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-# conflicts=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
-#
-# 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
-#
-#
-# install -m755 -d "${pkgdir}/usr/share/licenses/lib32-mesa-libgl"
-# install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/lib32-mesa-libgl/"
-# }
More information about the arch-commits
mailing list