Compile Meson/CMake Packages as Release by Default, Add Mesa Turnip 25.0.0 and 24.3.0 Stable

KreitinnSoftware · KreitinnSoftware · commit 9a481bc7c78a · 2025-03-01T02:20:09.000Z
diff --git a/build-all.sh b/build-all.sh
@@ -214,7 +214,7 @@ setupPackage()
 						echo "make -j $(nproc) install" >> build.sh
 					fi
 				elif [ -e "./CMakeLists.txt" ] && [ -n "$CMAKE_ARGS" ]; then
-					echo "cmake -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_INSTALL_LIBDIR=$PREFIX_DIR/lib $CMAKE_ARGS .." >> build.sh
+					echo "cmake -DCMAKE_INSTALL_PREFIX=$PREFIX_DIR -DCMAKE_INSTALL_LIBDIR=$PREFIX_DIR/lib -DCMAKE_BUILD_TYPE=Release $CMAKE_ARGS .." >> build.sh
 					echo "make -j $(nproc)" >> build.sh
 
 					if [ -e "$INIT_DIR/packages/$package/custom-make-install.sh" ]; then
@@ -223,7 +223,7 @@ setupPackage()
 						echo "make -j $(nproc) install" >> build.sh
 					fi
 				elif [ -e "./meson.build" ] && [ -n "$MESON_ARGS" ]; then
-					echo "meson setup --cross-file=$INIT_DIR/meson-cross-file-$ARCHITECTURE -Dprefix=$PREFIX_DIR $MESON_ARGS .." >> build.sh
+					echo "meson setup --cross-file=$INIT_DIR/meson-cross-file-$ARCHITECTURE -Dprefix=$PREFIX_DIR -Dbuildtype=release $MESON_ARGS .." >> build.sh
 
 					if [ -e "$INIT_DIR/packages/$package/post-configure.sh" ]; then
 						echo "$INIT_DIR/packages/$package/post-configure.sh" >> build.sh
diff --git a/packages/box64/build.sh b/packages/box64/build.sh
@@ -4,5 +4,5 @@ PKG_PRETTY_NAME="Box64"
 
 GIT_URL=https://github.com/ptitSeb/box64
 GIT_COMMIT=8bb53e10018e7ebee785afc8ad571f1cee5f9bef
-CMAKE_ARGS="-DANDROID=1 -DBAD_SIGNAL=1 -DARM_DYNAREC=1"
+CMAKE_ARGS="-DCMAKE_BUILD_TYPE=RelWithDebInfo -DANDROID=1 -DBAD_SIGNAL=1 -DARM_DYNAREC=1"
 BLACKLIST_ARCHITECTURE=x86_64
diff --git a/packages/index b/packages/index
@@ -54,7 +54,8 @@ libxml2
 zstd
 libarchive
 android-shmem
-mesa-vulkan-freedreno
+mesa-vulkan-freedreno-24.3.0
+mesa-vulkan-freedreno-25.0.0
 mesa-vulkan-radeon
 mesa-vulkan-wrapper-rev8
 mesa-vulkan-wrapper-rev9
diff --git a/packages/mesa-vulkan-freedreno-24.3.0/build.sh b/packages/mesa-vulkan-freedreno-24.3.0/build.sh
@@ -1,12 +1,11 @@
-PKG_VER=25.0.0-devel-[gss]
+PKG_VER=24.3.0
 PKG_CATEGORY="VulkanDriver"
 PKG_PRETTY_NAME="Mesa Turnip Driver"
 VK_DRIVER_LIB="libvulkan_freedreno.so"
 
 BLACKLIST_ARCHITECTURE=x86_64
 
-GIT_URL=https://gitlab.freedesktop.org/mesa/mesa
-GIT_COMMIT=365cd04375baeb8c607c1a49e85e9a364e193a08
+SRC_URL=https://archive.mesa3d.org/mesa-$PKG_VER.tar.xz
 LDFLAGS="-L$PREFIX/lib -landroid-shmem"
 CPPFLAGS="-D__USE_GNU"
 MESON_ARGS="-Dgallium-drivers= -Dvulkan-drivers=freedreno -Dfreedreno-kmds=msm,kgsl -Dglvnd=disabled -Dplatforms=x11 -Dxmlconfig=disabled -Dllvm=disabled -Dopengl=false -Degl=disabled -Dzstd=enabled"
diff --git a/packages/mesa-vulkan-freedreno-24.3.0/disable-memfd-create-getrandom.patch b/packages/mesa-vulkan-freedreno-24.3.0/disable-memfd-create-getrandom.patch
diff --git a/packages/mesa-vulkan-freedreno-24.3.0/force-linux-like-build.patch b/packages/mesa-vulkan-freedreno-24.3.0/force-linux-like-build.patch
diff --git a/packages/mesa-vulkan-freedreno-24.3.0/install-drivers-without-hardlinks.patch b/packages/mesa-vulkan-freedreno-24.3.0/install-drivers-without-hardlinks.patch
diff --git a/packages/mesa-vulkan-freedreno-24.3.0/wsi-common-no-pthread-cancel.patch b/packages/mesa-vulkan-freedreno-24.3.0/wsi-common-no-pthread-cancel.patch
diff --git a/packages/mesa-vulkan-freedreno-25.0.0/build.sh b/packages/mesa-vulkan-freedreno-25.0.0/build.sh
@@ -0,0 +1,11 @@
+PKG_VER=25.0.0
+PKG_CATEGORY="VulkanDriver"
+PKG_PRETTY_NAME="Mesa Turnip Driver"
+VK_DRIVER_LIB="libvulkan_freedreno.so"
+
+BLACKLIST_ARCHITECTURE=x86_64
+
+SRC_URL=https://archive.mesa3d.org/mesa-$PKG_VER.tar.xz
+LDFLAGS="-L$PREFIX/lib -landroid-shmem"
+CPPFLAGS="-D__USE_GNU"
+MESON_ARGS="-Dgallium-drivers= -Dvulkan-drivers=freedreno -Dfreedreno-kmds=msm,kgsl -Dglvnd=disabled -Dplatforms=x11 -Dxmlconfig=disabled -Dllvm=disabled -Dopengl=false -Degl=disabled -Dzstd=enabled"
diff --git a/packages/mesa-vulkan-freedreno-25.0.0/disable-memfd-create-getrandom.patch b/packages/mesa-vulkan-freedreno-25.0.0/disable-memfd-create-getrandom.patch
@@ -0,0 +1,25 @@
+diff --git a/meson.build b/meson.build
+index 66e14c211d2..7e73daf221a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1354,7 +1354,7 @@ if not ['linux'].contains(host_machine.system())
+   endif
+ endif
+ 
+-foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'sys/shm.h',
++foreach h : ['linux/futex.h', 'endian.h', 'dlfcn.h', 'sys/shm.h',
+              'cet.h', 'pthread_np.h', 'sys/inotify.h', 'linux/udmabuf.h']
+   if cc.check_header(h)
+     pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
+@@ -1364,11 +1364,9 @@ endforeach
+ functions_to_detect = {
+   'strtof': '',
+   'mkostemp': '',
+-  'memfd_create': '',
+   'random_r': '',
+   'flock': '',
+   'strtok_r': '',
+-  'getrandom': '',
+   'qsort_s': '',
+   'posix_fallocate': '',
+   'secure_getenv': '',
diff --git a/packages/mesa-vulkan-freedreno-25.0.0/force-linux-like-build.patch b/packages/mesa-vulkan-freedreno-25.0.0/force-linux-like-build.patch
@@ -0,0 +1,26 @@
+diff --git a/include/vulkan/vk_android_native_buffer.h b/include/vulkan/vk_android_native_buffer.h
+index 21f82ef57a2..5c67746ca44 100644
+--- a/include/vulkan/vk_android_native_buffer.h
++++ b/include/vulkan/vk_android_native_buffer.h
+@@ -17,7 +17,7 @@
+  * system rather the build target.
+  */
+ 
+-#if defined(__ANDROID__) || defined(ANDROID)
++#if 0
+ 
+ #include <cutils/native_handle.h>
+ #if ANDROID_API_LEVEL < 28
+diff --git a/src/util/detect_os.h b/src/util/detect_os.h
+index 86286dfbe70..49195b3398c 100644
+--- a/src/util/detect_os.h
++++ b/src/util/detect_os.h
+@@ -25,7 +25,7 @@
+  * also be defined.
+  */
+ #if defined(__ANDROID__)
+-#define DETECT_OS_ANDROID 1
++#define DETECT_OS_ANDROID 0
+ #endif
+ 
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
diff --git a/packages/mesa-vulkan-freedreno-25.0.0/install-drivers-without-hardlinks.patch b/packages/mesa-vulkan-freedreno-25.0.0/install-drivers-without-hardlinks.patch
@@ -0,0 +1,21 @@
+diff --git a/bin/install_megadrivers.py b/bin/install_megadrivers.py
+index 216f6999feb..c79e95d1afd 100644
+--- a/bin/install_megadrivers.py
++++ b/bin/install_megadrivers.py
+@@ -24,7 +24,16 @@
+ 
+ import argparse
+ import os
++import shutil
++ 
++def link(src, dest):
++    shutil.copyfile(src, dest)
+ 
++def unlink(src):
++    os.remove(src)
++
++os.link = link
++os.unlink = unlink
+ 
+ def resolve_libdir(libdir):
+     if os.path.isabs(libdir):
diff --git a/packages/mesa-vulkan-freedreno-25.0.0/wsi-common-no-pthread-cancel.patch b/packages/mesa-vulkan-freedreno-25.0.0/wsi-common-no-pthread-cancel.patch
@@ -0,0 +1,88 @@
+diff --git a/src/vulkan/wsi/wsi_common_display.c b/src/vulkan/wsi/wsi_common_display.c
+index ff57a259046..4703500f374 100644
+--- a/src/vulkan/wsi/wsi_common_display.c
++++ b/src/vulkan/wsi/wsi_common_display.c
+@@ -176,6 +176,12 @@ struct wsi_display_sync {
+ 
+ static uint64_t fence_sequence;
+ 
++#ifdef __ANDROID__
++static void thread_signal_handler (int signum) {
++   pthread_exit (0);
++}
++#endif
++
+ ICD_DEFINE_NONDISP_HANDLE_CASTS(wsi_display_mode, VkDisplayModeKHR)
+ ICD_DEFINE_NONDISP_HANDLE_CASTS(wsi_display_connector, VkDisplayKHR)
+ 
+@@ -1341,7 +1347,9 @@ wsi_display_wait_thread(void *data)
+       .events = POLLIN
+    };
+ 
++#ifndef __ANDROID__
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
++#endif
+    for (;;) {
+       int ret = poll(&pollfd, 1, -1);
+       if (ret > 0) {
+@@ -1369,9 +1377,22 @@ wsi_display_start_wait_thread(struct wsi_display *wsi)
+ static void
+ wsi_display_stop_wait_thread(struct wsi_display *wsi)
+ {
++#ifdef __ANDROID__
++   struct sigaction actions;
++   memset (&actions, 0, sizeof (actions));
++   sigemptyset (&actions.sa_mask);
++   actions.sa_flags = 0;
++   actions.sa_handler = thread_signal_handler;
++   sigaction (SIGUSR2, &actions, NULL);
++#endif
++
+    mtx_lock(&wsi->wait_mutex);
+    if (wsi->wait_thread) {
++#ifndef __ANDROID__
+       pthread_cancel(wsi->wait_thread);
++#else
++      pthread_kill(wsi->wait_thread, SIGUSR2);
++#endif
+       pthread_join(wsi->wait_thread, NULL);
+       wsi->wait_thread = 0;
+    }
+@@ -2215,7 +2236,9 @@ udev_event_listener_thread(void *data)
+ 
+    int udev_fd = udev_monitor_get_fd(mon);
+ 
++#ifndef __ANDROID__
+    pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, NULL);
++#endif
+ 
+    for (;;) {
+       nfds_t nfds = 1;
+@@ -2340,6 +2363,15 @@ wsi_display_finish_wsi(struct wsi_device *wsi_device,
+    struct wsi_display *wsi =
+       (struct wsi_display *) wsi_device->wsi[VK_ICD_WSI_PLATFORM_DISPLAY];
+ 
++#ifdef __ANDROID__
++   struct sigaction actions;
++   memset (&actions, 0, sizeof (actions));
++   sigemptyset (&actions.sa_mask);
++   actions.sa_flags = 0;
++   actions.sa_handler = thread_signal_handler;
++   sigaction (SIGUSR2, &actions, NULL);
++#endif
++
+    if (wsi) {
+       wsi_for_each_connector(connector, wsi) {
+          wsi_for_each_display_mode(mode, connector) {
+@@ -2351,7 +2383,11 @@ wsi_display_finish_wsi(struct wsi_device *wsi_device,
+       wsi_display_stop_wait_thread(wsi);
+ 
+       if (wsi->hotplug_thread) {
++#ifndef __ANDROID__
+          pthread_cancel(wsi->hotplug_thread);
++#else
++         pthread_kill(wsi->hotplug_thread, SIGUSR2);
++#endif
+          pthread_join(wsi->hotplug_thread, NULL);
+       }
+ 
