[arch-commits] Commit in mesa-demos/trunk (PKGBUILD meson-demos_data_dir.patch)

[Andreas Radke]

    Date: Thursday, June 16, 2022 @ 15:21:00
  Author: andyrtr
Revision: 448806

upgpkg: mesa-demos 8.5.0-2: fix broken system-data-files location - FS#75063

Added:
  mesa-demos/trunk/meson-demos_data_dir.patch
Modified:
  mesa-demos/trunk/PKGBUILD

----------------------------+
 PKGBUILD                   |   14 +++++++++++---
 meson-demos_data_dir.patch |   12 ++++++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-16 15:05:25 UTC (rev 448805)
+++ PKGBUILD	2022-06-16 15:21:00 UTC (rev 448806)
@@ -3,7 +3,7 @@
 pkgbase=mesa-demos
 pkgname=('mesa-demos' 'mesa-utils')
 pkgver=8.5.0
-pkgrel=1
+pkgrel=2
 arch=('x86_64')
 url="https://www.mesa3d.org/"
 license=('custom')
@@ -10,13 +10,21 @@
 makedepends=('meson' 'mesa' 'glu' 'freeglut' 'wayland-protocols')
 options=('debug')
 source=(https://archive.mesa3d.org/demos/${pkgver}/mesa-demos-${pkgver}.tar.bz2{,.sig}
-        'LICENSE')
+        'LICENSE'
+        meson-demos_data_dir.patch)
 sha512sums=('df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8'
             'SKIP'
-            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2')
+            '25da77914dded10c1f432ebcbf29941124138824ceecaf1367b3deedafaecabc082d463abcfa3d15abff59f177491472b505bcb5ba0c4a51bb6b93b4721a23c2'
+            'fe5cedcb4ecee4d792ea1e3fa8724ca65b8528babd0e3207ee4a584aa27509cd7f65ed4ef08335c5e220cfb9216f2c20c3b1da1a3d7a9cce3f7192908430d8c5')
 #validpgpkeys=('E390B9700582FAEA959ACAD41EEF53D38A3A9C67') # "Andreas Boll <andreas.boll.dev at gmail.com>"
 validpgpkeys=('FF4CF638C624C3CF21ED2CF227EF763A2AA39F96') # Erik Faye-Lund <erik.faye-lund at collabora.com>
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  # FS#75063 - https://gitlab.freedesktop.org/mesa/demos/-/issues/26
+  patch -Np1 -i ../meson-demos_data_dir.patch
+}
+
 build() {
 
   arch-meson mesa-demos-$pkgver build \

Added: meson-demos_data_dir.patch
===================================================================
--- meson-demos_data_dir.patch	                        (rev 0)
+++ meson-demos_data_dir.patch	2022-06-16 15:21:00 UTC (rev 448806)
@@ -0,0 +1,12 @@
+diff -pudr 1/meson.build 2/meson.build
+--- 1/meson.build	2022-06-16 13:22:14.416192318 +0300
++++ 2/meson.build	2022-06-16 13:23:08.790303478 +0300
+@@ -29,7 +29,7 @@ null_dep = dependency('', required : fal
+ 
+ demos_data_dir = '../data/'
+ if get_option('with-system-data-files')
+-  demos_data_dir = get_option('datadir') / 'mesa-demos'
++  demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos' / ''
+ endif
+ add_project_arguments(
+   '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir),