From 98b6eb43d15f8866ce041ed9712d372af5b28b17 Mon Sep 17 00:00:00 2001 From: newHeiko <35038740+newHeiko@users.noreply.github.com> Date: Fri, 20 Dec 2024 22:41:33 +0100 Subject: [PATCH] misc/jmri: Updated for version 5.10. --- misc/jmri/jmri.SlackBuild | 4 +- misc/jmri/jmri.info | 6 +-- .../skip_conflict-GPU_detect.patch | 29 ------------ .../skip_conflict-GPU_detect.patch | 47 ------------------- 4 files changed, 5 insertions(+), 81 deletions(-) delete mode 100644 system/nvidia-legacy390-driver/skip_conflict-GPU_detect.patch delete mode 100644 system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch diff --git a/misc/jmri/jmri.SlackBuild b/misc/jmri/jmri.SlackBuild index 382d2075a6b..b627696b493 100644 --- a/misc/jmri/jmri.SlackBuild +++ b/misc/jmri/jmri.SlackBuild @@ -27,8 +27,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=jmri -VERSION=${VERSION:-5.8} -REVISION=${REVISION:-Rbc21ce2ce7} +VERSION=${VERSION:-5.10} +REVISION=${REVISION:-Rca461bd266} if [ -z "$ARCH" ]; then case "$( uname -m )" in diff --git a/misc/jmri/jmri.info b/misc/jmri/jmri.info index 7136a381892..4052f266344 100644 --- a/misc/jmri/jmri.info +++ b/misc/jmri/jmri.info @@ -1,8 +1,8 @@ PRGNAM="jmri" -VERSION="5.8" +VERSION="5.10" HOMEPAGE="http://jmri.org/" -DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v5.8/JMRI.5.8+Rbc21ce2ce7.tgz" -MD5SUM="d46eec67b1e0bd09af1f808ce18521a8" +DOWNLOAD="https://github.com/JMRI/JMRI/releases/download/v5.10/JMRI.5.10+Rca461bd266.tgz" +MD5SUM="dd29dd1f244218bd777588966d45a633" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="zulu-openjdk11" diff --git a/system/nvidia-legacy390-driver/skip_conflict-GPU_detect.patch b/system/nvidia-legacy390-driver/skip_conflict-GPU_detect.patch deleted file mode 100644 index 2b979cbf463..00000000000 --- a/system/nvidia-legacy390-driver/skip_conflict-GPU_detect.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff -uaN command-list.c command-list.c.new ---- command-list.c 2018-01-24 20:59:24.000000000 -0800 -+++ command-list.c.new 2018-02-18 00:51:13.218202297 -0800 -@@ -903,6 +903,8 @@ - // Allocate enough space for the whole file list, plus two extra files and - // a NULL at the end. - cfList = nvalloc((p->num_entries + 3) * sizeof(ConflictingFileInfo)); -+/* let's just return an empty list! */ -+ return cfList; - - for (i = 0; i < p->num_entries; i++) { - PackageEntry *entry = &p->entries[i]; - -diff -uaN misc.c misc.c.new ---- misc.c 2018-02-18 00:52:42.822203145 -0800 -+++ misc.c.new 2018-02-18 00:53:28.926203581 -0800 -@@ -2289,7 +2289,10 @@ - "For further details, please see the appendix SUPPORTED " - "NVIDIA GRAPHICS CHIPS in the README available on the Linux " - "driver download page at www.nvidia.com.", p->version); -- return FALSE; -+/* return FALSE; -+ * We're just going to keep the message but skip the result -+ * so we can run this in a VM. -+ */ - } - - if (!found_vga_device) - diff --git a/system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch b/system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch deleted file mode 100644 index a64b671d60f..00000000000 --- a/system/nvidia-legacy470-driver/skip_conflict-GPU_detect.patch +++ /dev/null @@ -1,47 +0,0 @@ -diff -uaN command-list.c command-list.c.new ---- command-list.c 2020-01-29 17:56:11.000000000 -0800 -+++ command-list.c.new 2020-03-08 11:24:03.000000000 -0700 -@@ -890,6 +890,8 @@ - // Allocate enough space for the whole file list, plus two extra files and - // a NULL at the end. - cfList = nvalloc((p->num_entries + 3) * sizeof(ConflictingFileInfo)); -+ /* let's just return an empty list! */ -+ return cfList; - - for (i = 0; i < p->num_entries; i++) { - PackageEntry *entry = &p->entries[i]; - -diff -uaN misc.c misc.c.new ---- misc.c 2020-01-29 17:56:11.000000000 -0800 -+++ misc.c.new 2020-03-08 11:42:12.000000000 -0700 -@@ -1153,13 +1153,12 @@ - } - - if (!install) { -- ui_warn(op, "The %s module will not be installed. As a result, %s " -- "will not function with this installation of the NVIDIA " -- "driver.", optional_modules[i].module_name, -+ ui_warn(op, "The %s module will be installed with no gpu detect. As a result, %s " -+ "will function with this installation of the NVIDIA " -+ "driver, but only if the card is installed", optional_modules[i].module_name, - optional_modules[i].optional_module_dependee); -- -- remove_kernel_module_from_package(p, -- optional_modules[i].module_name); -+// remove_kernel_module_from_package(p, -+// optional_modules[i].module_name); - } - } - } -@@ -2036,7 +2035,10 @@ - "For further details, please see the appendix SUPPORTED " - "NVIDIA GRAPHICS CHIPS in the README available on the Linux " - "driver download page at www.nvidia.com.", p->version); -- return FALSE; -+ /* return FALSE; -+ * We're just going to keep the message but skip the result -+ * so we can run this in a VM. -+ */ - } - - if (!found_vga_device)