Merge remote-tracking branch 'upstream/master' into drm

Lord-Grey · Lord-Grey · commit f6006c159a24 · 2025-10-25T15:40:13.000+02:00
diff --git a/.github/actions/download-pre-built-deps/buildspec.json b/.github/actions/download-pre-built-deps/buildspec.json
@@ -1,110 +1,110 @@
 {
-  "version": "2025-06-14",
+  "version": "2025-10-18",
   "baseUrl": "https://github.com/hyperion-project/hyperion-deps/releases/download",
   "hashes": {
     "debian_bookworm": {
       "amd64": {
         "qt6": {
-          "debug": "e4b23dae967ba4f1f97f3b14be85ba64ba22749e568e16992edcb26c98253785",
-          "release": "3d41b66502e4a306f15f22123920d2180346ad56e160e26825d1c906d24d1a3e"
+          "debug": "a905db1cb0ec7f2099f9703e2b97f15d850b7aac69657416d6f4c0bda4256a6b",
+          "release": "a7216c688c5a5ff4b6e1c534c9c939e422a675803a5831aaffbe7fc7ba173894"
         }
       },
       "arm64": {
         "qt6": {
-          "debug": "a598f94c59138841384220137dae968ea04a306e54d42aded0983746324d0199",
-          "release": "e76a951f98a584e0bef5abd18e367a0ca9625e5d323851b8c56bd0ea913dd7a3"
+          "debug": "083ed521e20894138c751dc3406363167af39f846e080c0d8b12329f4468e59f",
+          "release": "7ba77697a85496ae467249046db65f628aee3c13fbe16f1b17878eb59de42f80"
         }
       },
       "armv6": {
         "qt6": {
-          "debug": "d76d863a6027eebb3cdb55b794154da1a4627074481f54f45bb0c8132294f3eb",
-          "release": "0d1ff354e8d75cf7113c0f99f9ceb9852a68a520fb8fb6b24db815b68cc6a962"
+          "debug": "6a89a75d6c6bae815fa9357cf0c342f0ae0fa78be64d8d99d95d95b69e803bf7",
+          "release": "ad756f9154b8b1a5bae7dc47f9a8a86264f46bf52e3d1457b90038d6640fd5d6"
         }
       },
       "armv7": {
         "qt6": {
-          "debug": "dbeb12e1819a65dd15cf0e26ebf2b3b5ba98c1a97b313187d4a2a4c283d1786f",
-          "release": "19f4b26f0b5e53a7b1fb1e909bdb5483f5fb152d95df6b49f02ea1bb362caa4a"
+          "debug": "acc3ea2126f84741eb0a803344f4b626d44bc739cb556416f2594616064fcbcb",
+          "release": "75f343a6f015b58463e15762e8af79309656b648de1e8550b2e41aeea71c3a5e"
         }
       }
     },
     "debian_bullseye": {
       "amd64": {
         "qt6": {
-          "debug": "8e69724c2ec35b471765b6bd153c00fb3edfe7e136dfdfa023b9232f0bf02545",
-          "release": "532ebf28a3469be87a88a32fd4871dc475b585857b9f85398386160439689647"
+          "debug": "434603d57ffee0c4b6640dfcd1b06bb8c745c199d8a81d50c1cc304244bcf7ff",
+          "release": "bc6540399f8fb198e194fc6080f0056267bce827511ade8f13843eb92f987bca"
         }
       },
       "arm64": {
         "qt6": {
-          "debug": "4dc745b91eea3b7dc057a1f781cfdff600d51f4b4bc6751c2795578e2a70c0db",
-          "release": "ca681d04c7cbd720b336e52972918d9fb0c4cf0e85fda078005b1030fa353444"
+          "debug": "01e2b25c191dac140fe9c24f3d3e22bf1020ed8ee44867d25e021b0eded8699e",
+          "release": "25d25009e563899fd1abfd2ca079b3e396f20774a680a991c086d5f5430dd5a8"
         }
       },
       "armv6": {
         "qt5": {
-          "debug": "76f39f5f771e33978d3ed1f3de3b995020f0ba8be952b16e7613e831a2a3b0b5",
-          "release": "a388f7941bdd0cf3fe8807eb98ba5a815af666e65c47c3c3821ccd099778403e"
+          "debug": "8b253cac7614e5debda8b8749d963b1d944f54198fd12b3f63e31bfd4a4e57e6",
+          "release": "8c3f23457e5f033f391986fa860b0f7835053fcfdc34ba4c8e4f345349ea5610"
         }
       },
       "armv7": {
         "qt6": {
-          "debug": "43743e0956529d3420380bdf2648a2cf6d0e16d9ae8b000faebc5afc4781a942",
-          "release": "754573abfe866695545614e3775d9554102a2249ef42bb2b262c94026e9af7ce"
+          "debug": "8099bef7e66a14b83736dea63f3489b1387533bd02107ef41b259323a0379086",
+          "release": "9231e3dff694d4cb2f513ec087574b01fae8f8d48ca30f97a5d30d194e8c5b71"
         }
       }
     },
     "debian_trixie": {
       "amd64": {
         "qt6": {
-          "debug": "13b548b24d78628854431e313dbeb792be22df124e0f3366285ab1f858bbf759",
-          "release": "265032c7173d16c1acc8901dd8ec5c65effd4db05069f4dfefea3c901d4afc51"
+          "debug": "38d9ebb0e97120ec815977f855eb5c44681f8a312f70a0fb0e3e0d7fc1760ea4",
+          "release": "6b8513dd42036428b704d775c5e4e39bd324485bd9d54ff49ad6056259e53425"
         }
       },
       "arm64": {
         "qt6": {
-          "debug": "ad02bd31029a5b30b27d4333e00c30ffbf242da555683394d8ccf2ac6ab42f21",
-          "release": "b0f8644c5c2bf61fe3b8d3623324bc7cc85b3f8e481b180e797d0719d0ad6e9f"
+          "debug": "042a822aac4c0567b4074fe7a665f1fc1a61e6f3eb9a035c113f585ed2ee11c7",
+          "release": "322cd767e3b4e7d18166af091cb83bac8c7b7001552da0a379f397c680da278f"
         }
       },
       "armv6": {
         "qt6": {
-          "debug": "0ecda00729db18d52a1353a594caa61122541a7380b45f54c389e8317106f208",
-          "release": "2066020c282c49b52d504147be76f0932e3d69c8f281a21500ccda86cf2940bb"
+          "debug": "7b72cf3b1f98000d60789ec19c33afa05c368198717bf9e4609c0c1a0a721ede",
+          "release": "8bffeb651aa7c3c0337567c949a7587720e130c4da64078408d0fd9e8edcac42"
         }
       },
       "armv7": {
         "qt6": {
-          "debug": "a2e06583be33963bcd2ec5b0921b90f2849d9a1c0b3f9c77d916a20f83600cb6",
-          "release": "7424d63e6f5986b8891635fddab46dfce51de2de5155ab9dbde62d5614a08c50"
+          "debug": "6f8df2ce86dd0cd3006ddb9502ac383f764c6bee2f7ec7229b0b4b66fa0abe4a",
+          "release": "dbb31da97e047bfb77fb872d54f8bf38909cfa369d279942f9de9c4ca807189f"
         }
       }
     },
     "macos": {
       "arm64": {
         "qt6": {
-          "debug": "11d3eb5658ecad15c4f2f4ef8e00b6fe870260df90b6c6cbb495adf4e33ba6d8",
-          "release": "9c4921b3a8497b36572091a5907d35e04009d554daf835d4ec8c5950b9c5fc60"
+          "debug": "15c33416e706ebb9c32b9785e9b47e05c2eed484a729e2eb672966586bf248da",
+          "release": "8fcbc9ac2f753d312a62f50ad39632d5befde3397b53d00de6e6803b8a0cf889"
         }
       },
       "x64": {
         "qt6": {
-          "debug": "d4e123952710e61db3be7ff2c23c44f99a902539892a090758463a576edaff8b",
-          "release": "69a93c21bf36f7f84ea8f3e627df3599c139df299e639b7e803e0e95e60032bb"
+          "debug": "5873403e647af0d199cd79857058030894d4175ee6d1df237b0212f69fb2cc98",
+          "release": "bd6c5704423f1f782771ae68695960554b9b56ec43f83dff3ce938f067fb2a36"
         }
       }
     },
     "windows": {
       "arm64": {
         "qt6": {
-          "release": "b8b38aa1077003d2eb20fad49e046796a59297e408fd039d0300d70d6b54bc19",
-          "relwithdebinfo": "1ad231fd78a5fc490793b077f8a1da989e89c76b9b32c820cf64dd10880e8c5c"
+          "release": "0f5a324b1d852dd7d2093e3c275bcd3209e368fda32dc8c760f3e26931c687e8",
+          "relwithdebinfo": "68e6e468b0cc9ff47a54454b120cbf47ef84a575d2a1da9bd7912132799fda1c"
         }
       },
       "x64": {
         "qt6": {
-          "release": "70af4ea825e52c933e565cffd8bd8d8c7da554daca989e6288eba1928d2296bd",
-          "relwithdebinfo": "d267667572a1898b208e687d81554f51705fc6f895a02b83ddfc46fbb52a34e6"
+          "release": "de989913f047aff4d5f8bf5ee65ebf7b14aaa9478daabfb361e52883c100a181",
+          "relwithdebinfo": "5741b925ec912e1348f4e0b549aa0bb33b24e31d303236bb6f78399646aed3a2"
         }
       }
     }
diff --git a/.github/workflows/debian.yml b/.github/workflows/debian.yml
@@ -53,6 +53,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           submodules: recursive
+          fetch-depth: 0  # Ensures all tags are fetched
 
       - name: 🔧 Prepare
         shell: bash
@@ -85,9 +86,11 @@ jobs:
             -e LANG="C.UTF-8" \
             -e LC_ALL="C.UTF-8" \
             ghcr.io/hyperion-project/debian:${{ env.DOCKER_TAG }} \
-            /bin/bash -c "cmake --preset linux-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
-            cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package &&
-            cp /source/build/Hyperion-* /deploy/ 2>/dev/null"
+            /bin/bash -c "
+              git config --global --add safe.directory /source &&            
+              cmake --preset linux-${{ env.BUILD_TYPE }} ${{ steps.dependencies.outputs.cmakeArgs }} -DPLATFORM=${{ matrix.os.platform }} ${{ env.CPACK_SYSTEM_PROCESSOR }} &&
+              cmake --build --preset linux-${{ env.BUILD_TYPE }} --target package &&
+              cp /source/build/Hyperion-* /deploy/ 2>/dev/null"
         env:
           DOCKER_TAG: ${{ inputs.codename == 'bullseye' && matrix.os.architecture[0] == 'armv6' && inputs.codename || format('{0}-qt6', inputs.codename) }}
           BUILD_TYPE: ${{ inputs.event_name == 'pull_request' && 'debug' || 'release' }}
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
@@ -42,7 +42,8 @@ jobs:
       - name: ⬇ Checkout
         uses: actions/checkout@v5
         with:
-          submodules: recursive
+          submodules: recursive	
+          fetch-depth: 0  # Ensures all tags are fetched
 
       - name: 🔧 Prepare
         shell: bash
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -43,6 +43,7 @@ jobs:
         uses: actions/checkout@v5
         with:
           submodules: recursive
+          fetch-depth: 0  # Ensures all tags are fetched          
 
       - name: 🔧 Prepare
         shell: bash
diff --git a/bin/scripts/install_pr.sh b/bin/scripts/install_pr.sh
@@ -2,7 +2,7 @@
 # Script for downloading a specific open Pull Request Artifact from Hyperion.NG
 
 # Fixed variables
-api_url="https://api.github.com/repos/hyperion-project/hyperion.ng"
+api_url="https://api.github.com/repos"
 type wget >/dev/null 2>/dev/null
 hasWget=$?
 type curl >/dev/null 2>/dev/null
@@ -12,8 +12,9 @@ hasPython3=$?
 type python >/dev/null 2>/dev/null
 hasPython2=$?
 
+REPOSITORY="hyperion-project/hyperion.ng"
 DISTRIBUTION="debian"
-CODENAME="bullseye"
+CODEBASE=""
 ARCHITECTURE=""
 
 BASE_PATH='.'
@@ -79,10 +80,12 @@ request_call() {
 	echo "$body"
 }
 
-while getopts ":a:c:r:t:" opt; do
+while getopts ":a:b:c:g:r:t:" opt; do
 	case "$opt" in
 	a) ARCHITECTURE=$OPTARG ;;
+	b) CODEBASE=$OPTARG ;;
 	c) CONFIGDIR=$OPTARG ;;
+	g) REPOSITORY=$OPTARG ;;
 	r) run_id=$OPTARG ;;
 	t) PR_TOKEN=$OPTARG ;;
 	esac
@@ -91,7 +94,7 @@ shift $((OPTIND - 1))
 
 # Check for a command line argument (PR number)
 if [ "$1" == "" ] || [ $# -gt 1 ] || [ -z ${PR_TOKEN} ]; then
-	echo "Usage: $0 -t <git_token> -a <architecture> -r <run_id> -c <hyperion config directory> <PR_NUMBER>" >&2
+	echo "Usage: $0 -t <git_token> -a <architecture> -b <codebase> -r <run_id> -c <hyperion config directory> -g <github project/repository> <PR_NUMBER>" >&2
 	exit 1
 else
 	pr_number="$1"
@@ -137,10 +140,18 @@ if [ $? -ne 0 ]; then
 	echo "---> Critical Error: Target architecture $ARCHITECTURE is unknown -> abort"
 	exit 1
 else
-	PACKAGE="${ARCHITECTURE}"
-	echo "---> Download package for identified runtime architecture: $ARCHITECTURE"
+	if [[ -z ${CODEBASE} ]]; then
+		PACKAGE="${ARCHITECTURE}"
+		echo "---> Download package for identified runtime architecture: $ARCHITECTURE"
+	else
+		PACKAGE="${CODEBASE}_${ARCHITECTURE}"
+		echo "---> Download package for identified runtime architecture: $ARCHITECTURE and selected codebase: $CODEBASE"
+	fi
 fi
 
+api_url="${api_url}/${REPOSITORY}"
+
+
 # Determine if PR number exists
 pulls=$(request_call "$api_url/pulls?state=open")
 
diff --git a/dependencies/CMakeLists.txt b/dependencies/CMakeLists.txt
@@ -424,6 +424,10 @@ if(ENABLE_PROTOBUF_SERVER)
 	endif()
 
 	if(NOT USE_SYSTEM_PROTO_LIBS)
+		
+		# Enable ProtoBuf verbose mode
+		set(protobuf_VERBOSE OFF CACHE BOOL "Build protobuf verbose")
+		
 		# Build Protobuf as static library
 		set(protobuf_BUILD_SHARED_LIBS OFF CACHE BOOL "Build protobuf shared")
 
@@ -433,8 +437,11 @@ if(ENABLE_PROTOBUF_SERVER)
 		# Disable build of Protobuf with zlib support
 		set(protobuf_WITH_ZLIB OFF CACHE BOOL "Build protobuf with zlib support")
 
-		# Disable build of libupb
-		set(protobuf_BUILD_LIBUPB OFF CACHE BOOL "Build libupb")
+		# Enable build of libupb
+		set(protobuf_BUILD_LIBUPB ON CACHE BOOL "Build libupb")
+		
+		# Force all dependencies to be downloaded from GitHub
+		set(protobuf_FORCE_FETCH_DEPENDENCIES ON CACHE INTERNAL "Force all dependencies to be downloaded from GitHub")
 
 		# Build abeil (3rd party sub-module) with C++ version requirements
 		set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")
@@ -458,8 +465,15 @@ if(ENABLE_PROTOBUF_SERVER)
 			set(protobuf_BUILD_PROTOC_BINARIES OFF CACHE BOOL "Build protobuf libraries and protoc compiler")
 		endif()
 
+		include(FetchContent)
+
 		# Add Protobuf directory to the build
-		add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf")
+		FetchContent_Declare(
+			protobuf
+			SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf"
+			PATCH_COMMAND git apply "${CMAKE_CURRENT_SOURCE_DIR}/patch/protobuf/atomic.diff"
+		)
+		FetchContent_MakeAvailable(protobuf)
 
 		if(CMAKE_CROSSCOMPILING)
 			if(IMPORT_PROTOC)
@@ -472,6 +486,7 @@ if(ENABLE_PROTOBUF_SERVER)
 					PREFIX				${CMAKE_BINARY_DIR}/dependencies/external/protoc-host
 					BUILD_ALWAYS		OFF
 					DOWNLOAD_COMMAND	""
+					PATCH_COMMAND		git apply "${CMAKE_CURRENT_SOURCE_DIR}/patch/protobuf/atomic.diff"
 					INSTALL_COMMAND     ""
 					SOURCE_DIR			${CMAKE_CURRENT_SOURCE_DIR}/external/protobuf
 					CMAKE_ARGS          -Dprotobuf_BUILD_LIBPROTOC:BOOL=OFF
diff --git a/dependencies/external/protobuf b/dependencies/external/protobuf
@@ -1 +1 @@
-Subproject commit 1be1c9d0ea6efa2a25bd7b76186844d1669be78a
+Subproject commit a79f2d2e9fadd75e94f3fe40a0399bf0a5d90551
diff --git a/dependencies/patch/protobuf/atomic.diff b/dependencies/patch/protobuf/atomic.diff
@@ -0,0 +1,15 @@
+diff --git a/cmake/protobuf-configure-target.cmake b/cmake/protobuf-configure-target.cmake
+index c67c57056..171e0a8f0 100644
+--- a/cmake/protobuf-configure-target.cmake
++++ b/cmake/protobuf-configure-target.cmake
+@@ -7,8 +7,8 @@
+ 
+ # Refactors configuration options set on all Protobuf targets
+ function(protobuf_configure_target target)
+-    if(protobuf_LINK_LIBATOMIC)
+-        target_link_libraries(libprotobuf PRIVATE atomic)
++    if(protobuf_LINK_LIBATOMIC AND "${target}" STREQUAL "libprotobuf")
++        target_link_libraries("${target}" PRIVATE atomic)
+     endif()
+ 
+     target_compile_features("${target}" PUBLIC cxx_std_17)
