[gentoo-commits] repo/gentoo:master commit in: games-action/supertuxkart/files/, games-action/supertuxkart/

["James Le Cuirot" <chewi@gentoo.org>]

commit:     49441c0caade1866d7270e166025c06b1f71acbd
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 18 15:21:18 2018 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Jan 18 15:24:49 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49441c0c

games-action/supertuxkart: Add upstream patch to fix CPU intrinsics

Closes: https://bugs.gentoo.org/644190
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../files/supertuxkart-0.9.3-intrin.patch          | 56 ++++++++++++++++++++++
 .../supertuxkart/supertuxkart-0.9.3.ebuild         |  3 +-
 2 files changed, 58 insertions(+), 1 deletion(-)

diff --git a/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
new file mode 100644
index 00000000000..75830b8ba8f
--- /dev/null
+++ b/games-action/supertuxkart/files/supertuxkart-0.9.3-intrin.patch
@@ -0,0 +1,56 @@
+From 813b08bc73e4e93714b972ee56c64b4771735e01 Mon Sep 17 00:00:00 2001
+From: Benau <Benau@users.noreply.github.com>
+Date: Sun, 14 Jan 2018 10:19:37 +0800
+Subject: [PATCH] Fix #3091
+
+---
+ lib/graphics_utils/mipmap/cpusimd.h | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/lib/graphics_utils/mipmap/cpusimd.h b/lib/graphics_utils/mipmap/cpusimd.h
+index 1dc2c730b2..5e2cf30e5f 100644
+--- a/lib/graphics_utils/mipmap/cpusimd.h
++++ b/lib/graphics_utils/mipmap/cpusimd.h
+@@ -38,11 +38,11 @@
+  #include <mmintrin.h>
+  #define CPU_MMX_SUPPORT (1)
+ #endif
+-#if __SSE__ || _M_X64 || _M_IX86_FP >= 1  || CPU_ENABLE_SSE
++#if __SSE__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 1 ) ) || CPU_ENABLE_SSE
+  #include <xmmintrin.h>
+  #define CPU_SSE_SUPPORT (1)
+ #endif
+-#if __SSE2__ || _M_X64 || _M_IX86_FP >= 2  || CPU_ENABLE_SSE2
++#if __SSE2__ || defined(_M_X64) || ( defined(_M_IX86_FP) && ( _M_IX86_FP >= 2 ) ) || CPU_ENABLE_SSE2
+  #include <emmintrin.h>
+  #define CPU_SSE2_SUPPORT (1)
+ #endif
+@@ -95,23 +95,23 @@
+  #define CPU_POPCNT_SUPPORT (1)
+ #endif
+ #if __LZCNT__ || CPU_ENABLE_LZCNT
+- #include <lzcntintrin.h>
++ #include <x86intrin.h>
+  #define CPU_LZCNT_SUPPORT (1)
+ #endif
+ #if __F16C__ || CPU_ENABLE_F16C
+- #include <f16cintrin.h>
++ #include <x86intrin.h>
+  #define CPU_F16C_SUPPORT (1)
+ #endif
+ #if __BMI__ || CPU_ENABLE_BMI
+- #include <bmiintrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI_SUPPORT (1)
+ #endif
+ #if __BMI2__ || CPU_ENABLE_BMI2
+- #include <bmi2intrin.h>
++ #include <x86intrin.h>
+  #define CPU_BMI2_SUPPORT (1)
+ #endif
+ #if __TBM__ || CPU_ENABLE_TBM
+- #include <tbmintrin.h>
++ #include <x86intrin.h>
+  #define CPU_TBM_SUPPORT (1)
+ #endif
+ 

diff --git a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
index 04fa2e6dba1..cfda52536ec 100644
--- a/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
+++ b/games-action/supertuxkart/supertuxkart-0.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -41,6 +41,7 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 PATCHES=(
+	"${FILESDIR}"/${PN}-0.9.3-intrin.patch
 	"${FILESDIR}"/${PN}-0.9.3-unbundle-enet.patch
 	"${FILESDIR}"/${PN}-0.9.3-unbundle-libs.patch
 	"${FILESDIR}"/${PN}-0.9.3-irrlicht-arch-support.patch