Merge remote-tracking branch 'upstream/7.7' into 7.7

.github/workflows/build.yml

@@ -35,7 +35,6 @@ jobs:
               # Build Dependencies
               "bison"
               "pkg-config"
-              "mingw-w64"
               "gcenx/wine/cx-llvm"
 
               # Utilities (DXVK)
@@ -53,6 +52,23 @@ jobs:
 
           brew install "${REQUIRED_PACKAGES[@]}"
 
+          # As of mingw-w64 12, brew uses UCRT instead of MSVCRT
+          # Wine will fail to build with UCRT, so we must rollback.
+
+          curl -L https://raw.githubusercontent.com/Homebrew/homebrew-core/31209a399a7b40bf2cd3abd7aee2715547ccd5bd/Formula/m/mingw-w64.rb > mingw-w64.rb && brew install mingw-w64.rb
+          rm mingw-w64.rb
+
+      - name: Echo Libs [DEBUG]
+        run: |
+          echo "Brew Libs\n========="
+          ls $(brew --prefix)/lib
+
+          echo "FFmpeg Libs\n===========" 
+          ls $(brew --prefix ffmpeg@6)/lib
+
+          echo "GStreamer Libs\n=============="
+          ls $(brew --prefix gstreamer)/lib/gstreamer-1.0
+
       - name: Add bison & cx-llvm to $PATH
         run: |
           echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
@@ -200,6 +216,7 @@ jobs:
       - name: Copy External Libraries
         run: |
           LIBS=(
+              "libbluray.2"
               "libfreetype"
               "libfreetype.6"
               "libgio-2.0.0"
@@ -240,6 +257,7 @@ jobs:
               "libSDL2-2.0.0"
               "libtasn1.6"
               "libunistring.5"
+              "libvpx.8"
               "libXau.6"
               "libXdmcp.6"
               "libX11.6"
@@ -252,6 +270,9 @@ jobs:
             "libavformat.60"
             "libavcodec.60"
             "libavutil.58"
+            "libpostproc.57"
+            "libswresample.4"
+            "libswscale.7"
           )
 
           GSTREAMER_LIBS=(

GPTK/redist/lib/external/D3DMetal.framework/Versions/A/Resources/version.plist

@@ -5,12 +5,12 @@
 	<key>BuildVersion</key>
 	<string>1</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1</string>
+	<string>2.0b1</string>
 	<key>CFBundleVersion</key>
-	<string>1.1</string>
+	<string>2.0b1</string>
 	<key>ProjectName</key>
 	<string>D3DRendererMetal</string>
 	<key>SourceVersion</key>
-	<string>18000000000000</string>
+	<string>25011000000000</string>
 </dict>
 </plist>

GPTK/redist/lib/external/D3DMetal.framework/Versions/A/_CodeSignature/CodeResources

@@ -6,35 +6,35 @@
 	<dict>
 		<key>Resources/Info.plist</key>
 		<data>
-		hzsBQ6cbbnHppYzNvPQAI2Cy7UA=
+		vHGLkInuoUsB8AH0OnqKGAShx9Y=
 		</data>
 		<key>Resources/LICENSE</key>
 		<data>
 		1s+LZYFe//ikbe8+xMdMVwM9Jfo=
 		</data>
 		<key>Resources/default.metallib</key>
 		<data>
-		gYcOTKQJiteCQ5E7LXczKjN1nAQ=
+		LQZ8p5HlC6WNBzOhGZB0I59xJHI=
 		</data>
 		<key>Resources/libdxccontainer.dylib</key>
 		<data>
-		Ptn6MFTuEJHo0v5yJ6NbI3etMaM=
+		sjzzc3d+CUWxeURQG95BtKO6dEE=
 		</data>
 		<key>Resources/libdxcompiler.dylib</key>
 		<data>
-		ez6SzGY2XUP4QGQiRxEDPKbRj+w=
+		SosJ4ruO0UnCrmNGxE1DTPICox0=
 		</data>
 		<key>Resources/libdxilconv.dylib</key>
 		<data>
-		BnF78QISXSqXReIJ5caE2kO/4II=
+		1HaxatZtI8A0RGYMXWqeZry18mI=
 		</data>
 		<key>Resources/libmetalirconverter.dylib</key>
 		<data>
-		EvaL7uQF5KMaSW4Bh1t/lUJew90=
+		dLIQcMwng33L6rSQaE80hAaIAQo=
 		</data>
 		<key>Resources/version.plist</key>
 		<data>
-		bQczriH5Fz7qW+e6B4nZIqUEGgA=
+		y7JjtFeGtpaYPX0tFHQCu7bum0Y=
 		</data>
 	</dict>
 	<key>files2</key>
@@ -43,7 +43,7 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			dhtwN93oHSf/rvWOELWFll5vIBeOGGe+uWfJSjvF76U=
+			7OP6tTTfUIS1dgf5xAIb+B0LqhFr9gKg0oVS9nf/9wc=
 			</data>
 		</dict>
 		<key>Resources/LICENSE</key>
@@ -57,42 +57,42 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			Kp83/Ijjmwqow6gqVddHFHTxI3kNgoqGlDEHwcqi2Xg=
+			B95I9T2lA9AsJHu/pTkKeI4k+6OqbVThfK8nIaLDl04=
 			</data>
 		</dict>
 		<key>Resources/libdxccontainer.dylib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			a9OSHVyoExGmGSkxIqKTz43b454SMP+ad7vCVYOGUQU=
+			zm7gUzeEpj0QNjMTViwMmjA0EfTCy3lLfSuCuXVBBBg=
 			</data>
 		</dict>
 		<key>Resources/libdxcompiler.dylib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			fwQLfh+ega5+OTilGCHQIOBF6Qhpzzk9DHHNdz13tIc=
+			erzoN04l+P/qm6x+uVfL2HJYy3zbCGssSLQN27biL6g=
 			</data>
 		</dict>
 		<key>Resources/libdxilconv.dylib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			4pCMRYibeSQTU9YrAVXPmDQp6MfdYQSYicwmFf3Ma9M=
+			5FnyTvUK0kRYY7vT+F0eNy7YIg4H/aCCG9XL4DzCJpA=
 			</data>
 		</dict>
 		<key>Resources/libmetalirconverter.dylib</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			r9EUAuP9u3ZcurAm7GIgrm+DhHKZWq0hz97FbM0Fri4=
+			9OvZc+2PlPYaNiWRZ4kzxR1OnhvAjZXoiv+AWu/xfUY=
 			</data>
 		</dict>
 		<key>Resources/version.plist</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			O2LMR9xWGSdtjOV/G5G4BADpzT95MUYLTZqHc20YjMk=
+			idHsvcSD9w+BzMvuhXYk32/rYL+mN3jfj+0bXOSuIQM=
 			</data>
 		</dict>
 	</dict>

properties.plist

@@ -9,9 +9,9 @@
 		<key>major</key>
 		<integer>2</integer>
 		<key>minor</key>
-		<integer>2</integer>
+		<integer>3</integer>
 		<key>patch</key>
-		<integer>0</integer>
+		<integer>1</integer>
 		<key>preRelease</key>
 		<string></string>
 	</dict>