package/{mesa3d, mesa3d-headers}: bump version to 24.0.0
Release notes: https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html https://cgit.freedesktop.org/mesa/mesa/tree/docs/relnotes/24.0.0.rst?h=24.0 Removed patch which is included in this release. Signed-off-by: Bernd Kuhls <bernd@kuhls.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
b1662a165c
commit
ad8608df6b
@ -12,7 +12,7 @@ endif
|
||||
|
||||
# Not possible to directly refer to mesa3d variables, because of
|
||||
# first/second expansion trickery...
|
||||
MESA3D_HEADERS_VERSION = 23.3.5
|
||||
MESA3D_HEADERS_VERSION = 24.0.0
|
||||
MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz
|
||||
MESA3D_HEADERS_SITE = https://archive.mesa3d.org
|
||||
MESA3D_HEADERS_DL_SUBDIR = mesa3d
|
||||
|
@ -1,68 +0,0 @@
|
||||
From b60974fac8a2f4c85cbb2ca788fc4ec3e81998f9 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
||||
Date: Tue, 17 Aug 2021 11:54:49 +0200
|
||||
Subject: [PATCH] util: os_same_file_description: fix unknown linux < 3.5
|
||||
syscall SYS_kcmp
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
https://man7.org/linux/man-pages/man2/kcmp.2.html
|
||||
|
||||
The kcmp() system call first appeared in Linux 3.5.
|
||||
|
||||
But was probably also not supported by all major platforms
|
||||
at that time. So fallback to the check that is done for windows.
|
||||
|
||||
Signed-off-by: Thomas Devoogdt <thomas.devoogdt@barco.com>
|
||||
Acked-by: Yonggang Luo <luoyonggang@gmail.com>
|
||||
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
|
||||
Upstream: https://gitlab.freedesktop.org/mesa/mesa/-/commit/3ef514982441ce496aa127611edd26b9867f4b95
|
||||
Signed-off-by: Thomas Devoogdt <thomas@devoogdt.com>
|
||||
---
|
||||
src/util/os_file.c | 18 ++++++------------
|
||||
1 file changed, 6 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/src/util/os_file.c b/src/util/os_file.c
|
||||
index 5fb30f2d908..464425a9b87 100644
|
||||
--- a/src/util/os_file.c
|
||||
+++ b/src/util/os_file.c
|
||||
@@ -202,29 +202,23 @@ os_read_file(const char *filename, size_t *size)
|
||||
/* copied from <linux/kcmp.h> */
|
||||
#define KCMP_FILE 0
|
||||
|
||||
+#endif
|
||||
+
|
||||
int
|
||||
os_same_file_description(int fd1, int fd2)
|
||||
{
|
||||
+#ifdef SYS_kcmp
|
||||
pid_t pid = getpid();
|
||||
+#endif
|
||||
|
||||
/* Same file descriptor trivially implies same file description */
|
||||
if (fd1 == fd2)
|
||||
return 0;
|
||||
|
||||
+#ifdef SYS_kcmp
|
||||
return syscall(SYS_kcmp, pid, pid, KCMP_FILE, fd1, fd2);
|
||||
-}
|
||||
-
|
||||
#else
|
||||
-
|
||||
-int
|
||||
-os_same_file_description(int fd1, int fd2)
|
||||
-{
|
||||
- /* Same file descriptor trivially implies same file description */
|
||||
- if (fd1 == fd2)
|
||||
- return 0;
|
||||
-
|
||||
/* Otherwise we can't tell */
|
||||
return -1;
|
||||
-}
|
||||
-
|
||||
#endif
|
||||
+}
|
||||
--
|
||||
2.34.1
|
||||
|
@ -1,5 +1,5 @@
|
||||
# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000748.html
|
||||
sha256 69ccb1278641ff5bad71ca0f866188aeb1a92aadc4dbb9d35f50aebec5b8b50f mesa-23.3.5.tar.xz
|
||||
sha512 1ad29f524caee0000ef51abe58d29d9687de5fbc5168f7e677bb4e69c5e9a94918d5fbf6e10c6757fe7ce6d47bab109e452f0fa2e26aad2e6f8bfb744383b5ea mesa-23.3.5.tar.xz
|
||||
# From https://lists.freedesktop.org/archives/mesa-announce/2024-February/000747.html
|
||||
sha256 dc7e8c077bc5884df95478263b34bdebb7e88e600689cb56fb07be2b8c304c36 mesa-24.0.0.tar.xz
|
||||
sha512 9dfdea7cebb37b9c020335e24194b39b399f48b5af6eec30c3455108276ac4e29e7b06df942cb2abc7afa667784968c0c43d19b9afe30ef03021b9cb6a789f15 mesa-24.0.0.tar.xz
|
||||
# License
|
||||
sha256 a00275a53178e2645fb65be99a785c110513446a5071ff2c698ed260ad917d75 docs/license.rst
|
||||
|
@ -5,7 +5,7 @@
|
||||
################################################################################
|
||||
|
||||
# When updating the version, please also update mesa3d-headers
|
||||
MESA3D_VERSION = 23.3.5
|
||||
MESA3D_VERSION = 24.0.0
|
||||
MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz
|
||||
MESA3D_SITE = https://archive.mesa3d.org
|
||||
MESA3D_LICENSE = MIT, SGI, Khronos
|
||||
|
Loading…
Reference in New Issue
Block a user