summaryrefslogtreecommitdiff
path: root/source/x
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2022-03-02 01:54:23 +0000
committerEric Hameleers <alien@slackware.com>2022-03-02 06:59:45 +0100
commitffd548b099c715ca0e169b2e33a41933620204e2 (patch)
tree9d618a9a5e7f6d5e9bfeae0b2f8a799de26703c5 /source/x
parent29cb9e3b02f88bf8d8d3abad7aa03f6a74d6fbc0 (diff)
downloadcurrent-ffd548b099c715ca0e169b2e33a41933620204e2.tar.gz
Wed Mar 2 01:54:23 UTC 202220220302015423
a/lrzip-0.650-x86_64-1.txz: Upgraded. d/mercurial-6.1-x86_64-1.txz: Upgraded. l/nodejs-16.14.0-x86_64-1.txz: Added. Thanks to Audrius Kažukauskas, Ryan P.C. McQuen, and Willy Sudiarto Raharjo for the slackbuilds.org version of the build script.
Diffstat (limited to 'source/x')
-rw-r--r--source/x/FTBFSlog3
-rw-r--r--source/x/x11/patch/igt-gpu-tools.patch2
-rw-r--r--source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch36
3 files changed, 41 insertions, 0 deletions
diff --git a/source/x/FTBFSlog b/source/x/FTBFSlog
index 859555ed..0b15e38c 100644
--- a/source/x/FTBFSlog
+++ b/source/x/FTBFSlog
@@ -1,3 +1,6 @@
+Wed Mar 2 01:27:59 UTC 2022
+x11/igt-gpu-tools: Patched for new meson. Thanks to nobodino.
++--------------------------+
Mon Feb 7 20:57:55 UTC 2022
All packages tested and found to compile properly.
+--------------------------+
diff --git a/source/x/x11/patch/igt-gpu-tools.patch b/source/x/x11/patch/igt-gpu-tools.patch
new file mode 100644
index 00000000..d55f9b92
--- /dev/null
+++ b/source/x/x11/patch/igt-gpu-tools.patch
@@ -0,0 +1,2 @@
+zcat $CWD/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch.gz | patch -p1 --verbose \
+ || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch b/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch
new file mode 100644
index 00000000..142e2fa4
--- /dev/null
+++ b/source/x/x11/patch/igt-gpu-tools/963917a3565466832a3b2fc22e9285d34a0bf944.patch
@@ -0,0 +1,36 @@
+From 963917a3565466832a3b2fc22e9285d34a0bf944 Mon Sep 17 00:00:00 2001
+From: Petri Latvala <petri.latvala@intel.com>
+Date: Thu, 28 Oct 2021 11:05:31 +0300
+Subject: [PATCH] lib/meson.build: Fix underscorify call
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+f.underscorify() is correct, f.underscorify(f) is an error that later
+meson versions don't like at all.
+
+Closes: https://gitlab.freedesktop.org/drm/igt-gpu-tools/-/issues/107
+Fixes: 588555f77909 ("lib/i915: Extract helpers for determining scheduler capabilities")
+Cc: Arkadiusz Hiler <arek@hiler.eu>
+Signed-off-by: Petri Latvala <petri.latvala@intel.com>
+Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
+---
+ lib/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/meson.build b/lib/meson.build
+index c3080fc8..297b0ad2 100644
+--- a/lib/meson.build
++++ b/lib/meson.build
+@@ -155,7 +155,7 @@ lib_version = vcs_tag(input : 'version.h.in', output : 'version.h',
+
+ lib_intermediates = []
+ foreach f: lib_sources
+- name = f.underscorify(f)
++ name = f.underscorify()
+ lib = static_library('igt-' + name,
+ [ f, lib_version ],
+ include_directories: inc,
+--
+GitLab
+