diff --git a/glslang.spec b/glslang.spec index 4cc7914..06a188d 100644 --- a/glslang.spec +++ b/glslang.spec @@ -26,7 +26,6 @@ Url: https://www.khronos.org/opengles/sdk/tools/Reference-Compiler/ Source: %name-%version.tar.xz Patch1: badcode.diff -Patch2: sharedlib.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bison BuildRequires: cmake >= 2.8 @@ -56,7 +55,7 @@ compressor's dictionary can find better cross module commonality. %prep %setup -q -%patch -P 1 -P 2 -p1 +%patch -P 1 -p1 %build %cmake diff --git a/sharedlib.diff b/sharedlib.diff deleted file mode 100644 index e88de35..0000000 --- a/sharedlib.diff +++ /dev/null @@ -1,95 +0,0 @@ ---- - OGLCompilersDLL/CMakeLists.txt | 4 ++-- - SPIRV/CMakeLists.txt | 4 ++-- - glslang/CMakeLists.txt | 4 ++-- - glslang/OSDependent/Unix/CMakeLists.txt | 4 ++-- - glslang/OSDependent/Windows/CMakeLists.txt | 4 ++-- - 5 files changed, 10 insertions(+), 10 deletions(-) - -Index: glslang-2.3.g244/OGLCompilersDLL/CMakeLists.txt -=================================================================== ---- glslang-2.3.g244.orig/OGLCompilersDLL/CMakeLists.txt -+++ glslang-2.3.g244/OGLCompilersDLL/CMakeLists.txt -@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 2.8) - - set(SOURCES InitializeDll.cpp InitializeDll.h) - --add_library(OGLCompiler STATIC ${SOURCES}) -+add_library(OGLCompiler SHARED ${SOURCES}) - - if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - - install(TARGETS OGLCompiler -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib) -Index: glslang-2.3.g244/SPIRV/CMakeLists.txt -=================================================================== ---- glslang-2.3.g244.orig/SPIRV/CMakeLists.txt -+++ glslang-2.3.g244/SPIRV/CMakeLists.txt -@@ -18,11 +18,11 @@ set(HEADERS - doc.h - disassemble.h) - --add_library(SPIRV STATIC ${SOURCES} ${HEADERS}) -+add_library(SPIRV SHARED ${SOURCES} ${HEADERS}) - - if(WIN32) - source_group("Source" FILES ${SOURCES} ${HEADERS}) - endif(WIN32) - - install(TARGETS SPIRV -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib) -Index: glslang-2.3.g244/glslang/CMakeLists.txt -=================================================================== ---- glslang-2.3.g244.orig/glslang/CMakeLists.txt -+++ glslang-2.3.g244/glslang/CMakeLists.txt -@@ -78,7 +78,7 @@ add_custom_command(OUTPUT ${CMAKE_CURREN - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) - set(BISON_GLSLParser_OUTPUT_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}/MachineIndependent/glslang_tab.cpp) - --add_library(glslang STATIC ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) -+add_library(glslang SHARED ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) - - if(WIN32) - source_group("Public" REGULAR_EXPRESSION "Public/*") -@@ -90,4 +90,4 @@ if(WIN32) - endif(WIN32) - - install(TARGETS glslang -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib) -Index: glslang-2.3.g244/glslang/OSDependent/Unix/CMakeLists.txt -=================================================================== ---- glslang-2.3.g244.orig/glslang/OSDependent/Unix/CMakeLists.txt -+++ glslang-2.3.g244/glslang/OSDependent/Unix/CMakeLists.txt -@@ -2,7 +2,7 @@ - - cmake_minimum_required(VERSION 2.8) - --add_library(OSDependent STATIC ossource.cpp ../osinclude.h) -+add_library(OSDependent SHARED ossource.cpp ../osinclude.h) - - install(TARGETS OSDependent -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib) -Index: glslang-2.3.g244/glslang/OSDependent/Windows/CMakeLists.txt -=================================================================== ---- glslang-2.3.g244.orig/glslang/OSDependent/Windows/CMakeLists.txt -+++ glslang-2.3.g244/glslang/OSDependent/Windows/CMakeLists.txt -@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 2.8) - - set(SOURCES ossource.cpp ../osinclude.h) - --add_library(OSDependent STATIC ${SOURCES}) -+add_library(OSDependent SHARED ${SOURCES}) - - if(WIN32) - source_group("Source" FILES ${SOURCES}) - endif(WIN32) - - install(TARGETS OSDependent -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION lib)