cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to glm-0.9.9.8.

Browse Source
This commit is contained in:
ajacoutot 2022-10-14 13:27:10 +00:00
parent e3264ea24b
commit f5733a2ecd
8 changed files with 255 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
graphics/glm/Makefile
View File

@ -1,6 +1,6 @@
COMMENT= C++ mathematics header-only library for OpenGL software
GH_TAGNAME= 0.9.8.5
GH_TAGNAME= 0.9.9.8
GH_PROJECT= glm
GH_ACCOUNT= g-truc
@ -13,14 +13,20 @@ PERMIT_PACKAGE= Yes
MODULES= devel/cmake
COMPILER = base-clang ports-clang ports-gcc
COMPILER= base-clang ports-clang ports-gcc
# it's kind-of a NO_BUILD port, but doing so means you can't
# run the tests.
CONFIGURE_ARGS+=-DGLM_TEST_ENABLE=BOOLEAN=ON
CONFIGURE_ARGS += -DGLM_TEST_ENABLE=ON
CXXFLAGS+= -Wno-long-long
# https://github.com/g-truc/glm/pull/1121
CXXFLAGS += -Wno-unused-but-set-variable
PKG_ARCH= *
do-install:
cp -Rp ${WRKSRC}/glm ${PREFIX}/include
${INSTALL_DATA_DIR} ${PREFIX}/lib/cmake
cp -Rp ${WRKSRC}/cmake/glm/ ${PREFIX}/lib/cmake
.include <bsd.port.mk>

4
graphics/glm/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (glm-0.9.8.5.tar.gz) = gM+ZWPBuVQT430XqFP3odBEnAQKTC+McChbA2kMPySA=
SIZE (glm-0.9.8.5.tar.gz) = 3756809
SHA256 (glm-0.9.9.8.tar.gz) = fVCKtyy11DIno3EUIPBv+ZsKDLY+4vk2MbFiv+H+lZI=
SIZE (glm-0.9.9.8.tar.gz) = 4368032

11
graphics/glm/patches/patch-CMakeLists_txt
View File

@ -1,11 +0,0 @@
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -77,6 +77,7 @@ if(GLM_TEST_ENABLE_LANG_EXTENSIONS)
if(GLM_TEST_ENABLE_FAST_MATH)
if(CMAKE_COMPILER_IS_GNUCXX)
add_definitions(-ffast-math)
+ add_definitions(-mfpmath=387)
endif()
if(MSVC)

16
graphics/glm/patches/patch-glm_ext_quaternion_common_inl Normal file
View File

@ -0,0 +1,16 @@
glm-0.9.9.8/glm-0.9.9.8/glm/../glm/gtc/../ext/quaternion_common.inl:107:29: error: implicit conversion from 'int' to 'float' may lose precision [-Werror,-Wimplicit-int-float-conversion]
T phi = angle + k * glm::pi<T>();
^ ~
Index: glm/ext/quaternion_common.inl
--- glm/ext/quaternion_common.inl.orig
+++ 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);
}
}

17
graphics/glm/patches/patch-glm_gtc_random_inl Normal file
View File

@ -0,0 +1,17 @@
From 63a229359efd1b8ad35c63110027687a42343112 Mon Sep 17 00:00:00 2001
From: Baldvin Kovacs <baldvin.kovacs@gmail.com>
Date: Thu, 10 Feb 2022 22:12:46 +0100
Subject: [PATCH] Fix implicit conversion compiler error in glm/gtc/random.inl
Index: glm/gtc/random.inl
--- glm/gtc/random.inl.orig
+++ glm/gtc/random.inl
@@ -22,7 +22,7 @@ namespace detail
GLM_FUNC_QUALIFIER static vec<1, uint8, P> call()
{
return vec<1, uint8, P>(
- std::rand() % std::numeric_limits<uint8>::max());
+ static_cast<uint8>(std::rand() % std::numeric_limits<uint8>::max()));
}
};

11
graphics/glm/patches/patch-test_CMakeLists_txt Normal file
View File

@ -0,0 +1,11 @@
Index: test/CMakeLists.txt
--- test/CMakeLists.txt.orig
+++ test/CMakeLists.txt
@@ -77,6 +77,7 @@ if(GLM_TEST_ENABLE_FAST_MATH)
if((CMAKE_CXX_COMPILER_ID MATCHES "Clang") OR (CMAKE_CXX_COMPILER_ID MATCHES "GNU"))
add_compile_options(-ffast-math)
+ add_definitions(-mfpmath=387)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_compile_options(/fp:fast)

14
graphics/glm/patches/patch-test_core_core_func_matrix_cpp Normal file
View File

@ -0,0 +1,14 @@
64bit time_t
Index: test/core/core_func_matrix.cpp
--- test/core/core_func_matrix.cpp.orig
+++ test/core/core_func_matrix.cpp
@@ -297,7 +297,7 @@ int test_inverse_perf(std::size_t Count, std::size_t I
//glm::uint Ulp = 0;
//Ulp = glm::max(glm::float_distance(*Dst, *Src), Ulp);
- std::printf("inverse<%s>(%f): %lu\n", Message, static_cast<double>(Diff), EndTime - StartTime);
+ std::printf("inverse<%s>(%f): %lld\n", Message, static_cast<double>(Diff), EndTime - StartTime);
return 0;
}

209
graphics/glm/pkg/PLIST
View File

@ -8,42 +8,30 @@ include/glm/detail/_noise.hpp
include/glm/detail/_swizzle.hpp
include/glm/detail/_swizzle_func.hpp
include/glm/detail/_vectorize.hpp
include/glm/detail/dummy.cpp
include/glm/detail/func_common.hpp
include/glm/detail/compute_common.hpp
include/glm/detail/compute_vector_relational.hpp
include/glm/detail/func_common.inl
include/glm/detail/func_common_simd.inl
include/glm/detail/func_exponential.hpp
include/glm/detail/func_exponential.inl
include/glm/detail/func_exponential_simd.inl
include/glm/detail/func_geometric.hpp
include/glm/detail/func_geometric.inl
include/glm/detail/func_geometric_simd.inl
include/glm/detail/func_integer.hpp
include/glm/detail/func_integer.inl
include/glm/detail/func_integer_simd.inl
include/glm/detail/func_matrix.hpp
include/glm/detail/func_matrix.inl
include/glm/detail/func_matrix_simd.inl
include/glm/detail/func_packing.hpp
include/glm/detail/func_packing.inl
include/glm/detail/func_packing_simd.inl
include/glm/detail/func_trigonometric.hpp
include/glm/detail/func_trigonometric.inl
include/glm/detail/func_trigonometric_simd.inl
include/glm/detail/func_vector_relational.hpp
include/glm/detail/func_vector_relational.inl
include/glm/detail/func_vector_relational_simd.inl
include/glm/detail/glm.cpp
include/glm/detail/precision.hpp
include/glm/detail/qualifier.hpp
include/glm/detail/setup.hpp
include/glm/detail/type_float.hpp
include/glm/detail/type_gentype.hpp
include/glm/detail/type_gentype.inl
include/glm/detail/type_half.hpp
include/glm/detail/type_half.inl
include/glm/detail/type_int.hpp
include/glm/detail/type_mat.hpp
include/glm/detail/type_mat.inl
include/glm/detail/type_mat2x2.hpp
include/glm/detail/type_mat2x2.inl
include/glm/detail/type_mat2x3.hpp
@ -63,8 +51,9 @@ include/glm/detail/type_mat4x3.inl
include/glm/detail/type_mat4x4.hpp
include/glm/detail/type_mat4x4.inl
include/glm/detail/type_mat4x4_simd.inl
include/glm/detail/type_vec.hpp
include/glm/detail/type_vec.inl
include/glm/detail/type_quat.hpp
include/glm/detail/type_quat.inl
include/glm/detail/type_quat_simd.inl
include/glm/detail/type_vec1.hpp
include/glm/detail/type_vec1.inl
include/glm/detail/type_vec2.hpp
@ -75,22 +64,183 @@ include/glm/detail/type_vec4.hpp
include/glm/detail/type_vec4.inl
include/glm/detail/type_vec4_simd.inl
include/glm/exponential.hpp
include/glm/ext/
include/glm/ext.hpp
include/glm/ext/matrix_clip_space.hpp
include/glm/ext/matrix_clip_space.inl
include/glm/ext/matrix_common.hpp
include/glm/ext/matrix_common.inl
include/glm/ext/matrix_double2x2.hpp
include/glm/ext/matrix_double2x2_precision.hpp
include/glm/ext/matrix_double2x3.hpp
include/glm/ext/matrix_double2x3_precision.hpp
include/glm/ext/matrix_double2x4.hpp
include/glm/ext/matrix_double2x4_precision.hpp
include/glm/ext/matrix_double3x2.hpp
include/glm/ext/matrix_double3x2_precision.hpp
include/glm/ext/matrix_double3x3.hpp
include/glm/ext/matrix_double3x3_precision.hpp
include/glm/ext/matrix_double3x4.hpp
include/glm/ext/matrix_double3x4_precision.hpp
include/glm/ext/matrix_double4x2.hpp
include/glm/ext/matrix_double4x2_precision.hpp
include/glm/ext/matrix_double4x3.hpp
include/glm/ext/matrix_double4x3_precision.hpp
include/glm/ext/matrix_double4x4.hpp
include/glm/ext/matrix_double4x4_precision.hpp
include/glm/ext/matrix_float2x2.hpp
include/glm/ext/matrix_float2x2_precision.hpp
include/glm/ext/matrix_float2x3.hpp
include/glm/ext/matrix_float2x3_precision.hpp
include/glm/ext/matrix_float2x4.hpp
include/glm/ext/matrix_float2x4_precision.hpp
include/glm/ext/matrix_float3x2.hpp
include/glm/ext/matrix_float3x2_precision.hpp
include/glm/ext/matrix_float3x3.hpp
include/glm/ext/matrix_float3x3_precision.hpp
include/glm/ext/matrix_float3x4.hpp
include/glm/ext/matrix_float3x4_precision.hpp
include/glm/ext/matrix_float4x2.hpp
include/glm/ext/matrix_float4x2_precision.hpp
include/glm/ext/matrix_float4x3.hpp
include/glm/ext/matrix_float4x3_precision.hpp
include/glm/ext/matrix_float4x4.hpp
include/glm/ext/matrix_float4x4_precision.hpp
include/glm/ext/matrix_int2x2.hpp
include/glm/ext/matrix_int2x2_sized.hpp
include/glm/ext/matrix_int2x3.hpp
include/glm/ext/matrix_int2x3_sized.hpp
include/glm/ext/matrix_int2x4.hpp
include/glm/ext/matrix_int2x4_sized.hpp
include/glm/ext/matrix_int3x2.hpp
include/glm/ext/matrix_int3x2_sized.hpp
include/glm/ext/matrix_int3x3.hpp
include/glm/ext/matrix_int3x3_sized.hpp
include/glm/ext/matrix_int3x4.hpp
include/glm/ext/matrix_int3x4_sized.hpp
include/glm/ext/matrix_int4x2.hpp
include/glm/ext/matrix_int4x2_sized.hpp
include/glm/ext/matrix_int4x3.hpp
include/glm/ext/matrix_int4x3_sized.hpp
include/glm/ext/matrix_int4x4.hpp
include/glm/ext/matrix_int4x4_sized.hpp
include/glm/ext/matrix_projection.hpp
include/glm/ext/matrix_projection.inl
include/glm/ext/matrix_relational.hpp
include/glm/ext/matrix_relational.inl
include/glm/ext/matrix_transform.hpp
include/glm/ext/matrix_transform.inl
include/glm/ext/matrix_uint2x2.hpp
include/glm/ext/matrix_uint2x2_sized.hpp
include/glm/ext/matrix_uint2x3.hpp
include/glm/ext/matrix_uint2x3_sized.hpp
include/glm/ext/matrix_uint2x4.hpp
include/glm/ext/matrix_uint2x4_sized.hpp
include/glm/ext/matrix_uint3x2.hpp
include/glm/ext/matrix_uint3x2_sized.hpp
include/glm/ext/matrix_uint3x3.hpp
include/glm/ext/matrix_uint3x3_sized.hpp
include/glm/ext/matrix_uint3x4.hpp
include/glm/ext/matrix_uint3x4_sized.hpp
include/glm/ext/matrix_uint4x2.hpp
include/glm/ext/matrix_uint4x2_sized.hpp
include/glm/ext/matrix_uint4x3.hpp
include/glm/ext/matrix_uint4x3_sized.hpp
include/glm/ext/matrix_uint4x4.hpp
include/glm/ext/matrix_uint4x4_sized.hpp
include/glm/ext/quaternion_common.hpp
include/glm/ext/quaternion_common.inl
include/glm/ext/quaternion_common_simd.inl
include/glm/ext/quaternion_double.hpp
include/glm/ext/quaternion_double_precision.hpp
include/glm/ext/quaternion_exponential.hpp
include/glm/ext/quaternion_exponential.inl
include/glm/ext/quaternion_float.hpp
include/glm/ext/quaternion_float_precision.hpp
include/glm/ext/quaternion_geometric.hpp
include/glm/ext/quaternion_geometric.inl
include/glm/ext/quaternion_relational.hpp
include/glm/ext/quaternion_relational.inl
include/glm/ext/quaternion_transform.hpp
include/glm/ext/quaternion_transform.inl
include/glm/ext/quaternion_trigonometric.hpp
include/glm/ext/quaternion_trigonometric.inl
include/glm/ext/scalar_common.hpp
include/glm/ext/scalar_common.inl
include/glm/ext/scalar_constants.hpp
include/glm/ext/scalar_constants.inl
include/glm/ext/scalar_int_sized.hpp
include/glm/ext/scalar_integer.hpp
include/glm/ext/scalar_integer.inl
include/glm/ext/scalar_packing.hpp
include/glm/ext/scalar_packing.inl
include/glm/ext/scalar_relational.hpp
include/glm/ext/scalar_relational.inl
include/glm/ext/scalar_uint_sized.hpp
include/glm/ext/scalar_ulp.hpp
include/glm/ext/scalar_ulp.inl
include/glm/ext/vector_bool1.hpp
include/glm/ext/vector_bool1_precision.hpp
include/glm/ext/vector_bool2.hpp
include/glm/ext/vector_bool2_precision.hpp
include/glm/ext/vector_bool3.hpp
include/glm/ext/vector_bool3_precision.hpp
include/glm/ext/vector_bool4.hpp
include/glm/ext/vector_bool4_precision.hpp
include/glm/ext/vector_common.hpp
include/glm/ext/vector_common.inl
include/glm/ext/vector_double1.hpp
include/glm/ext/vector_double1_precision.hpp
include/glm/ext/vector_double2.hpp
include/glm/ext/vector_double2_precision.hpp
include/glm/ext/vector_double3.hpp
include/glm/ext/vector_double3_precision.hpp
include/glm/ext/vector_double4.hpp
include/glm/ext/vector_double4_precision.hpp
include/glm/ext/vector_float1.hpp
include/glm/ext/vector_float1_precision.hpp
include/glm/ext/vector_float2.hpp
include/glm/ext/vector_float2_precision.hpp
include/glm/ext/vector_float3.hpp
include/glm/ext/vector_float3_precision.hpp
include/glm/ext/vector_float4.hpp
include/glm/ext/vector_float4_precision.hpp
include/glm/ext/vector_int1.hpp
include/glm/ext/vector_int1_sized.hpp
include/glm/ext/vector_int2.hpp
include/glm/ext/vector_int2_sized.hpp
include/glm/ext/vector_int3.hpp
include/glm/ext/vector_int3_sized.hpp
include/glm/ext/vector_int4.hpp
include/glm/ext/vector_int4_sized.hpp
include/glm/ext/vector_integer.hpp
include/glm/ext/vector_integer.inl
include/glm/ext/vector_packing.hpp
include/glm/ext/vector_packing.inl
include/glm/ext/vector_relational.hpp
include/glm/ext/vector_relational.inl
include/glm/ext/vector_uint1.hpp
include/glm/ext/vector_uint1_sized.hpp
include/glm/ext/vector_uint2.hpp
include/glm/ext/vector_uint2_sized.hpp
include/glm/ext/vector_uint3.hpp
include/glm/ext/vector_uint3_sized.hpp
include/glm/ext/vector_uint4.hpp
include/glm/ext/vector_uint4_sized.hpp
include/glm/ext/vector_ulp.hpp
include/glm/ext/vector_ulp.inl
include/glm/fwd.hpp
include/glm/geometric.hpp
include/glm/glm.hpp
include/glm/gtc/
include/glm/gtc/bitfield.hpp
include/glm/gtc/bitfield.inl
include/glm/gtc/color_encoding.inl
include/glm/gtc/color_space.hpp
include/glm/gtc/color_space.inl
include/glm/gtc/constants.hpp
include/glm/gtc/constants.inl
include/glm/gtc/epsilon.hpp
include/glm/gtc/epsilon.inl
include/glm/gtc/functions.hpp
include/glm/gtc/functions.inl
include/glm/gtc/integer.hpp
include/glm/gtc/integer.inl
include/glm/gtc/matrix_access.hpp
@ -121,7 +271,6 @@ include/glm/gtc/type_ptr.inl
include/glm/gtc/ulp.hpp
include/glm/gtc/ulp.inl
include/glm/gtc/vec1.hpp
include/glm/gtc/vec1.inl
include/glm/gtx/
include/glm/gtx/associated_min_max.hpp
include/glm/gtx/associated_min_max.inl
@ -129,6 +278,8 @@ include/glm/gtx/bit.hpp
include/glm/gtx/bit.inl
include/glm/gtx/closest_point.hpp
include/glm/gtx/closest_point.inl
include/glm/gtx/color_encoding.hpp
include/glm/gtx/color_encoding.inl
include/glm/gtx/color_space.hpp
include/glm/gtx/color_space.inl
include/glm/gtx/color_space_YCoCg.hpp
@ -141,12 +292,16 @@ include/glm/gtx/component_wise.hpp
include/glm/gtx/component_wise.inl
include/glm/gtx/dual_quaternion.hpp
include/glm/gtx/dual_quaternion.inl
include/glm/gtx/easing.hpp
include/glm/gtx/easing.inl
include/glm/gtx/euler_angles.hpp
include/glm/gtx/euler_angles.inl
include/glm/gtx/extend.hpp
include/glm/gtx/extend.inl
include/glm/gtx/extended_min_max.hpp
include/glm/gtx/extended_min_max.inl
include/glm/gtx/exterior_product.hpp
include/glm/gtx/exterior_product.inl
include/glm/gtx/fast_exponential.hpp
include/glm/gtx/fast_exponential.inl
include/glm/gtx/fast_square_root.hpp
@ -154,6 +309,8 @@ include/glm/gtx/fast_square_root.inl
include/glm/gtx/fast_trigonometry.hpp
include/glm/gtx/fast_trigonometry.inl
include/glm/gtx/float_notmalize.inl
include/glm/gtx/functions.hpp
include/glm/gtx/functions.inl
include/glm/gtx/gradient_paint.hpp
include/glm/gtx/gradient_paint.inl
include/glm/gtx/handed_coordinate_space.hpp
@ -172,6 +329,8 @@ include/glm/gtx/matrix_cross_product.hpp
include/glm/gtx/matrix_cross_product.inl
include/glm/gtx/matrix_decompose.hpp
include/glm/gtx/matrix_decompose.inl
include/glm/gtx/matrix_factorisation.hpp
include/glm/gtx/matrix_factorisation.inl
include/glm/gtx/matrix_interpolation.hpp
include/glm/gtx/matrix_interpolation.inl
include/glm/gtx/matrix_major_storage.hpp
@ -220,6 +379,8 @@ include/glm/gtx/std_based_type.hpp
include/glm/gtx/std_based_type.inl
include/glm/gtx/string_cast.hpp
include/glm/gtx/string_cast.inl
include/glm/gtx/texture.hpp
include/glm/gtx/texture.inl
include/glm/gtx/transform.hpp
include/glm/gtx/transform.inl
include/glm/gtx/transform2.hpp
@ -228,6 +389,7 @@ include/glm/gtx/type_aligned.hpp
include/glm/gtx/type_aligned.inl
include/glm/gtx/type_trait.hpp
include/glm/gtx/type_trait.inl
include/glm/gtx/vec_swizzle.hpp
include/glm/gtx/vector_angle.hpp
include/glm/gtx/vector_angle.inl
include/glm/gtx/vector_query.hpp
@ -252,6 +414,7 @@ include/glm/simd/exponential.h
include/glm/simd/geometric.h
include/glm/simd/integer.h
include/glm/simd/matrix.h
include/glm/simd/neon.h
include/glm/simd/packing.h
include/glm/simd/platform.h
include/glm/simd/trigonometric.h
@ -263,7 +426,5 @@ include/glm/vec4.hpp
include/glm/vector_relational.hpp
lib/cmake/
lib/cmake/glm/
lib/cmake/glm/glmConfig-version.cmake
lib/cmake/glm/glmConfig.cmake
lib/cmake/glm/glmConfigVersion.cmake
lib/cmake/glm/glmTargets.cmake
lib/pkgconfig/glm.pc