From 21ee87dad89294bc37278edee1d6f0c387abb208 Mon Sep 17 00:00:00 2001 From: tnn Date: Sun, 2 Jan 2022 14:53:26 +0000 Subject: [PATCH] glm: update to 0.9.9.8 (needed for kicad 6) With fixes from pkgsrc-wip by Mike M. Volokhov. Release notes omitted since package was last updated in 2015 and they are too verbose: https://github.com/g-truc/glm/releases --- graphics/glm/Makefile | 19 ++-- graphics/glm/PLIST | 256 ++++++++++++++++++++++++++++++++++-------- graphics/glm/distinfo | 8 +- 3 files changed, 222 insertions(+), 61 deletions(-) diff --git a/graphics/glm/Makefile b/graphics/glm/Makefile index 879d03ca9360..558485635aaa 100644 --- a/graphics/glm/Makefile +++ b/graphics/glm/Makefile @@ -1,34 +1,31 @@ -# $NetBSD: Makefile,v 1.5 2020/01/26 17:31:21 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2022/01/02 14:53:26 tnn Exp $ -DISTNAME= glm-0.9.7.0 -CATEGORIES= graphics +DISTNAME= glm-0.9.9.8 +CATEGORIES= graphics math MASTER_SITES= ${MASTER_SITE_GITHUB:=g-truc/} -EXTRACT_SUFX= .zip MAINTAINER= ryoon@NetBSD.org HOMEPAGE= https://glm.g-truc.net/ -COMMENT= C++ mathematics library for graphics programming +COMMENT= C++ mathematics library for software based on the OpenGL GLSL LICENSE= mit -# in "Happy Bunny" variation, adding: -# Restrictions: By making use of the Software for military purposes, -# you choose to make a Bunny unhappy. NO_BUILD= yes NO_CONFIGURE= yes -USE_TOOLS+= pax +USE_TOOLS+= pax pkg-config GLM_DIR= include/glm INSTALLATION_DIRS= ${GLM_DIR} do-install: ${RUN}cd ${WRKSRC}/glm && \ - ${CHMOD} 644 *hpp detail/* gtc/* gtx/* + ${CHMOD} 644 *hpp detail/* ext/* gtc/* gtx/* simd/* ${RUN}cd ${WRKSRC}/glm && \ - pax -rw *hpp detail gtc gtx \ + pax -rw *hpp detail ext gtc gtx simd \ ${DESTDIR}${PREFIX}/${GLM_DIR} # for test target +USE_CMAKE= yes USE_LANGUAGES= c c++ do-test: ${RUN}cd ${WRKSRC} && \ diff --git a/graphics/glm/PLIST b/graphics/glm/PLIST index 4f74687fe945..4ca911c5215e 100644 --- a/graphics/glm/PLIST +++ b/graphics/glm/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2015/08/09 11:17:00 wiz Exp $ +@comment $NetBSD: PLIST,v 1.4 2022/01/02 14:53:26 tnn Exp $ include/glm/common.hpp include/glm/detail/_features.hpp include/glm/detail/_fixes.hpp @@ -6,50 +6,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_exponential.hpp +include/glm/detail/func_common_simd.inl include/glm/detail/func_exponential.inl -include/glm/detail/func_geometric.hpp +include/glm/detail/func_exponential_simd.inl include/glm/detail/func_geometric.inl -include/glm/detail/func_integer.hpp +include/glm/detail/func_geometric_simd.inl include/glm/detail/func_integer.inl -include/glm/detail/func_matrix.hpp +include/glm/detail/func_integer_simd.inl include/glm/detail/func_matrix.inl -include/glm/detail/func_noise.hpp -include/glm/detail/func_noise.inl -include/glm/detail/func_packing.hpp +include/glm/detail/func_matrix_simd.inl include/glm/detail/func_packing.inl -include/glm/detail/func_trigonometric.hpp +include/glm/detail/func_packing_simd.inl include/glm/detail/func_trigonometric.inl -include/glm/detail/func_vector_relational.hpp +include/glm/detail/func_trigonometric_simd.inl include/glm/detail/func_vector_relational.inl +include/glm/detail/func_vector_relational_simd.inl include/glm/detail/glm.cpp -include/glm/detail/intrinsic_common.hpp -include/glm/detail/intrinsic_common.inl -include/glm/detail/intrinsic_exponential.hpp -include/glm/detail/intrinsic_exponential.inl -include/glm/detail/intrinsic_geometric.hpp -include/glm/detail/intrinsic_geometric.inl -include/glm/detail/intrinsic_integer.hpp -include/glm/detail/intrinsic_integer.inl -include/glm/detail/intrinsic_matrix.hpp -include/glm/detail/intrinsic_matrix.inl -include/glm/detail/intrinsic_trigonometric.hpp -include/glm/detail/intrinsic_trigonometric.inl -include/glm/detail/intrinsic_vector_relational.hpp -include/glm/detail/intrinsic_vector_relational.inl -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 @@ -68,8 +48,10 @@ include/glm/detail/type_mat4x3.hpp include/glm/detail/type_mat4x3.inl include/glm/detail/type_mat4x4.hpp include/glm/detail/type_mat4x4.inl -include/glm/detail/type_vec.hpp -include/glm/detail/type_vec.inl +include/glm/detail/type_mat4x4_simd.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 @@ -78,11 +60,172 @@ include/glm/detail/type_vec3.hpp include/glm/detail/type_vec3.inl include/glm/detail/type_vec4.hpp include/glm/detail/type_vec4.inl -include/glm/detail/type_vec4_avx.inl -include/glm/detail/type_vec4_avx2.inl -include/glm/detail/type_vec4_sse2.inl +include/glm/detail/type_vec4_simd.inl include/glm/exponential.hpp 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 @@ -109,12 +252,14 @@ include/glm/gtc/packing.hpp include/glm/gtc/packing.inl include/glm/gtc/quaternion.hpp include/glm/gtc/quaternion.inl +include/glm/gtc/quaternion_simd.inl include/glm/gtc/random.hpp include/glm/gtc/random.inl include/glm/gtc/reciprocal.hpp include/glm/gtc/reciprocal.inl include/glm/gtc/round.hpp include/glm/gtc/round.inl +include/glm/gtc/type_aligned.hpp include/glm/gtc/type_precision.hpp include/glm/gtc/type_precision.inl include/glm/gtc/type_ptr.hpp @@ -122,13 +267,14 @@ 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/associated_min_max.hpp include/glm/gtx/associated_min_max.inl 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,18 +287,25 @@ 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/extented_min_max.hpp -include/glm/gtx/extented_min_max.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 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 @@ -171,6 +324,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 @@ -213,24 +368,23 @@ include/glm/gtx/rotate_vector.inl include/glm/gtx/scalar_multiplication.hpp include/glm/gtx/scalar_relational.hpp include/glm/gtx/scalar_relational.inl -include/glm/gtx/simd_mat4.hpp -include/glm/gtx/simd_mat4.inl -include/glm/gtx/simd_quat.hpp -include/glm/gtx/simd_quat.inl -include/glm/gtx/simd_vec4.hpp -include/glm/gtx/simd_vec4.inl include/glm/gtx/spline.hpp include/glm/gtx/spline.inl 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 include/glm/gtx/transform2.inl 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 @@ -249,6 +403,16 @@ include/glm/mat4x3.hpp include/glm/mat4x4.hpp include/glm/matrix.hpp include/glm/packing.hpp +include/glm/simd/common.h +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 +include/glm/simd/vector_relational.h include/glm/trigonometric.hpp include/glm/vec2.hpp include/glm/vec3.hpp diff --git a/graphics/glm/distinfo b/graphics/glm/distinfo index 49bc6b6f0272..48ec2b3fb116 100644 --- a/graphics/glm/distinfo +++ b/graphics/glm/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.6 2021/10/26 10:46:13 nia Exp $ +$NetBSD: distinfo,v 1.7 2022/01/02 14:53:26 tnn Exp $ -BLAKE2s (glm-0.9.7.0.zip) = 4b7b08f5b61eab7ffee4db5be98d5d6d2634ee350278037eef37337960f01ac6 -SHA512 (glm-0.9.7.0.zip) = 19c901a63bec6a3ef1749081d0f4c7af62b415e641fbab125c55252a0581c0b8c87e9239c503803f825ac68d582e5aa209467d24946a8cbb064895f35e4d93a4 -Size (glm-0.9.7.0.zip) = 4436581 bytes +BLAKE2s (glm-0.9.9.8.tar.gz) = c765ebf24705108ca033fd9aa147f29088a79669c25a8646055b6a33767e8740 +SHA512 (glm-0.9.9.8.tar.gz) = 9484b0c12175414237c5b9486a2990099b1cb727e442f25ecda18b081aa661f7e92a44481f642989553cd3da7992a773441ee5688991bd539ce19fb66a5ce9e8 +Size (glm-0.9.9.8.tar.gz) = 4368032 bytes