Index: head/math/glm/Makefile =================================================================== --- head/math/glm/Makefile (revision 442565) +++ head/math/glm/Makefile (revision 442566) @@ -1,24 +1,27 @@ # Created by: demon@FreeBSD.org # $FreeBSD$ PORTNAME= glm -PORTVERSION= 0.9.7.3 +PORTVERSION= 0.9.8.4 PORTEPOCH= 1 CATEGORIES= math graphics MAINTAINER= ports@FreeBSD.org COMMENT= C++ mathematics library for software based on the OpenGL GLSL LICENSE= MIT LICENSE_FILE= ${WRKSRC}/copying.txt USE_GITHUB= yes GH_ACCOUNT= g-truc NO_ARCH= yes NO_BUILD= yes -CMAKE_ARGS= -DGLM_TEST_ENABLE:BOOL=OFF -USES= cmake:outsource +USES= cmake:outsource pkgconfig + +.ifndef MAINTAINER_MODE +CMAKE_ARGS= -DGLM_TEST_ENABLE:BOOL=OFF -DCMAKE_INSTALL_PKG_CONFIG_DIR:PATH="${PREFIX}/libdata/pkgconfig" +.endif .include Index: head/math/glm/distinfo =================================================================== --- head/math/glm/distinfo (revision 442565) +++ head/math/glm/distinfo (revision 442566) @@ -1,2 +1,3 @@ -SHA256 (g-truc-glm-0.9.7.3_GH0.tar.gz) = 24f286a3cba59c64d1bdf3fe30125eb76f824fe195a0a29964c29d4d520ff392 -SIZE (g-truc-glm-0.9.7.3_GH0.tar.gz) = 3454231 +TIMESTAMP = 1496432867 +SHA256 (g-truc-glm-0.9.8.4_GH0.tar.gz) = a220e60f8711265595be3221e530d632d5823641ecd46a3a54bc174933bff14c +SIZE (g-truc-glm-0.9.8.4_GH0.tar.gz) = 3769208 Index: head/math/glm/files/patch-glm_detail_setup.hpp =================================================================== --- head/math/glm/files/patch-glm_detail_setup.hpp (revision 442565) +++ head/math/glm/files/patch-glm_detail_setup.hpp (nonexistent) @@ -1,54 +0,0 @@ ---- glm/detail/setup.hpp.orig 2015-05-07 21:31:27 UTC -+++ glm/detail/setup.hpp -@@ -62,6 +62,7 @@ - #define GLM_PLATFORM_UNIX 0x00400000 - #define GLM_PLATFORM_QNXNTO 0x00800000 - #define GLM_PLATFORM_WINCE 0x01000000 -+#define GLM_PLATFORM_FREEBSD 0x02000000 - - #ifdef GLM_FORCE_PLATFORM_UNKNOWN - # define GLM_PLATFORM GLM_PLATFORM_UNKNOWN -@@ -79,6 +80,8 @@ - # define GLM_PLATFORM GLM_PLATFORM_ANDROID - #elif defined(__linux) - # define GLM_PLATFORM GLM_PLATFORM_LINUX -+#elif defined(__FreeBSD__) -+# define GLM_PLATFORM GLM_PLATFORM_FREEBSD - #elif defined(__unix) - # define GLM_PLATFORM GLM_PLATFORM_UNIX - #else -@@ -104,6 +107,8 @@ - # pragma message("GLM: Android platform detected") - # elif(GLM_PLATFORM & GLM_PLATFORM_LINUX) - # pragma message("GLM: Linux platform detected") -+# elif(GLM_PLATFORM & GLM_PLATFORM_FREEBSD) -+# pragma message("GLM: FreeBSD platform detected") - # elif(GLM_PLATFORM & GLM_PLATFORM_UNIX) - # pragma message("GLM: UNIX platform detected") - # elif(GLM_PLATFORM & GLM_PLATFORM_UNKNOWN) -@@ -523,7 +528,11 @@ - - // N1988 - #if GLM_LANG & GLM_LANG_CXX11_FLAG --# define GLM_HAS_EXTENDED_INTEGER_TYPE 1 -+# if (GLM_PLATFORM & GLM_PLATFORM_FREEBSD) && (GLM_COMPILER & GLM_COMPILER_LLVM) -+# define GLM_HAS_EXTENDED_INTEGER_TYPE __has_include(<__config>) -+# else -+# define GLM_HAS_EXTENDED_INTEGER_TYPE 1 -+# endif - #else - # define GLM_HAS_EXTENDED_INTEGER_TYPE (\ - ((GLM_LANG & GLM_LANG_CXX0X_FLAG) && (GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2012)) || \ -@@ -638,7 +647,11 @@ - - // - #if GLM_LANG & GLM_LANG_CXX11_FLAG --# define GLM_HAS_MAKE_SIGNED 1 -+# if (GLM_PLATFORM & GLM_PLATFORM_FREEBSD) && (GLM_COMPILER & GLM_COMPILER_LLVM) -+# define GLM_HAS_MAKE_SIGNED __has_include(<__config>) -+# else -+# define GLM_HAS_MAKE_SIGNED 1 -+# endif - #else - # define GLM_HAS_MAKE_SIGNED (GLM_LANG & GLM_LANG_CXX0X_FLAG) && (\ - ((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2013))) Property changes on: head/math/glm/files/patch-glm_detail_setup.hpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/math/glm/files/patch-CMakeLists.txt =================================================================== --- head/math/glm/files/patch-CMakeLists.txt (nonexistent) +++ head/math/glm/files/patch-CMakeLists.txt (revision 442566) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2017-06-04 05:59:53 UTC ++++ CMakeLists.txt +@@ -226,7 +226,7 @@ configure_file( + # install pkg-config file + install( + FILES "${CMAKE_CURRENT_BINARY_DIR}/glm.pc" +- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig" ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/../libdata/pkgconfig" + ) + + export(PACKAGE glm) Property changes on: head/math/glm/files/patch-CMakeLists.txt ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/math/glm/pkg-plist =================================================================== --- head/math/glm/pkg-plist (revision 442565) +++ head/math/glm/pkg-plist (revision 442566) @@ -1,257 +1,268 @@ include/glm/CMakeLists.txt include/glm/common.hpp include/glm/detail/_features.hpp include/glm/detail/_fixes.hpp 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/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/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/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 include/glm/detail/type_mat2x3.inl include/glm/detail/type_mat2x4.hpp include/glm/detail/type_mat2x4.inl include/glm/detail/type_mat3x2.hpp include/glm/detail/type_mat3x2.inl include/glm/detail/type_mat3x3.hpp include/glm/detail/type_mat3x3.inl include/glm/detail/type_mat3x4.hpp include/glm/detail/type_mat3x4.inl include/glm/detail/type_mat4x2.hpp include/glm/detail/type_mat4x2.inl 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_mat4x4_simd.inl include/glm/detail/type_vec.hpp include/glm/detail/type_vec.inl include/glm/detail/type_vec1.hpp include/glm/detail/type_vec1.inl include/glm/detail/type_vec2.hpp include/glm/detail/type_vec2.inl 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/fwd.hpp include/glm/geometric.hpp include/glm/glm.hpp 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 include/glm/gtc/matrix_access.inl include/glm/gtc/matrix_integer.hpp include/glm/gtc/matrix_inverse.hpp include/glm/gtc/matrix_inverse.inl include/glm/gtc/matrix_transform.hpp include/glm/gtc/matrix_transform.inl include/glm/gtc/noise.hpp include/glm/gtc/noise.inl 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 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_space.hpp include/glm/gtx/color_space.inl include/glm/gtx/color_space_YCoCg.hpp include/glm/gtx/color_space_YCoCg.inl include/glm/gtx/common.hpp include/glm/gtx/common.inl include/glm/gtx/compatibility.hpp include/glm/gtx/compatibility.inl 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/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/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/gradient_paint.hpp include/glm/gtx/gradient_paint.inl include/glm/gtx/handed_coordinate_space.hpp include/glm/gtx/handed_coordinate_space.inl include/glm/gtx/hash.hpp include/glm/gtx/hash.inl include/glm/gtx/integer.hpp include/glm/gtx/integer.inl include/glm/gtx/intersect.hpp include/glm/gtx/intersect.inl include/glm/gtx/io.hpp include/glm/gtx/io.inl include/glm/gtx/log_base.hpp include/glm/gtx/log_base.inl 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_interpolation.hpp include/glm/gtx/matrix_interpolation.inl include/glm/gtx/matrix_major_storage.hpp include/glm/gtx/matrix_major_storage.inl include/glm/gtx/matrix_operation.hpp include/glm/gtx/matrix_operation.inl include/glm/gtx/matrix_query.hpp include/glm/gtx/matrix_query.inl include/glm/gtx/matrix_transform_2d.hpp include/glm/gtx/matrix_transform_2d.inl include/glm/gtx/mixed_product.hpp include/glm/gtx/mixed_product.inl include/glm/gtx/norm.hpp include/glm/gtx/norm.inl include/glm/gtx/normal.hpp include/glm/gtx/normal.inl include/glm/gtx/normalize_dot.hpp include/glm/gtx/normalize_dot.inl include/glm/gtx/number_precision.hpp include/glm/gtx/number_precision.inl include/glm/gtx/optimum_pow.hpp include/glm/gtx/optimum_pow.inl include/glm/gtx/orthonormalize.hpp include/glm/gtx/orthonormalize.inl include/glm/gtx/perpendicular.hpp include/glm/gtx/perpendicular.inl include/glm/gtx/polar_coordinates.hpp include/glm/gtx/polar_coordinates.inl include/glm/gtx/projection.hpp include/glm/gtx/projection.inl include/glm/gtx/quaternion.hpp include/glm/gtx/quaternion.inl include/glm/gtx/range.hpp include/glm/gtx/raw_data.hpp include/glm/gtx/raw_data.inl include/glm/gtx/rotate_normalized_axis.hpp include/glm/gtx/rotate_normalized_axis.inl include/glm/gtx/rotate_vector.hpp 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/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/vector_angle.hpp include/glm/gtx/vector_angle.inl include/glm/gtx/vector_query.hpp include/glm/gtx/vector_query.inl include/glm/gtx/wrap.hpp include/glm/gtx/wrap.inl include/glm/integer.hpp include/glm/mat2x2.hpp include/glm/mat2x3.hpp include/glm/mat2x4.hpp include/glm/mat3x2.hpp include/glm/mat3x3.hpp include/glm/mat3x4.hpp include/glm/mat4x2.hpp 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/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 include/glm/vec4.hpp include/glm/vector_relational.hpp lib/cmake/glm/glmConfig.cmake +lib/cmake/glm/glmConfigVersion.cmake lib/cmake/glm/glmTargets.cmake -lib/cmake/glm/glmVersion.cmake +libdata/pkgconfig/glm.pc