File shaderc-moronicize.patch of Package shaderc-moronic
From 15406097895240571ed067d498da8fb6c122e887 Mon Sep 17 00:00:00 2001
From: v-fox <virtuousfox@gmail.com>
Date: Wed, 31 Jul 2024 04:02:50 +0500
Subject: [PATCH] shaderc-moronicize
---
CMakeLists.txt | 6 ++--
cmake/shaderc.pc.in | 2 +-
cmake/shaderc_combined.pc.in | 2 +-
cmake/shaderc_static.pc.in | 2 +-
examples/online-compile/main.cc | 2 +-
glslc/src/file_compiler.h | 2 +-
glslc/src/main.cc | 4 +--
glslc/src/resource_parse.h | 2 +-
glslc/src/shader_stage.h | 2 +-
glslc/src/stage_test.cc | 2 +-
libshaderc/CMakeLists.txt | 32 +++++++++----------
.../{shaderc => shaderc-moronic}/env.h | 0
.../{shaderc => shaderc-moronic}/shaderc.h | 6 ++--
.../{shaderc => shaderc-moronic}/shaderc.hpp | 0
.../{shaderc => shaderc-moronic}/status.h | 0
.../{shaderc => shaderc-moronic}/visibility.h | 0
libshaderc/src/shaderc.cc | 2 +-
libshaderc/src/shaderc_c_smoke_test.c | 2 +-
libshaderc/src/shaderc_cpp_test.cc | 2 +-
libshaderc/src/shaderc_private.h | 2 +-
libshaderc/src/shaderc_test.cc | 2 +-
.../include/libshaderc_util/compiler.h | 2 +-
22 files changed, 38 insertions(+), 38 deletions(-)
rename libshaderc/include/{shaderc => shaderc-moronic}/env.h (100%)
rename libshaderc/include/{shaderc => shaderc-moronic}/shaderc.h (99%)
rename libshaderc/include/{shaderc => shaderc-moronic}/shaderc.hpp (100%)
rename libshaderc/include/{shaderc => shaderc-moronic}/status.h (100%)
rename libshaderc/include/{shaderc => shaderc-moronic}/visibility.h (100%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c1a6d8..627082b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -142,7 +142,7 @@ function(define_pkg_config_file NAME LIBS)
COMMAND ${CMAKE_COMMAND}
-DCHANGES_FILE=${CMAKE_CURRENT_SOURCE_DIR}/CHANGES
-DTEMPLATE_FILE=${CMAKE_CURRENT_SOURCE_DIR}/cmake/${NAME}.pc.in
- -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${NAME}.pc
+ -DOUT_FILE=${CMAKE_CURRENT_BINARY_DIR}/${NAME}-moronic.pc
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-DCMAKE_INSTALL_LIBDIR=${CMAKE_INSTALL_LIBDIR}
-DCMAKE_INSTALL_INCLUDEDIR=${CMAKE_INSTALL_INCLUDEDIR}
@@ -153,10 +153,10 @@ function(define_pkg_config_file NAME LIBS)
if (SHADERC_ENABLE_INSTALL)
install(
FILES
- ${CMAKE_CURRENT_BINARY_DIR}/${NAME}.pc
+ ${CMAKE_CURRENT_BINARY_DIR}/${NAME}-moronic.pc
DESTINATION
${CMAKE_INSTALL_LIBDIR}/pkgconfig)
endif()
endfunction()
-define_pkg_config_file(shaderc -lshaderc_shared)
+define_pkg_config_file(shaderc -lshaderc_moronic)
diff --git a/cmake/shaderc.pc.in b/cmake/shaderc.pc.in
index 6d217bf..d8020ab 100644
--- a/cmake/shaderc.pc.in
+++ b/cmake/shaderc.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-Name: shaderc
+Name: shaderc-moronic
Description: Tools and libraries for Vulkan shader compilation
Version: @CURRENT_VERSION@
URL: https://github.com/google/shaderc
diff --git a/cmake/shaderc_combined.pc.in b/cmake/shaderc_combined.pc.in
index 6d217bf..d8020ab 100644
--- a/cmake/shaderc_combined.pc.in
+++ b/cmake/shaderc_combined.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-Name: shaderc
+Name: shaderc-moronic
Description: Tools and libraries for Vulkan shader compilation
Version: @CURRENT_VERSION@
URL: https://github.com/google/shaderc
diff --git a/cmake/shaderc_static.pc.in b/cmake/shaderc_static.pc.in
index 6d217bf..d8020ab 100644
--- a/cmake/shaderc_static.pc.in
+++ b/cmake/shaderc_static.pc.in
@@ -3,7 +3,7 @@ exec_prefix=${prefix}
libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
-Name: shaderc
+Name: shaderc-moronic
Description: Tools and libraries for Vulkan shader compilation
Version: @CURRENT_VERSION@
URL: https://github.com/google/shaderc
diff --git a/examples/online-compile/main.cc b/examples/online-compile/main.cc
index 9e1ca5b..397d43e 100644
--- a/examples/online-compile/main.cc
+++ b/examples/online-compile/main.cc
@@ -28,7 +28,7 @@
#include <string>
#include <vector>
-#include <shaderc/shaderc.hpp>
+#include <shaderc-moronic/shaderc.hpp>
// Returns GLSL shader source text after preprocessing.
std::string preprocess_shader(const std::string& source_name,
diff --git a/glslc/src/file_compiler.h b/glslc/src/file_compiler.h
index cd41f73..6f93c3f 100644
--- a/glslc/src/file_compiler.h
+++ b/glslc/src/file_compiler.h
@@ -19,7 +19,7 @@
#include "libshaderc_util/file_finder.h"
#include "libshaderc_util/string_piece.h"
-#include "shaderc/shaderc.hpp"
+#include "shaderc-moronic/shaderc.hpp"
#include "dependency_info.h"
diff --git a/glslc/src/main.cc b/glslc/src/main.cc
index 5cc3f43..9a64eac 100644
--- a/glslc/src/main.cc
+++ b/glslc/src/main.cc
@@ -32,8 +32,8 @@
#include "libshaderc_util/string_piece.h"
#include "resource_parse.h"
#include "shader_stage.h"
-#include "shaderc/env.h"
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/env.h"
+#include "shaderc-moronic/shaderc.h"
#include "spirv-tools/libspirv.h"
using shaderc_util::string_piece;
diff --git a/glslc/src/resource_parse.h b/glslc/src/resource_parse.h
index 9794ce4..b0b7646 100644
--- a/glslc/src/resource_parse.h
+++ b/glslc/src/resource_parse.h
@@ -18,7 +18,7 @@
#include <string>
#include <vector>
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
namespace glslc {
diff --git a/glslc/src/shader_stage.h b/glslc/src/shader_stage.h
index 8e4ffde..780df48 100644
--- a/glslc/src/shader_stage.h
+++ b/glslc/src/shader_stage.h
@@ -18,7 +18,7 @@
#include <ostream>
#include "libshaderc_util/string_piece.h"
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
namespace glslc {
diff --git a/glslc/src/stage_test.cc b/glslc/src/stage_test.cc
index 3177673..2983eb5 100644
--- a/glslc/src/stage_test.cc
+++ b/glslc/src/stage_test.cc
@@ -21,7 +21,7 @@
#include <sstream>
#include <gtest/gtest.h>
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
#include "shader_stage.h"
diff --git a/libshaderc/CMakeLists.txt b/libshaderc/CMakeLists.txt
index bc0504e..bd32ced 100644
--- a/libshaderc/CMakeLists.txt
+++ b/libshaderc/CMakeLists.txt
@@ -18,19 +18,19 @@ project(libshaderc)
# a dependency here will force clients of the library to rebuild
# when it changes.
set(SHADERC_SOURCES
- include/shaderc/shaderc.h
- include/shaderc/shaderc.hpp
+ include/shaderc-moronic/shaderc.h
+ include/shaderc-moronic/shaderc.hpp
src/shaderc.cc
src/shaderc_private.h
)
-add_library(shaderc_shared SHARED ${SHADERC_SOURCES})
-shaderc_default_compile_options(shaderc_shared)
-target_include_directories(shaderc_shared
+add_library(shaderc_moronic SHARED ${SHADERC_SOURCES})
+shaderc_default_compile_options(shaderc_moronic)
+target_include_directories(shaderc_moronic
PUBLIC include
PRIVATE ${glslang_SOURCE_DIR}
${SPIRV-Headers_SOURCE_DIR}/include)
-target_compile_definitions(shaderc_shared
+target_compile_definitions(shaderc_moronic
PRIVATE SHADERC_IMPLEMENTATION
PUBLIC SHADERC_SHAREDLIB
)
@@ -38,15 +38,15 @@ target_compile_definitions(shaderc_shared
if(SHADERC_ENABLE_INSTALL)
install(
FILES
- include/shaderc/env.h
- include/shaderc/status.h
- include/shaderc/visibility.h
- include/shaderc/shaderc.h
- include/shaderc/shaderc.hpp
+ include/shaderc-moronic/env.h
+ include/shaderc-moronic/status.h
+ include/shaderc-moronic/visibility.h
+ include/shaderc-moronic/shaderc.h
+ include/shaderc-moronic/shaderc.hpp
DESTINATION
- ${CMAKE_INSTALL_INCLUDEDIR}/shaderc)
+ ${CMAKE_INSTALL_INCLUDEDIR}/shaderc-moronic)
- install(TARGETS shaderc_shared
+ install(TARGETS shaderc_moronic
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -61,11 +61,11 @@ set(SHADERC_LIBS
SPIRV-Tools
)
-target_link_libraries(shaderc_shared PRIVATE ${SHADERC_LIBS})
+target_link_libraries(shaderc_moronic PRIVATE ${SHADERC_LIBS})
shaderc_add_tests(
- TEST_PREFIX shaderc_shared
- LINK_LIBS shaderc_shared SPIRV-Tools
+ TEST_PREFIX shaderc_moronic
+ LINK_LIBS shaderc_moronic SPIRV-Tools
INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
${spirv-tools_SOURCE_DIR}/include
${SPIRV-Headers_SOURCE_DIR}/include
diff --git a/libshaderc/include/shaderc/env.h b/libshaderc/include/shaderc-moronic/env.h
similarity index 100%
rename from libshaderc/include/shaderc/env.h
rename to libshaderc/include/shaderc-moronic/env.h
diff --git a/libshaderc/include/shaderc/shaderc.h b/libshaderc/include/shaderc-moronic/shaderc.h
similarity index 99%
rename from libshaderc/include/shaderc/shaderc.h
rename to libshaderc/include/shaderc-moronic/shaderc.h
index ff31aac..110fca7 100644
--- a/libshaderc/include/shaderc/shaderc.h
+++ b/libshaderc/include/shaderc-moronic/shaderc.h
@@ -23,9 +23,9 @@ extern "C" {
#include <stddef.h>
#include <stdint.h>
-#include "shaderc/env.h"
-#include "shaderc/status.h"
-#include "shaderc/visibility.h"
+#include "shaderc-moronic/env.h"
+#include "shaderc-moronic/status.h"
+#include "shaderc-moronic/visibility.h"
// Source language kind.
typedef enum {
diff --git a/libshaderc/include/shaderc/shaderc.hpp b/libshaderc/include/shaderc-moronic/shaderc.hpp
similarity index 100%
rename from libshaderc/include/shaderc/shaderc.hpp
rename to libshaderc/include/shaderc-moronic/shaderc.hpp
diff --git a/libshaderc/include/shaderc/status.h b/libshaderc/include/shaderc-moronic/status.h
similarity index 100%
rename from libshaderc/include/shaderc/status.h
rename to libshaderc/include/shaderc-moronic/status.h
diff --git a/libshaderc/include/shaderc/visibility.h b/libshaderc/include/shaderc-moronic/visibility.h
similarity index 100%
rename from libshaderc/include/shaderc/visibility.h
rename to libshaderc/include/shaderc-moronic/visibility.h
diff --git a/libshaderc/src/shaderc.cc b/libshaderc/src/shaderc.cc
index 289977e..1ad6ea7 100644
--- a/libshaderc/src/shaderc.cc
+++ b/libshaderc/src/shaderc.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
#include <algorithm>
#include <cassert>
diff --git a/libshaderc/src/shaderc_c_smoke_test.c b/libshaderc/src/shaderc_c_smoke_test.c
index 80c4048..5f48ea7 100644
--- a/libshaderc/src/shaderc_c_smoke_test.c
+++ b/libshaderc/src/shaderc_c_smoke_test.c
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
#include <assert.h>
#include <string.h>
diff --git a/libshaderc/src/shaderc_cpp_test.cc b/libshaderc/src/shaderc_cpp_test.cc
index 0f1f37f..d3077cb 100644
--- a/libshaderc/src/shaderc_cpp_test.cc
+++ b/libshaderc/src/shaderc_cpp_test.cc
@@ -20,7 +20,7 @@
#include <unordered_map>
#include "common_shaders_for_test.h"
-#include "shaderc/shaderc.hpp"
+#include "shaderc-moronic/shaderc.hpp"
#include "spirv-tools/libspirv.hpp"
#include "spirv/unified1/spirv.hpp"
diff --git a/libshaderc/src/shaderc_private.h b/libshaderc/src/shaderc_private.h
index ff35020..e3b746c 100644
--- a/libshaderc/src/shaderc_private.h
+++ b/libshaderc/src/shaderc_private.h
@@ -20,7 +20,7 @@
#include <string>
#include <vector>
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
#include "libshaderc_util/compiler.h"
#include "spirv-tools/libspirv.h"
diff --git a/libshaderc/src/shaderc_test.cc b/libshaderc/src/shaderc_test.cc
index 5610b0b..618bf74 100644
--- a/libshaderc/src/shaderc_test.cc
+++ b/libshaderc/src/shaderc_test.cc
@@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "shaderc/shaderc.h"
+#include "shaderc-moronic/shaderc.h"
#include <gmock/gmock.h>
#include <gtest/gtest.h>
diff --git a/libshaderc_util/include/libshaderc_util/compiler.h b/libshaderc_util/include/libshaderc_util/compiler.h
index b076ec8..f904c4c 100644
--- a/libshaderc_util/include/libshaderc_util/compiler.h
+++ b/libshaderc_util/include/libshaderc_util/compiler.h
@@ -507,7 +507,7 @@ class Compiler {
// The version number of the target environment. The numbering scheme is
// particular to each target environment. If this is 0, then use a default
- // for that particular target environment. See libshaders/shaderc/shaderc.h
+ // for that particular target environment. See libshaders/shaderc-moronic/shaderc.h
// for those defaults.
TargetEnvVersion target_env_version_;
--
2.45.2