diff options
Diffstat (limited to 'meta-oe/recipes-graphics/glm')
10 files changed, 383 insertions, 934 deletions
diff --git a/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch b/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch deleted file mode 100644 index d69c5af3af..0000000000 --- a/meta-oe/recipes-graphics/glm/files/0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch +++ /dev/null @@ -1,860 +0,0 @@ -From 99a9676a0193f6291d7202d7af72e24580abe565 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 16 Mar 2018 13:55:29 +0100 -Subject: [PATCH 1/2] Make GLM_ENABLE_EXPERIMENTAL a configurable option -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -It seems that erroring out if GLM_ENABLE_EXPERIMENTAL is not set turns into -packagers nightmare: There are packages around expecting glx headers. E.g -libgltf [1] fails during configure checking for usable headers AND during -compile. Paticularly fixing configure for those packages is time-consuming: -The only way (correct me if I am wrong) is creating a patch adding - -AC_DEFINE([GLM_ENABLE_EXPERIMENTAL], [1], [glm needs this for gtx headers]) - -By adding a configure option 'GLM_ENABLE_EXPERIMENTAL', the decision to use -glm/glx is done at one (and the right) place. - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -[1] https://gerrit.libreoffice.org/gitweb?p=libgltf.git - -Uptream-Status: Submitted [2] - -[2] https://github.com/g-truc/glm/pull/741 ---- - CMakeLists.txt | 6 ++++++ - glm/CMakeLists.txt | 2 ++ - glm/experimental.hpp.in | 1 + - glm/ext.hpp | 1 + - glm/gtx/associated_min_max.hpp | 1 + - glm/gtx/bit.hpp | 1 + - glm/gtx/closest_point.hpp | 1 + - glm/gtx/color_space.hpp | 1 + - glm/gtx/color_space_YCoCg.hpp | 1 + - glm/gtx/common.hpp | 1 + - glm/gtx/compatibility.hpp | 1 + - glm/gtx/component_wise.hpp | 1 + - glm/gtx/dual_quaternion.hpp | 1 + - glm/gtx/euler_angles.hpp | 1 + - glm/gtx/extend.hpp | 1 + - glm/gtx/extended_min_max.hpp | 1 + - glm/gtx/fast_exponential.hpp | 1 + - glm/gtx/fast_square_root.hpp | 1 + - glm/gtx/fast_trigonometry.hpp | 1 + - glm/gtx/gradient_paint.hpp | 1 + - glm/gtx/handed_coordinate_space.hpp | 1 + - glm/gtx/hash.hpp | 1 + - glm/gtx/integer.hpp | 1 + - glm/gtx/intersect.hpp | 1 + - glm/gtx/io.hpp | 1 + - glm/gtx/log_base.hpp | 1 + - glm/gtx/matrix_cross_product.hpp | 1 + - glm/gtx/matrix_decompose.hpp | 1 + - glm/gtx/matrix_factorisation.hpp | 1 + - glm/gtx/matrix_interpolation.hpp | 1 + - glm/gtx/matrix_major_storage.hpp | 1 + - glm/gtx/matrix_operation.hpp | 1 + - glm/gtx/matrix_query.hpp | 1 + - glm/gtx/matrix_transform_2d.hpp | 1 + - glm/gtx/mixed_product.hpp | 1 + - glm/gtx/norm.hpp | 1 + - glm/gtx/normal.hpp | 1 + - glm/gtx/normalize_dot.hpp | 1 + - glm/gtx/number_precision.hpp | 1 + - glm/gtx/optimum_pow.hpp | 1 + - glm/gtx/orthonormalize.hpp | 1 + - glm/gtx/perpendicular.hpp | 1 + - glm/gtx/polar_coordinates.hpp | 1 + - glm/gtx/projection.hpp | 1 + - glm/gtx/quaternion.hpp | 1 + - glm/gtx/range.hpp | 1 + - glm/gtx/raw_data.hpp | 1 + - glm/gtx/rotate_normalized_axis.hpp | 1 + - glm/gtx/rotate_vector.hpp | 1 + - glm/gtx/scalar_multiplication.hpp | 1 + - glm/gtx/scalar_relational.hpp | 1 + - glm/gtx/spline.hpp | 1 + - glm/gtx/std_based_type.hpp | 1 + - glm/gtx/string_cast.hpp | 1 + - glm/gtx/texture.hpp | 1 + - glm/gtx/transform.hpp | 1 + - glm/gtx/transform2.hpp | 1 + - glm/gtx/type_aligned.hpp | 1 + - glm/gtx/type_trait.hpp | 1 + - glm/gtx/vec_swizzle.hpp | 1 + - glm/gtx/vector_angle.hpp | 1 + - glm/gtx/vector_query.hpp | 1 + - glm/gtx/wrap.hpp | 1 + - 63 files changed, 69 insertions(+) - create mode 100644 glm/experimental.hpp.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index e5159b0f..bd4dd654 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -82,6 +82,11 @@ option(GLM_TEST_ENABLE_SIMD_AVX "Enable AVX optimizations" OFF) - option(GLM_TEST_ENABLE_SIMD_AVX2 "Enable AVX2 optimizations" OFF) - option(GLM_TEST_FORCE_PURE "Force 'pure' instructions" OFF) - -+option(GLM_ENABLE_EXPERIMENTAL "Enable experimental GLM_GTX" OFF) -+configure_file(glm/experimental.hpp.in experimental.hpp @ONLY) -+include_directories(${CMAKE_BINARY_DIR}/glm) -+include_directories(${CMAKE_BINARY_DIR}) -+ - if(GLM_TEST_FORCE_PURE) - add_definitions(-DGLM_FORCE_PURE) - -@@ -167,6 +172,7 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) - set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") - if (GLM_INSTALL_ENABLE) - install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) - endif() - - write_basic_package_version_file("${CMAKE_CURRENT_BINARY_DIR}/glmConfigVersion.cmake" VERSION ${GLM_VERSION} COMPATIBILITY AnyNewerVersion) -diff --git a/glm/CMakeLists.txt b/glm/CMakeLists.txt -index df9c9ee5..dc5db4bc 100644 ---- a/glm/CMakeLists.txt -+++ b/glm/CMakeLists.txt -@@ -43,6 +43,8 @@ source_group("SIMD Files" FILES ${SIMD_INLINE}) - source_group("SIMD Files" FILES ${SIMD_HEADER}) - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..) -+# make out-of tree builds find experimental.hpp -+include_directories(${CMAKE_BINARY_DIR}/glm) - - if(GLM_STATIC_LIBRARY_ENABLE OR GLM_DYNAMIC_LIBRARY_ENABLE) - if(GLM_STATIC_LIBRARY_ENABLE) -diff --git a/glm/experimental.hpp.in b/glm/experimental.hpp.in -new file mode 100644 -index 00000000..bfab5138 ---- /dev/null -+++ b/glm/experimental.hpp.in -@@ -0,0 +1 @@ -+#cmakedefine GLM_ENABLE_EXPERIMENTAL -diff --git a/glm/ext.hpp b/glm/ext.hpp -index d085bfd5..a2948447 100644 ---- a/glm/ext.hpp -+++ b/glm/ext.hpp -@@ -39,6 +39,7 @@ - # include "./gtc/type_aligned.hpp" - #endif - -+#include "experimental.hpp" - #ifdef GLM_ENABLE_EXPERIMENTAL - #include "./gtx/associated_min_max.hpp" - #include "./gtx/bit.hpp" -diff --git a/glm/gtx/associated_min_max.hpp b/glm/gtx/associated_min_max.hpp -index 0c9935f3..d00c2bc4 100644 ---- a/glm/gtx/associated_min_max.hpp -+++ b/glm/gtx/associated_min_max.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GTX_associated_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/bit.hpp b/glm/gtx/bit.hpp -index 1447fa00..31957083 100644 ---- a/glm/gtx/bit.hpp -+++ b/glm/gtx/bit.hpp -@@ -15,6 +15,7 @@ - // Dependencies - #include "../gtc/bitfield.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_bit is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/closest_point.hpp b/glm/gtx/closest_point.hpp -index 6859bb96..ebd9fe5a 100644 ---- a/glm/gtx/closest_point.hpp -+++ b/glm/gtx/closest_point.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/color_space.hpp b/glm/gtx/color_space.hpp -index d1e655c3..51416819 100644 ---- a/glm/gtx/color_space.hpp -+++ b/glm/gtx/color_space.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_color_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/color_space_YCoCg.hpp b/glm/gtx/color_space_YCoCg.hpp -index e82cbd8b..7ae71041 100644 ---- a/glm/gtx/color_space_YCoCg.hpp -+++ b/glm/gtx/color_space_YCoCg.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_color_space_YCoCg is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/common.hpp b/glm/gtx/common.hpp -index 8081bff7..57a68a8d 100644 ---- a/glm/gtx/common.hpp -+++ b/glm/gtx/common.hpp -@@ -18,6 +18,7 @@ - #include "../vec4.hpp" - #include "../gtc/vec1.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_common is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/compatibility.hpp b/glm/gtx/compatibility.hpp -index e5b60399..9876669c 100644 ---- a/glm/gtx/compatibility.hpp -+++ b/glm/gtx/compatibility.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_compatibility is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/component_wise.hpp b/glm/gtx/component_wise.hpp -index 39bab5d5..4fe0e4e2 100644 ---- a/glm/gtx/component_wise.hpp -+++ b/glm/gtx/component_wise.hpp -@@ -18,6 +18,7 @@ - #include "../detail/setup.hpp" - #include "../detail/qualifier.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_component_wise is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/dual_quaternion.hpp b/glm/gtx/dual_quaternion.hpp -index c4343e9d..d59fb459 100644 ---- a/glm/gtx/dual_quaternion.hpp -+++ b/glm/gtx/dual_quaternion.hpp -@@ -20,6 +20,7 @@ - #include "../gtc/constants.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_dual_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/euler_angles.hpp b/glm/gtx/euler_angles.hpp -index e66e9281..ad5988c1 100644 ---- a/glm/gtx/euler_angles.hpp -+++ b/glm/gtx/euler_angles.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_euler_angles is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/extend.hpp b/glm/gtx/extend.hpp -index eda4e470..cde6db63 100644 ---- a/glm/gtx/extend.hpp -+++ b/glm/gtx/extend.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/extended_min_max.hpp b/glm/gtx/extended_min_max.hpp -index 3e767b0c..0bcffcc6 100644 ---- a/glm/gtx/extended_min_max.hpp -+++ b/glm/gtx/extended_min_max.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extented_min_max is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_exponential.hpp b/glm/gtx/fast_exponential.hpp -index 2d4918e7..e6d11f0a 100644 ---- a/glm/gtx/fast_exponential.hpp -+++ b/glm/gtx/fast_exponential.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_exponential is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_square_root.hpp b/glm/gtx/fast_square_root.hpp -index 1e1ec3cf..f758aeef 100644 ---- a/glm/gtx/fast_square_root.hpp -+++ b/glm/gtx/fast_square_root.hpp -@@ -19,6 +19,7 @@ - #include "../exponential.hpp" - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_square_root is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/fast_trigonometry.hpp b/glm/gtx/fast_trigonometry.hpp -index 739065fb..f1332958 100644 ---- a/glm/gtx/fast_trigonometry.hpp -+++ b/glm/gtx/fast_trigonometry.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../gtc/constants.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_fast_trigonometry is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/gradient_paint.hpp b/glm/gtx/gradient_paint.hpp -index 2713cec0..d4703991 100644 ---- a/glm/gtx/gradient_paint.hpp -+++ b/glm/gtx/gradient_paint.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/optimum_pow.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_gradient_paint is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/handed_coordinate_space.hpp b/glm/gtx/handed_coordinate_space.hpp -index 1d0d4104..3a52ddcf 100644 ---- a/glm/gtx/handed_coordinate_space.hpp -+++ b/glm/gtx/handed_coordinate_space.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_handed_coordinate_space is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/hash.hpp b/glm/gtx/hash.hpp -index fe8a3efd..92bfc9b2 100644 ---- a/glm/gtx/hash.hpp -+++ b/glm/gtx/hash.hpp -@@ -12,6 +12,7 @@ - - #pragma once - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_hash is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/integer.hpp b/glm/gtx/integer.hpp -index 96637a13..5d1a16c6 100644 ---- a/glm/gtx/integer.hpp -+++ b/glm/gtx/integer.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/integer.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_integer is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/intersect.hpp b/glm/gtx/intersect.hpp -index 61e2226a..4895ba93 100644 ---- a/glm/gtx/intersect.hpp -+++ b/glm/gtx/intersect.hpp -@@ -21,6 +21,7 @@ - #include "../gtx/closest_point.hpp" - #include "../gtx/vector_query.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_closest_point is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/io.hpp b/glm/gtx/io.hpp -index 49a1ec11..ae39cd60 100644 ---- a/glm/gtx/io.hpp -+++ b/glm/gtx/io.hpp -@@ -23,6 +23,7 @@ - #include "../glm.hpp" - #include "../gtx/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_io is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/log_base.hpp b/glm/gtx/log_base.hpp -index e873e356..45b8d53c 100644 ---- a/glm/gtx/log_base.hpp -+++ b/glm/gtx/log_base.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_log_base is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_cross_product.hpp b/glm/gtx/matrix_cross_product.hpp -index 967743b8..52d6c173 100644 ---- a/glm/gtx/matrix_cross_product.hpp -+++ b/glm/gtx/matrix_cross_product.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_cross_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_decompose.hpp b/glm/gtx/matrix_decompose.hpp -index b7ec0e83..6793fee2 100644 ---- a/glm/gtx/matrix_decompose.hpp -+++ b/glm/gtx/matrix_decompose.hpp -@@ -20,6 +20,7 @@ - #include "../gtc/quaternion.hpp" - #include "../gtc/matrix_transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_decompose is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_factorisation.hpp b/glm/gtx/matrix_factorisation.hpp -index e30a7746..79c293be 100644 ---- a/glm/gtx/matrix_factorisation.hpp -+++ b/glm/gtx/matrix_factorisation.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_factorisation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_interpolation.hpp b/glm/gtx/matrix_interpolation.hpp -index 89c4596c..799983bb 100644 ---- a/glm/gtx/matrix_interpolation.hpp -+++ b/glm/gtx/matrix_interpolation.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_interpolation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_major_storage.hpp b/glm/gtx/matrix_major_storage.hpp -index 7f264a59..e68467cd 100644 ---- a/glm/gtx/matrix_major_storage.hpp -+++ b/glm/gtx/matrix_major_storage.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_major_storage is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_operation.hpp b/glm/gtx/matrix_operation.hpp -index bce938bb..1e85bb5e 100644 ---- a/glm/gtx/matrix_operation.hpp -+++ b/glm/gtx/matrix_operation.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_operation is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_query.hpp b/glm/gtx/matrix_query.hpp -index 5df5f52f..eec1eec0 100644 ---- a/glm/gtx/matrix_query.hpp -+++ b/glm/gtx/matrix_query.hpp -@@ -18,6 +18,7 @@ - #include "../gtx/vector_query.hpp" - #include <limits> - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/matrix_transform_2d.hpp b/glm/gtx/matrix_transform_2d.hpp -index 239ab9f4..3ca8d2f2 100644 ---- a/glm/gtx/matrix_transform_2d.hpp -+++ b/glm/gtx/matrix_transform_2d.hpp -@@ -17,6 +17,7 @@ - #include "../mat3x3.hpp" - #include "../vec2.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_matrix_transform_2d is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/mixed_product.hpp b/glm/gtx/mixed_product.hpp -index 58562aab..5c7460d5 100644 ---- a/glm/gtx/mixed_product.hpp -+++ b/glm/gtx/mixed_product.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_mixed_product is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/norm.hpp b/glm/gtx/norm.hpp -index 46474e07..3cf2c3ea 100644 ---- a/glm/gtx/norm.hpp -+++ b/glm/gtx/norm.hpp -@@ -17,6 +17,7 @@ - #include "../geometric.hpp" - #include "../gtx/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_norm is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/normal.hpp b/glm/gtx/normal.hpp -index 15cec9c2..7bb4c096 100644 ---- a/glm/gtx/normal.hpp -+++ b/glm/gtx/normal.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_normal is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/normalize_dot.hpp b/glm/gtx/normalize_dot.hpp -index 86048e70..c6604da4 100644 ---- a/glm/gtx/normalize_dot.hpp -+++ b/glm/gtx/normalize_dot.hpp -@@ -16,6 +16,7 @@ - // Dependency: - #include "../gtx/fast_square_root.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_normalize_dot is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/number_precision.hpp b/glm/gtx/number_precision.hpp -index 3732a56c..b48845f7 100644 ---- a/glm/gtx/number_precision.hpp -+++ b/glm/gtx/number_precision.hpp -@@ -18,6 +18,7 @@ - #include "../glm.hpp" - #include "../gtc/type_precision.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_number_precision is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/optimum_pow.hpp b/glm/gtx/optimum_pow.hpp -index eb09f1c3..94a6bbb2 100644 ---- a/glm/gtx/optimum_pow.hpp -+++ b/glm/gtx/optimum_pow.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_optimum_pow is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/orthonormalize.hpp b/glm/gtx/orthonormalize.hpp -index 2a684ee4..4ff47e53 100644 ---- a/glm/gtx/orthonormalize.hpp -+++ b/glm/gtx/orthonormalize.hpp -@@ -18,6 +18,7 @@ - #include "../mat3x3.hpp" - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_orthonormalize is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/perpendicular.hpp b/glm/gtx/perpendicular.hpp -index 35601ac7..17251ebe 100644 ---- a/glm/gtx/perpendicular.hpp -+++ b/glm/gtx/perpendicular.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/projection.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_perpendicular is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/polar_coordinates.hpp b/glm/gtx/polar_coordinates.hpp -index b8421db4..5125215d 100644 ---- a/glm/gtx/polar_coordinates.hpp -+++ b/glm/gtx/polar_coordinates.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_polar_coordinates is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/projection.hpp b/glm/gtx/projection.hpp -index 9a24abf9..4d5bf76f 100644 ---- a/glm/gtx/projection.hpp -+++ b/glm/gtx/projection.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../geometric.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_projection is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/quaternion.hpp b/glm/gtx/quaternion.hpp -index c3d99a5c..808ba0fd 100644 ---- a/glm/gtx/quaternion.hpp -+++ b/glm/gtx/quaternion.hpp -@@ -19,6 +19,7 @@ - #include "../gtc/quaternion.hpp" - #include "../gtx/norm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/range.hpp b/glm/gtx/range.hpp -index e0ef46af..03c797c3 100644 ---- a/glm/gtx/range.hpp -+++ b/glm/gtx/range.hpp -@@ -15,6 +15,7 @@ - // Dependencies - #include "../detail/setup.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_range is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/raw_data.hpp b/glm/gtx/raw_data.hpp -index fb34c8cb..0084fec6 100644 ---- a/glm/gtx/raw_data.hpp -+++ b/glm/gtx/raw_data.hpp -@@ -16,6 +16,7 @@ - #include "../detail/setup.hpp" - #include "../detail/type_int.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_raw_data is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/rotate_normalized_axis.hpp b/glm/gtx/rotate_normalized_axis.hpp -index eee90d6e..82612928 100644 ---- a/glm/gtx/rotate_normalized_axis.hpp -+++ b/glm/gtx/rotate_normalized_axis.hpp -@@ -19,6 +19,7 @@ - #include "../gtc/epsilon.hpp" - #include "../gtc/quaternion.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_rotate_normalized_axis is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/rotate_vector.hpp b/glm/gtx/rotate_vector.hpp -index c8ace89e..e954b041 100644 ---- a/glm/gtx/rotate_vector.hpp -+++ b/glm/gtx/rotate_vector.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_rotate_vector is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/scalar_multiplication.hpp b/glm/gtx/scalar_multiplication.hpp -index b73edf67..22baa52a 100644 ---- a/glm/gtx/scalar_multiplication.hpp -+++ b/glm/gtx/scalar_multiplication.hpp -@@ -16,6 +16,7 @@ - - #include "../detail/setup.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_scalar_multiplication is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/scalar_relational.hpp b/glm/gtx/scalar_relational.hpp -index 7fc8c1cc..f21f3b2b 100644 ---- a/glm/gtx/scalar_relational.hpp -+++ b/glm/gtx/scalar_relational.hpp -@@ -15,6 +15,7 @@ - // Dependency: - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_extend is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/spline.hpp b/glm/gtx/spline.hpp -index f96d7e07..76359cfd 100644 ---- a/glm/gtx/spline.hpp -+++ b/glm/gtx/spline.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtx/optimum_pow.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_spline is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/std_based_type.hpp b/glm/gtx/std_based_type.hpp -index 55a2f074..92532b9e 100644 ---- a/glm/gtx/std_based_type.hpp -+++ b/glm/gtx/std_based_type.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include <cstdlib> - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_std_based_type is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/string_cast.hpp b/glm/gtx/string_cast.hpp -index 4b4e280f..dfcd5085 100644 ---- a/glm/gtx/string_cast.hpp -+++ b/glm/gtx/string_cast.hpp -@@ -24,6 +24,7 @@ - #include <string> - #include <cmath> - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_string_cast is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/texture.hpp b/glm/gtx/texture.hpp -index 312bf398..7af185f6 100644 ---- a/glm/gtx/texture.hpp -+++ b/glm/gtx/texture.hpp -@@ -17,6 +17,7 @@ - #include "../gtc/integer.hpp" - #include "../gtx/component_wise.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_texture is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/transform.hpp b/glm/gtx/transform.hpp -index d23b99ce..5a5d9619 100644 ---- a/glm/gtx/transform.hpp -+++ b/glm/gtx/transform.hpp -@@ -19,6 +19,7 @@ - #include "../glm.hpp" - #include "../gtc/matrix_transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_transform is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/transform2.hpp b/glm/gtx/transform2.hpp -index 85f5bea4..5d7c83fc 100644 ---- a/glm/gtx/transform2.hpp -+++ b/glm/gtx/transform2.hpp -@@ -17,6 +17,7 @@ - #include "../glm.hpp" - #include "../gtx/transform.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_transform2 is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/type_aligned.hpp b/glm/gtx/type_aligned.hpp -index 6ff9f276..6ad92fad 100644 ---- a/glm/gtx/type_aligned.hpp -+++ b/glm/gtx/type_aligned.hpp -@@ -18,6 +18,7 @@ - // Dependency: - #include "../gtc/type_precision.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_type_aligned is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/type_trait.hpp b/glm/gtx/type_trait.hpp -index 637bbd19..65519cab 100644 ---- a/glm/gtx/type_trait.hpp -+++ b/glm/gtx/type_trait.hpp -@@ -12,6 +12,7 @@ - - #pragma once - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_type_trait is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vec_swizzle.hpp b/glm/gtx/vec_swizzle.hpp -index daebac38..13d523dc 100644 ---- a/glm/gtx/vec_swizzle.hpp -+++ b/glm/gtx/vec_swizzle.hpp -@@ -14,6 +14,7 @@ - - #include "../glm.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vec_swizzle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vector_angle.hpp b/glm/gtx/vector_angle.hpp -index 401a47eb..98c9d110 100644 ---- a/glm/gtx/vector_angle.hpp -+++ b/glm/gtx/vector_angle.hpp -@@ -20,6 +20,7 @@ - #include "../gtx/quaternion.hpp" - #include "../gtx/rotate_vector.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vector_angle is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/vector_query.hpp b/glm/gtx/vector_query.hpp -index 6560eaa5..5ab1ffda 100644 ---- a/glm/gtx/vector_query.hpp -+++ b/glm/gtx/vector_query.hpp -@@ -17,6 +17,7 @@ - #include <cfloat> - #include <limits> - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_vector_query is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif -diff --git a/glm/gtx/wrap.hpp b/glm/gtx/wrap.hpp -index 2c4b55df..5bf26a33 100644 ---- a/glm/gtx/wrap.hpp -+++ b/glm/gtx/wrap.hpp -@@ -16,6 +16,7 @@ - #include "../glm.hpp" - #include "../gtc/vec1.hpp" - -+#include "../experimental.hpp" - #ifndef GLM_ENABLE_EXPERIMENTAL - # error "GLM: GLM_GTX_wrap is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it." - #endif --- -2.14.3 - diff --git a/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch b/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch deleted file mode 100644 index 1be3318cc1..0000000000 --- a/meta-oe/recipes-graphics/glm/files/0002-glm-install-headers-only.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 7fdd36d7496238e03e43fcc32839f75588116c5d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 16 Mar 2018 15:44:48 +0100 -Subject: [PATCH 2/2] glm: install headers only -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Plausibility check in root source path - -$ find glm -type f ! -name '*.hpp' ! -name '*.h' ! -name '*.inl' -glm/detail/glm.cpp -glm/detail/dummy.cpp -glm/experimental.hpp.in -glm/CMakeLists.txt - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> - -Uptream-Status: Submitted [1] - -[1] https://github.com/g-truc/glm/pull/741 ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index bd4dd654..113dd735 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -171,7 +171,12 @@ option(GLM_INSTALL_ENABLE "GLM install" ON) - - set(GLM_INSTALL_CONFIGDIR "${CMAKE_INSTALL_LIBDIR}/cmake/glm") - if (GLM_INSTALL_ENABLE) -- install(DIRECTORY glm DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) -+ install(DIRECTORY glm -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} -+ FILES_MATCHING -+ PATTERN "*.h" -+ PATTERN "*.hpp" -+ PATTERN "*.inl") - install(FILES "${CMAKE_CURRENT_BINARY_DIR}/experimental.hpp" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/glm) - endif() - --- -2.14.3 - diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch new file mode 100644 index 0000000000..dee2749898 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch @@ -0,0 +1,32 @@ +From ee405855bca7d6399ff1a1aef952010056c84ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 21:08:09 -0800 +Subject: [PATCH] Do not use -Werror with clang + +Too many warnings to handle for a distro build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + test/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e7f85f19..0b6fd980 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -197,10 +197,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-Werror -Weverything) +- add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) +- add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) +- + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + if(NOT GLM_QUIET) + message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler") +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch new file mode 100644 index 0000000000..10692dd423 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -0,0 +1,145 @@ +From bd9b5060bc3b9581090d44f15b4e236566ea86a6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 4 Jun 2021 12:57:57 -0700 +Subject: [PATCH] Silence clang warnings + +Fixes +glm/gtc/random.inl:25:17: error: implicit conversion loses integer precision: 'int' to 'unsigned char' [-Werror,-Wimplicit-int-conversion] +| std::rand() % std::numeric_limits<uint8>::max()); +| ~~~~~~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +glm/gtc/../ext/quaternion_common.inl:76:87: error: unused parameter 'k' [-Werror,-Wunused-parameter] + GLM_FUNC_QUALIFIER qua<T, Q> slerp(qua<T, Q> const& x, qua<T, Q> const& y, T a, S k) + ^ + +and + +test/gtx/gtx_fast_trigonometry.cpp:135:9: error: variable 'result' set but not used [-Werror,-Wunused-but-set-variable] +| float result = 0.f; +| ^ + +Upstream-Status: Submitted [https://github.com/g-truc/glm/pull/1055] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + glm/ext/quaternion_common.inl | 2 +- + glm/gtc/random.inl | 2 +- + test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ + 3 files changed, 14 insertions(+), 20 deletions(-) + +--- a/glm/ext/quaternion_common.inl ++++ b/glm/ext/quaternion_common.inl +@@ -104,7 +104,7 @@ namespace glm + { + // Graphics Gems III, page 96 + T angle = acos(cosTheta); +- T phi = angle + k * glm::pi<T>(); ++ T phi = angle + static_cast<T>(k) * glm::pi<T>(); + return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); + } + } +--- a/test/gtx/gtx_fast_trigonometry.cpp ++++ b/test/gtx/gtx_fast_trigonometry.cpp +@@ -19,15 +19,14 @@ namespace fastCos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastCos(i); ++ glm::fastCos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::cos(i); ++ glm::cos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -53,15 +52,14 @@ namespace fastSin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastSin(i); ++ glm::fastSin(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::sin(i); ++ glm::sin(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -79,15 +77,14 @@ namespace fastTan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastTan(i); ++ glm::fastTan(i); + + const std::clock_t timestamp2 = std::clock(); + for (float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::tan(i); ++ glm::tan(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -105,15 +102,14 @@ namespace fastAcos + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAcos(i); ++ glm::fastAcos(i); + + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::acos(i); ++ glm::acos(i); + + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; +@@ -132,13 +128,12 @@ namespace fastAsin + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAsin(i); ++ glm::fastAsin(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::asin(i); ++ glm::asin(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; +@@ -155,13 +150,12 @@ namespace fastAtan + { + const float begin = -glm::pi<float>(); + const float end = glm::pi<float>(); +- float result = 0.f; + const std::clock_t timestamp1 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::fastAtan(i); ++ glm::fastAtan(i); + const std::clock_t timestamp2 = std::clock(); + for(float i = begin; i < end; i = NextFloat ? glm::nextFloat(i) : i += 0.1f) +- result = glm::atan(i); ++ glm::atan(i); + const std::clock_t timestamp3 = std::clock(); + const std::clock_t time_fast = timestamp2 - timestamp1; + const std::clock_t time_default = timestamp3 - timestamp2; diff --git a/meta-oe/recipes-graphics/glm/glm/glm.pc.in b/meta-oe/recipes-graphics/glm/glm/glm.pc.in new file mode 100644 index 0000000000..54052e287d --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glm.pc.in @@ -0,0 +1,7 @@ +prefix=/usr +includedir=${prefix}/include + +Name: GLM +Description: OpenGL Mathematics +Version: @VERSION@ +Cflags: -I${includedir} diff --git a/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in b/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in new file mode 100644 index 0000000000..8ab23a18d7 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmConfig.cmake.in @@ -0,0 +1,20 @@ +set(GLM_VERSION "@VERSION@") + + +####### Expanded from @PACKAGE_INIT@ by configure_package_config_file() ####### +get_filename_component(PACKAGE_PREFIX_DIR "${CMAKE_CURRENT_LIST_DIR}/../../../" ABSOLUTE) + +macro(set_and_check _var _file) + set(${_var} "${_file}") + if(NOT EXISTS "${_file}") + message(FATAL_ERROR "File or directory ${_file} referenced by variable ${_var} does not exist !") + endif() +endmacro() + +#################################################################################### + +set_and_check(GLM_INCLUDE_DIRS "${PACKAGE_PREFIX_DIR}/include") + +if (NOT CMAKE_VERSION VERSION_LESS "3.0") + include("${CMAKE_CURRENT_LIST_DIR}/glmTargets.cmake") +endif() diff --git a/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in b/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in new file mode 100644 index 0000000000..561a0db61f --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmConfigVersion.cmake.in @@ -0,0 +1,31 @@ +# This is a basic version file for the Config-mode of find_package(). +# It is used by write_basic_package_version_file() as input file for configure_file() +# to create a version-file which can be installed along a config.cmake file. +# +# The created file sets PACKAGE_VERSION_EXACT if the current version string and +# the requested version string are exactly the same and it sets +# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version. +# The variable CVF_VERSION must be set before calling configure_file(). + +set(PACKAGE_VERSION "@VERSION@") + +if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) + set(PACKAGE_VERSION_COMPATIBLE FALSE) +else() + set(PACKAGE_VERSION_COMPATIBLE TRUE) + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION) + set(PACKAGE_VERSION_EXACT TRUE) + endif() +endif() + +# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: +if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "8" STREQUAL "") + return() +endif() + +# check that the installed version has the same 32/64bit-ness as the one which is currently searching: +if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "8") + math(EXPR installedBits "8 * 8") + set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") + set(PACKAGE_VERSION_UNSUITABLE FALSE) +endif() diff --git a/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake b/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake new file mode 100644 index 0000000000..905b67731b --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/glmTargets.cmake @@ -0,0 +1,107 @@ +# Generated by CMake + +if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.5) + message(FATAL_ERROR "CMake >= 2.6.0 required") +endif() +cmake_policy(PUSH) +cmake_policy(VERSION 2.6) +#---------------------------------------------------------------- +# Generated CMake target import file. +#---------------------------------------------------------------- + +# Commands may need to know the format version. +set(CMAKE_IMPORT_FILE_VERSION 1) + +# Protect against multiple inclusion, which would fail when already imported targets are added once more. +set(_targetsDefined) +set(_targetsNotDefined) +set(_expectedTargets) +foreach(_expectedTarget glm) + list(APPEND _expectedTargets ${_expectedTarget}) + if(NOT TARGET ${_expectedTarget}) + list(APPEND _targetsNotDefined ${_expectedTarget}) + endif() + if(TARGET ${_expectedTarget}) + list(APPEND _targetsDefined ${_expectedTarget}) + endif() +endforeach() +if("${_targetsDefined}" STREQUAL "${_expectedTargets}") + unset(_targetsDefined) + unset(_targetsNotDefined) + unset(_expectedTargets) + set(CMAKE_IMPORT_FILE_VERSION) + cmake_policy(POP) + return() +endif() +if(NOT "${_targetsDefined}" STREQUAL "") + message(FATAL_ERROR "Some (but not all) targets in this export set were already defined.\nTargets Defined: ${_targetsDefined}\nTargets not yet defined: ${_targetsNotDefined}\n") +endif() +unset(_targetsDefined) +unset(_targetsNotDefined) +unset(_expectedTargets) + + +# Compute the installation prefix relative to this file. +get_filename_component(_IMPORT_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH) +# Use original install prefix when loaded through a +# cross-prefix symbolic link such as /lib -> /usr/lib. +get_filename_component(_realCurr "${_IMPORT_PREFIX}" REALPATH) +get_filename_component(_realOrig "/usr/lib/cmake/glm" REALPATH) +if(_realCurr STREQUAL _realOrig) + set(_IMPORT_PREFIX "/usr/lib/cmake/glm") +endif() +unset(_realOrig) +unset(_realCurr) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +get_filename_component(_IMPORT_PREFIX "${_IMPORT_PREFIX}" PATH) +if(_IMPORT_PREFIX STREQUAL "/") + set(_IMPORT_PREFIX "") +endif() + +# Create imported target glm +add_library(glm INTERFACE IMPORTED) + +set_target_properties(glm PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include" +) + +if(CMAKE_VERSION VERSION_LESS 3.0.0) + message(FATAL_ERROR "This file relies on consumers using CMake 3.0.0 or greater.") +endif() + +# Load information for each installed configuration. +get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +file(GLOB CONFIG_FILES "${_DIR}/glmTargets-*.cmake") +foreach(f ${CONFIG_FILES}) + include(${f}) +endforeach() + +# Cleanup temporary variables. +set(_IMPORT_PREFIX) + +# Loop over all imported files and verify that they actually exist +foreach(target ${_IMPORT_CHECK_TARGETS} ) + foreach(file ${_IMPORT_CHECK_FILES_FOR_${target}} ) + if(NOT EXISTS "${file}" ) + message(FATAL_ERROR "The imported target \"${target}\" references the file + \"${file}\" +but this file does not exist. Possible reasons include: +* The file was deleted, renamed, or moved to another location. +* An install or uninstall procedure did not complete successfully. +* The installation package was faulty and contained + \"${CMAKE_CURRENT_LIST_FILE}\" +but not all the files it references. +") + endif() + endforeach() + unset(_IMPORT_CHECK_FILES_FOR_${target}) +endforeach() +unset(_IMPORT_CHECK_TARGETS) + +# This file does not depend on other imported targets which have +# been exported from the same project but in a separate export set. + +# Commands beyond this point should not need to know the version. +set(CMAKE_IMPORT_FILE_VERSION) +cmake_policy(POP) diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb deleted file mode 100644 index 4e2ee23787..0000000000 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9-a2.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "OpenGL Mathematics Library" -DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ -mathematics library for graphics software based on the OpenGL \ -Shading Language (GLSL) specifications." -HOMEPAGE = "https://glm.g-truc.net" -BUGTRACKER = "https://github.com/g-truc/glm/issues" - -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://readme.md;beginline=21;endline=22;md5=3075b5727d36f29edccf97b93e72b790" - -SRC_URI = " \ - git://github.com/g-truc/glm;branch=master \ - file://0001-Make-GLM_ENABLE_EXPERIMENTAL-a-configurable-option.patch \ - file://0002-glm-install-headers-only.patch \ -" -SRCREV = "fcbedf5058ef8613dd02aac62ef00d55dcfeadd7" -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DGLM_ENABLE_EXPERIMENTAL=ON" - -FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "" - -BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb new file mode 100644 index 0000000000..e313d7a192 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -0,0 +1,41 @@ +SUMMARY = "OpenGL Mathematics Library" +DESCRIPTION = "OpenGL Mathematics (GLM) is a header only C++ \ +mathematics library for graphics software based on the OpenGL \ +Shading Language (GLSL) specifications." +HOMEPAGE = "https://glm.g-truc.net" +BUGTRACKER = "https://github.com/g-truc/glm/issues" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" + +SRC_URI = " \ + git://github.com/g-truc/glm;branch=master;protocol=https \ + file://0001-Silence-clang-warnings.patch \ + file://0001-Do-not-use-Werror-with-clang.patch \ + file://glmConfig.cmake.in \ + file://glmConfigVersion.cmake.in \ + file://glm.pc.in \ + file://glmTargets.cmake \ +" +SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447" +PV .= "+0.9.9.9+git" + +S = "${WORKDIR}/git" + +inherit cmake + +do_install() { + install -d ${D}${includedir} ${D}${docdir}/glm ${D}${libdir}/pkgconfig ${D}${libdir}/cmake/glm + cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} + cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm + rm ${D}${includedir}/glm/CMakeLists.txt + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc + install -Dm644 ${UNPACKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake + +} + +RDEPENDS:${PN}-dev = "" + +BBCLASSEXTEND = "native" |