gentoo resync : 19.03.2019

3 files changed, 36 insertions, 3 deletions

diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest
index 6bbddf502eee..aa82e80031ac 100644
--- a/media-libs/glm/Manifest
+++ b/media-libs/glm/Manifest
@@ -1,9 +1,10 @@
 AUX glm-0.9.8.5-gcc7_tests.patch 2495 BLAKE2B afb4e8d64272497cd3e02ea73ba5536b660b3d73302fab4f2eff4fe87b3a2eae604a04fd5aa7ebc55dc860e419ea370a1c240a1b2d30fd6d522c9f37d3277c50 SHA512 c21859d4db606bd6420a889ae4ae3242b1e60a7f660cbe7aaee1583919a82c47b2f209d596378f8d919aa59c34ebb12beef05a06f969fd6941168b9bbe7e8467
+AUX glm-0.9.9.2-avx.patch 1124 BLAKE2B d7cf404b222d98ea4771c354ad3afa712e217be0a4e917c026f79cfb7262e1be9faa2efe85c5bf2cae8df446b421b5f3c1c5545fcc8f6cf3181f6b50425dd680 SHA512 a6a67dccfd9eeecf3ddf083de89da2fd48498a1d815e58d82a9f53feab164d46450c8a41978fcb131b9517e468bdc0949ce4c15b1b24ffe9c0dd6e94516c7874
 AUX glm-gcc73.patch 1378 BLAKE2B 98be49157daff3250931510e26f7b21cdee74ab2931f5df50153d31a66d4b85e6b7eeeed2316154a2a4c70ed63c53f530a486672fc6b5255a1de9521cac512ef SHA512 c816b9ab071f5d6ef2435c10699c562807d1e8dac08c896d0a6a76f0bcd6c21f82e831349f544e171897e826c26d23a3bf958f808abc8a3d6b8f1c8b534ccda5
 DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a80c034c86341d12fedb17ab16f96114df28f56f52a12d8d60edecd26ecbcbffe6daa76f035711248240ef6616 SHA512 5a7e84ecc5a54320c74776c133bfdbeaf0d4496a7a7fdf2f4ccf89e66b3665a577a370a662ac97a350a2b1f717ce769cb0826057ebb3b13c9c2fee65f20ac7b4
 DIST glm-0.9.9.2.tar.gz 4572279 BLAKE2B 8b9ade542989b3f73f1a80403b73b5c04c5d64ae259891a6b41564eb7b4417876d527ea8440352f2feec6480ec926ca877a4849c4e75c6ece3692d24d87c942a SHA512 80a5fbeaaea5f1034cd6f8ad3f4daf8b5fa8d9410ccce15ced20f37e24c0f6083332fde82b1fa7357399b3e37c1a31dd3a14f257b7847a5f1ddefa627b50351a
 DIST glm-0.9.9.3.tar.gz 4577239 BLAKE2B 167312e95a43417dba59481b1d45976d9249af9fda9ebb6d0ec598e706bc2469b8c0928877683d47335e0c55ee881a20c1c7f648dd77e183880f7c2792bd5277 SHA512 44152ea6438763feda3b78813287fd59d3574a9630a41647a157825bf5ce4a18fbbecae5a5ccd94acc118ed3d42cbce53d3a67f25632d0c00ab77e7de2bb4650
 EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05
-EBUILD glm-0.9.9.2.ebuild 865 BLAKE2B 69b9fb6daadd63ba3b5691b6c8cfaa3b2afc072a0894f81ac95908d968f5060e24129497db2ea11f93604bf38f7d700ee769472918f05a55df17b7484f5b3001 SHA512 bffa26d68e2d034fd7802c9ad4b174f843c1fe773f40e3e36a56237e4605d63c50c6bcbf6e8145a6ce29fc53ebbd8852fe1157e2ae33c60e0fd11ba9b2e2d127
+EBUILD glm-0.9.9.2.ebuild 903 BLAKE2B 0a3a6d5761f7c2a8c497c59d03094c306eeaba1d5d6d5d97b07bd67d05d92389279ffa6302a57ba86bfdeeb3bcf75d5a1daf949d677298648d43df371b01540c SHA512 fd05cc52d409c68d807193e366f01c8e44b1bd168a559c3a9548e71c634b82a0c076b974fb1c230da4bfafbdc3b4e0ea1f4483346a0bc54a897510406a57815a
 EBUILD glm-0.9.9.3.ebuild 862 BLAKE2B 9b34afe8021029980017534376e5fb49faeb7e5ec1ebf17859424cfcacdfc4cd10a3943df9bfae3888cd5317e024ceaaafbbdc6590c75ae908b3cec6c030f017 SHA512 7f004b7285c6304a2e268b7cf6f14f7bb8e79a5ca23bf181446797afe8c57731cf19995448f8cc88c967006418d03f6799ef23ee3471b4a8a13a2e3b60d6a71a
 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971
diff --git a/media-libs/glm/files/glm-0.9.9.2-avx.patch b/media-libs/glm/files/glm-0.9.9.2-avx.patch
new file mode 100644
index 000000000000..3549af416fc4
--- /dev/null
+++ b/media-libs/glm/files/glm-0.9.9.2-avx.patch
@@ -0,0 +1,30 @@
+--- a/glm/simd/platform.h	2019-03-06 18:57:53.309630574 +0100
++++ b/glm/simd/platform.h	2019-03-06 18:58:30.796988006 +0100
+@@ -233,7 +233,7 @@
+ #define GLM_ARCH_SSSE3_BIT	(0x00000010)
+ #define GLM_ARCH_SSE41_BIT	(0x00000020)
+ #define GLM_ARCH_SSE42_BIT	(0x00000040)
+-#define GLM_ARCH_AVX_BIT	(0x00000080)
++#define GLM_ARCH_AVX_BIT	(0x00000000)
+ #define GLM_ARCH_AVX2_BIT	(0x00000100)
+ 
+ #define GLM_ARCH_UNKNOWN	(0)
+--- a/CMakeLists.txt	2019-03-06 19:27:14.052353176 +0100
++++ b/CMakeLists.txt	2019-03-06 19:27:05.161503895 +0100
+@@ -203,7 +203,6 @@
+ 		message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler")
+ 	endif()
+ 
+-	add_compile_options(-O2)
+ 	add_compile_options(-Wno-long-long)
+ 
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
+--- a/test/perf/CMakeLists.txt.old	2019-03-18 20:18:58.397352048 +0100
++++ b/test/perf/CMakeLists.txt	2019-03-18 20:19:08.466182370 +0100
+@@ -1,6 +1,3 @@
+-glmCreateTestGTC(perf_matrix_div)
+ glmCreateTestGTC(perf_matrix_inverse)
+-glmCreateTestGTC(perf_matrix_mul)
+-glmCreateTestGTC(perf_matrix_mul_vector)
+ glmCreateTestGTC(perf_matrix_transpose)
+ glmCreateTestGTC(perf_vector_mul_matrix)
diff --git a/media-libs/glm/glm-0.9.9.2.ebuild b/media-libs/glm/glm-0.9.9.2.ebuild
index 8f93505e3279..5dd83d7c5081 100644
--- a/media-libs/glm/glm-0.9.9.2.ebuild
+++ b/media-libs/glm/glm-0.9.9.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,11 +11,13 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="|| ( HappyBunny MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2"
 
 RDEPEND="virtual/opengl"
 
+PATCHES=( "${FILESDIR}"/${P}-avx.patch )
+
 src_configure() {
 	if use test; then
 		local mycmakeargs=(