Wed Feb 21 11:31:21 2024 UTC (106d)
snes9x: Attempt to accomodate messy c++ versions situation


(nia)
diff -r1.6 -r1.7 pkgsrc/emulators/libretro-snes9x/Makefile
diff -r1.60 -r1.61 pkgsrc/emulators/snes9x/Makefile
diff -r1.7 -r1.8 pkgsrc/emulators/snes9x/Makefile.common
diff -r1.104 -r1.105 pkgsrc/emulators/snes9x-gtk/Makefile
cvs diff -r1.6 -r1.7 pkgsrc/emulators/libretro-snes9x/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/libretro-snes9x/Makefile 2020/05/30 15:20:12 1.6
+++ pkgsrc/emulators/libretro-snes9x/Makefile 2024/02/21 11:31:21 1.7
@@ -1,16 +1,18 @@ @@ -1,16 +1,18 @@
1# $NetBSD: Makefile,v 1.6 2020/05/30 15:20:12 nia Exp $ 1# $NetBSD: Makefile,v 1.7 2024/02/21 11:31:21 nia Exp $
2 2
3.include "../../emulators/snes9x/Makefile.common" 3.include "../../emulators/snes9x/Makefile.common"
4 4
5PKGNAME= libretro-snes9x-${SNES9X_VERSION} 5PKGNAME= libretro-snes9x-${SNES9X_VERSION}
6 6
7MAINTAINER= nia@NetBSD.org 7MAINTAINER= nia@NetBSD.org
8HOMEPAGE= https://docs.libretro.com/library/snes9x/ 8HOMEPAGE= https://docs.libretro.com/library/snes9x/
9COMMENT= Libretro core based on the snes9x Super Nintendo emulator 9COMMENT= Libretro core based on the snes9x Super Nintendo emulator
10 10
11BUILD_DIRS= libretro 11BUILD_DIRS= libretro
12 12
13LIBRETRO_CORE= snes9x 13LIBRETRO_CORE= snes9x
14 14
 15FORCE_CXX_STD= c++11
 16
15.include "../../emulators/retroarch/core.mk" 17.include "../../emulators/retroarch/core.mk"
16.include "../../mk/bsd.pkg.mk" 18.include "../../mk/bsd.pkg.mk"
cvs diff -r1.60 -r1.61 pkgsrc/emulators/snes9x/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x/Makefile 2022/05/03 17:09:19 1.60
+++ pkgsrc/emulators/snes9x/Makefile 2024/02/21 11:31:21 1.61
@@ -1,20 +1,22 @@ @@ -1,20 +1,22 @@
1# $NetBSD: Makefile,v 1.60 2022/05/03 17:09:19 nia Exp $ 1# $NetBSD: Makefile,v 1.61 2024/02/21 11:31:21 nia Exp $
2 2
3.include "../../emulators/snes9x/Makefile.common" 3.include "../../emulators/snes9x/Makefile.common"
4 4
5MAINTAINER= nia@NetBSD.org 5MAINTAINER= nia@NetBSD.org
6COMMENT= Super Nintendo Entertainment System (SNES) emulator (CLI version) 6COMMENT= Super Nintendo Entertainment System (SNES) emulator (CLI version)
7 7
 8FORCE_CXX_STD= c++11
 9
8CONFIGURE_DIRS= unix 10CONFIGURE_DIRS= unix
9BUILD_DIRS= unix 11BUILD_DIRS= unix
10 12
11GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
12 14
13USE_TOOLS+= gmake pkg-config 15USE_TOOLS+= gmake pkg-config
14 16
15CONFIGURE_ARGS+= --enable-netplay 17CONFIGURE_ARGS+= --enable-netplay
16 18
17CONFIGURE_ARGS+= --with-system-zip 19CONFIGURE_ARGS+= --with-system-zip
18 20
19INSTALLATION_DIRS+= bin 21INSTALLATION_DIRS+= bin
20INSTALLATION_DIRS+= share/doc/snes9x 22INSTALLATION_DIRS+= share/doc/snes9x
cvs diff -r1.7 -r1.8 pkgsrc/emulators/snes9x/Makefile.common (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x/Makefile.common 2023/11/20 10:19:00 1.7
+++ pkgsrc/emulators/snes9x/Makefile.common 2024/02/21 11:31:21 1.8
@@ -1,24 +1,26 @@ @@ -1,24 +1,26 @@
1# $NetBSD: Makefile.common,v 1.7 2023/11/20 10:19:00 nia Exp $ 1# $NetBSD: Makefile.common,v 1.8 2024/02/21 11:31:21 nia Exp $
2 2
3# used by emulators/libretro-snes9x/Makefile 3# used by emulators/libretro-snes9x/Makefile
4# used by emulators/snes9x/Makefile 4# used by emulators/snes9x/Makefile
5# used by emulators/snes9x-gtk/Makefile 5# used by emulators/snes9x-gtk/Makefile
6 6
7SNES9X_VERSION= 1.62.3 7SNES9X_VERSION= 1.62.3
8DISTNAME= snes9x-${SNES9X_VERSION} 8DISTNAME= snes9x-${SNES9X_VERSION}
9CATEGORIES= emulators 9CATEGORIES= emulators
10MASTER_SITES= ${MASTER_SITE_GITHUB:=snes9xgit/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=snes9xgit/}
11GITHUB_PROJECT= snes9x 11GITHUB_PROJECT= snes9x
12GITHUB_TAG= ${SNES9X_VERSION} 12GITHUB_TAG= ${SNES9X_VERSION}
13 13
14GITHUB_SUBMODULES+= KhronosGroup SPIRV-Cross 4e2fdb25671c742a9fbe93a6034eb1542244c7e1 external/SPIRV-Cross 14GITHUB_SUBMODULES+= KhronosGroup SPIRV-Cross 4e2fdb25671c742a9fbe93a6034eb1542244c7e1 external/SPIRV-Cross
15GITHUB_SUBMODULES+= KhronosGroup glslang 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7 external/glslang 15GITHUB_SUBMODULES+= KhronosGroup glslang 6d41bb9c557c5a0eec61ffba1f775dc5f717a8f7 external/glslang
16GITHUB_SUBMODULES+= KhronosGroup Vulkan-Headers a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2 external/vulkan-headers 16GITHUB_SUBMODULES+= KhronosGroup Vulkan-Headers a3dd2655a3a68c2a67c55a0f8b77dcb8b166ada2 external/vulkan-headers
17 17
18HOMEPAGE= http://www.snes9x.com/ 18HOMEPAGE= http://www.snes9x.com/
19LICENSE= snes9x-license 19LICENSE= snes9x-license
20 20
21USE_LANGUAGES= c c++ 21USE_LANGUAGES= c c++
22 22
 23USE_CXX_FEATURES+= c++11
 24
23DISTINFO_FILE= ${.CURDIR}/../../emulators/snes9x/distinfo 25DISTINFO_FILE= ${.CURDIR}/../../emulators/snes9x/distinfo
24PATCHDIR= ${.CURDIR}/../../emulators/snes9x/patches 26PATCHDIR= ${.CURDIR}/../../emulators/snes9x/patches
cvs diff -r1.104 -r1.105 pkgsrc/emulators/snes9x-gtk/Makefile (expand / switch to unified diff)

--- pkgsrc/emulators/snes9x-gtk/Makefile 2024/02/17 21:19:30 1.104
+++ pkgsrc/emulators/snes9x-gtk/Makefile 2024/02/21 11:31:21 1.105
@@ -1,27 +1,30 @@ @@ -1,27 +1,30 @@
1# $NetBSD: Makefile,v 1.104 2024/02/17 21:19:30 nia Exp $ 1# $NetBSD: Makefile,v 1.105 2024/02/21 11:31:21 nia Exp $
2 2
3PKGREVISION= 1 3PKGREVISION= 1
4.include "../../emulators/snes9x/Makefile.common" 4.include "../../emulators/snes9x/Makefile.common"
5 5
6PKGNAME= snes9x-gtk-${SNES9X_VERSION} 6PKGNAME= snes9x-gtk-${SNES9X_VERSION}
7 7
8MAINTAINER= nia@NetBSD.org 8MAINTAINER= nia@NetBSD.org
9COMMENT= Super Nintendo Entertainment System (SNES) emulator (GUI version) 9COMMENT= Super Nintendo Entertainment System (SNES) emulator (GUI version)
10 10
11USE_TOOLS+= pkg-config 11USE_TOOLS+= pkg-config
12USE_TOOLS+= msgfmt xgettext 12USE_TOOLS+= msgfmt xgettext
13USE_TOOLS+= gawk 13USE_TOOLS+= gawk
14 14
 15USE_CXX_FEATURES+= c++17
 16FORCE_CXX_STD= c++17
 17
15USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
16 19
17CMAKE_ARGS+= -DUSE_SYSTEMZIP=ON 20CMAKE_ARGS+= -DUSE_SYSTEMZIP=ON
18CMAKE_ARGS+= -DENABLE_PCH=OFF 21CMAKE_ARGS+= -DENABLE_PCH=OFF
19CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR=${PKGLOCALEDIR}/locale 22CMAKE_ARGS+= -DCMAKE_INSTALL_LOCALEDIR=${PKGLOCALEDIR}/locale
20 23
21TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4 24TOOL_DEPENDS+= gettext-m4-[0-9]*:../../devel/gettext-m4
22 25
23CONFIGURE_DIR= gtk 26CONFIGURE_DIR= gtk
24 27
25USE_CXX_FEATURES+= c++17 filesystem 28USE_CXX_FEATURES+= c++17 filesystem
26 29
27.include "../../mk/oss.buildlink3.mk" 30.include "../../mk/oss.buildlink3.mk"