From 68128c2cdb8549f57c4000dee7780f4d129bf9cb Mon Sep 17 00:00:00 2001 From: Anton Danielsson Date: Sat, 27 Apr 2024 09:36:21 +0200 Subject: [PATCH] fix some warnings --- recipes/openscenegraph/all/conandata.yml | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/recipes/openscenegraph/all/conandata.yml b/recipes/openscenegraph/all/conandata.yml index c8ad60d55bef5..094e9853e6fca 100644 --- a/recipes/openscenegraph/all/conandata.yml +++ b/recipes/openscenegraph/all/conandata.yml @@ -5,22 +5,34 @@ sources: patches: 3.6.5: - patch_file: patches/0001-fix-to_cmake_path-usage.patch + patch_description: Fix cmake paths + patch_type: portability - patch_file: patches/0005-use-JPEG-target-for-plugin.patch + patch_description: This fixes building against a static libjpeg on windows + patch_type: portability - patch_file: patches/0006-Declare-result-as-LONG-for-Mingw-build.patch + patch_description: Win32's ChangeDisplaySettingsEx() API function is documented as returning `LONG`, which evidently is not always the same as `unsigned int` (Mingw64.) This cause a compile error on Mingw with clang10. + patch_type: official + patch_source: https://github.com/openscenegraph/OpenSceneGraph/commit/67468cce344dd5e503aaa1063845f34720563f79 - patch_file: patches/0007-fix-msvc-with-std-c++17.patch - patch_type: bugfix + patch_description: Fix to be able to build with c++17 on MSVC + patch_type: official patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1055 - patch_file: patches/0008-replace-mem-fun-ref.patch - patch_type: bugfix + patch_description: Replaced std::mem_fun_ref usage to avoid compatiblity with modern compilers + patch_type: official patch_source: https://github.com/openscenegraph/OpenSceneGraph/commit/8a0114a46a4bad9041297950fe3bfbb2aea6e1da - patch_file: patches/0009-replace-auto-ptr-in-plugins.patch + patch_description: auto_ptr is removed in C++17. patch_type: portability patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1246 - patch_file: patches/0010-replace-ptr-fun-in-obj-plugin.patch + patch_description: ptr_fun is removed in C++17 patch_type: portability patch_source: https://github.com/openscenegraph/OpenSceneGraph/pull/1246 - patch_file: patches/0011-remove-deprecated-register.patch - patch_type: portability + patch_description: The "register" keyword is deprecated as of C++17 + patch_type: bugfix patch_source: - https://github.com/openscenegraph/OpenSceneGraph/pull/1296 - https://github.com/openscenegraph/OpenSceneGraph/pull/951