[HotFix] DirectX 9 grabber is now optional

The DirectX SDK from Microsoft is officially no longer offered.

.github/workflows/pull-request.yml

@@ -159,16 +159,10 @@ jobs:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
           key: ${{ runner.os }}-chocolatey
 
-      - name: "Remove Redistributable"
+      - name: Install Python, NSIS, OpenSSL
-        shell: cmd
-        run: |
-          MsiExec.exe /passive /X{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}
-          MsiExec.exe /passive /X{1D8E6291-B0D5-35EC-8441-6616F567A0F7}
-
-      - name: Install Python, NSIS, OpenSSL, DirectX SDK
         shell: powershell
         run: |
-          choco install --no-progress python nsis openssl directx-sdk -y
+          choco install --no-progress python nsis openssl -y
 
       - name: Set up x64 build architecture environment
         shell: cmd

.github/workflows/push-master.yml

@@ -123,16 +123,10 @@ jobs:
           path: C:\Users\runneradmin\AppData\Local\Temp\chocolatey
           key: ${{ runner.os }}-chocolatey
 
-      - name: "Remove Redistributable"
+      - name: Install Python, NSIS, OpenSSL
-        shell: cmd
-        run: |
-          MsiExec.exe /passive /X{F0C3E5D1-1ADE-321E-8167-68EF0DE699A5}
-          MsiExec.exe /passive /X{1D8E6291-B0D5-35EC-8441-6616F567A0F7}
-
-      - name: Install Python, NSIS, OpenSSL, DirectX SDK
         shell: powershell
         run: |
-          choco install --no-progress python nsis openssl directx-sdk -y
+          choco install --no-progress python nsis openssl -y
 
       - name: Set up x64 build architecture environment
         shell: cmd

CMakeLists.txt

@@ -59,7 +59,7 @@ IF ( ${CMAKE_SYSTEM} MATCHES "Linux" )
 	SET ( DEFAULT_USB_HID     ON )
 	SET ( DEFAULT_CEC         ON )
 ELSEIF ( WIN32 )
-	SET ( DEFAULT_DX ON )
+	SET ( DEFAULT_DX OFF )
 ELSE()
 	SET ( DEFAULT_V4L2        OFF )
 	SET ( DEFAULT_FB          OFF )
@@ -340,7 +340,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
 	# Search for DirectX9
 	if (ENABLE_DX)
 		find_package(DirectX9 REQUIRED)
-	endif()
+	endif(ENABLE_DX)
 
 endif()
 

CompileHowto.md

@@ -101,9 +101,12 @@ We assume a 64bit Windows 10. Install the following;
 - [Python 3 (Windows x86-64 executable installer)](https://www.python.org/downloads/windows/) (Check: Add to PATH and Debug Symbols)
   - Open a console window and execute `pip install aqtinstall`.
   - Now we can download Qt to _C:\Qt_ `mkdir c:\Qt && aqt install -O c:\Qt 5.15.0 windows desktop win64_msvc2019_64`
-- [DirectX Software Development Kit](https://www.microsoft.com/en-us/download/details.aspx?id=6812) ([direct link](https://download.microsoft.com/download/A/E/7/AE743F1F-632B-4809-87A9-AA1BB3458E31/DXSDK_Jun10.exe))
 
-- Optional for package creation: [NSIS 3.x](https://sourceforge.net/projects/nsis/files/NSIS%203/) ([direct link](https://sourceforge.net/projects/nsis/files/latest/download))
+###  Optional:
+- For DirectX9 grabber:
+  - DirectX Software Development Kit. The download link is no longer available, so you will have to search for it yourself.
+- For package creation:
+  - [NSIS 3.x](https://sourceforge.net/projects/nsis/files/NSIS%203/) ([direct link](https://sourceforge.net/projects/nsis/files/latest/download))
 
 # Compiling and installing Hyperion
 

cmake/Dependencies.cmake

@@ -318,27 +318,29 @@ macro(DeployWindows TARGET)
 			)
 		endforeach()
 
-		# Download DirectX End-User Runtimes (June 2010)
+		if(ENABLE_DX)
-		set(url "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
+			# Download DirectX End-User Runtimes (June 2010)
-		if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe")
+			set(url "https://download.microsoft.com/download/8/4/A/84A35BF1-DAFE-4AE8-82AF-AD2AE20B6B14/directx_Jun2010_redist.exe")
-			file(DOWNLOAD "${url}" "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe"
+			if(NOT EXISTS "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe")
-				STATUS result
+				file(DOWNLOAD "${url}" "${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe"
-			)
+					STATUS result
+				)
 
-			# Check if the download is successful
+				# Check if the download is successful
-			list(GET result 0 result_code)
+				list(GET result 0 result_code)
-			if(NOT result_code EQUAL 0)
+				if(NOT result_code EQUAL 0)
-				list(GET result 1 reason)
+					list(GET result 1 reason)
-				message(FATAL_ERROR "Could not download DirectX End-User Runtimes: ${reason}")
+					message(FATAL_ERROR "Could not download DirectX End-User Runtimes: ${reason}")
+				endif()
 			endif()
-		endif()
 
-		# Copy DirectX End-User Runtimes to 'hyperion'
+			# Copy DirectX End-User Runtimes to 'hyperion'
-		install(
+			install(
-			FILES ${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe
+				FILES ${CMAKE_CURRENT_BINARY_DIR}/dx_redist.exe
-			DESTINATION "bin"
+				DESTINATION "bin"
-			COMPONENT "Hyperion"
+				COMPONENT "Hyperion"
-		)
+			)
+		endif (ENABLE_DX)
 
 	else()
 		# Run CMake after target was built

cmake/nsis/template/NSIS.template.in

@@ -792,12 +792,6 @@ Section "-Core installation"
 ; Install Visual c++ Redistributable
 ExecWait '"$INSTDIR\bin\vc_redist.x64.exe" /install /quiet'
 
-; Install DirectX 9 Redistributable
-ExecWait '"$INSTDIR\bin\dx_redist.exe" /q /t:"$INSTDIR\tmp"'
-	ExecWait '"$INSTDIR\tmp\DXSETUP.exe" /silent'
-	Delete   '$INSTDIR\tmp\*.*'
-	RMDir    '$INSTDIR\tmp'
-
 SectionEnd
 
 Section "-Add to path"