这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions packages/mesa/0003-fix-for-anon-file.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@ Fallback to `@TERMUX_PREFIX@/tmp` if env `XDG_RUNTIME_DIR` is not set.

--- a/src/util/anon_file.c
+++ b/src/util/anon_file.c
@@ -137,6 +137,11 @@
char *name;
@@ -122,7 +122,7 @@ get_or_create_user_temp_dir(char* buf, size_t len) {
return buf;
}

path = getenv("XDG_RUNTIME_DIR");
+#ifdef __TERMUX__
+ if (!path) {
+ path = "@TERMUX_PREFIX@/tmp";
+ }
+#endif
if (!path) {
errno = ENOENT;
return -1;
- snprintf(buf, len, "/tmp/xdg-runtime-mesa-%ld", (long)getuid());
+ snprintf(buf, len, "@TERMUX_PREFIX@/tmp/xdg-runtime-mesa-%ld", (long)getuid());
mesa_logd("%s: XDG_RUNTIME_DIR not set; falling back to temp dir %s",
__func__, buf);
if (stat(buf, &st) == 0) {
4 changes: 2 additions & 2 deletions packages/mesa/0008-workaround-fortify-check.patch
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ https://github.com/termux/termux-packages/issues/18823

--- a/src/c11/threads.h
+++ b/src/c11/threads.h
@@ -117,7 +117,15 @@
@@ -117,7 +117,15 @@ typedef struct
typedef pthread_cond_t cnd_t;
typedef pthread_t thrd_t;
typedef pthread_key_t tss_t;
Expand All @@ -15,9 +15,9 @@ https://github.com/termux/termux-packages/issues/18823
+#else
typedef pthread_mutex_t mtx_t;
+#endif
#ifndef __once_flag_defined
typedef pthread_once_t once_flag;
# define ONCE_FLAG_INIT PTHREAD_ONCE_INIT
# ifdef PTHREAD_DESTRUCTOR_ITERATIONS
--- a/src/c11/impl/threads_posix.c
+++ b/src/c11/impl/threads_posix.c
@@ -120,7 +120,11 @@
Expand Down
60 changes: 0 additions & 60 deletions packages/mesa/0015-fix-detection-memfd_create-getrandom.patch

This file was deleted.

6 changes: 3 additions & 3 deletions packages/mesa/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specificatio
TERMUX_PKG_LICENSE="MIT"
TERMUX_PKG_LICENSE_FILE="docs/license.rst"
TERMUX_PKG_MAINTAINER="@termux"
TERMUX_PKG_VERSION="25.2.5"
TERMUX_PKG_VERSION="25.3.0"
_LLVM_MAJOR_VERSION=$(. $TERMUX_SCRIPTDIR/packages/libllvm/build.sh; echo "${LLVM_MAJOR_VERSION}")
_LLVM_MAJOR_VERSION_NEXT=$((_LLVM_MAJOR_VERSION + 1))
TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
TERMUX_PKG_SHA256=bb6243e7a6f525febfa1e6ab50827ca4d4bfdad73812377b0ca9b6c50998b03e
TERMUX_PKG_SHA256=0fd54fea7dbbddb154df05ac752b18621f26d97e27863db3be951417c6abe8ae
TERMUX_PKG_AUTO_UPDATE=true
TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libglvnd, libllvm (<< ${_LLVM_MAJOR_VERSION_NEXT}), libwayland, libx11, libxext, libxfixes, libxshmfence, libxxf86vm, ncurses, vulkan-loader, zlib, zstd"
TERMUX_PKG_SUGGESTS="mesa-dev"
Expand Down Expand Up @@ -37,7 +37,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
"

termux_pkg_auto_update() {
read -r latest < <(curl -fsSL "https://archive.mesa3d.org/" | sed -rn 's/.*mesa-([0-9]+(\.[0-9]+)*).*/\1/p' | sort -Vr);
read -r latest < <(curl -fsSL "https://archive.mesa3d.org/" | grep -v rc | sed -rn 's/.*mesa-([0-9]+(\.[0-9]+)*).*/\1/p' | sort -Vr);
termux_pkg_upgrade_version "${latest}"
}

Expand Down