Jan Engelhardt 2018-11-12 17:04:58 +00:00 committed by Git OBS Bridge
parent f0be5cee06
commit a050107269
2 changed files with 12 additions and 12 deletions

View File

@ -40,11 +40,11 @@ glslang is a compiler front end for the OpenGL ES and OpenGL shading
languages. It implements a strict interpretation of the languages. It implements a strict interpretation of the
specifications for these languages. specifications for these languages.
%package -n libglslang-suse1 %package -n libglslang-suse2
Summary: OpenGL and OpenGL ES shader front end implementation Summary: OpenGL and OpenGL ES shader front end implementation
Group: System/Libraries Group: System/Libraries
%description -n libglslang-suse1 %description -n libglslang-suse2
glslang is a compiler front end for the OpenGL ES and OpenGL shading glslang is a compiler front end for the OpenGL ES and OpenGL shading
languages. It implements a strict interpretation of the languages. It implements a strict interpretation of the
specifications for these languages. specifications for these languages.
@ -52,7 +52,7 @@ specifications for these languages.
%package devel %package devel
Summary: OpenGL and OpenGL ES shader front end and validator Summary: OpenGL and OpenGL ES shader front end and validator
Group: Development/Libraries/C and C++ Group: Development/Libraries/C and C++
Requires: libglslang-suse1 = %version Requires: libglslang-suse2 = %version
%description devel %description devel
glslang is a compiler front end for the OpenGL ES and OpenGL shading glslang is a compiler front end for the OpenGL ES and OpenGL shading
@ -85,12 +85,12 @@ ln -s SPIRV/spirv.hpp "$b/%_includedir/"
find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+" find "$b/%_includedir/" -type f -exec chmod a-x "{}" "+"
cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/" cp build/StandAlone/libglslang-default-resource-limits.so "$b/%_libdir/"
%post -n libglslang-suse1 -p /sbin/ldconfig %post -n libglslang-suse2 -p /sbin/ldconfig
%postun -n libglslang-suse1 -p /sbin/ldconfig %postun -n libglslang-suse2 -p /sbin/ldconfig
%files -n libglslang-suse1 %files -n libglslang-suse2
%defattr(-,root,root) %defattr(-,root,root)
%_libdir/*.so.suse1* %_libdir/*.so.suse2*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)

View File

@ -18,14 +18,14 @@ Index: glslang-7.9.2933.g33/SPIRV/CMakeLists.txt
endif(ENABLE_NV_EXTENSIONS) endif(ENABLE_NV_EXTENSIONS)
add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS}) add_library(SPIRV ${LIB_TYPE} ${SOURCES} ${HEADERS})
+set_target_properties(SPIRV PROPERTIES SOVERSION suse1) +set_target_properties(SPIRV PROPERTIES SOVERSION suse2)
set_property(TARGET SPIRV PROPERTY FOLDER glslang) set_property(TARGET SPIRV PROPERTY FOLDER glslang)
set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPIRV PROPERTY POSITION_INDEPENDENT_CODE ON)
target_include_directories(SPIRV PUBLIC ..) target_include_directories(SPIRV PUBLIC ..)
if (ENABLE_SPVREMAPPER) if (ENABLE_SPVREMAPPER)
add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS}) add_library(SPVRemapper ${LIB_TYPE} ${SPVREMAP_SOURCES} ${SPVREMAP_HEADERS})
+ set_target_properties(SPVRemapper PROPERTIES SOVERSION suse1) + set_target_properties(SPVRemapper PROPERTIES SOVERSION suse2)
set_property(TARGET SPVRemapper PROPERTY FOLDER glslang) set_property(TARGET SPVRemapper PROPERTY FOLDER glslang)
set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET SPVRemapper PROPERTY POSITION_INDEPENDENT_CODE ON)
endif() endif()
@ -36,7 +36,7 @@ Index: glslang-7.9.2933.g33/StandAlone/CMakeLists.txt
@@ -1,5 +1,6 @@ @@ -1,5 +1,6 @@
add_library(glslang-default-resource-limits add_library(glslang-default-resource-limits
${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp) ${CMAKE_CURRENT_SOURCE_DIR}/ResourceLimits.cpp)
+set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse1) +set_target_properties(glslang-default-resource-limits PROPERTIES SOVERSION suse2)
set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang) set_property(TARGET glslang-default-resource-limits PROPERTY FOLDER glslang)
set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET glslang-default-resource-limits PROPERTY POSITION_INDEPENDENT_CODE ON)
@ -48,7 +48,7 @@ Index: glslang-7.9.2933.g33/glslang/CMakeLists.txt
glslang_pch(SOURCES MachineIndependent/pch.cpp) glslang_pch(SOURCES MachineIndependent/pch.cpp)
add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS}) add_library(glslang ${LIB_TYPE} ${BISON_GLSLParser_OUTPUT_SOURCE} ${SOURCES} ${HEADERS})
+set_target_properties(glslang PROPERTIES SOVERSION suse1) +set_target_properties(glslang PROPERTIES SOVERSION suse2)
set_property(TARGET glslang PROPERTY FOLDER glslang) set_property(TARGET glslang PROPERTY FOLDER glslang)
set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET glslang PROPERTY POSITION_INDEPENDENT_CODE ON)
target_link_libraries(glslang OGLCompiler OSDependent) target_link_libraries(glslang OGLCompiler OSDependent)
@ -60,7 +60,7 @@ Index: glslang-7.9.2933.g33/hlsl/CMakeLists.txt
glslang_pch(SOURCES pch.cpp) glslang_pch(SOURCES pch.cpp)
add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS}) add_library(HLSL ${LIB_TYPE} ${SOURCES} ${HEADERS})
+set_target_properties(HLSL PROPERTIES SOVERSION suse1) +set_target_properties(HLSL PROPERTIES SOVERSION suse2)
set_property(TARGET HLSL PROPERTY FOLDER hlsl) set_property(TARGET HLSL PROPERTY FOLDER hlsl)
set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON) set_property(TARGET HLSL PROPERTY POSITION_INDEPENDENT_CODE ON)