Merge branch 'KreitinnSoftware:main' into main

build-all.sh

@@ -125,7 +125,6 @@ gitDownload()
 		echo "-- Git Cloning '$package'..."
 
 		git clone --no-checkout $GIT_URL "$INIT_DIR/cache/$package" &> /dev/zero
-
 		git clone "$INIT_DIR/cache/$package" &> /dev/zero
 	fi
 
@@ -136,9 +135,12 @@ gitDownload()
 	fi
 
 	git checkout . &> /dev/zero
-
 	git submodule update --init --recursive &> /dev/zero
 
+	if [ "$PKG_VER" == "[gss]" ]; then
+		PKG_VER=$(git rev-parse --short HEAD)
+	fi
+
 	cd ..
 }
 
@@ -149,16 +151,22 @@ setupPackages()
 	mkdir -p "$PREFIX/include"
 
 	for package in $PACKAGES; do
-		if [ -f "$INIT_DIR/built-pkgs/$package-$ARCHITECTURE.zip" ]; then
+		unset NON_CONVENTIONAL_BUILD_PATH PKG_VER GIT_URL SRC_URL HOST_BUILD_FOLDER HOST_BUILD_MAKE HOST_BUILD_CONFIGURE_ARGS HOST_BUILD_CFLAGS HOST_BUILD_CXXFLAGS HOST_BUILD_LDFLAGS CONFIGURE_ARGS MESON_ARGS CMAKE_ARGS RUN_POST_APPLY_PATCH RUN_POST_BUILD RUN_POST_CONFIGURE CFLAGS CPPFLAGS LDFLAGS LIBS OVERRIDE_PREFIX OVERRIDE_PKG_CONFIG_PATH GIT_COMMIT BLACKLIST_ARCHITECTURE
+
+		. "$INIT_DIR/packages/$package/build.sh"
+
+		if [ "$PKG_VER" == "[gss]" ]; then
+			if [ -n "$GIT_COMMIT" ]; then
+				PKG_VER="$(echo $GIT_COMMIT | cut -c1-7)"
+			fi
+		fi
+
+		if [ -f "$INIT_DIR/built-pkgs/$package-$PKG_VER-$ARCHITECTURE.zip" ]; then
 			echo "-- Package '$package' already built, No configuring necessary."
 		else
 			if [ -e "$INIT_DIR/workdir/$package/build.sh" ]; then
 				echo "-- Package '$package' already configured."
 			else
-				unset NON_CONVENTIONAL_BUILD_PATH GIT_URL SRC_URL HOST_BUILD_FOLDER HOST_BUILD_MAKE HOST_BUILD_CONFIGURE_ARGS HOST_BUILD_CFLAGS HOST_BUILD_CXXFLAGS HOST_BUILD_LDFLAGS CONFIGURE_ARGS MESON_ARGS CMAKE_ARGS RUN_POST_APPLY_PATCH RUN_POST_BUILD RUN_POST_CONFIGURE CFLAGS CPPFLAGS LDFLAGS LIBS OVERRIDE_PREFIX OVERRIDE_PKG_CONFIG_PATH GIT_COMMIT BLACKLIST_ARCHITECTURE
-
-				. "$INIT_DIR/packages/$package/build.sh"
-
 				if [ "$BLACKLIST_ARCHITECTURE" == "$ARCHITECTURE" ]; then
 					echo "-- Warning: '$package' will not be built."
 				else
@@ -172,6 +180,10 @@ setupPackages()
 
 					applyPatches
 
+					if [ $EXPERIMENTAL_16KB_PAGESIZE -eq 1 ]; then
+						LDFLAGS+=" -Wl,-z,max-page-size=16384"
+					fi
+
 					echo "export CFLAGS=\"$CFLAGS\" LIBS=\"$LIBS\" CPPFLAGS=\"$CPPFLAGS\" LDFLAGS=\"$LDFLAGS\"" > build.sh
 					echo "export DESTDIR=\"$INIT_DIR/workdir/$package/destdir-pkg\"" >> build.sh
 
@@ -274,6 +286,7 @@ setupPackages()
 					fi
 
 					echo 'echo $? > exit_code' >> build.sh
+					echo $PKG_VER >> pkg-ver
 
 					chmod +x build.sh
 
@@ -313,15 +326,22 @@ compileAll()
 
 		touch exit_code
 
-		if [ -f "$INIT_DIR/built-pkgs/$package-$ARCHITECTURE.zip" ]; then
+		pkgVersion="$(cat ../pkg-ver)"
+
+		if [ -f "$INIT_DIR/built-pkgs/$package-$pkgVersion-$ARCHITECTURE.zip" ]; then
 			echo "-- Package '$package' already built."
 		else
 			echo ""
 			echo "-- Compiling Package '$package'..."
 
 			../build.sh 1> "$INIT_DIR/logs/$package-log.txt" 2> "$INIT_DIR/logs/$package-error_log.txt"
 
-			if [ "$(cat exit_code)" != "0" ]; then
+			if [ "$?" != "0" ]; then
+				echo "- Package: '"$package"' failed to compile. Check logs"
+				exit 0
+			fi
+
+			if [ ! -d "$INIT_DIR/workdir/$package/destdir-pkg/data/data/com.micewine.emu" ]; then
 				echo "- Package: '"$package"' failed to compile. Check logs"
 				exit 0
 			fi
@@ -334,7 +354,7 @@ compileAll()
 
 			cd "$INIT_DIR/workdir/$package/destdir-pkg"
 
-			7z a "$INIT_DIR/built-pkgs/$package-$ARCHITECTURE.zip" &> /dev/zero
+			7z a "$INIT_DIR/built-pkgs/$package-$pkgVersion-$ARCHITECTURE.zip" &> /dev/zero
 		fi
 	done
 }
@@ -348,6 +368,7 @@ showHelp()
 	echo "	--clean-prefix: Clean generated rootfs."
 	echo "	--clean-workdir: Clean workdir (for a clean compiling)."
 	echo "	--clean-cache: Clean cache of downloaded packages."
+	echo "  --16kb: Compile with experimental support for Android 15 with 16kb pagesizes"
 	echo ""
 	echo "Available Architectures:"
 	echo "	x86_64"
@@ -395,6 +416,13 @@ case $* in "--clean-workdir")
 	rm -rf workdir
 esac
 
+case $* in "--16kb")
+	echo "Warning: Compiling MiceWine RootFS with experimental support to 16kb pagesizes, Work is not garanted"
+	echo ""
+
+	export EXPERIMENTAL_16KB_PAGESIZE=1
+esac
+
 rm -rf logs
 
 export PACKAGES="$(ls packages)"

packages/01-xcb-proto/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-1.17.0.tar.xz
+PKG_VER=1.17.0
+SRC_URL=https://xorg.freedesktop.org/archive/individual/proto/xcb-proto-$PKG_VER.tar.xz
 CONFIGURE_ARGS=" "

packages/02-xorg-utils-macros/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/util/util-macros-1.20.1.tar.xz
+PKG_VER=1.20.1
+SRC_URL=https://xorg.freedesktop.org/releases/individual/util/util-macros-$PKG_VER.tar.xz
 CONFIGURE_ARGS=" "

packages/03-xorgproto/build.sh

@@ -1,2 +1,3 @@
+PKG_VER=2024.1
 SRC_URL=https://xorg.freedesktop.org/archive/individual/proto/xorgproto-2024.1.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/04-xtrans/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/xtrans-1.5.0.tar.xz
+PKG_VER=1.5.0
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/xtrans-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/05-libtool/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://mirrors.kernel.org/gnu/libtool/libtool-2.4.7.tar.gz
+PKG_VER=2.4.7
+SRC_URL=https://mirrors.kernel.org/gnu/libtool/libtool-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/06-zlib/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://github.com/madler/zlib/releases/download/v1.3.1/zlib-1.3.1.tar.xz
+PKG_VER=1.3.1
+SRC_URL=https://github.com/madler/zlib/releases/download/v$PKG_VER/zlib-$PKG_VER.tar.xz
 CFLAGS="-fPIC"
 CMAKE_ARGS=" "

packages/07-libpng/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://download.sourceforge.net/libpng/libpng-1.6.43.tar.xz
+PKG_VER=1.6.43
+SRC_URL=https://download.sourceforge.net/libpng/libpng-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/08-brotli/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/google/brotli/archive/v1.1.0.tar.gz
+PKG_VER=1.1.0
+SRC_URL=https://github.com/google/brotli/archive/v$PKG_VER.tar.gz
 CMAKE_ARGS=" "

packages/09-freetype/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://downloads.sourceforge.net/freetype/freetype-2.13.2.tar.xz
+PKG_VER=2.13.2
+SRC_URL=https://downloads.sourceforge.net/freetype/freetype-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --without-bzip2 --without-harfbuzz"

packages/10-libXau/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXau-1.0.11.tar.xz
+PKG_VER=1.0.11
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXau-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/11-libXdmcp/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/archive/individual/lib/libXdmcp-1.1.5.tar.xz
+PKG_VER=1.1.5
+SRC_URL=https://xorg.freedesktop.org/archive/individual/lib/libXdmcp-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/12-libxcb/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/archive/individual/lib/libxcb-1.17.0.tar.xz
+PKG_VER=1.17.0
+SRC_URL=https://xorg.freedesktop.org/archive/individual/lib/libxcb-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/13-libX11/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libX11-1.8.9.tar.xz
+PKG_VER=1.8.9
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libX11-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/14-libXfixes/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXfixes-6.0.1.tar.xz
+PKG_VER=6.0.1
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXfixes-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/15-libXcomposite/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXcomposite-0.4.6.tar.xz
+PKG_VER=0.4.6
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXcomposite-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/16-libXext/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXext-1.3.6.tar.xz
+PKG_VER=1.3.6
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXext-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/17-libXrender/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXrender-0.9.11.tar.xz
+PKG_VER=0.9.11
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXrender-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/18-libXcursor/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXcursor-1.2.2.tar.xz
+PKG_VER=1.2.2
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXcursor-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/19-libXi/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXi-1.8.1.tar.xz
+PKG_VER=1.8.1
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXi-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/20-libXinerama/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXinerama-1.1.5.tar.xz
+PKG_VER=1.1.5
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXinerama-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/21-libXrandr/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.5.4.tar.xz
+PKG_VER=1.5.4
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXrandr-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/22-libXxf86vm/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-1.1.5.tar.xz
+PKG_VER=1.1.5
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libXxf86vm-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-malloc0returnsnull"

packages/23-libxshmfence/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libxshmfence-1.3.2.tar.xz
+PKG_VER=1.3.2
+SRC_URL=https://xorg.freedesktop.org/releases/individual/lib/libxshmfence-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --disable-futex"

packages/24-xkeyboard-config/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-2.41.tar.xz
+PKG_VER=2.41
+SRC_URL=https://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/xkeyboard-config-$PKG_VER.tar.xz
 MESON_ARGS="-Dxkb-base=$PREFIX/share/X11/xkb -Dcompat-rules=true -Dxorg-rules-symlinks=false"

packages/25-libsndfile/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/libsndfile/libsndfile/archive/refs/tags/1.2.2.tar.gz
+PKG_VER=1.2.2
+SRC_URL=https://github.com/libsndfile/libsndfile/archive/refs/tags/$PKG_VER.tar.gz
 CMAKE_ARGS="-DBUILD_SHARED_LIBS=0 -DENABLE_EXTERNAL_LIBS=0 -DCMAKE_C_FLAGS=-fPIC -DENABLE_MPEG=0 -DBUILD_REGTEST=0 -DANDROID=1"

packages/26-opus/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/xiph/opus/releases/download/v1.4/opus-1.4.tar.gz
+PKG_VER=1.4
+SRC_URL=https://github.com/xiph/opus/releases/download/v$PKG_VER/opus-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --disable-extra-programs"

packages/27-libogg/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.xz
+PKG_VER=1.3.5
+SRC_URL=https://github.com/xiph/ogg/releases/download/v$PKG_VER/libogg-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/28-libvorbis/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz
+PKG_VER=1.3.7
+SRC_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/29-pulseaudio/build.sh

@@ -1,3 +1,4 @@
+PKG_VER=[gss]
 GIT_URL=https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
 MESON_ARGS="--cross-file=$INIT_DIR/meson-cross-file-$ARCHITECTURE -Dalsa=disabled -Dx11=disabled -Dgtk=disabled -Dopenssl=disabled -Dgsettings=disabled -Ddoxygen=false -Ddatabase=simple -Dsystemd=disabled -Dudev=disabled -Dgstreamer=disabled -Dglib=disabled -Dman=false -Dbashcompletiondir=false -Dzshcompletiondir=false -Dtests=false"
 RUN_POST_APPLY_PATCH="cp include/libintl.h $PREFIX/include"

packages/30-libdrm/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://dri.freedesktop.org/libdrm/libdrm-2.4.123.tar.xz
+PKG_VER=2.4.123
+SRC_URL=https://dri.freedesktop.org/libdrm/libdrm-$PKG_VER.tar.xz
 MESON_ARGS="--cross-file=../../../meson-cross-file-$ARCHITECTURE -Dfreedreno=enabled -Dfreedreno-kgsl=true -Dintel=disabled -Dradeon=enabled -Damdgpu=enabled -Dnouveau=disabled -Dvmwgfx=disabled -Dtests=false"

packages/31-Vulkan-Headers/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/KhronosGroup/Vulkan-Headers/archive/v1.3.296.tar.gz
+PKG_VER=1.3.296
+SRC_URL=https://github.com/KhronosGroup/Vulkan-Headers/archive/v$PKG_VER.tar.gz
 CMAKE_ARGS=" "

packages/32-Vulkan-Loader/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v1.3.296.tar.gz
+PKG_VER=1.3.296
+SRC_URL=https://github.com/KhronosGroup/Vulkan-Loader/archive/refs/tags/v$PKG_VER.tar.gz
 CMAKE_ARGS="-DBUILD_TESTS=OFF -DCMAKE_SYSTEM_NAME=Linux -DENABLE_WERROR=OFF -DVULKAN_HEADERS_INSTALL_DIR=$PREFIX -DUSE_GAS=OFF"

packages/33-Vulkan-Volk/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/zeux/volk/archive/refs/tags/1.3.295.tar.gz
+PKG_VER=1.3.295
+SRC_URL=https://github.com/zeux/volk/archive/refs/tags/$PKG_VER.tar.gz
 CMAKE_ARGS="-DVOLK_INSTALL=ON"

packages/34-Vulkan-Tools/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v1.3.296.tar.gz
+PKG_VER=1.3.296
+SRC_URL=https://github.com/KhronosGroup/Vulkan-Tools/archive/refs/tags/v$PKG_VER.tar.gz
 CMAKE_ARGS="-DCMAKE_SYSTEM_NAME=Linux -DBUILD_CUBE=ON -DBUILD_ICD=OFF -DBUILD_WSI_WAYLAND_SUPPORT=OFF -DBUILD_WSI_XCB_SUPPORT=ON -DBUILD_WSI_XLIB_SUPPORT=ON -DVULKAN_HEADERS_INSTALL_DIR=$PREFIX"

packages/35-libglvnd/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v1.7.0/libglvnd-v1.7.0.tar.gz
+PKG_VER=1.7.0
+SRC_URL=https://gitlab.freedesktop.org/glvnd/libglvnd/-/archive/v$PKG_VER/libglvnd-v$PKG_VER.tar.gz
 MESON_ARGS="--cross-file=../../../meson-cross-file-$ARCHITECTURE -Dtls=false"
 CFLAGS="-I$PREFIX_DIR/include"

packages/36-GLU/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://mesa.freedesktop.org/archive/glu/glu-9.0.3.tar.xz
+PKG_VER=9.0.3
+SRC_URL=https://mesa.freedesktop.org/archive/glu/glu-$PKG_VER.tar.xz
 MESON_ARGS="--cross-file=../../../meson-cross-file-$ARCHITECTURE"

packages/37-FreeGLUT/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://downloads.sourceforge.net/freeglut/freeglut-3.4.0.tar.gz
+PKG_VER=3.4.0
+SRC_URL=https://downloads.sourceforge.net/freeglut/freeglut-$PKG_VER.tar.gz
 CMAKE_ARGS="-DANDROID=OFF -DCMAKE_LIBRARY_PATH=/data/data/com.micewine.emu/files/usr/lib"
 CFLAGS="-I$PREFIX_DIR/include"

packages/38-mesa-demos/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://mesa.freedesktop.org/archive/demos/mesa-demos-9.0.0.tar.xz
+PKG_VER=9.0.0
+SRC_URL=https://mesa.freedesktop.org/archive/demos/mesa-demos-$PKG_VER.tar.xz
 MESON_ARGS="--cross-file=../../../meson-cross-file-$ARCHITECTURE -Dlibdrm=disabled -Dvulkan=disabled -Dwayland=disabled -Dwith-system-data-files=true -Dglut=disabled -Degl=disabled"

packages/39-libiconv/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.17.tar.gz
+PKG_VER=1.17
+SRC_URL=https://ftp.gnu.org/pub/gnu/libiconv/libiconv-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-extra-encodings --enable-static --enable-shared"

packages/40-libunistring/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://mirrors.kernel.org/gnu/libunistring/libunistring-1.1.tar.xz
+PKG_VER=1.1
+SRC_URL=https://mirrors.kernel.org/gnu/libunistring/libunistring-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE ac_cv_func_uselocale=no am_cv_langinfo_codeset=yes"

packages/41-openssl/build.sh

@@ -1,4 +1,5 @@
-SRC_URL=https://github.com/openssl/openssl/releases/download/openssl-3.2.2/openssl-3.2.2.tar.gz
+PKG_VER=3.2.2
+SRC_URL=https://github.com/openssl/openssl/releases/download/openssl-$PKG_VER/openssl-$PKG_VER.tar.gz
 CFLAGS="-DNO_SYSLOG"
 
 getOpenSSLArch()

packages/42-libghttp/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/nghttp2/nghttp2/releases/download/v1.61.0/nghttp2-1.61.0.tar.xz
+PKG_VER=1.61.0
+SRC_URL=https://github.com/nghttp2/nghttp2/releases/download/v$PKG_VER/nghttp2-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --enable-lib-only"

packages/43-libevent/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/libevent/libevent/archive/release-2.1.12-stable.tar.gz
+PKG_VER=2.1.12
+SRC_URL=https://github.com/libevent/libevent/archive/release-$PKG_VER-stable.tar.gz
 CMAKE_ARGS="-DEVENT__DISABLE_THREAD_SUPPORT=1 -DEVENT__DISABLE_TESTS=1"

packages/44-libexpat/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://github.com/libexpat/libexpat/releases/download/R_2_6_2/expat-2.6.2.tar.bz2
+PKG_VER=2.6.2
+SRC_URL=https://github.com/libexpat/libexpat/releases/download/R_$(echo $PKG_VER | sed 's/\./_/g')/expat-$PKG_VER.tar.bz2
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --without-xmlwf --without-docbook"
 RUN_POST_APPLY_PATCH="sed -i 's/^\(linux\*android\)\*)/\1-non-micewine)/' configure"

packages/45-libunbound/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://nlnetlabs.nl/downloads/unbound/unbound-1.20.0.tar.gz
+PKG_VER=1.20.0
+SRC_URL=https://nlnetlabs.nl/downloads/unbound/unbound-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE ac_cv_func_chown=no ac_cv_func_chroot=no ac_cv_func_getpwnam=no --enable-event-api --enable-ipsecmod --enable-linux-ip-local-port-range --enable-tfo-server --with-libevent=$PREFIX_DIR --with-libexpat=$PREFIX_DIR --without-libhiredis --without-libmnl --without-pyunbound --without-pythonmodule --with-libnghttp2=$PREFIX_DIR --with-ssl=$PREFIX_DIR --with-pidfile=$PREFIX_DIR/var/run/unbound.pid --with-username= --with-libunbound-only --enable-static=no"

packages/46-libgmp/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://mirrors.kernel.org/gnu/gmp/gmp-6.3.0.tar.xz
+PKG_VER=6.3.0
+SRC_URL=https://mirrors.kernel.org/gnu/gmp/gmp-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"
 LDFLAGS="-L$PREFIX/lib"

packages/47-libnettle/build.sh

@@ -1,4 +1,5 @@
-SRC_URL=https://mirrors.kernel.org/gnu/nettle/nettle-3.9.1.tar.gz
+PKG_VER=3.9.1
+SRC_URL=https://mirrors.kernel.org/gnu/nettle/nettle-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"
 LDFLAGS="-L$PREFIX/lib"
 CFLAGS=-I$PREFIX/include

packages/48-libidn2/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://mirrors.kernel.org/gnu/libidn/libidn2-2.3.7.tar.gz
+PKG_VER=2.3.7
+SRC_URL=https://mirrors.kernel.org/gnu/libidn/libidn2-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE"

packages/49-libgnutls/build.sh

@@ -1,4 +1,5 @@
-SRC_URL=https://www.gnupg.org/ftp/gcrypt/gnutls/v3.8/gnutls-3.8.5.tar.xz
+PKG_VER=3.8.5
+SRC_URL=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_VER%.*}/gnutls-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --disable-hardware-acceleration --with-default-trust-store-file=$PREFIX_DIR/etc/tls/cert.pem --with-system-priority-file=$PREFIX_DIR/etc/gnutls/default-priorities --with-unbound-root-key-file=$PREFIX_DIR/etc/unbound/root.key  --with-included-libtasn1 --enable-local-libopts --without-p11-kit --disable-guile --disable-doc --without-zstd"
 LDFLAGS="-L$PREFIX/lib"
 CFLAGS="-I$PREFIX/include"

packages/50-libffi/build.sh

@@ -1,3 +1,4 @@
-SRC_URL=https://github.com/libffi/libffi/releases/download/v3.4.6/libffi-3.4.6.tar.gz
+PKG_VER=3.4.6
+SRC_URL=https://github.com/libffi/libffi/releases/download/v$PKG_VER/libffi-$PKG_VER.tar.gz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE --disable-multi-os-directory"
 RUN_POST_CONFIGURE="echo \"#define FFI_MMAP_EXEC_WRIT 1\" >> fficonfig.h"

packages/51-libxml2/build.sh

@@ -1,4 +1,5 @@
-SRC_URL=https://download.gnome.org/sources/libxml2/2.12/libxml2-2.12.6.tar.xz
+PKG_VER=2.12.6
+SRC_URL=https://download.gnome.org/sources/libxml2/${PKG_VER%.*}/libxml2-$PKG_VER.tar.xz
 CONFIGURE_ARGS="--host=$TOOLCHAIN_TRIPLE host_alias=$TOOLCHAIN_TRIPLE  --without-python --without-lzma"
 RUN_POST_APPLY_PATCH="sed -i 's/^\(linux\*android\)\*)/\1-notermux)/' configure"
 CFLAGS="-fPIC"

packages/52-zstd/build.sh

@@ -1,2 +1,3 @@
-SRC_URL=https://github.com/facebook/zstd/archive/v1.5.6.tar.gz
+PKG_VER=1.5.6
+SRC_URL=https://github.com/facebook/zstd/archive/v$PKG_VER.tar.gz
 MESON_ARGS="--cross-file=../../../meson-cross-file-$ARCHITECTURE -Ddefault_library=both -Dbin_programs=true -Dbin_tests=false -Dbin_contrib=true -Dzlib=enabled -Dlzma=disabled -Dlz4=disabled"