CVS commit: pkgsrc/emulators

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators
From: "Nia Alarie" <nia%netbsd.org@localhost>
Date: Tue, 18 Jul 2023 18:02:47 +0000

Module Name:    pkgsrc
Committed By:   nia
Date:           Tue Jul 18 18:02:47 UTC 2023

Modified Files:
        pkgsrc/emulators/PC6001VX: Makefile
        pkgsrc/emulators/bsnes: Makefile
        pkgsrc/emulators/ckmame: Makefile
        pkgsrc/emulators/dolphin-emu: Makefile
        pkgsrc/emulators/dosbox-x: Makefile
        pkgsrc/emulators/emulationstation: Makefile
        pkgsrc/emulators/flycast: Makefile.common
        pkgsrc/emulators/libretro-beetle-psx: Makefile.common
        pkgsrc/emulators/libretro-dolphin: Makefile
        pkgsrc/emulators/mame: Makefile
        pkgsrc/emulators/mednafen: Makefile
        pkgsrc/emulators/melonds: Makefile
        pkgsrc/emulators/mgba-qt: Makefile
        pkgsrc/emulators/nono: Makefile
        pkgsrc/emulators/openmsx: Makefile
        pkgsrc/emulators/snes9x-gtk: Makefile
        pkgsrc/emulators/stella: Makefile.common

Log Message:
emulators: Adapt packages (where possible) to USE_(CC|CXX)_FEATURES


To generate a diff of this commit:
cvs rdiff -u -r1.82 -r1.83 pkgsrc/emulators/PC6001VX/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/emulators/bsnes/Makefile
cvs rdiff -u -r1.74 -r1.75 pkgsrc/emulators/ckmame/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/emulators/dolphin-emu/Makefile
cvs rdiff -u -r1.45 -r1.46 pkgsrc/emulators/dosbox-x/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/emulators/emulationstation/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/emulators/flycast/Makefile.common
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/libretro-beetle-psx/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/emulators/libretro-dolphin/Makefile
cvs rdiff -u -r1.172 -r1.173 pkgsrc/emulators/mame/Makefile
cvs rdiff -u -r1.43 -r1.44 pkgsrc/emulators/mednafen/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/melonds/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/emulators/mgba-qt/Makefile
cvs rdiff -u -r1.26 -r1.27 pkgsrc/emulators/nono/Makefile
cvs rdiff -u -r1.71 -r1.72 pkgsrc/emulators/openmsx/Makefile
cvs rdiff -u -r1.94 -r1.95 pkgsrc/emulators/snes9x-gtk/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/emulators/stella/Makefile.common

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

Modified files:

Index: pkgsrc/emulators/PC6001VX/Makefile
diff -u pkgsrc/emulators/PC6001VX/Makefile:1.82 pkgsrc/emulators/PC6001VX/Makefile:1.83
--- pkgsrc/emulators/PC6001VX/Makefile:1.82     Mon May 22 21:00:23 2023
+++ pkgsrc/emulators/PC6001VX/Makefile  Tue Jul 18 18:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2023/05/22 21:00:23 wiz Exp $
+# $NetBSD: Makefile,v 1.83 2023/07/18 18:02:45 nia Exp $
 
 VERSION=               4.1.3
 DISTNAME=              PC6001VX_${VERSION}_src
@@ -16,7 +16,7 @@ USE_LIBTOOL=          yes
 USE_TOOLS+=            pkg-config
 USE_LANGUAGES=         c c++
 
-GCC_REQD+=             9       # for qt6 that requires <filesystem>
+USE_CXX_FEATURES+=     c++17 filesystem
 
 INSTALLATION_DIRS+=    bin
 

Index: pkgsrc/emulators/bsnes/Makefile
diff -u pkgsrc/emulators/bsnes/Makefile:1.19 pkgsrc/emulators/bsnes/Makefile:1.20
--- pkgsrc/emulators/bsnes/Makefile:1.19        Sat May  6 19:09:12 2023
+++ pkgsrc/emulators/bsnes/Makefile     Tue Jul 18 18:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2023/05/06 19:09:12 ryoon Exp $
+# $NetBSD: Makefile,v 1.20 2023/07/18 18:02:45 nia Exp $
 
 DISTNAME=      bsnes-115
 PKGREVISION=   17
@@ -14,8 +14,7 @@ LICENSE=      gnu-gpl-v3
 USE_TOOLS+=    gmake pkg-config
 USE_LANGUAGES= c c++
 
-# c++17
-GCC_REQD+=     7
+USE_CXX_FEATURES+=     c++17
 
 # incorrect warnings for certain strings with gcc-7.5.0.
 CXXFLAGS+=     -Wno-trigraphs

Index: pkgsrc/emulators/ckmame/Makefile
diff -u pkgsrc/emulators/ckmame/Makefile:1.74 pkgsrc/emulators/ckmame/Makefile:1.75
--- pkgsrc/emulators/ckmame/Makefile:1.74       Tue Jul 18 13:12:34 2023
+++ pkgsrc/emulators/ckmame/Makefile    Tue Jul 18 18:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2023/07/18 13:12:34 wiz Exp $
+# $NetBSD: Makefile,v 1.75 2023/07/18 18:02:45 nia Exp $
 
 DISTNAME=              ckmame-2.0
 PKGREVISION=           4
@@ -15,15 +15,7 @@ USE_LANGUAGES=               c c++
 USE_TOOLS+=            pkg-config perl:test
 TEST_TARGET=           test
 
-GCC_REQD+=             9 # std::filesystem
-USE_GCC_RUNTIME=       yes
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 099915
-USE_PKGSRC_GCC=                yes
-USE_PKGSRC_GCC_RUNTIME=        yes
-.endif
+USE_CXX_FEATURES+=     c++17 filesystem
 
 .include "../../devel/cmake/build.mk"
 .include "../../archivers/libarchive/buildlink3.mk"

Index: pkgsrc/emulators/dolphin-emu/Makefile
diff -u pkgsrc/emulators/dolphin-emu/Makefile:1.45 pkgsrc/emulators/dolphin-emu/Makefile:1.46
--- pkgsrc/emulators/dolphin-emu/Makefile:1.45  Thu Jul 13 13:45:42 2023
+++ pkgsrc/emulators/dolphin-emu/Makefile       Tue Jul 18 18:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: Makefile,v 1.46 2023/07/18 18:02:45 nia Exp $
 
 DISTNAME=      dolphin-emu-5.0
 PKGREVISION=   38
@@ -22,6 +22,8 @@ CMAKE_ARGS+=  -DCMAKE_DISABLE_FIND_PACKAG
 
 CMAKE_ARGS+=   -DPKGMANDIR=${PKGMANDIR}
 
+USE_CXX_FEATURES+=     unique_ptr
+
 .include "../../mk/bsd.prefs.mk"
 
 # Claims to only support little endian architectures.

Index: pkgsrc/emulators/dosbox-x/Makefile
diff -u pkgsrc/emulators/dosbox-x/Makefile:1.45 pkgsrc/emulators/dosbox-x/Makefile:1.46
--- pkgsrc/emulators/dosbox-x/Makefile:1.45     Sat May  6 19:09:13 2023
+++ pkgsrc/emulators/dosbox-x/Makefile  Tue Jul 18 18:02:45 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2023/05/06 19:09:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.46 2023/07/18 18:02:45 nia Exp $
 
 DISTNAME=      dosbox-x-0.84.3
 PKGREVISION=   2
@@ -18,8 +18,7 @@ USE_LANGUAGES=        c c++
 
 TOOL_DEPENDS+= dos2unix-[0-9]*:../../converters/dos2unix
 
-# C++11
-GCC_REQD+=     4.7
+USE_CXX_FEATURES+=     c++11
 
 LIBS.NetBSD+=  -lcompat
 

Index: pkgsrc/emulators/emulationstation/Makefile
diff -u pkgsrc/emulators/emulationstation/Makefile:1.44 pkgsrc/emulators/emulationstation/Makefile:1.45
--- pkgsrc/emulators/emulationstation/Makefile:1.44     Sat May  6 19:09:13 2023
+++ pkgsrc/emulators/emulationstation/Makefile  Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2023/05/06 19:09:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.45 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      emulationstation-2.9.4
 PKGREVISION=   11
@@ -15,7 +15,8 @@ LICENSE=      mit
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES+=        c c++
-GCC_REQD+=     4.7 # C++11
+
+USE_CXX_FEATURES+=     c++11
 
 WRKSRC=                ${WRKDIR}/EmulationStation-${PKGVERSION_NOREV}
 

Index: pkgsrc/emulators/flycast/Makefile.common
diff -u pkgsrc/emulators/flycast/Makefile.common:1.2 pkgsrc/emulators/flycast/Makefile.common:1.3
--- pkgsrc/emulators/flycast/Makefile.common:1.2        Thu Jul 13 13:45:42 2023
+++ pkgsrc/emulators/flycast/Makefile.common    Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: Makefile.common,v 1.3 2023/07/18 18:02:46 nia Exp $
 # used by emulators/flycast/Makefile
 # used by emulators/libretro-flycast/Makefile
 
@@ -27,6 +27,8 @@ CMAKE_ARGS+=  -DCMAKE_DISABLE_FIND_PACKAG
 DISTINFO_FILE= ${.CURDIR}/../../emulators/flycast/distinfo
 PATCHDIR=      ${.CURDIR}/../../emulators/flycast/patches
 
+USE_CXX_FEATURES+=     c++17
+
 GITHUB_SUBMODULES+=    rtissera libchdr 2781322c4a7f8315c5fd6499129ad4b718e35843 core/deps/libchdr
 GITHUB_SUBMODULES+=    flyinghead mingw-breakpad 4c3d5fce1a4fef4decfbfeaf20f3746ecd209775 core/deps/breakpad
 GITHUB_SUBMODULES+=    vinniefalco LuaBridge fab7b33b896a42dcc865ba5ecdbacd9f40 core/deps/luabridge

Index: pkgsrc/emulators/libretro-beetle-psx/Makefile.common
diff -u pkgsrc/emulators/libretro-beetle-psx/Makefile.common:1.6 pkgsrc/emulators/libretro-beetle-psx/Makefile.common:1.7
--- pkgsrc/emulators/libretro-beetle-psx/Makefile.common:1.6    Fri Jan 29 09:14:06 2021
+++ pkgsrc/emulators/libretro-beetle-psx/Makefile.common        Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2021/01/29 09:14:06 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2023/07/18 18:02:46 nia Exp $
 
 # used by emulators/libretro-beetle-psx-hw/Makefile
 # used by emulators/libretro-beetle-psx/Makefile
@@ -19,7 +19,7 @@ USE_LANGUAGES=        c c++03
 USE_TOOLS+=    pkg-config
 
 # gcc-4.9 for <stdatomic.h>
-GCC_REQD+=     4.9
+USE_CC_FEATURES+=      c11
 
 MAKE_FLAGS+=   SYSTEM_ZLIB=1
 

Index: pkgsrc/emulators/libretro-dolphin/Makefile
diff -u pkgsrc/emulators/libretro-dolphin/Makefile:1.25 pkgsrc/emulators/libretro-dolphin/Makefile:1.26
--- pkgsrc/emulators/libretro-dolphin/Makefile:1.25     Thu Jul 13 13:45:42 2023
+++ pkgsrc/emulators/libretro-dolphin/Makefile  Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: Makefile,v 1.26 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      libretro-dolphin-20180827
 PKGREVISION=   17
@@ -35,6 +35,8 @@ CMAKE_ARGS+=  -DENABLE_SDL=OFF
 CMAKE_ARGS+=   -DENABLE_EVDEV=OFF
 CMAKE_ARGS+=   -DLIBRETRO=ON
 
+USE_CXX_FEATURES+=     c++14
+
 .include "../../mk/bsd.prefs.mk"
 
 # Big endian platforms not supported.

Index: pkgsrc/emulators/mame/Makefile
diff -u pkgsrc/emulators/mame/Makefile:1.172 pkgsrc/emulators/mame/Makefile:1.173
--- pkgsrc/emulators/mame/Makefile:1.172        Wed Jun 28 07:46:18 2023
+++ pkgsrc/emulators/mame/Makefile      Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.172 2023/06/28 07:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.173 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      mame-0.256
 CATEGORIES=    emulators
@@ -20,7 +20,7 @@ DEPENDS+=             liberation-ttf-[0-9]*:../../f
 TOOL_DEPENDS+=         ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 
 USE_LANGUAGES=         c99 c++
-GCC_REQD+=             7
+USE_CXX_FEATURES+=     c++17
 USE_TOOLS+=            gmake pkg-config
 UNLIMIT_RESOURCES+=    datasize virtualsize
 MAKE_FILE=             makefile

Index: pkgsrc/emulators/mednafen/Makefile
diff -u pkgsrc/emulators/mednafen/Makefile:1.43 pkgsrc/emulators/mednafen/Makefile:1.44
--- pkgsrc/emulators/mednafen/Makefile:1.43     Sat May  6 19:09:13 2023
+++ pkgsrc/emulators/mednafen/Makefile  Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2023/05/06 19:09:13 ryoon Exp $
+# $NetBSD: Makefile,v 1.44 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      mednafen-1.29.0
 PKGREVISION=   4
@@ -29,7 +29,7 @@ USE_LIBTOOL=          yes
 USE_PKGLOCALEDIR=      yes
 INSTALLATION_DIRS=     share/doc/mednafen
 
-GCC_REQD+=             4.7 # gnu++11
+USE_CXX_FEATURES+=     c++11
 
 # Complains, loudly.
 MKPIE_SUPPORTED=       no

Index: pkgsrc/emulators/melonds/Makefile
diff -u pkgsrc/emulators/melonds/Makefile:1.15 pkgsrc/emulators/melonds/Makefile:1.16
--- pkgsrc/emulators/melonds/Makefile:1.15      Sat May  6 19:09:14 2023
+++ pkgsrc/emulators/melonds/Makefile   Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2023/05/06 19:09:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.16 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      melonDS-0.8.3
 PKGNAME=       ${DISTNAME:S/DS/ds/}
@@ -13,10 +13,9 @@ LICENSE=     gnu-gpl-v3
 
 USE_CMAKE=     yes
 USE_TOOLS+=    pkg-config
-USE_LANGUAGES= c c++11
+USE_LANGUAGES= c c++
 
-# C++11
-GCC_REQD+=     4.8
+USE_CXX_FEATURES+=     c++11
 
 CMAKE_ARGS+=   -DCMAKE_BUILD_TYPE="Release"
 CMAKE_ARGS+=   -DENABLE_LTO=OFF

Index: pkgsrc/emulators/mgba-qt/Makefile
diff -u pkgsrc/emulators/mgba-qt/Makefile:1.7 pkgsrc/emulators/mgba-qt/Makefile:1.8
--- pkgsrc/emulators/mgba-qt/Makefile:1.7       Mon May 22 21:00:23 2023
+++ pkgsrc/emulators/mgba-qt/Makefile   Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2023/05/22 21:00:23 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2023/07/18 18:02:46 nia Exp $
 
 PKGREVISION= 4
 .include "${.CURDIR}/../../emulators/mgba/Makefile.common"
@@ -14,8 +14,7 @@ CMAKE_ARGS+=  -DBUILD_QT=ON
 CMAKE_ARGS+=   -DBUILD_GL=OFF
 CMAKE_ARGS+=   -DUSE_EPOXY=OFF
 
-# C++14
-GCC_REQD+=     5
+USE_CXX_FEATURES+=     c++14
 
 # We probably don't actually want Qt5Multimedia.
 # It's an option as an audio output, but SDL supports many more pkgsrc

Index: pkgsrc/emulators/nono/Makefile
diff -u pkgsrc/emulators/nono/Makefile:1.26 pkgsrc/emulators/nono/Makefile:1.27
--- pkgsrc/emulators/nono/Makefile:1.26 Mon May  8 21:53:48 2023
+++ pkgsrc/emulators/nono/Makefile      Tue Jul 18 18:02:46 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2023/05/08 21:53:48 jun Exp $
+# $NetBSD: Makefile,v 1.27 2023/07/18 18:02:46 nia Exp $
 
 DISTNAME=      nono-0.6.1
 #PKGREVISION=  1
@@ -23,11 +23,9 @@ RESTRICTED=  License disallows binary red
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
 
-GCC_REQD+=             7
-
 USE_TOOLS+=            awk:build xgettext
 GNU_CONFIGURE=         yes
-USE_LANGUAGES=         c c++14
+USE_LANGUAGES=         c c++
 
 INSTALLATION_DIRS+=    share/doc/nono
 

Index: pkgsrc/emulators/openmsx/Makefile
diff -u pkgsrc/emulators/openmsx/Makefile:1.71 pkgsrc/emulators/openmsx/Makefile:1.72
--- pkgsrc/emulators/openmsx/Makefile:1.71      Sat May  6 19:09:14 2023
+++ pkgsrc/emulators/openmsx/Makefile   Tue Jul 18 18:02:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2023/05/06 19:09:14 ryoon Exp $
+# $NetBSD: Makefile,v 1.72 2023/07/18 18:02:47 nia Exp $
 
 DISTNAME=              openmsx-17.0
 PKGREVISION=           8
@@ -15,7 +15,7 @@ LICENSE=              gnu-gpl-v2
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            pkg-config pax
 
-GCC_REQD+=             8 # std::charconv
+USE_CXX_FEATURES+=     c++17 charconv
 
 # Not sure why this is necessary to find components.hh...
 CXXFLAGS+=             -I${WRKSRC}/output

Index: pkgsrc/emulators/snes9x-gtk/Makefile
diff -u pkgsrc/emulators/snes9x-gtk/Makefile:1.94 pkgsrc/emulators/snes9x-gtk/Makefile:1.95
--- pkgsrc/emulators/snes9x-gtk/Makefile:1.94   Sat May  6 19:09:15 2023
+++ pkgsrc/emulators/snes9x-gtk/Makefile        Tue Jul 18 18:02:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2023/05/06 19:09:15 ryoon Exp $
+# $NetBSD: Makefile,v 1.95 2023/07/18 18:02:47 nia Exp $
 
 PKGREVISION= 9
 .include "../../emulators/snes9x/Makefile.common"
@@ -16,7 +16,9 @@ CONFIGURE_DIRS=       gtk
 
 TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
 
-GCC_REQD+=     7 # C++17
+USE_CMAKE=     yes
+
+USE_CXX_FEATURES+=     c++17
 
 .include "../../mk/oss.buildlink3.mk"
 

Index: pkgsrc/emulators/stella/Makefile.common
diff -u pkgsrc/emulators/stella/Makefile.common:1.15 pkgsrc/emulators/stella/Makefile.common:1.16
--- pkgsrc/emulators/stella/Makefile.common:1.15        Thu Jul 13 13:45:42 2023
+++ pkgsrc/emulators/stella/Makefile.common     Tue Jul 18 18:02:47 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2023/07/13 13:45:42 nia Exp $
+# $NetBSD: Makefile.common,v 1.16 2023/07/18 18:02:47 nia Exp $
 # used by emulators/stella/Makefile
 # used by emulators/libretro-stella/Makefile
 
@@ -18,4 +18,6 @@ WRKSRC=               ${WRKDIR}/${DISTNAME:S/-src//1}
 
 USE_LANGUAGES= c c++
 
+USE_CXX_FEATURES+=     c++17
+
 UNLIMIT_RESOURCES=     datasize

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/finance
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/finance
Indexes:

Home | Main Index | Thread Index | Old Index