On Sun, Feb 17, 2019 at 2:43 AM Anthony J. Bentley <[email protected]> wrote: > I've added arm and arm64 to ONLY_FOR_ARCHS
I actually forgot to do that part. Here's a new patch, this one relative to /usr/ports as it updates the meta package too. In addition, I've attached a port for a new plugin, mupen64plus-rsp-cxd4, a low-level emulation plugin which you can use with --rsp in place of the default rsp-hle plugin. tests? oks? -- Anthony J. Bentley
Index: meta/mupen64plus/Makefile =================================================================== RCS file: /cvs/ports/meta/mupen64plus/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- meta/mupen64plus/Makefile 11 Jan 2016 09:35:45 -0000 1.5 +++ meta/mupen64plus/Makefile 18 Feb 2019 00:14:37 -0000 @@ -3,14 +3,13 @@ COMMENT-main= n64 emulator (default plugins) COMMENT-extra= n64 emulator (all plugins) -V= 2.5 +V= 2.5.9 PKGNAME= mupen64plus-$V -REVISION= 1 PKGNAME-main= mupen64plus-$V PKGNAME-extra= mupen64plus-extra-$V -HOMEPAGE= http://mupen64plus.org/ +HOMEPAGE= https://mupen64plus.org/ MAINTAINER= Anthony J. Bentley <[email protected]> @@ -31,6 +30,7 @@ RUN_DEPENDS-main += \ # extra plugins RUN_DEPENDS-extra += \ STEM-=${V}:${BASE_PKGPATH},-main \ + emulators/mupen64plus/rsp-cxd4 \ emulators/mupen64plus/rsp-z64 \ emulators/mupen64plus/video-arachnoid \ emulators/mupen64plus/video-glide64 \ Index: emulators/mupen64plus/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/Makefile,v retrieving revision 1.3 diff -u -p -r1.3 Makefile --- emulators/mupen64plus/Makefile 5 Sep 2013 03:33:52 -0000 1.3 +++ emulators/mupen64plus/Makefile 18 Feb 2019 00:14:37 -0000 @@ -4,6 +4,7 @@ SUBDIR = SUBDIR += audio-sdl SUBDIR += core SUBDIR += input-sdl +SUBDIR += rsp-cxd4 SUBDIR += rsp-hle SUBDIR += rsp-z64 SUBDIR += ui-console Index: emulators/mupen64plus/Makefile.inc =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v retrieving revision 1.14 diff -u -p -r1.14 Makefile.inc --- emulators/mupen64plus/Makefile.inc 26 Nov 2018 18:57:27 -0000 1.14 +++ emulators/mupen64plus/Makefile.inc 18 Feb 2019 00:14:37 -0000 @@ -1,10 +1,10 @@ # $OpenBSD: Makefile.inc,v 1.14 2018/11/26 18:57:27 naddy Exp $ -ONLY_FOR_ARCHS ?= amd64 i386 powerpc -VERSION ?= 2.5 +ONLY_FOR_ARCHS ?= amd64 i386 powerpc arm arm64 +VERSION ?= 2.5.9 DISTNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-src-${VERSION} PKGNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-${VERSION} -HOMEPAGE ?= http://mupen64plus.org/ +HOMEPAGE ?= https://mupen64plus.org/ CATEGORIES ?= emulators games MASTER_SITES ?= https://github.com/mupen64plus/mupen64plus-${MUPEN64PLUS_MOD}/releases/download/${VERSION}/ MAINTAINER ?= Anthony J. Bentley <[email protected]> @@ -22,7 +22,7 @@ FAKE_FLAGS ?= PREFIX=${PREFIX} LDCONFIG .if ${MUPEN64PLUS_MOD} != "core" MAKE_FLAGS += APIDIR=${LOCALBASE}/include/mupen64plus -BUILD_DEPENDS += emulators/mupen64plus/core>=2.5 +BUILD_DEPENDS += emulators/mupen64plus/core>=2.5.9 .endif WRKBUILD ?= ${WRKDIST}/projects/unix Index: emulators/mupen64plus/audio-sdl/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- emulators/mupen64plus/audio-sdl/Makefile 26 Nov 2018 18:57:27 -0000 1.12 +++ emulators/mupen64plus/audio-sdl/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,12 +1,11 @@ # $OpenBSD: Makefile,v 1.12 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator sdl audio plugin -REVISION = 4 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB = SDL2 pthread samplerate speexdsp +WANTLIB = SDL2 samplerate speexdsp LIB_DEPENDS = audio/speexdsp \ devel/sdl2 \ audio/libsamplerate Index: emulators/mupen64plus/audio-sdl/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/audio-sdl/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/audio-sdl/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-audio-sdl-src-2.5.tar.gz) = HFn4wtcCBjUMC5BnqXIs8t1n5WhplNWlWtv1HuiBL1k= -SIZE (mupen64plus-audio-sdl-src-2.5.tar.gz) = 26147 +SHA256 (mupen64plus-audio-sdl-src-2.5.9.tar.gz) = GTFNlMxKCscTYQgf7U5uaB86SVwbG7A6q/dAYQfjjm4= +SIZE (mupen64plus-audio-sdl-src-2.5.9.tar.gz) = 28884 Index: emulators/mupen64plus/core/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v retrieving revision 1.21 diff -u -p -r1.21 Makefile --- emulators/mupen64plus/core/Makefile 26 Nov 2018 18:57:27 -0000 1.21 +++ emulators/mupen64plus/core/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,8 +1,7 @@ # $OpenBSD: Makefile,v 1.21 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator core -SHARED_LIBS = mupen64plus 2.3 # 2.5 -REVISION = 8 +SHARED_LIBS = mupen64plus 2.4 # 2.5.9 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes @@ -12,8 +11,7 @@ WANTLIB = GL GLU c m ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc LIB_DEPENDS = devel/sdl2 \ - graphics/png \ - print/freetype + graphics/png MUPEN64PLUS_MOD = core Index: emulators/mupen64plus/core/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/core/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/core/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/core/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-core-src-2.5.tar.gz) = Wemaeef4YlFyMuMRW9H3I3fj402nlcEYumF8R4yDlXg= -SIZE (mupen64plus-core-src-2.5.tar.gz) = 895890 +SHA256 (mupen64plus-core-src-2.5.9.tar.gz) = hCRMd6k8DBmHKdoG11YoxcVRPuVqX8CleFqSRhBx80w= +SIZE (mupen64plus-core-src-2.5.9.tar.gz) = 1618486 Index: emulators/mupen64plus/core/patches/patch-projects_unix_Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/core/patches/patch-projects_unix_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-projects_unix_Makefile --- emulators/mupen64plus/core/patches/patch-projects_unix_Makefile 11 May 2015 09:40:40 -0000 1.1 +++ emulators/mupen64plus/core/patches/patch-projects_unix_Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,7 +1,8 @@ $OpenBSD: patch-projects_unix_Makefile,v 1.1 2015/05/11 09:40:40 bentley Exp $ ---- projects/unix/Makefile.orig Wed Apr 29 02:17:34 2015 -+++ projects/unix/Makefile Wed Apr 29 02:17:39 2015 -@@ -636,7 +636,6 @@ install: $(TARGET) +Index: projects/unix/Makefile +--- projects/unix/Makefile.orig ++++ projects/unix/Makefile +@@ -735,7 +735,6 @@ install: $(TARGET) $(INSTALL) -d "$(DESTDIR)$(INCDIR)" $(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)" -$(LDCONFIG) "$(DESTDIR)$(LIBDIR)" Index: emulators/mupen64plus/core/patches/patch-src_memory_memory_h =================================================================== RCS file: emulators/mupen64plus/core/patches/patch-src_memory_memory_h diff -N emulators/mupen64plus/core/patches/patch-src_memory_memory_h --- emulators/mupen64plus/core/patches/patch-src_memory_memory_h 11 May 2015 09:40:40 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-src_memory_memory_h,v 1.1 2015/05/11 09:40:40 bentley Exp $ -From upstream commit 4ad1c2b76670eee9a584db4d3bfa37e296815d9a. ---- src/memory/memory.h.orig Mon May 11 03:32:00 2015 -+++ src/memory/memory.h Mon May 11 03:32:01 2015 -@@ -48,7 +48,7 @@ extern void (*writememh[0x10000])(void); - extern void (*writememd[0x10000])(void); - - #ifndef M64P_BIG_ENDIAN --#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 2)) -+#if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 3)) - #define sl(x) __builtin_bswap32(x) - #else - #define sl(mot) \ Index: emulators/mupen64plus/input-sdl/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/Makefile,v retrieving revision 1.12 diff -u -p -r1.12 Makefile --- emulators/mupen64plus/input-sdl/Makefile 26 Nov 2018 18:57:27 -0000 1.12 +++ emulators/mupen64plus/input-sdl/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,12 +1,11 @@ # $OpenBSD: Makefile,v 1.12 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator input plugin -REVISION = 4 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WANTLIB = SDL2 pthread +WANTLIB = SDL2 m LIB_DEPENDS = devel/sdl2 MUPEN64PLUS_MOD = input-sdl Index: emulators/mupen64plus/input-sdl/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/input-sdl/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/input-sdl/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-input-sdl-src-2.5.tar.gz) = ZeUoZnt/V6MHuSq7o3o2Ae4X6d2dMDun5BY7J/Pvdxs= -SIZE (mupen64plus-input-sdl-src-2.5.tar.gz) = 50580 +SHA256 (mupen64plus-input-sdl-src-2.5.9.tar.gz) = bZzSN1of91XOEJ0D9ozEVgpI0HgVHES24blzL/x3cU8= +SIZE (mupen64plus-input-sdl-src-2.5.9.tar.gz) = 56403 Index: emulators/mupen64plus/rsp-hle/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/rsp-hle/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- emulators/mupen64plus/rsp-hle/Makefile 26 Nov 2018 18:57:27 -0000 1.11 +++ emulators/mupen64plus/rsp-hle/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.11 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator signal co-processor plugin -REVISION = 3 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes Index: emulators/mupen64plus/rsp-hle/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/rsp-hle/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/rsp-hle/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/rsp-hle/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-rsp-hle-src-2.5.tar.gz) = Sy4RGTdG4Pvk36eEJsEhTPLkJ3kTLrL2aL+I9JhRdwM= -SIZE (mupen64plus-rsp-hle-src-2.5.tar.gz) = 46998 +SHA256 (mupen64plus-rsp-hle-src-2.5.9.tar.gz) = rXrF4brwu7RguuQAZbnmcz4eCxFBRFrIdpVsj1jkSCs= +SIZE (mupen64plus-rsp-hle-src-2.5.9.tar.gz) = 53889 Index: emulators/mupen64plus/rsp-z64/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/rsp-z64/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- emulators/mupen64plus/rsp-z64/Makefile 26 Nov 2018 18:57:27 -0000 1.14 +++ emulators/mupen64plus/rsp-z64/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,15 +1,9 @@ # $OpenBSD: Makefile,v 1.14 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator signal co-processor plugin -REVISION = 7 - -# XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0) -VERSION = 2.0.0 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes - -WRKDIST = ${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD} WANTLIB = c m ${COMPILER_LIBCXX} Index: emulators/mupen64plus/rsp-z64/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/rsp-z64/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- emulators/mupen64plus/rsp-z64/distinfo 5 Sep 2013 03:26:30 -0000 1.2 +++ emulators/mupen64plus/rsp-z64/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-rsp-z64-src-2.0.0.tar.gz) = 32nrci+umk7de3ZOnJpFn2ptNIIiXUaYccOTxpX4bps= -SIZE (mupen64plus-rsp-z64-src-2.0.0.tar.gz) = 44341 +SHA256 (mupen64plus-rsp-z64-src-2.5.9.tar.gz) = TINB14KwX7eSe+Idrbr6rYjtIvksicl/tzRKP3x4hvs= +SIZE (mupen64plus-rsp-z64-src-2.5.9.tar.gz) = 45620 Index: emulators/mupen64plus/ui-console/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/ui-console/Makefile,v retrieving revision 1.14 diff -u -p -r1.14 Makefile --- emulators/mupen64plus/ui-console/Makefile 20 Aug 2016 00:14:01 -0000 1.14 +++ emulators/mupen64plus/ui-console/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.14 2016/08/20 00:14:01 bentley Exp $ COMMENT = n64 emulator command-line ui plugin -REVISION = 4 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes @@ -15,5 +14,8 @@ MAKE_FLAGS += MANDIR=${PREFIX}/man \ PIE=1 USE_WXNEEDED = Yes + +RUN_DEPENDS = devel/desktop-file-utils \ + x11/gtk+3,-guic .include <bsd.port.mk> Index: emulators/mupen64plus/ui-console/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/ui-console/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/ui-console/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/ui-console/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-ui-console-src-2.5.tar.gz) = cf7gEmeP+I8YEw4zmv2MVGeiZGt+UNp1ui1fo0K3Smc= -SIZE (mupen64plus-ui-console-src-2.5.tar.gz) = 47852 +SHA256 (mupen64plus-ui-console-src-2.5.9.tar.gz) = c+kASI1q06d+OLp5T1YAjXdTFCYN8ZrPVVJRcDcSA8E= +SIZE (mupen64plus-ui-console-src-2.5.9.tar.gz) = 58934 Index: emulators/mupen64plus/ui-console/pkg/PLIST =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/ui-console/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- emulators/mupen64plus/ui-console/pkg/PLIST 26 Dec 2011 13:38:27 -0000 1.1.1.1 +++ emulators/mupen64plus/ui-console/pkg/PLIST 18 Feb 2019 00:14:37 -0000 @@ -1,3 +1,8 @@ @comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/26 13:38:27 stsp Exp $ @bin bin/mupen64plus @man man/man6/mupen64plus.6 +share/applications/mupen64plus.desktop +share/icons/hicolor/48x48/apps/mupen64plus.png +share/icons/hicolor/scalable/apps/mupen64plus.svg +@tag gtk-update-icon-cache %D/share/icons/hicolor +@tag update-desktop-database Index: emulators/mupen64plus/video-arachnoid/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-arachnoid/Makefile,v retrieving revision 1.13 diff -u -p -r1.13 Makefile --- emulators/mupen64plus/video-arachnoid/Makefile 26 Nov 2018 18:57:27 -0000 1.13 +++ emulators/mupen64plus/video-arachnoid/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,15 +1,9 @@ # $OpenBSD: Makefile,v 1.13 2018/11/26 18:57:27 naddy Exp $ COMMENT = n64 emulator video plugin -REVISION = 6 - -# XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0) -VERSION = 2.0.0 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes - -WRKDIST = ${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD} WANTLIB = GL c m pthread ${COMPILER_LIBCXX} Index: emulators/mupen64plus/video-arachnoid/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-arachnoid/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- emulators/mupen64plus/video-arachnoid/distinfo 5 Sep 2013 03:26:31 -0000 1.2 +++ emulators/mupen64plus/video-arachnoid/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-video-arachnoid-src-2.0.0.tar.gz) = VizIlrxg6YxORaBxbTIkgw9CVB71JshDdpnfEDqI11o= -SIZE (mupen64plus-video-arachnoid-src-2.0.0.tar.gz) = 126329 +SHA256 (mupen64plus-video-arachnoid-src-2.5.9.tar.gz) = Pg2B+psfO9vKmU/07XcHU49SryFiHYtKzhlqWWVBwW4= +SIZE (mupen64plus-video-arachnoid-src-2.5.9.tar.gz) = 129064 Index: emulators/mupen64plus/video-glide64/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-glide64/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- emulators/mupen64plus/video-glide64/Makefile 26 Nov 2018 18:57:28 -0000 1.17 +++ emulators/mupen64plus/video-glide64/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,21 +1,15 @@ # $OpenBSD: Makefile,v 1.17 2018/11/26 18:57:28 naddy Exp $ COMMENT = n64 emulator video plugin -REVISION = 9 - -# XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0) -VERSION = 2.0.0 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WRKDIST = ${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD} - -WANTLIB = GL SDL c m pthread ${COMPILER_LIBCXX} +WANTLIB = GL SDL2 c m pthread ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc -LIB_DEPENDS = devel/sdl +LIB_DEPENDS = devel/sdl2 MUPEN64PLUS_MOD = video-glide64 Index: emulators/mupen64plus/video-glide64/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-glide64/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- emulators/mupen64plus/video-glide64/distinfo 5 Sep 2013 03:26:31 -0000 1.2 +++ emulators/mupen64plus/video-glide64/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-video-glide64-src-2.0.0.tar.gz) = U1ndHWnCQYO95RkoViWsjLf0rF0gacysx7u5WoVcJfM= -SIZE (mupen64plus-video-glide64-src-2.0.0.tar.gz) = 334935 +SHA256 (mupen64plus-video-glide64-src-2.5.9.tar.gz) = zO6GkSv8qD+GKxDGHLw7NxcetDs+ZXLNsXO9jWmocCs= +SIZE (mupen64plus-video-glide64-src-2.5.9.tar.gz) = 334690 Index: emulators/mupen64plus/video-glide64/patches/patch-src_Main_cpp =================================================================== RCS file: emulators/mupen64plus/video-glide64/patches/patch-src_Main_cpp diff -N emulators/mupen64plus/video-glide64/patches/patch-src_Main_cpp --- emulators/mupen64plus/video-glide64/patches/patch-src_Main_cpp 9 Apr 2018 05:25:45 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,53 +0,0 @@ -$OpenBSD: patch-src_Main_cpp,v 1.3 2018/04/09 05:25:45 bentley Exp $ -Index: src/Main.cpp ---- src/Main.cpp.orig -+++ src/Main.cpp -@@ -54,6 +54,8 @@ - #include <sys/time.h> - #endif - -+#include <endian.h> -+ - #include "osal_dynamiclib.h" - - #define G64_VERSION "Mupen64Plus" -@@ -634,11 +636,7 @@ void guLoadTextures () - for (i=0; i<0x200; i++) - { - // cur = ~*(data++), byteswapped --#if !defined(__GNUC__) -- cur = _byteswap_ulong(~*(data++)); --#else -- cur = __builtin_bswap32(~*(data++)); --#endif -+ cur = swap32(~*(data++)); - - for (b=0x80000000; b!=0; b>>=1) - { -@@ -714,7 +712,7 @@ BOOL InitGfx (BOOL evoodoo_using_window) - WriteLog(M64MSG_INFO, "fb_hires\n"); - GRWINOPENEXT grSstWinOpenExt = (GRWINOPENEXT)grGetProcAddress("grSstWinOpenExt"); - if (grSstWinOpenExt) -- gfx_context = grSstWinOpenExt ((FxU32)NULL, -+ gfx_context = grSstWinOpenExt ((uintptr_t)NULL, - settings.res_data, - GR_REFRESH_60Hz, - GR_COLORFORMAT_RGBA, -@@ -724,7 +722,7 @@ BOOL InitGfx (BOOL evoodoo_using_window) - 1); // 1 auxillary buffer - } - if (!gfx_context) -- gfx_context = grSstWinOpen ((FxU32)NULL, -+ gfx_context = grSstWinOpen ((uintptr_t)NULL, - settings.res_data, - GR_REFRESH_60Hz, - GR_COLORFORMAT_RGBA, -@@ -1204,7 +1202,7 @@ EXPORT void CALL GetDllInfo ( PLUGIN_INFO * PluginInfo - { - PluginInfo->Version = 0x0103; // Set to 0x0103 - PluginInfo->Type = PLUGIN_TYPE_GFX; // Set to PLUGIN_TYPE_GFX -- sprintf (PluginInfo->Name, "Glide64 "G64_VERSION); // Name of the DLL -+ sprintf (PluginInfo->Name, "Glide64 " G64_VERSION); // Name of the DLL - - // If DLL supports memory these memory options then set them to TRUE or FALSE - // if it does not support it Index: emulators/mupen64plus/video-glide64/patches/patch-src_TexBuffer_cpp =================================================================== RCS file: emulators/mupen64plus/video-glide64/patches/patch-src_TexBuffer_cpp diff -N emulators/mupen64plus/video-glide64/patches/patch-src_TexBuffer_cpp --- emulators/mupen64plus/video-glide64/patches/patch-src_TexBuffer_cpp 15 Feb 2015 06:31:03 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,22 +0,0 @@ -$OpenBSD: patch-src_TexBuffer_cpp,v 1.1 2015/02/15 06:31:03 bentley Exp $ -Backwards memcpy. ---- src/TexBuffer.cpp.orig Sat Feb 14 23:22:25 2015 -+++ src/TexBuffer.cpp Sat Feb 14 23:22:28 2015 -@@ -297,7 +297,7 @@ BOOL OpenTextureBuffer(COLOR_IMAGE & cimage) - grRenderBuffer( GR_BUFFER_BACKBUFFER ); - rdp.texbufs[i].count--; - if (j < rdp.texbufs[i].count) -- memcpy(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[i].count-j)); -+ memmove(&(rdp.texbufs[i].images[j]), &(rdp.texbufs[i].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[i].count-j)); - } - } - } -@@ -599,7 +599,7 @@ BOOL FindTextureBuffer(DWORD addr, WORD width) - { - rdp.texbufs[index].count--; - if (j < rdp.texbufs[index].count) -- memcpy(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[index].count-j)); -+ memmove(&(rdp.texbufs[index].images[j]), &(rdp.texbufs[index].images[j+1]), sizeof(HIRES_COLOR_IMAGE)*(rdp.texbufs[index].count-j)); - } - } - } Index: emulators/mupen64plus/video-glide64/patches/patch-src_rdp_cpp =================================================================== RCS file: emulators/mupen64plus/video-glide64/patches/patch-src_rdp_cpp diff -N emulators/mupen64plus/video-glide64/patches/patch-src_rdp_cpp --- emulators/mupen64plus/video-glide64/patches/patch-src_rdp_cpp 5 Sep 2013 03:26:32 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-src_rdp_cpp,v 1.1 2013/09/05 03:26:32 bentley Exp $ ---- src/rdp.cpp.orig Sun Jul 7 20:08:53 2013 -+++ src/rdp.cpp Sun Jul 7 20:09:31 2013 -@@ -67,9 +67,7 @@ int wrong_tile = -1; - - int drawFlag = 1; // draw flag for rendering callback - --#if defined(__GNUC__) -- #define bswap32(x) __builtin_bswap32(x) --#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) -+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) - #include <stdlib.h> - #define bswap32(x) _byteswap_ulong(x) - #else Index: emulators/mupen64plus/video-glide64mk2/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-glide64mk2/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- emulators/mupen64plus/video-glide64mk2/Makefile 13 Dec 2018 19:53:23 -0000 1.17 +++ emulators/mupen64plus/video-glide64mk2/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.17 2018/12/13 19:53:23 sthen Exp $ COMMENT = n64 emulator video plugin -REVISION = 6 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes Index: emulators/mupen64plus/video-glide64mk2/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-glide64mk2/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- emulators/mupen64plus/video-glide64mk2/distinfo 11 May 2015 09:40:40 -0000 1.2 +++ emulators/mupen64plus/video-glide64mk2/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-video-glide64mk2-src-2.5.tar.gz) = 7z2uAITgeNhDYFq99QOeuLXdaP8UELT8Er3xlZKp/LY= -SIZE (mupen64plus-video-glide64mk2-src-2.5.tar.gz) = 488988 +SHA256 (mupen64plus-video-glide64mk2-src-2.5.9.tar.gz) = VoPzx0KknZ2ZSqcahP1UnjzhOUatJCrGAjmZVQcIwJE= +SIZE (mupen64plus-video-glide64mk2-src-2.5.9.tar.gz) = 498350 Index: emulators/mupen64plus/video-glide64mk2/patches/patch-projects_unix_Makefile =================================================================== RCS file: emulators/mupen64plus/video-glide64mk2/patches/patch-projects_unix_Makefile diff -N emulators/mupen64plus/video-glide64mk2/patches/patch-projects_unix_Makefile --- emulators/mupen64plus/video-glide64mk2/patches/patch-projects_unix_Makefile 19 Feb 2017 06:16:25 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-projects_unix_Makefile,v 1.1 2017/02/19 06:16:25 bentley Exp $ ---- projects/unix/Makefile.orig Sat Feb 18 21:23:21 2017 -+++ projects/unix/Makefile Sat Feb 18 21:23:29 2017 -@@ -98,6 +98,7 @@ ifneq ("$(filter ppc macppc socppc powerpc,$(HOST_CPU) - BIG_ENDIAN := 1 - PIC ?= 1 - NO_ASM := 1 -+ NO_SSE := 1 - $(warning Architecture "$(HOST_CPU)" not officially supported.') - endif - ifneq ("$(filter ppc64 powerpc64,$(HOST_CPU))","") Index: emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_3dmath_cpp =================================================================== RCS file: emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_3dmath_cpp diff -N emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_3dmath_cpp --- emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_3dmath_cpp 27 May 2017 08:41:44 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,17 +0,0 @@ -$OpenBSD: patch-src_Glide64_3dmath_cpp,v 1.1 2017/05/27 08:41:44 espie Exp $ - -Index: src/Glide64/3dmath.cpp ---- src/Glide64/3dmath.cpp.orig -+++ src/Glide64/3dmath.cpp -@@ -271,7 +271,11 @@ void MulMatricesSSE(float m1[4][4],float m2[4][4],floa - tmp = _mm_shuffle_ps (tmp, tmp, 3 + (3 << 2) + (3 << 4) + (3 << 6)); - destrow += tmp * row3; - -+#if defined(__clang__) -+ _mm_storeu_ps(r[i], destrow); -+#else - __builtin_ia32_storeups(r[i], destrow); -+#endif - } - #elif !defined(NO_ASM) && !defined(NOSSE) - __asm Index: emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_Main_cpp =================================================================== RCS file: emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_Main_cpp diff -N emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_Main_cpp --- emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_Main_cpp 11 Sep 2016 10:45:13 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,21 +0,0 @@ -$OpenBSD: patch-src_Glide64_Main_cpp,v 1.1 2016/09/11 10:45:13 naddy Exp $ ---- src/Glide64/Main.cpp.orig Sun Apr 26 21:32:36 2015 -+++ src/Glide64/Main.cpp Sun Sep 11 02:17:37 2016 -@@ -1182,7 +1182,7 @@ int InitGfx () - char strSstWinOpenExt[] ="grSstWinOpenExt"; - GRWINOPENEXT grSstWinOpenExt = (GRWINOPENEXT)grGetProcAddress(strSstWinOpenExt); - if (grSstWinOpenExt) -- gfx_context = grSstWinOpenExt ((FxU32)NULL, -+ gfx_context = grSstWinOpenExt (0, - res_data, - GR_REFRESH_60Hz, - GR_COLORFORMAT_RGBA, -@@ -1192,7 +1192,7 @@ int InitGfx () - 1); // 1 auxillary buffer - } - if (!gfx_context) -- gfx_context = grSstWinOpen ((FxU32)NULL, -+ gfx_context = grSstWinOpen (0, - res_data, - GR_REFRESH_60Hz, - GR_COLORFORMAT_RGBA, Index: emulators/mupen64plus/video-rice/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-rice/Makefile,v retrieving revision 1.17 diff -u -p -r1.17 Makefile --- emulators/mupen64plus/video-rice/Makefile 26 Nov 2018 18:57:28 -0000 1.17 +++ emulators/mupen64plus/video-rice/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,7 +1,6 @@ # $OpenBSD: Makefile,v 1.17 2018/11/26 18:57:28 naddy Exp $ COMMENT = n64 emulator opengl video plugin -REVISION = 6 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes Index: emulators/mupen64plus/video-rice/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-rice/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- emulators/mupen64plus/video-rice/distinfo 11 May 2015 09:40:40 -0000 1.4 +++ emulators/mupen64plus/video-rice/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-video-rice-src-2.5.tar.gz) = lp9lufQvSLx+hA5O0TQiM+Q3HC7cpaqPNvacSyCVWCg= -SIZE (mupen64plus-video-rice-src-2.5.tar.gz) = 339012 +SHA256 (mupen64plus-video-rice-src-2.5.9.tar.gz) = eVlhF4dOhJFls9/55ki3gmLggnUKO2xmfwa5QDflI2Y= +SIZE (mupen64plus-video-rice-src-2.5.9.tar.gz) = 300964 Index: emulators/mupen64plus/video-z64/Makefile =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-z64/Makefile,v retrieving revision 1.15 diff -u -p -r1.15 Makefile --- emulators/mupen64plus/video-z64/Makefile 26 Nov 2018 18:57:28 -0000 1.15 +++ emulators/mupen64plus/video-z64/Makefile 18 Feb 2019 00:14:37 -0000 @@ -1,22 +1,16 @@ # $OpenBSD: Makefile,v 1.15 2018/11/26 18:57:28 naddy Exp $ COMMENT = n64 emulator video plugin -REVISION = 8 - -# XXX upstream was inconsistent with numbering this release (2.0 vs 2.0.0) -VERSION = 2.0.0 # GPLv2+ PERMIT_PACKAGE_CDROM = Yes -WRKDIST = ${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD} - -WANTLIB = GL GLEW GLU SDL c m pthread ${COMPILER_LIBCXX} +WANTLIB = GL GLEW GLU SDL2 c m pthread ${COMPILER_LIBCXX} COMPILER = base-clang ports-gcc base-gcc LIB_DEPENDS = graphics/glew>=1.12.0 \ - devel/sdl + devel/sdl2 MUPEN64PLUS_MOD = video-z64 Index: emulators/mupen64plus/video-z64/distinfo =================================================================== RCS file: /cvs/ports/emulators/mupen64plus/video-z64/distinfo,v retrieving revision 1.2 diff -u -p -r1.2 distinfo --- emulators/mupen64plus/video-z64/distinfo 5 Sep 2013 03:26:33 -0000 1.2 +++ emulators/mupen64plus/video-z64/distinfo 18 Feb 2019 00:14:37 -0000 @@ -1,2 +1,2 @@ -SHA256 (mupen64plus-video-z64-src-2.0.0.tar.gz) = 3sBqCvuLQDdU+qJto2xq2nf3kYEkUWxvRJqdkNPEhh8= -SIZE (mupen64plus-video-z64-src-2.0.0.tar.gz) = 65723 +SHA256 (mupen64plus-video-z64-src-2.5.9.tar.gz) = +9bgH1iG09cG9CI1P4KistdanLz/IwzVh30erDvRXsM= +SIZE (mupen64plus-video-z64-src-2.5.9.tar.gz) = 66880 Index: emulators/mupen64plus/video-z64/patches/patch-src_glshader_cpp =================================================================== RCS file: emulators/mupen64plus/video-z64/patches/patch-src_glshader_cpp diff -N emulators/mupen64plus/video-z64/patches/patch-src_glshader_cpp --- emulators/mupen64plus/video-z64/patches/patch-src_glshader_cpp 29 May 2015 23:23:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_glshader_cpp,v 1.1 2015/05/29 23:23:07 bentley Exp $ - -Correct the path to the GLEW header. -https://code.google.com/p/mupen64plus/issues/detail?id=649 - ---- src/glshader.cpp.orig Thu May 28 19:52:52 2015 -+++ src/glshader.cpp Thu May 28 19:53:08 2015 -@@ -23,7 +23,7 @@ - #include <stdio.h> - #include <string.h> - #include "rgl_assert.h" --#include <glew.h> -+#include <GL/glew.h> - #if defined(__MACOSX__) - #include <OpenGL/gl.h> - #include <OpenGL/glext.h> Index: emulators/mupen64plus/video-z64/patches/patch-src_rgl_h =================================================================== RCS file: emulators/mupen64plus/video-z64/patches/patch-src_rgl_h diff -N emulators/mupen64plus/video-z64/patches/patch-src_rgl_h --- emulators/mupen64plus/video-z64/patches/patch-src_rgl_h 29 May 2015 23:23:07 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_rgl_h,v 1.1 2015/05/29 23:23:07 bentley Exp $ - -Correct the path to the GLEW header. -https://code.google.com/p/mupen64plus/issues/detail?id=649 - ---- src/rgl.h.orig Thu May 28 19:51:09 2015 -+++ src/rgl.h Thu May 28 19:51:32 2015 -@@ -26,7 +26,7 @@ - #include "rgl_assert.h" - #include "rdp.h" - --#include <glew.h> -+#include <GL/glew.h> - #if defined(__MACOSX__) - #include <OpenGL/gl.h> - #elif defined(__MACOS__)
rsp-cxd4.tar.gz
Description: application/gzip
