Merge branch 'master' into DeviceEmulation-SteelBattalionController

2025-01-26 11:27:15 -05:00 · 2025-01-26 11:27:15 -05:00 · 8c9b1d1688
parent 3cb293e220 61e29a0678
commit 8c9b1d1688
11 changed files with 15 additions and 103 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -79,7 +79,7 @@ jobs:
          artifact_name: xemu-win-aarch64-release
          arch: aarch64
    env:
-      DOCKER_IMAGE_NAME: ghcr.io/xemu-project/xemu-win64-toolchain:sha-b6d29d4
+      DOCKER_IMAGE_NAME: ghcr.io/xemu-project/xemu-win64-toolchain:sha-03e3cd0

    steps:
    - name: Download source package
--- a/meson.build
+++ b/meson.build
@ -2292,14 +2292,6 @@ libglslang = not_found

 if host_os == 'windows'
  vulkan = declare_dependency(compile_args: ['-DVK_USE_PLATFORM_WIN32_KHR'])
-  libglslang = declare_dependency(link_args: [
-        '-lglslang',
-        '-lMachineIndependent',
-        '-lGenericCodeGen',
-        '-lSPIRV',
-        '-lSPIRV-Tools',
-        '-lSPIRV-Tools-opt'
-      ])
 elif host_os == 'linux'
  vulkan = dependency('vulkan')
 endif
--- a/scripts/gen-license.py
+++ b/scripts/gen-license.py
@ -261,6 +261,12 @@ Lib('SPIRV-Reflect', 'https://github.com/KhronosGroup/SPIRV-Reflect',
 	submodule=Submodule('subprojects/SPIRV-Reflect.wrap')
 	),

+Lib('glslang', 'https://github.com/KhronosGroup/glslang',
+	bsd_3clause, 'https://raw.githubusercontent.com/KhronosGroup/glslang/main/LICENSE.txt',
+	ships_static=all_platforms,
+	submodule=Submodule('subprojects/glslang.wrap')
+	),
+
 #
 # Data files included with xemu
 #
@ -374,18 +380,6 @@ Lib('miniz', 'https://github.com/richgel999/miniz',
 	ships_static={windows},	platform={windows},
 	version='2.1.0'
 	),
-
-Lib('glslang', 'https://github.com/KhronosGroup/glslang',
-	bsd_3clause, 'https://raw.githubusercontent.com/KhronosGroup/glslang/main/LICENSE.txt',
-	ships_static={windows},	platform={windows},
-	version='14.3.0'
-	),
-
-Lib('SPIRV-Tools', 'https://github.com/KhronosGroup/SPIRV-Tools',
-	apache2, 'https://raw.githubusercontent.com/KhronosGroup/SPIRV-Tools/main/LICENSE',
-	ships_static={windows},	platform={windows},
-	pkgconfig=PkgConfig('SPIRV-Tools')
-	),
 ]

 def gen_license():
--- a/subprojects/SPIRV-Reflect.wrap
+++ b/subprojects/SPIRV-Reflect.wrap
@ -1,4 +1,4 @@
 [wrap-git]
 url=https://github.com/KhronosGroup/SPIRV-Reflect
-revision=vulkan-sdk-1.3.296.0
+revision=vulkan-sdk-1.4.304.0
 depth=1
--- a/subprojects/glslang.wrap
+++ b/subprojects/glslang.wrap
@ -1,4 +1,4 @@
 [wrap-git]
 url=https://github.com/KhronosGroup/glslang
-revision=vulkan-sdk-1.3.296.0
+revision=vulkan-sdk-1.4.304.0
 depth=1
--- a/subprojects/volk.wrap
+++ b/subprojects/volk.wrap
@ -1,4 +1,4 @@
 [wrap-git]
 url=https://github.com/zeux/volk
-revision=1.3.295
+revision=1.4.304
 depth=1
--- a/ubuntu-win64-cross/Dockerfile
+++ b/ubuntu-win64-cross/Dockerfile
@ -6,10 +6,10 @@ FROM ubuntu:24.04

 ENV MXE_PATH=/opt/mxe
 ENV MXE_REPO=https://github.com/mxe/mxe.git
-ENV MXE_VERSION=ab676e8ce5ba921daaa80a123ff2e415aac4524a
+ENV MXE_VERSION=7f054f14930d109412d2d61d019c12fa80816b8c

 ENV MXE_LLVM_MINGW_REPO=https://github.com/libvips/build-win64-mxe
-ENV MXE_LLVM_MINGW_VERSION=21e02f87c282fcfe17c8376217b0a4f44f14d01b
+ENV MXE_LLVM_MINGW_VERSION=8a4e0ab8a3b574287378459356f6bdaecc727de2
 ENV MXE_LLVM_MINGW_PATH=/opt/build-win64-mxe

 ARG PLUGIN_DIRS="${MXE_LLVM_MINGW_PATH} ${MXE_LLVM_MINGW_PATH}/build/plugins/llvm-mingw"
@ -78,9 +78,6 @@ RUN make \

 RUN rm ${MXE_PATH}/src/sdl2*.patch
 COPY vulkan-headers.mk \
-     spirv-headers.mk \
-     spirv-tools.mk \
-     glslang.mk \
     glib.mk \
     sdl2.mk \
     libsamplerate.mk \
@ -101,10 +98,7 @@ RUN make \
        cmake \
        libslirp \
        sdl2 \
-        vulkan-headers \
-        spirv-headers \
-        spirv-tools \
-        glslang
+        vulkan-headers

 RUN find ${MXE_PATH}/usr -executable -type f -exec chmod a+x {} \;

--- a/ubuntu-win64-cross/glslang.mk
+++ b/ubuntu-win64-cross/glslang.mk
@ -1,25 +0,0 @@
-PKG             := glslang
-$(PKG)_WEBSITE  := https://github.com/KhronosGroup/glslang
-$(PKG)_DESCR    := glslang
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 15.0.0
-$(PKG)_SUBDIR   := glslang-$($(PKG)_VERSION)
-$(PKG)_FILE     := glslang-$($(PKG)_VERSION).tar.gz
-$(PKG)_CHECKSUM := c31c8c2e89af907507c0631273989526ee7d5cdf7df95ececd628fd7b811e064
-$(PKG)_URL      := https://github.com/KhronosGroup/glslang/archive/refs/tags/$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := cc spirv-tools
-
-define $(PKG)_BUILD
-    $(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)' \
-        -G"Ninja" \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-        -DENABLE_GLSLANG_BINARIES=OFF \
-        -DGLSLANG_TESTS=OFF \
-        -DBUILD_EXTERNAL=OFF \
-        -DALLOW_EXTERNAL_SPIRV_TOOLS=ON \
-        -DVERBOSE=1
-    $(TARGET)-cmake --build '$(BUILD_DIR)'
-    $(TARGET)-cmake --install '$(BUILD_DIR)'
-endef
-
-# FIXME: Shared libs
--- a/ubuntu-win64-cross/spirv-headers.mk
+++ b/ubuntu-win64-cross/spirv-headers.mk
@ -1,16 +0,0 @@
-PKG             := spirv-headers
-$(PKG)_WEBSITE  := https://github.com/KhronosGroup/SPIRV-Headers
-$(PKG)_DESCR    := SPIRV-Headers
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := vulkan-sdk-1.3.296.0
-$(PKG)_SUBDIR   := SPIRV-Headers-$($(PKG)_VERSION)
-$(PKG)_FILE     := spirv-headers-$($(PKG)_VERSION).tar.gz
-$(PKG)_CHECKSUM := 1423d58a1171611d5aba2bf6f8c69c72ef9c38a0aca12c3493e4fda64c9b2dc6
-$(PKG)_URL      := https://github.com/KhronosGroup/SPIRV-Headers/archive/refs/tags/$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := cc
-
-define $(PKG)_BUILD
-    $(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)'
-    $(TARGET)-cmake --build '$(BUILD_DIR)'
-    $(TARGET)-cmake --install '$(BUILD_DIR)'
-endef
--- a/ubuntu-win64-cross/spirv-tools.mk
+++ b/ubuntu-win64-cross/spirv-tools.mk
@ -1,27 +0,0 @@
-PKG             := spirv-tools
-$(PKG)_WEBSITE  := https://github.com/KhronosGroup/SPIRV-Tools
-$(PKG)_DESCR    := SPIRV-Tools
-$(PKG)_IGNORE   :=
-$(PKG)_VERSION  := vulkan-sdk-1.3.296.0
-$(PKG)_SUBDIR   := SPIRV-Tools-$($(PKG)_VERSION)
-$(PKG)_FILE     := spirv-tools-$($(PKG)_VERSION).tar.gz
-$(PKG)_CHECKSUM := 75aafdf7e731b4b6bfb36a590ddfbb38ebc605d80487f38254da24fe0cb95837
-$(PKG)_URL      := https://github.com/KhronosGroup/SPIRV-Tools/archive/refs/tags/$($(PKG)_VERSION).tar.gz
-$(PKG)_DEPS     := cc spirv-headers
-
-define $(PKG)_BUILD
-    $(TARGET)-cmake -B'$(BUILD_DIR)' -S'$(SOURCE_DIR)' \
-        -G"Ninja" \
-        -DBUILD_SHARED_LIBS=$(CMAKE_SHARED_BOOL) \
-        -DSPIRV-Headers_SOURCE_DIR=$(PREFIX)/$(TARGET) \
-        -DSPIRV_WERROR=OFF \
-        -DBUILD_SHARED_LIBS=OFF \
-        -DSPIRV_TOOLS_BUILD_STATIC=ON \
-        -DSPIRV_SKIP_EXECUTABLES=ON \
-        -DSPIRV_SKIP_TESTS=ON \
-        -DVERBOSE=1
-    $(TARGET)-cmake --build '$(BUILD_DIR)'
-    $(TARGET)-cmake --install '$(BUILD_DIR)'
-endef
-
-# FIXME: Shared libs
--- a/ubuntu-win64-cross/vulkan-headers.mk
+++ b/ubuntu-win64-cross/vulkan-headers.mk
@ -2,10 +2,10 @@ PKG             := vulkan-headers
 $(PKG)_WEBSITE  := https://github.com/KhronosGroup/Vulkan-Headers
 $(PKG)_DESCR    := Vulkan-Headers
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := vulkan-sdk-1.3.296.0
+$(PKG)_VERSION  := vulkan-sdk-1.4.304.0
 $(PKG)_SUBDIR   := Vulkan-Headers-$($(PKG)_VERSION)
 $(PKG)_FILE     := vulkan-headers-$($(PKG)_VERSION).tar.gz
-$(PKG)_CHECKSUM := 1e872a0be3890784bbe68dcd89b7e017fed77ba95820841848718c98bda6dc33
+$(PKG)_CHECKSUM := 46f8f5b6384a36c688e0c40d28d534df41d22de406493dfb5c9b7bcc29672613
 $(PKG)_URL      := https://github.com/KhronosGroup/Vulkan-Headers/archive/refs/tags/$($(PKG)_VERSION).tar.gz
 $(PKG)_DEPS     := cc