mesa: move from x11-packages/ to packages/

x11-packages/mesa/build.sh

@@ -1,63 +0,0 @@
-TERMUX_PKG_HOMEPAGE=https://www.mesa3d.org
-TERMUX_PKG_DESCRIPTION="An open-source implementation of the OpenGL specification"
-TERMUX_PKG_LICENSE="MIT"
-TERMUX_PKG_LICENSE_FILE="docs/license.rst"
-TERMUX_PKG_MAINTAINER="@termux"
-TERMUX_PKG_VERSION=22.2.2
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SRCURL=https://archive.mesa3d.org/mesa-${TERMUX_PKG_VERSION}.tar.xz
-TERMUX_PKG_SHA256=2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9
-TERMUX_PKG_DEPENDS="libandroid-shmem, libc++, libdrm, libexpat, libx11, libxext, ncurses, zlib, zstd"
-TERMUX_PKG_SUGGESTS="mesa-dev"
-TERMUX_PKG_BUILD_DEPENDS="libllvm-static, llvm, llvm-tools, mlir, xorgproto"
-TERMUX_PKG_CONFLICTS="libmesa, ndk-sysroot (<= 25b)"
-TERMUX_PKG_REPLACES="libmesa"
-
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
---cmake-prefix-path $TERMUX_PREFIX
--Dcpp_rtti=false
--Dgbm=disabled
--Degl=disabled
--Dgles1=enabled
--Dgles2=enabled
--Ddri3=enabled
--Dllvm=enabled
--Dshared-llvm=disabled
--Dglx=xlib
--Dplatforms=x11
--Ddri-drivers=
--Dgallium-drivers=swrast
--Dvulkan-drivers=
--Dosmesa=true
-"
-
-termux_step_pre_configure() {
-	termux_setup_cmake
-
-	CPPFLAGS+=" -D__USE_GNU"
-	LDFLAGS+=" -landroid-shmem"
-
-	_WRAPPER_BIN=$TERMUX_PKG_BUILDDIR/_wrapper/bin
-	mkdir -p $_WRAPPER_BIN
-	if [ "$TERMUX_ON_DEVICE_BUILD" = "false" ]; then
-		sed 's|@CMAKE@|'"$(command -v cmake)"'|g' \
-			$TERMUX_PKG_BUILDER_DIR/cmake-wrapper.in \
-			> $_WRAPPER_BIN/cmake
-		chmod 0700 $_WRAPPER_BIN/cmake
-	fi
-	export PATH=$_WRAPPER_BIN:$PATH
-}
-
-termux_step_post_configure() {
-	rm -f $_WRAPPER_BIN/cmake
-}
-
-termux_step_post_massage() {
-	# A bunch of programs in the wild assume that the name of OpenGL shared
-	# library is `libGL.so.1` and try to dlopen(3) it. In fact `sdl2` does
-	# this. So please do not ever remove the symlink.
-	cd ${TERMUX_PKG_MASSAGEDIR}/${TERMUX_PREFIX}/lib || exit 1
-	if [ ! -e "./libGL.so.1" ]; then
-		ln -sf libGL.so libGL.so.1
-	fi
-}

x11-packages/mesa/cmake-wrapper.in

@@ -1,16 +0,0 @@
-#!/bin/sh
-
-if [ -e CMakeLists.txt ]; then
-	sed -i '1s|^|project(foo LANGUAGES C CXX)\n|' CMakeLists.txt
-fi
-
-for f in "$@"; do
-	case "${f}" in
-		-DCMAKE_TOOLCHAIN_FILE=* )
-			sed -i "${f#-DCMAKE_TOOLCHAIN_FILE=}" \
-				-e 's|\(set(CMAKE_SYSTEM_NAME\) "Android")|\1 "Linux")|g'
-			;;
-	esac
-done
-
-exec @CMAKE@ "$@"

x11-packages/mesa/mesa-22.2.0-llvm-15.patch

@@ -1,12 +0,0 @@
-https://gitlab.freedesktop.org/mesa/mesa/-/issues/6505
-
---- a/meson.build
-+++ b/meson.build
-@@ -1733,6 +1733,7 @@
- if draw_with_llvm
-   llvm_modules += 'native'
- endif
-+llvm_modules += 'passes'
- 
- if with_amd_vk or with_gallium_radeonsi
-   _llvm_version = '>= 11.0.0'

x11-packages/mesa/mesa-dev.subpackage.sh

@@ -1,6 +0,0 @@
-TERMUX_SUBPKG_DESCRIPTION="Mesa's GLES headers"
-TERMUX_SUBPKG_INCLUDE="include/GLES*"
-TERMUX_SUBPKG_DEPEND_ON_PARENT="no"
-TERMUX_SUBPKG_BREAKS="mesa (<< 22.2.2-1)"
-TERMUX_SUBPKG_REPLACES="mesa (<< 22.2.2-1)"
-TERMUX_SUBPKG_PLATFORM_INDEPENDENT=true

x11-packages/mesa/meson.build.patch

@@ -1,11 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -1377,7 +1377,7 @@
-   endif
- endif
- 
--foreach h : ['xlocale.h', 'linux/futex.h', 'endian.h', 'dlfcn.h', 'sys/shm.h', 'cet.h', 'pthread_np.h']
-+foreach h : ['linux/futex.h', 'endian.h', 'dlfcn.h', 'sys/shm.h', 'cet.h', 'pthread_np.h']
-   if cc.check_header(h)
-     pre_args += '-DHAVE_@0@'.format(h.to_upper().underscorify())
-   endif

x11-packages/mesa/src-gallium-drivers-llvmpipe-lp_screen.c.patch

@@ -1,16 +0,0 @@
-Disable multithreading by default because it seems to introduce a significant
-overhead when enabled.
-
---- a/src/gallium/drivers/llvmpipe/lp_screen.c
-+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
-@@ -1072,7 +1072,9 @@
-    screen->allow_cl = !!getenv("LP_CL");
-    screen->use_tgsi = (LP_DEBUG & DEBUG_TGSI_IR);
-    screen->num_threads = util_get_cpu_caps()->nr_cpus > 1 ? util_get_cpu_caps()->nr_cpus : 0;
--#ifdef EMBEDDED_DEVICE
-+#if defined __ANDROID__
-+   screen->num_threads = 0;
-+#elif defined EMBEDDED_DEVICE
-    screen->num_threads = MIN2(screen->num_threads, 2);
- #endif
-    screen->num_threads = debug_get_num_option("LP_NUM_THREADS", screen->num_threads);