diff --git a/abi_symbols b/abi_symbols --- a/abi_symbols +++ b/abi_symbols @@ -18,6 +18,7 @@ libdraco.so.1:_ZN5draco10ObjDecoder13ResetCountersEv libdraco.so.1:_ZN5draco10ObjDecoder14DecodeFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPNS_10PointCloudE libdraco.so.1:_ZN5draco10ObjDecoder14DecodeFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPNS_4MeshE +libdraco.so.1:_ZN5draco10ObjDecoder14DecodeFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPNS_4MeshEPSt6vectorIS6_SaIS6_EE libdraco.so.1:_ZN5draco10ObjDecoder14DecodeInternalEv libdraco.so.1:_ZN5draco10ObjDecoder15ParseDefinitionEPNS_6StatusE libdraco.so.1:_ZN5draco10ObjDecoder16DecodeFromBufferEPNS_13DecoderBufferEPNS_10PointCloudE @@ -104,7 +105,7 @@ libdraco.so.1:_ZN5draco11MeshCleanup20RemoveDuplicateFacesEPNS_4MeshE libdraco.so.1:_ZN5draco11MeshCleanup22RemoveDegeneratedFacesEPNS_4MeshE libdraco.so.1:_ZN5draco11MeshCleanup22RemoveUnusedAttributesEPNS_4MeshE -libdraco.so.1:_ZN5draco11MeshCleanupclEPNS_4MeshERKNS_18MeshCleanupOptionsE +libdraco.so.1:_ZN5draco11MeshCleanup7CleanupEPNS_4MeshERKNS_18MeshCleanupOptionsE libdraco.so.1:_ZN5draco11MeshDecoder18DecodeGeometryDataEv libdraco.so.1:_ZN5draco11MeshDecoder6DecodeERKNS_12DracoOptionsINS_17GeometryAttribute4TypeEEEPNS_13DecoderBufferEPNS_4MeshE libdraco.so.1:_ZN5draco11MeshDecoderC1Ev @@ -218,6 +219,8 @@ libdraco.so.1:_ZN5draco16DirectBitEncoderD1Ev libdraco.so.1:_ZN5draco16DirectBitEncoderD2Ev libdraco.so.1:_ZN5draco16GeometryMetadata20AddAttributeMetadataESt10unique_ptrINS_17AttributeMetadataESt14default_deleteIS2_EE +libdraco.so.1:_ZN5draco16GeometryMetadataC1ERKS0_ +libdraco.so.1:_ZN5draco16GeometryMetadataC2ERKS0_ libdraco.so.1:_ZN5draco16ReadFileToBufferERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPSt6vectorIcS4_E libdraco.so.1:_ZN5draco16ReadFileToBufferERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEPSt6vectorIhSaIhEE libdraco.so.1:_ZN5draco16ReadMeshFromFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE @@ -233,6 +236,8 @@ libdraco.so.1:_ZN5draco16SymbolBitEncoder28EncodeLeastSignificantBits32Eij libdraco.so.1:_ZN5draco16SymbolBitEncoder5ClearEv libdraco.so.1:_ZN5draco16vp10_fastdiv_tabE +libdraco.so.1:_ZN5draco17AttributeMetadataC1ERKS0_ +libdraco.so.1:_ZN5draco17AttributeMetadataC2ERKS0_ libdraco.so.1:_ZN5draco17AttributesDecoder27DecodeAttributesDecoderDataEPNS_13DecoderBufferE libdraco.so.1:_ZN5draco17AttributesDecoder4InitEPNS_17PointCloudDecoderEPNS_10PointCloudE libdraco.so.1:_ZN5draco17AttributesDecoderC1Ev @@ -296,6 +301,7 @@ libdraco.so.1:_ZN5draco17WriteBufferToFileEPKvmRKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libdraco.so.1:_ZN5draco18AttributeTransform24InitTransformedAttributeERKNS_14PointAttributeEi libdraco.so.1:_ZN5draco18IsDataTypeIntegralENS_8DataTypeE +libdraco.so.1:_ZN5draco19RemoveFileExtensionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libdraco.so.1:_ZN5draco20ReplaceFileExtensionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES7_ libdraco.so.1:_ZN5draco21ComputeShannonEntropyEPKjiiPi libdraco.so.1:_ZN5draco21MeshSequentialDecoder18DecodeConnectivityEv @@ -395,6 +401,7 @@ libdraco.so.1:_ZN5draco25CheckAndCreatePathForFileERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libdraco.so.1:_ZN5draco26ConvertSignedIntsToSymbolsEPKiiPj libdraco.so.1:_ZN5draco26ConvertSymbolsToSignedIntsEPKjiPi +libdraco.so.1:_ZN5draco26LowercaseMimeTypeExtensionERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libdraco.so.1:_ZN5draco26MeshEdgebreakerDecoderImplINS_31MeshEdgebreakerTraversalDecoderEE13AttributeDataC1Ev libdraco.so.1:_ZN5draco26MeshEdgebreakerDecoderImplINS_31MeshEdgebreakerTraversalDecoderEE13AttributeDataC2Ev libdraco.so.1:_ZN5draco26MeshEdgebreakerDecoderImplINS_31MeshEdgebreakerTraversalDecoderEE15IsTopologySplitEiPNS_12EdgeFaceNameEPi @@ -673,6 +680,7 @@ libdraco.so.1:_ZN5draco7OptionsC2Ev libdraco.so.1:_ZN5draco8Metadata11AddEntryIntERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEi libdraco.so.1:_ZN5draco8Metadata11RemoveEntryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE +libdraco.so.1:_ZN5draco8Metadata12sub_metadataERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEE libdraco.so.1:_ZN5draco8Metadata14AddEntryBinaryERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEERKSt6vectorIhSaIhEE libdraco.so.1:_ZN5draco8Metadata14AddEntryDoubleERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEd libdraco.so.1:_ZN5draco8Metadata14AddEntryStringERKNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEES8_ diff --git a/abi_used_symbols b/abi_used_symbols --- a/abi_used_symbols +++ b/abi_used_symbols @@ -7,10 +7,10 @@ libc.so.6:__stack_chk_fail libc.so.6:__vsnprintf_chk libc.so.6:fclose -libc.so.6:fopen +libc.so.6:fopen64 libc.so.6:fread libc.so.6:fseek -libc.so.6:ftell +libc.so.6:ftello64 libc.so.6:fwrite libc.so.6:gettimeofday libc.so.6:isspace @@ -21,7 +21,7 @@ libc.so.6:putchar libc.so.6:puts libc.so.6:rewind -libc.so.6:stat +libc.so.6:stat64 libc.so.6:stderr libc.so.6:strcmp libc.so.6:strlen @@ -79,6 +79,7 @@ libstdc++.so.6:_ZSt24__throw_out_of_range_fmtPKcz libstdc++.so.6:_ZSt25__throw_bad_function_callv libstdc++.so.6:_ZSt28_Rb_tree_rebalance_for_erasePSt18_Rb_tree_node_baseRS_ +libstdc++.so.6:_ZSt28__throw_bad_array_new_lengthv libstdc++.so.6:_ZSt29_Rb_tree_insert_and_rebalancebPSt18_Rb_tree_node_baseS0_RS_ libstdc++.so.6:_ZSt7nothrow libstdc++.so.6:_ZStlsISt11char_traitsIcEERSt13basic_ostreamIcT_ES5_PKc @@ -99,7 +100,6 @@ libstdc++.so.6:__cxa_end_catch libstdc++.so.6:__cxa_guard_acquire libstdc++.so.6:__cxa_guard_release -libstdc++.so.6:__cxa_pure_virtual libstdc++.so.6:__cxa_rethrow libstdc++.so.6:__cxa_throw_bad_array_new_length libstdc++.so.6:__gxx_personality_v0 diff --git a/files/soname-correction.patch b/files/soname-correction.patch --- a/files/soname-correction.patch +++ b/files/soname-correction.patch @@ -1,18 +1,11 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 3.12 FATAL_ERROR) -+cmake_minimum_required(VERSION 3.20.5 FATAL_ERROR) - - # Draco requires C++11. - set(CMAKE_CXX_STANDARD 11) --- a/cmake/draco_targets.cmake +++ b/cmake/draco_targets.cmake -@@ -320,6 +320,7 @@ macro(draco_add_library) - - if(lib_TYPE STREQUAL SHARED AND NOT MSVC) - set_target_properties(${lib_NAME} PROPERTIES SOVERSION ${DRACO_SOVERSION}) -+ set_target_properties(${lib_NAME} PROPERTIES VERSION ${DRACO_VERSION}) +@@ -320,7 +320,7 @@ macro(draco_add_library) + # VERSION and SOVERSION as necessary + if((lib_TYPE STREQUAL BUNDLE OR lib_TYPE STREQUAL SHARED) AND NOT MSVC) + set_target_properties(${lib_NAME} +- PROPERTIES VERSION ${DRACO_SOVERSION} SOVERSION ++ PROPERTIES VERSION ${DRACO_VERSION} SOVERSION + ${DRACO_SOVERSION_MAJOR}) + endif() endif() - - if(BUILD_SHARED_LIBS AND (MSVC OR WIN32)) diff --git a/files/strip-version-from-executables.patch b/files/strip-version-from-executables.patch new file mode 100644 --- /dev/null +++ b/files/strip-version-from-executables.patch @@ -0,0 +1,13 @@ +--- a/cmake/draco_targets.cmake ++++ b/cmake/draco_targets.cmake +@@ -102,10 +102,6 @@ macro(draco_add_executable) + + add_executable(${exe_NAME} ${exe_SOURCES}) + +- if(NOT EMSCRIPTEN) +- set_target_properties(${exe_NAME} PROPERTIES VERSION ${DRACO_VERSION}) +- endif() +- + if(exe_OUTPUT_NAME) + set_target_properties(${exe_NAME} PROPERTIES OUTPUT_NAME ${exe_OUTPUT_NAME}) + endif() diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : draco -version : 1.4.1 -release : 1 +version : 1.4.3 +release : 2 source : - - https://github.com/google/draco/archive/refs/tags/1.4.1.tar.gz : 83aa5637d36a835103a61f96af7ff04c6d6528e643909466595d51ee715417a9 + - https://github.com/google/draco/archive/refs/tags/1.4.3.tar.gz : 02a620a7ff8388c57d6f6e0941eecc10d0c23ab47c45942fb52f64a6245c44f5 homepage : https://google.github.io/draco/ license : Apache-2.0 component : multimedia.library @@ -11,7 +11,7 @@ Draco is an open-source library for compressing and decompressing 3D geometric meshes and point clouds. It is intended to improve the storage and transmission of 3D graphics. setup : | %patch -p1 < $pkgfiles/soname-correction.patch - + %patch -p1 < $pkgfiles/strip-version-from-executables.patch %cmake_ninja \ -DCMAKE_INTERPROCEDURAL_OPTIMIZATION=ON \ -DCMAKE_UNITY_BUILD=ON \ diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -23,7 +23,7 @@ /usr/bin/draco_decoder /usr/bin/draco_encoder /usr/lib64/libdraco.so.1 - /usr/lib64/libdraco.so.1.4.1 + /usr/lib64/libdraco.so.1.4.3 @@ -33,7 +33,7 @@ programming.devel - draco + draco /usr/include/draco/animation/keyframe_animation.h @@ -232,12 +232,12 @@ - - 2021-07-31 - 1.4.1 + + 2021-10-26 + 1.4.3 Packaging update Martin Reboredo yakoyoku@gmail.com \ No newline at end of file