diff options
| author | nia <nia@pkgsrc.org> | 2020-06-28 15:04:36 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-06-28 15:04:36 +0000 |
| commit | 658832dc5d22554dfa4990d43b82913f9273e426 (patch) | |
| tree | a44ca78a8a97f7083e3ef1ea3e5f4d8ee16f4e58 /emulators | |
| parent | 57cecfae9666afaea05c4031151f13e9af6fae1b (diff) | |
| download | pkgsrc-658832dc5d22554dfa4990d43b82913f9273e426.tar.gz | |
dolphin-emu: Build with -std=gnu++14 to get the right alloca definition.
EXTRACT_USING=bsdtar hack is no longer needed.
Diffstat (limited to 'emulators')
| -rw-r--r-- | emulators/dolphin-emu/Makefile | 7 | ||||
| -rw-r--r-- | emulators/dolphin-emu/distinfo | 4 | ||||
| -rw-r--r-- | emulators/dolphin-emu/patches/patch-CMakeLists.txt | 13 |
3 files changed, 17 insertions, 7 deletions
diff --git a/emulators/dolphin-emu/Makefile b/emulators/dolphin-emu/Makefile index 6f85519c291..ab4f9bdf9da 100644 --- a/emulators/dolphin-emu/Makefile +++ b/emulators/dolphin-emu/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.20 2020/05/22 10:56:05 adam Exp $ +# $NetBSD: Makefile,v 1.21 2020/06/28 15:04:36 nia Exp $ DISTNAME= dolphin-emu-5.0 -PKGREVISION= 14 +PKGREVISION= 15 CATEGORIES= emulators MASTER_SITES= ${MASTER_SITE_GITHUB:=dolphin-emu/} GITHUB_PROJECT= dolphin @@ -12,10 +12,9 @@ HOMEPAGE= https://dolphin-emu.org/ COMMENT= Nintendo GameCube and Wii emulator LICENSE= gnu-gpl-v2 -EXTRACT_USING= bsdtar USE_TOOLS+= msgfmt msgmerge pkg-config USE_CMAKE= yes -USE_LANGUAGES= c gnu++14 +USE_LANGUAGES= c c++ # std::make_unique GCC_REQD+= 4.9 diff --git a/emulators/dolphin-emu/distinfo b/emulators/dolphin-emu/distinfo index b358a0d3de7..b284bcceaf9 100644 --- a/emulators/dolphin-emu/distinfo +++ b/emulators/dolphin-emu/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.4 2020/04/20 00:34:20 joerg Exp $ +$NetBSD: distinfo,v 1.5 2020/06/28 15:04:36 nia Exp $ SHA1 (dolphin-emu-5.0.tar.gz) = 6553f9fe5281326b86f33fb6b99a93fe6a8820af RMD160 (dolphin-emu-5.0.tar.gz) = e8c4cb2c903b78c3e21cb12b0724ab0728c1391a SHA512 (dolphin-emu-5.0.tar.gz) = 8de76f811abfb82e19502336734e86ba600c11d9fa95bcf7f70a2a525165d07ead826854c39377602aab7856a057af9ba91bff458cf2dd008712527290489d3a Size (dolphin-emu-5.0.tar.gz) = 38246344 bytes -SHA1 (patch-CMakeLists.txt) = 6e0163c4d385f31981a13e4f8527c873820ba6a6 +SHA1 (patch-CMakeLists.txt) = e6f8d72d53ea930306dfb7a879608c3d3ab946aa SHA1 (patch-Externals_SFML_include_SFML_Config.hpp) = 75ece2ce86b54b219a80d6ff028ecc80a00454f5 SHA1 (patch-Source_Core_Common_FileUtil.cpp) = 27b859714e294abbfb3f468928e22b30abfd0099 SHA1 (patch-Source_Core_Common_MemoryUtil.cpp) = af681a3f43687f7af09c87732a7a2da8e8c58e05 diff --git a/emulators/dolphin-emu/patches/patch-CMakeLists.txt b/emulators/dolphin-emu/patches/patch-CMakeLists.txt index 13aa970df11..142f1c465f5 100644 --- a/emulators/dolphin-emu/patches/patch-CMakeLists.txt +++ b/emulators/dolphin-emu/patches/patch-CMakeLists.txt @@ -1,9 +1,11 @@ -$NetBSD: patch-CMakeLists.txt,v 1.2 2019/01/02 00:30:01 nia Exp $ +$NetBSD: patch-CMakeLists.txt,v 1.3 2020/06/28 15:04:36 nia Exp $ Allow better control over what libraries are detected. Install data unconditionally. +-std=c++1y can't be used with alloca() - use -std=gnu++14 instead + --- CMakeLists.txt.orig 2016-06-24 08:09:07.000000000 +0000 +++ CMakeLists.txt @@ -15,6 +15,12 @@ option(ENABLE_PCH "Use PCH to speed up c @@ -153,6 +155,15 @@ Install data unconditionally. endif() if(wxWidgets_FOUND) +@@ -965,7 +958,7 @@ add_custom_command(TARGET unittests POST + ######################################## + # Start compiling our code + # +-add_definitions(-std=c++1y) ++add_definitions(-std=gnu++14 -fexceptions) + + # These aren't actually needed for C11/C++11 + # but some dependencies require them (LLVM, libav). @@ -986,13 +979,8 @@ add_subdirectory(Source) ######################################## # Install shared data files |