Skip to content

Commit

Permalink
fix some warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
anton-danielsson committed Apr 27, 2024
1 parent dae498d commit 68128c2
Showing 1 changed file with 15 additions and 3 deletions.
18 changes: 15 additions & 3 deletions recipes/openscenegraph/all/conandata.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 68128c2

Please sign in to comment.