Add Initial Dependency Support for Auto Compiling Packages Without Hardcoded Index

Author: KreitinnSoftware

build-all.sh

@@ -102,7 +102,7 @@ setupPackage()
 {
     local package=$1
 
-    unset PKG_VER PKG_CATEGORY PKG_PRETTY_NAME PKG_OPTIONAL PKG_DEPENDENCIES
+    unset PKG_VER PKG_CATEGORY PKG_PRETTY_NAME PKG_OPTIONAL
 	unset SRC_URL GIT_URL GIT_COMMIT
 	unset HOST_BUILD_FOLDER HOST_BUILD_MAKE HOST_BUILD_CONFIGURE_ARGS HOST_BUILD_CFLAGS HOST_BUILD_CXXFLAGS HOST_BUILD_LDFLAGS
 	unset CONFIGURE_ARGS MESON_ARGS CMAKE_ARGS
@@ -282,15 +282,60 @@ setupPackage()
 	if [ -n "$CI" ]; then
 		rm -rf "$INIT_DIR/cache/$package"
 	fi
-
-	echo $package >> index
 }
 
 setupPackages()
 {
 	cd "$INIT_DIR/workdir"
 
-	for package in $PACKAGES; do
+	# We need to build package list respecting dependencies order
+	# First add packages that don't need extra dependencies
+
+	rm -f "$INIT_DIR/workdir/index"
+
+	export FILTERED_PACKAGES=""
+	export TODO_PACKAGES=$PACKAGES
+
+	while [ -n "$TODO_PACKAGES" ]; do
+		NEW_TODO=""
+
+		for package in $TODO_PACKAGES; do
+			unset DEPENDENCIES
+
+			if [ ! -d "$INIT_DIR/packages/$package" ]; then
+				echo "E: Package '$package' don't exists."
+				exit 1
+			fi
+
+			source "$INIT_DIR/packages/$package/build.sh"
+
+			if [ -z "$DEPENDENCIES" ]; then
+				if ! echo " $FILTERED_PACKAGES " | grep -q " $package "; then
+					FILTERED_PACKAGES+="$package "
+					continue
+				fi
+			fi
+
+			for dep in $DEPENDENCIES; do
+				if ! echo " $FILTERED_PACKAGES " | grep -q " $dep "; then
+					NEW_TODO+="$package "
+					break
+				fi
+			done
+
+			if ! echo " $NEW_TODO " | grep -q " $package "; then
+				if ! echo " $FILTERED_PACKAGES " | grep -q " $package "; then
+					FILTERED_PACKAGES+="$package "
+				fi
+			fi
+		done
+
+		TODO_PACKAGES="$NEW_TODO"
+	done
+
+	echo $FILTERED_PACKAGES > "$INIT_DIR/workdir/index"
+
+	for package in $FILTERED_PACKAGES; do
 		packageFullPath=$(ls "$INIT_DIR/built-pkgs/$package-"*"$ARCH.rat" 2> /dev/zero)
 		packageCommitFullPath=$(ls "$INIT_DIR/built-pkgs/$package-"*"$ARCH.commit" 2> /dev/zero)
 
@@ -339,6 +384,10 @@ compileAll()
 	local packageCount=$(cat "$INIT_DIR/workdir/index" | wc -l)
 
 	for package in $(cat "$INIT_DIR/workdir/index"); do
+		if [ ! -d "$INIT_DIR/workdir/$package" ]; then
+			continue
+		fi
+
 		local packageBuildDir="$INIT_DIR/workdir/$package/build_dir"
 		local packageDestDirPkg="$INIT_DIR/workdir/$package/destdir-pkg"
 		mkdir -p "$packageBuildDir"
@@ -466,7 +515,7 @@ export NDK_FILENAME="${NDK_URL##*/}"
 export MINGW_URL="http://techer.pascal.free.fr/Red-Rose_MinGW-w64-Toolchain/Red-Rose-MinGW-w64-Posix-Urct-v12.0.0.r458.g03d8a40f5-Gcc-11.5.0.tar.xz"
 export MINGW_FILENAME="${MINGW_URL##*/}"
 
-export PACKAGES="$(cat packages/index)"
+export PACKAGES="$(ls packages)"
 export INIT_DIR="$PWD"
 export INIT_PATH="$PATH"
 

packages/FreeGLUT/build.sh

@@ -1,5 +1,6 @@
 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"
+CMAKE_ARGS="-DANDROID=OFF -DCMAKE_LIBRARY_PATH=$PREFIX_DIR/lib"
 CFLAGS="-I$PREFIX_DIR/include"
 LDFLAGS="-L$PREFIX_DIR/lib -lGL"
+DEPENDENCIES="libX11 libXi libXrandr libXxf86vm GLU"

packages/GLU/build.sh

@@ -1,3 +1,4 @@
 PKG_VER=9.0.3
 SRC_URL=https://mesa.freedesktop.org/archive/glu/glu-$PKG_VER.tar.xz
 MESON_ARGS=" "
+DEPENDENCIES="libglvnd"

packages/Vulkan-Loader/build.sh

@@ -1,3 +1,4 @@
 PKG_VER=1.4.304
 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"
+DEPENDENCIES="Vulkan-Headers libX11 libXrandr"

packages/Vulkan-Tools/build.sh

@@ -1,3 +1,4 @@
 PKG_VER=1.4.304
 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"
+DEPENDENCIES="Vulkan-Loader Vulkan-Volk libX11 libXrandr libxcb"

packages/Vulkan-Volk/build.sh

@@ -1,3 +1,4 @@
 PKG_VER=1.4.304
 SRC_URL=https://github.com/zeux/volk/archive/refs/tags/$PKG_VER.tar.gz
 CMAKE_ARGS="-DVOLK_INSTALL=ON"
+DEPENDENCIES="Vulkan-Headers"

packages/freetype/build.sh

@@ -1,3 +1,4 @@
 PKG_VER=2.13.3
 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"
+DEPENDENCIES="brotli libpng zlib"

packages/glib/build.sh

@@ -3,3 +3,4 @@ SRC_URL=https://download.gnome.org/sources/glib/${PKG_VER%.*}/glib-$PKG_VER.tar.
 MESON_ARGS="-Dintrospection=disabled -Druntime_dir=$PREFIX/var/run -Dlibmount=disabled -Dman-pages=enabled -Dtests=false -Dselinux=disabled -Dlibelf=disabled"
 CFLAGS="-I$PREFIX/include"
 LDFLAGS="-L$PREFIX/lib -l:libiconv.a"
+DEPENDENCIES="zlib libiconv pcre2 libffi"

packages/gst-plugins-bad/build.sh

@@ -2,3 +2,4 @@ PKG_VER=1.24.11
 SRC_URL=https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-$PKG_VER.tar.xz
 MESON_ARGS="-Dandroidmedia=disabled -Dexamples=disabled -Drtmp=disabled -Dshm=disabled -Dtests=disabled -Dzbar=disabled -Dwebp=disabled -Dvulkan=disabled -Dhls-crypto=openssl"
 LDFLAGS="-lm"
+DEPENDENCIES="glib gstreamer gst-plugins-base opus libsndfile libX11 libxml2 openssl"

packages/gst-plugins-base/build.sh

@@ -3,3 +3,4 @@ SRC_URL=https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-
 MESON_ARGS="-Dintrospection=disabled -Dtests=disabled -Dexamples=disabled -Dpango=disabled "
 MESON_ARGS+="-Dtools=disabled -Dglib-asserts=disabled -Dglib-checks=disabled"
 LDFLAGS="-L$PREFIX/lib -landroid-shmem"
+DEPENDENCIES="gstreamer glib android-shmem libogg opus libvorbis libX11 libxcb libXext libXi zlib"