[arch-commits] Commit in lib32-libglvnd/trunk (PKGBUILD)

Laurent Carlier lcarlier at archlinux.org
Mon Feb 27 18:02:09 UTC 2017


    Date: Monday, February 27, 2017 @ 18:02:08
  Author: lcarlier
Revision: 214081

upgpkg: lib32-libglvnd 0.1.1.20161028-1.1

rebuild because of a mistake during a move between repos

Modified:
  lib32-libglvnd/trunk/PKGBUILD

----------+
 PKGBUILD |   33 +++++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 8 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-27 17:58:17 UTC (rev 214080)
+++ PKGBUILD	2017-02-27 18:02:08 UTC (rev 214081)
@@ -2,19 +2,30 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=lib32-libglvnd
-pkgver=0.2.999+g4ba53457
-_commit=4ba5345742d6c98b528ac28fb7127006d2cc3f75
-pkgrel=1
+pkgver=0.1.1.20161028
+_commit=470fc824a38521a52707c6c0f59d827aa5e0f45a
+pkgrel=1.1
 pkgdesc="The GL Vendor-Neutral Dispatch library"
 arch=('x86_64')
 url="https://github.com/NVIDIA/libglvnd"
 license=('custom:BSD-like')
-makedepends=('lib32-libx11' 'lib32-libxext' 'glproto' 'git' 'python')
-provides=('lib32-libgl' 'lib32-libegl' 'lib32-libgles')
+depends=('lib32-libxext' 'libglvnd')
+makedepends=('lib32-libx11' 'glproto' 'git' 'python')
 #source=("git+https://github.com/NVIDIA/libglvnd.git#tag=v$pkgver"
-source=("git+https://github.com/NVIDIA/libglvnd.git#commit=$_commit")
-sha1sums=('SKIP')
+source=("git+https://github.com/NVIDIA/libglvnd.git#commit=$_commit"
+        https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/110.patch
+        https://patch-diff.githubusercontent.com/raw/NVIDIA/libglvnd/pull/97.patch)
+sha1sums=('SKIP'
+          '048e89dbdd0a6ca33441a6273208e4126d9828fc'
+          '48fac1b1248f1a6766ebae66432269c5147b5815')
 
+prepare() {
+  cd libglvnd
+  # FS#51527
+  patch -p1 -i ../97.patch
+  patch -p1 -i ../110.patch
+}
+
 build() {
   export CC='gcc -m32'
   export CXX='g++ -m32'
@@ -27,12 +38,18 @@
 }
 
 package() {
-  depends=('lib32-libxext' 'libglvnd' 'lib32-opengl-driver')
   cd libglvnd
   make DESTDIR="${pkgdir}" install
 
   rm -r "$pkgdir/usr/include"
 
+  # For compatibility with older nvidia drivers for bumblebee
+  # Symlinks to /usr/lib will be in nvidia-libgl
+  mkdir "$pkgdir/usr/lib32/nvidia"
+  for _lib in libGL.so libGLESv1_CM.so libGLESv2.so libEGL.so; do
+    mv "$pkgdir"/usr/lib32/$_lib* "$pkgdir"/usr/lib32/nvidia/
+  done
+
   mkdir -p "$pkgdir/usr/share/licenses"
   ln -s libglvnd "$pkgdir/usr/share/licenses/$pkgname"
 }



More information about the arch-commits mailing list