CVS commit: pkgsrc/emulators/dolphin-emu

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Apr 20 00:34:20 UTC 2020

Modified Files:
        pkgsrc/emulators/dolphin-emu: distinfo
Added Files:
        pkgsrc/emulators/dolphin-emu/patches:
            patch-Source_Core_Common_x64CPUDetect.cpp

Log Message:
Don't conflict with macros from *intrin.h.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/dolphin-emu/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/dolphin-emu/distinfo
diff -u pkgsrc/emulators/dolphin-emu/distinfo:1.3 pkgsrc/emulators/dolphin-emu/distinfo:1.4
--- pkgsrc/emulators/dolphin-emu/distinfo:1.3   Fri Oct 25 09:56:51 2019
+++ pkgsrc/emulators/dolphin-emu/distinfo       Mon Apr 20 00:34:20 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2019/10/25 09:56:51 kamil Exp $
+$NetBSD: distinfo,v 1.4 2020/04/20 00:34:20 joerg Exp $
 
 SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af
 RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a
@@ -10,6 +10,7 @@ SHA1 (patch-Source_Core_Common_FileUtil.
 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05
 SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16
 SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3
+SHA1 (patch-Source_Core_Common_x64CPUDetect.cpp) = 9238fc6d7c9f225fbd9885c1e5b07b237041e4f7
 SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75
 SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768
 SHA1 (patch-Source_Core_Core_MemTools.cpp) = 2316e8103749fe174db7f694f2eeb22035cd135c

Added files:

Index: pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp
diff -u /dev/null pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp:1.1
--- /dev/null   Mon Apr 20 00:34:20 2020
+++ pkgsrc/emulators/dolphin-emu/patches/patch-Source_Core_Common_x64CPUDetect.cpp      Mon Apr 20 00:34:20 2020
@@ -0,0 +1,33 @@
+$NetBSD: patch-Source_Core_Common_x64CPUDetect.cpp,v 1.1 2020/04/20 00:34:20 joerg Exp $
+
+--- Source/Core/Common/x64CPUDetect.cpp.orig   2020-04-19 15:52:44.582835202 +0000
++++ Source/Core/Common/x64CPUDetect.cpp
+@@ -42,13 +42,18 @@ static inline void __cpuid(int info[4], 
+ }
+ 
+ #define _XCR_XFEATURE_ENABLED_MASK 0
+-static u64 _xgetbv(u32 index)
++static u64 my_xgetbv(u32 index)
+ {
+       u32 eax, edx;
+       __asm__ __volatile__("xgetbv" : "=a"(eax), "=d"(edx) : "c"(index));
+       return ((u64)edx << 32) | eax;
+ }
+ 
++#else
++static u64 my_xgetbv(u32 index)
++{
++      return _xgetbv(index);
++}
+ #endif // ifndef _WIN32
+ 
+ CPUInfo cpu_info;
+@@ -134,7 +139,7 @@ void CPUInfo::Detect()
+               //  - XGETBV result has the XCR bit set.
+               if (((cpu_id[2] >> 28) & 1) && ((cpu_id[2] >> 27) & 1))
+               {
+-                      if ((_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
++                      if ((my_xgetbv(_XCR_XFEATURE_ENABLED_MASK) & 0x6) == 0x6)
+                       {
+                               bAVX = true;
+                               if ((cpu_id[2] >> 12) & 1)