[arch-commits] Commit in mesa-demos/trunk (PKGBUILD)

[Andreas Radke]

    Date: Tuesday, November 23, 2021 @ 22:03:48
  Author: andyrtr
Revision: 428997

upgpkg: mesa-demos 8.4.0-6: actually remove the utils from demos package

Modified:
  mesa-demos/trunk/PKGBUILD

----------+
 PKGBUILD |   13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-23 21:47:43 UTC (rev 428996)
+++ PKGBUILD	2021-11-23 22:03:48 UTC (rev 428997)
@@ -3,7 +3,7 @@
 pkgbase=mesa-demos
 pkgname=('mesa-demos' 'mesa-utils')
 pkgver=8.4.0
-pkgrel=5
+pkgrel=6
 arch=('x86_64')
 url="https://www.mesa3d.org/"
 license=('custom')
@@ -35,10 +35,13 @@
   make DESTDIR="${pkgdir}" install
   
   # add missing egl files
-  install -m 0755 src/egl/opengl/{eglgears_x11,eglinfo,eglkms,egltri_x11,peglgears,xeglgears,xeglthreads} "${pkgdir}/usr/bin/"
+  install -m 0755 src/egl/opengl/{eglgears_x11,eglkms,egltri_x11,peglgears,xeglgears,xeglthreads} "${pkgdir}/usr/bin/"
   
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
+
+  # remove utils
+  rm ${pkgdir}/usr/bin/{glxinfo,glxgears,eglinfo}
 }
 
 package_mesa-utils() {
@@ -47,8 +50,10 @@
   depends=('libgl')
   provides=('glxinfo' 'glxgears' 'eglinfo')
 
-  install -Dm755 ../pkg/mesa-demos/usr/bin/{glxinfo,glxgears,eglinfo} -t "$pkgdir"/usr/bin
-  rm ../pkg/mesa-demos/usr/bin/{glxinfo,glxgears,eglinfo}
+  cd mesa-demos-$pkgver
+  install -Dm 0755 src/egl/opengl/eglinfo -t "${pkgdir}/usr/bin/"
+  install -Dm 0755 src/xdemos/{glxinfo,glxgears} -t "${pkgdir}/usr/bin/"
+
   
   install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"