Attachment 183161 Details for Bug 219737 – Diff to update math/glm

[patch] Diff to update math/glm

math-glm.diff (text/plain), 8.63 KB, created by Pedro F. Giffuni on 2017-06-02 20:11:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Pedro F. Giffuni

Created: 2017-06-02 20:11:44 UTC

Size: 8.63 KB

patch

obsolete

>Index: math/glm/Makefile
>===================================================================
>--- math/glm/Makefile	(revision 442379)
>+++ math/glm/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	glm
>-PORTVERSION=	0.9.7.3
>+PORTVERSION=	0.9.8.4
> PORTEPOCH=	1
> CATEGORIES=	math graphics
> 
>@@ -18,7 +18,10 @@
> NO_ARCH=	yes
> NO_BUILD=	yes
> 
>-CMAKE_ARGS=	-DGLM_TEST_ENABLE:BOOL=OFF
> USES=		cmake:outsource
> 
>+.ifndef MAINTAINER_MODE
>+CMAKE_ARGS=	-DGLM_TEST_ENABLE:BOOL=OFF
>+.endif
>+
> .include <bsd.port.mk>
>Index: math/glm/distinfo
>===================================================================
>--- math/glm/distinfo	(revision 442379)
>+++ math/glm/distinfo	(working copy)
>@@ -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: math/glm/files/patch-glm_detail_setup.hpp
>===================================================================
>--- math/glm/files/patch-glm_detail_setup.hpp	(revision 442379)
>+++ 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: 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: math/glm/pkg-plist
>===================================================================
>--- math/glm/pkg-plist	(revision 442379)
>+++ math/glm/pkg-plist	(working copy)
>@@ -9,35 +9,29 @@
> 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
>@@ -66,6 +60,7 @@
> 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
>@@ -76,9 +71,7 @@
> 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
>@@ -86,6 +79,7 @@
> 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
>@@ -92,6 +86,8 @@
> 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
>@@ -107,6 +103,7 @@
> 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
>@@ -113,6 +110,7 @@
> 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
>@@ -143,8 +141,8 @@
> 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
>@@ -151,6 +149,7 @@
> 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
>@@ -229,6 +228,8 @@
> 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
>@@ -247,6 +248,15 @@
> 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
>@@ -253,5 +263,6 @@
> 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
>+lib/pkgconfig/glm.pc

Actions: View | Diff

Attachments on bug 219737: 183161 | 183214 | 183215