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

[Andreas Radke]

    Date: Tuesday, November 23, 2021 @ 20:55:28
  Author: andyrtr
Revision: 428993

upgpkg: mesa-demos 8.4.0-5: split build and move glxinfo/glxgears/eglinfo into new mesa-utils - FS#72556

Added:
  mesa-demos/trunk/mesa-demos.install
Modified:
  mesa-demos/trunk/PKGBUILD

--------------------+
 PKGBUILD           |   32 +++++++++++++++++++++++++-------
 mesa-demos.install |    6 ++++++
 2 files changed, 31 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-11-23 17:51:46 UTC (rev 428992)
+++ PKGBUILD	2021-11-23 20:55:28 UTC (rev 428993)
@@ -1,15 +1,14 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
 # Maintainer: Andreas Radke <andyrtr at archlinux.org>
 
-pkgname='mesa-demos'
+pkgbase=mesa-demos
+pkgname=('mesa-demos' 'mesa-utils')
 pkgver=8.4.0
-pkgrel=4
+pkgrel=5
 arch=('x86_64')
-pkgdesc="Mesa demos and tools incl. glxinfo + glxgears"
 url="https://www.mesa3d.org/"
 license=('custom')
-depends=('libgl' 'glew' 'freeglut')
-makedepends=('mesa' 'freetype2' 'git')
+makedepends=('mesa' 'freetype2' 'git'
+             'glew' 'freeglut')
 source=(https://mesa.freedesktop.org/archive/demos/mesa-demos-$pkgver.tar.bz2{,.sig}
         'LICENSE')
 sha512sums=('b72d03cad36e0535ff18dcfb222ec4200064b9264f6da51a6e5f03b0dd912abe188bc1d600b6698de3ce6f63b28d2ce01565886ca8e7079edc4967fbf2fb0957'
@@ -22,10 +21,16 @@
   ./configure --prefix=/usr \
     --disable-gles1 \
     --with-system-data-files=/usr/share/mesa-demos
+
   make
 }
 
-package() {
+package_mesa-demos() {
+
+  pkgdesc="Mesa demos"
+  install=mesa-demos.install
+  depends=('glew' 'freeglut')
+  
   cd mesa-demos-$pkgver
   make DESTDIR="${pkgdir}" install
   
@@ -35,3 +40,16 @@
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa-demos"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa-demos/"
 }
+
+package_mesa-utils() {
+
+  pkgdesc="essential Mesa utilities"
+  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}
+  
+  install -m755 -d "${pkgdir}/usr/share/licenses/$pkgname"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/$pkgname/"
+}

Added: mesa-demos.install
===================================================================
--- mesa-demos.install	                        (rev 0)
+++ mesa-demos.install	2021-11-23 20:55:28 UTC (rev 428993)
@@ -0,0 +1,6 @@
+post_upgrade() {
+  if [ "`vercmp $2 8.4.0-5`" -lt 0 ]; then
+    echo ">>> glxinfo, eglinfo and glxgears are now part of"
+    echo ">>> the new \"mesa-utils\" package."
+  fi
+}