Fixed shaderc building

Signed-off-by: Robear Selwans <robear.selwans@outlook.com>

subprojects/packagefiles/libshaderc_old/meson.build

@@ -1,13 +0,0 @@
-project('libshaderc', 'cpp', default_options: ['buildtype=release', 'default_library=static'])
-
-fs = import('fs')
-cxxc = meson.get_compiler('cpp')
-
-shaderc_inc = include_directories('install/include')
-
-shaderc_dep = declare_dependency(
-  dependencies: cxxc.find_library('shaderc_combined', dirs: meson.current_source_dir()/'install/lib'),
-  include_directories: shaderc_inc,
-)
-
-meson.override_dependency('shaderc', shaderc_dep)

subprojects/packagefiles/shaderc/cmake_fix.diff

@@ -0,0 +1,17 @@
+diff --git a/third_party/CMakeLists.txt b/third_party/CMakeLists.txt
+index d44f62a..16bad95 100644
+--- a/third_party/CMakeLists.txt
++++ b/third_party/CMakeLists.txt
+@@ -87,7 +87,11 @@ if (NOT TARGET glslang)
+       # Glslang tests are off by default. Turn them on if testing Shaderc.
+       set(GLSLANG_TESTS ON)
+     endif()
+-    set(GLSLANG_ENABLE_INSTALL $<NOT:${SKIP_GLSLANG_INSTALL}>)
++    if (${SKIP_GLSLANG_INSTALL})
++      set(GLSLANG_ENABLE_INSTALL OFF)
++    else()
++      set(GLSLANG_ENABLE_INSTALL ON)
++    endif()
+     add_subdirectory(${SHADERC_GLSLANG_DIR} glslang)
+   endif()
+   if (NOT TARGET glslang)

subprojects/packagefiles/shaderc/meson.build

@@ -13,7 +13,7 @@ opts.add_cmake_defines({
     'SHADERC_SKIP_EXAMPLES': 'ON',
     'SHADERC_SKIP_COPYRIGHT_CHECK': 'ON'
 })
-shaderc_proj = cmake.subproject('shaderc', options: opts)
+shaderc_proj = cmake.subproject('shaderc_cmake', options: opts)
 shaderc_dep = declare_dependency(dependencies: [
     shaderc_proj.dependency('shaderc'),
     shaderc_proj.dependency('shaderc_util'),

subprojects/packagefiles/shaderc/shaderc_cmake.wrap

@@ -0,0 +1,10 @@
+[wrap-git]
+directory = shaderc
+url = https://github.com/google/shaderc
+revision = v2024.4
+depth=1
+
+; patch_directory = shaderc_cmake
+;
+; [provide]
+; dependency_names = shaderc_cmake

subprojects/packagefiles/shaderc/subprojects/shaderc_cmake.wrap

@@ -0,0 +1,10 @@
+[wrap-git]
+directory = shaderc
+url = https://github.com/google/shaderc
+revision = v2024.4
+depth=1
+
+; patch_directory = shaderc_cmake
+;
+; [provide]
+; dependency_names = shaderc_cmake

subprojects/packagefiles/shaderc_cmake/meson.build

@@ -1 +0,0 @@
-project('shaderc_cmake', 'cpp')

subprojects/shaderc.wrap

@@ -0,0 +1,12 @@
+[wrap-git]
+directory = shaderc
+
+url = https://github.com/google/shaderc
+revision = v2024.4
+depth=1
+patch_directory = shaderc
+
+diff_files = shaderc/cmake_fix.diff
+
+[provide]
+dependency_names = shaderc

subprojects/shaderc_cmake.wrap

@@ -1,10 +1,2 @@
-[wrap-git]
+[wrap-redirect]
-directory = shaderc_cmake
+filename = shaderc/subprojects/shaderc_cmake.wrap
-
-url = https://github.com/google/shaderc
-revision = v2024.4
-depth=1
-patch_directory = shaderc_cmake
-
-[provide]
-dependency_names = shaderc_cmake

subprojects/shaderc_old.wrap

@@ -1,12 +0,0 @@
-[wrap-file]
-directory = libshaderc_old
-
-source_url = https://storage.googleapis.com/shaderc/artifacts/prod/graphics_shader_compiler/shaderc/windows/continuous_release_2019/64/20241106-090939/install.zip
-source_filename = libshaderc-upstream-msvc.zip
-source_hash = a6879869e580d5991ebd9909f3665d1f6fe39cdb9830adf4f48b35dfd3782a78
-lead_directory_missing = libshaderc
-
-patch_directory = libshaderc_old
-
-[provide]
-dependency_names = shaderc_old