Sun Jun 28 15:04:36 2020 UTC ()
dolphin-emu: Build with -std=gnu++14 to get the right alloca definition.

EXTRACT_USING=bsdtar hack is no longer needed.


(nia)
diff -r1.20 -r1.21 pkgsrc/emulators/dolphin-emu/Makefile
diff -r1.4 -r1.5 pkgsrc/emulators/dolphin-emu/distinfo
diff -r1.2 -r1.3 pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt
cvs diff -r1.20 -r1.21 pkgsrc/emulators/dolphin-emu/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/dolphin-emu/Makefile 2020/05/22 10:56:05 1.20
+++ pkgsrc/emulators/dolphin-emu/Makefile 2020/06/28 15:04:36 1.21
@@ -1,31 +1,30 @@ @@ -1,31 +1,30 @@
1# $NetBSD: Makefile,v 1.20 2020/05/22 10:56:05 adam Exp $ 1# $NetBSD: Makefile,v 1.21 2020/06/28 15:04:36 nia Exp $
2 2
3DISTNAME= dolphin-emu-5.0 3DISTNAME= dolphin-emu-5.0
4PKGREVISION= 14 4PKGREVISION= 15
5CATEGORIES= emulators 5CATEGORIES= emulators
6MASTER_SITES= ${MASTER_SITE_GITHUB:=dolphin-emu/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=dolphin-emu/}
7GITHUB_PROJECT= dolphin 7GITHUB_PROJECT= dolphin
8GITHUB_TAG= ${PKGVERSION_NOREV} 8GITHUB_TAG= ${PKGVERSION_NOREV}
9 9
10MAINTAINER= nia@NetBSD.org 10MAINTAINER= nia@NetBSD.org
11HOMEPAGE= https://dolphin-emu.org/ 11HOMEPAGE= https://dolphin-emu.org/
12COMMENT= Nintendo GameCube and Wii emulator 12COMMENT= Nintendo GameCube and Wii emulator
13LICENSE= gnu-gpl-v2 13LICENSE= gnu-gpl-v2
14 14
15EXTRACT_USING= bsdtar 
16USE_TOOLS+= msgfmt msgmerge pkg-config 15USE_TOOLS+= msgfmt msgmerge pkg-config
17USE_CMAKE= yes 16USE_CMAKE= yes
18USE_LANGUAGES= c gnu++14 17USE_LANGUAGES= c c++
19 18
20# std::make_unique 19# std::make_unique
21GCC_REQD+= 4.9 20GCC_REQD+= 4.9
22 21
23# Since SFML is not available in pkgsrc, make sure the included version 22# Since SFML is not available in pkgsrc, make sure the included version
24# is always used. 23# is always used.
25CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SFML=ON 24CMAKE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_SFML=ON
26 25
27CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR} 26CMAKE_ARGS+= -DPKGMANDIR=${PKGMANDIR}
28 27
29.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
30 29
31# Claims to only support little endian architectures. 30# Claims to only support little endian architectures.
cvs diff -r1.4 -r1.5 pkgsrc/emulators/dolphin-emu/distinfo (expand / switch to unified diff)

--- pkgsrc/emulators/dolphin-emu/distinfo 2020/04/20 00:34:20 1.4
+++ pkgsrc/emulators/dolphin-emu/distinfo 2020/06/28 15:04:36 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1$NetBSD: distinfo,v 1.4 2020/04/20 00:34:20 joerg Exp $ 1$NetBSD: distinfo,v 1.5 2020/06/28 15:04:36 nia Exp $
2 2
3SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af 3SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af
4RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a 4RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a
5SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a 5SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a
6Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes 6Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes
7SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6 7SHA1 (patch-CMakeLists.txt) = e6f8d72d53ea930306dfb7a879608c3d3ab946aa
8SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5 8SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5
9SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099 9SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099
10SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05 10SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05
11SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16 11SHA1 (patch-Source_Core_Common_StringUtil.cpp) = 3a53d42ae9da1d50c0693bd222cb20be9ebe5a16
12SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3 12SHA1 (patch-Source_Core_Common_Thread.cpp) = 8356c548c43ad762f4d226cf3d51a854f0a8b7f3
13SHA1 (patch-Source_Core_Common_x64CPUDetect.cpp) = 9238fc6d7c9f225fbd9885c1e5b07b237041e4f7 13SHA1 (patch-Source_Core_Common_x64CPUDetect.cpp) = 9238fc6d7c9f225fbd9885c1e5b07b237041e4f7
14SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75 14SHA1 (patch-Source_Core_Core_HW_EXI__DeviceEthernet.h) = 144250d51b78e287a8305e75ee06e24c305c3d75
15SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768 15SHA1 (patch-Source_Core_Core_IPC__HLE_WII__Socket.h) = 8de6dec95689efb63c3795d3e361b5bd9a8d7768
16SHA1 (patch-Source_Core_Core_MemTools.cpp) = 2316e8103749fe174db7f694f2eeb22035cd135c 16SHA1 (patch-Source_Core_Core_MemTools.cpp) = 2316e8103749fe174db7f694f2eeb22035cd135c
17SHA1 (patch-Source_Core_VideoCommon_DriverDetails.cpp) = 227d2ab5835be08b23f13346c9b9252ae3295155 17SHA1 (patch-Source_Core_VideoCommon_DriverDetails.cpp) = 227d2ab5835be08b23f13346c9b9252ae3295155
18SHA1 (patch-Source_Core_VideoCommon_DriverDetails.h) = dc3a8f559253ea2a3f75223cfe7eb0a6c2c39ce1 18SHA1 (patch-Source_Core_VideoCommon_DriverDetails.h) = dc3a8f559253ea2a3f75223cfe7eb0a6c2c39ce1
cvs diff -r1.2 -r1.3 pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt (expand / switch to unified diff)

--- pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt 2019/01/02 00:30:01 1.2
+++ pkgsrc/emulators/dolphin-emu/patches/patch-CMakeLists.txt 2020/06/28 15:04:36 1.3
@@ -1,19 +1,21 @@ @@ -1,19 +1,21 @@
1$NetBSD: patch-CMakeLists.txt,v 1.2 2019/01/02 00:30:01 nia Exp $ 1$NetBSD: patch-CMakeLists.txt,v 1.3 2020/06/28 15:04:36 nia Exp $
2 2
3Allow better control over what libraries are detected. 3Allow better control over what libraries are detected.
4 4
5Install data unconditionally. 5Install data unconditionally.
6 6
 7-std=c++1y can't be used with alloca() - use -std=gnu++14 instead
 8
7--- CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000 9--- CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000
8+++ CMakeLists.txt 10+++ CMakeLists.txt
9@@ -15,6 +15,12 @@ option(ENABLE_PCH "Use PCH to speed up c 11@@ -15,6 +15,12 @@ option(ENABLE_PCH "Use PCH to speed up c
10 option(ENABLE_LTO "Enables Link Time Optimization" OFF) 12 option(ENABLE_LTO "Enables Link Time Optimization" OFF)
11 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF) 13 option(ENABLE_GENERIC "Enables generic build that should run on any little-endian host" OFF)
12 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF) 14 option(ENABLE_HEADLESS "Enables running Dolphin as a headless variant" OFF)
13+option(ENABLE_AO "Enable libao support" OFF) 15+option(ENABLE_AO "Enable libao support" OFF)
14+option(ENABLE_ALSA "Enable ALSA support" OFF) 16+option(ENABLE_ALSA "Enable ALSA support" OFF)
15+option(ENABLE_OPENAL "Enable OpenAL support" OFF) 17+option(ENABLE_OPENAL "Enable OpenAL support" OFF)
16+option(ENABLE_PULSEAUDIO "Enable PulseAudio support" OFF) 18+option(ENABLE_PULSEAUDIO "Enable PulseAudio support" OFF)
17+option(ENABLE_PORTAUDIO "Enable PortAudio support" OFF) 19+option(ENABLE_PORTAUDIO "Enable PortAudio support" OFF)
18+option(ENABLE_LLVM "Enable LLVM support (for disassembly)" OFF) 20+option(ENABLE_LLVM "Enable LLVM support (for disassembly)" OFF)
19  21
@@ -143,26 +145,35 @@ Install data unconditionally. @@ -143,26 +145,35 @@ Install data unconditionally.
143- include(FindGTK2) 145- include(FindGTK2)
144- if(GTK2_FOUND) 146- if(GTK2_FOUND)
145- include_directories(${GTK2_INCLUDE_DIRS}) 147- include_directories(${GTK2_INCLUDE_DIRS})
146- list(APPEND LIBS ${GTK2_LIBRARIES}) 148- list(APPEND LIBS ${GTK2_LIBRARIES})
147- else() 149- else()
148- message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.") 150- message(FATAL_ERROR "GTK is required to build the WX UI. Please install the GTK development libraries.")
149- endif() 151- endif()
150- endif() 152- endif()
151+ check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h OPTIONAL) 153+ check_lib(GTK2 gtk+-2.0 gtk+-2.0 gtk.h OPTIONAL)
152+ check_lib(GTK3 gtk+-3.0 gtk+-3.0 gtk.h OPTIONAL) 154+ check_lib(GTK3 gtk+-3.0 gtk+-3.0 gtk.h OPTIONAL)
153 endif() 155 endif()
154  156
155 if(wxWidgets_FOUND) 157 if(wxWidgets_FOUND)
 158@@ -965,7 +958,7 @@ add_custom_command(TARGET unittests POST
 159 ########################################
 160 # Start compiling our code
 161 #
 162-add_definitions(-std=c++1y)
 163+add_definitions(-std=gnu++14 -fexceptions)
 164
 165 # These aren't actually needed for C11/C++11
 166 # but some dependencies require them (LLVM, libav).
156@@ -986,13 +979,8 @@ add_subdirectory(Source) 167@@ -986,13 +979,8 @@ add_subdirectory(Source)
157 ######################################## 168 ########################################
158 # Install shared data files 169 # Install shared data files
159 # 170 #
160-if(NOT APPLE) 171-if(NOT APPLE)
161 install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN) 172 install(DIRECTORY Data/Sys/ DESTINATION ${datadir}/sys PATTERN)
162-endif() 173-endif()
163-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin") 174-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux|FreeBSD|Darwin")
164 install(FILES Data/license.txt DESTINATION ${datadir}) 175 install(FILES Data/license.txt DESTINATION ${datadir})
165-endif() 176-endif()
166-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 177-if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
167 # Install the application icon and menu item 178 # Install the application icon and menu item
168 install(FILES Data/dolphin-emu.svg 179 install(FILES Data/dolphin-emu.svg