Re: UPDATE: emulators/mupen64plus
Hi Nam, Nam Nguyen writes: > Thank you for your work updating mupen64plus. Please let me know if you > need any other information. Thanks for the testing, it's much appreciated. I've committed the update. If you encounter emulation issues, you might consider reporting upstream, although it might take a long time for them to get fixed. -- Anthony J. Bentley
Re: UPDATE: emulators/mupen64plus
Hi Anthony, "Anthony J. Bentley" writes: > On Sun, Feb 17, 2019 at 2:43 AM Anthony J. Bentley 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? I tested two games over two hours and they worked well. There were minor graphical glitches (e.g., missing assets, hard to read fonts) and even an unreproducible freeze. Overall, it was very playable. After researching, I see that each ROM is variable in how well it is supported. (https://mupen64plus.org/wiki/index.php?title=GameCompatibility) The hardest part in setup was figuring out the buttons. I used brute force to find out what to change /usr/local/share/mupen64plus/InputAutoCfg.ini to since there is no easy way to test buttons. IIUC, this is due to a lack of a userspace XInput driver and does not have to do with mupen64plus itself. (https://www.reddit.com/r/openbsd_gaming/comments/a6f7f4/request_advice_for_controllergamepads_fnaify/) The two biggest changes were switching the signs for the Y Axis: --8<---cut here---start->8--- Y Axis = axis(1+,1-) --8<---cut here---end--->8--- and seeing this message during startup: --8<---cut here---start->8--- Input Error: No auto-config found for joystick named 'Game_Pad (0)' in InputAutoConfig.ini --8<---cut here---end--->8--- which made me add [Game_Pad (0)] to a section inside InputAutoCfg.ini. I discovered this mapping for the usb xbox 360 controller I used. --8<---cut here---start->8--- | button(#) | xbox button | |---+---| | 0 | Start | | 1 | Select| | 2 | click L stick | | 3 | click R stick | | 4 | L shoulder| | 5 | R shoulder| | 6 | Guide button | | 7 | A | | 8 | B | | 9 | X | |10 | Y | | axis(2+) | L trigger | | axis(5+) | R trigger | --8<---cut here---end--->8--- and settled on: --8<---cut here---start->8--- [Game_Pad (0)] plugged = True mouse = False AnalogDeadzone = 4096,4096 AnalogPeak = 32768,32768 DPad R = hat(0 Right) DPad L = hat(0 Left) DPad D = hat(0 Down) DPad U = hat(0 Up) Start = button(0) Z Trig = axis(2+) B Button = button(9) A Button = button(7) C Button R = axis(3+,24000) button(6) C Button L = axis(3-,24000) button(1) C Button D = axis(4+,24000) button(8) C Button U = axis(4-,24000) button(10) R Trig = axis(5+) button(5) L Trig = button(4) Mempak switch = Rumblepak switch = X Axis = axis(0-,0+) Y Axis = axis(1+,1-) --8<---cut here---end--->8--- I am still unsure about the L, R and Z buttons, but these can be tweaked with experimentation. I ran the two video plugins, rice and glide64mk2, and glide64mk2 seemed to provide better performance in areas where rice was sluggish. Again, this varies per game. --8<---cut here---start->8--- mupen64plus --windowed --gfx mupen64plus-video-glide64mk2 game.z64 --8<---cut here---end--->8--- Thank you for your work updating mupen64plus. Please let me know if you need any other information.
Re: UPDATE: emulators/mupen64plus
On Sun, Feb 17, 2019 at 2:43 AM Anthony J. Bentley 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 - 1.5
+++ meta/mupen64plus/Makefile 18 Feb 2019 00:14:37 -
@@ -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
@@ -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 - 1.3
+++ emulators/mupen64plus/Makefile 18 Feb 2019 00:14:37 -
@@ -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 - 1.14
+++ emulators/mupen64plus/Makefile.inc 18 Feb 2019 00:14:37 -
@@ -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
@@ -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 - 1.12
+++ emulators/mupen64plus/audio-sdl/Makefile 18 Feb 2019 00:14:37 -
@@ -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 - 1.4
+++ emulators/mupen64plus/audio-sdl/distinfo 18 Feb 2019 00:14:37 -
@@ -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 - 1.21
+++ emulators/mupen64plus/core/Makefile 18 Feb 2019 00:14:37 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.21 2018/11/26 18:57:27 naddy Exp $
COMMENT = n64 emulator
UPDATE: emulators/mupen64plus
Hi,
Here's an update to mupen64plus-2.5.9.
The last mupen64plus release was 2.5 in 2015. 2.5.9 is effectively a
beta for the upcoming mupen64plus-2.6.0, so useful bug reports that
could lead to bugfixes would be greatly appreciated.
I've added arm and arm64 to ONLY_FOR_ARCHS in hopes that they work.
If not, it's something worth fixing by someone with the hardware.
PowerPC is currently broken at runtime. Anyone affected should join the
following conversation, as upstream has expressed interest in fixing
this problem: https://github.com/mupen64plus/mupen64plus-core/issues/506
Do note that if you're seeing issues with the graphics specifically,
you should try mupen64plus-video-glide64mk2 in addition to the default
mupen64plus-video-rice. See --gfx in the manpage.
Index: Makefile.inc
===
RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile.inc
--- Makefile.inc26 Nov 2018 18:57:27 - 1.14
+++ Makefile.inc17 Feb 2019 09:32:01 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile.inc,v 1.14 2018/11/26 18:57:27 naddy Exp $
ONLY_FOR_ARCHS ?= amd64 i386 powerpc
-VERSION ?= 2.5
+VERSION ?= 2.5.9
DISTNAME ?=mupen64plus-${MUPEN64PLUS_MOD}-src-${VERSION}
PKGNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-${VERSION}
HOMEPAGE ?=http://mupen64plus.org/
@@ -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: audio-sdl/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- audio-sdl/Makefile 26 Nov 2018 18:57:27 - 1.12
+++ audio-sdl/Makefile 17 Feb 2019 09:32:01 -
@@ -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: audio-sdl/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- audio-sdl/distinfo 11 May 2015 09:40:40 - 1.4
+++ audio-sdl/distinfo 17 Feb 2019 09:32:01 -
@@ -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: core/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- core/Makefile 26 Nov 2018 18:57:27 - 1.21
+++ core/Makefile 17 Feb 2019 09:32:01 -
@@ -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: core/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/core/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- core/distinfo 11 May 2015 09:40:40 - 1.4
+++ core/distinfo 17 Feb 2019 09:32:01 -
@@ -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: 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
---
UPDATE: emulators/mupen64plus
Hi,
Here is an update to mupen64plus-2.5.
A couple of patches and make flags go away due to upstream taking fixes.
A few plugins didn't get a 2.5 release (video-{glide64,z64,arachnoid}
and rsp-z64). These plugins saw only a couple of unimportant commits
since the 2.0 release, and work fine with the plugins that have been
updated to 2.5, so they can stay as-is.
Tested all plugin combinations on amd64.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile.inc
--- Makefile.inc17 Apr 2014 07:03:59 - 1.8
+++ Makefile.inc30 Apr 2015 07:48:09 -
@@ -2,7 +2,7 @@
ONLY_FOR_ARCHS ?= amd64 i386
SHARED_ONLY = Yes
-VERSION ?= 2.0
+VERSION ?= 2.5
DISTNAME ?=mupen64plus-${MUPEN64PLUS_MOD}-src-${VERSION}
PKGNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-${VERSION}
HOMEPAGE ?=https://code.google.com/p/mupen64plus/
@@ -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.0
+BUILD_DEPENDS += emulators/mupen64plus/core=2.5
.endif
WRKBUILD ?=${WRKDIST}/projects/unix
Index: audio-sdl/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- audio-sdl/Makefile 17 Apr 2014 07:03:59 - 1.6
+++ audio-sdl/Makefile 30 Apr 2015 07:48:09 -
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
COMMENT = n64 emulator sdl audio plugin
-REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -12,7 +11,5 @@ LIB_DEPENDS = audio/speex \
audio/libsamplerate
MUPEN64PLUS_MOD = audio-sdl
-
-MAKE_FLAGS += NO_OSS=1
.include bsd.port.mk
Index: audio-sdl/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- audio-sdl/distinfo 5 Sep 2013 03:26:29 - 1.3
+++ audio-sdl/distinfo 30 Apr 2015 07:48:09 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-audio-sdl-src-2.0.tar.gz) =
lD/6a2za8M2iokRp36HY6VHIjEFHLe2eXJ7LwRE2MoY=
-SIZE (mupen64plus-audio-sdl-src-2.0.tar.gz) = 26084
+SHA256 (mupen64plus-audio-sdl-src-2.5.tar.gz) =
HFn4wtcCBjUMC5BnqXIs8t1n5WhplNWlWtv1HuiBL1k=
+SIZE (mupen64plus-audio-sdl-src-2.5.tar.gz) = 26147
Index: core/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- core/Makefile 17 Apr 2014 07:03:59 - 1.9
+++ core/Makefile 30 Apr 2015 07:48:09 -
@@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.9 2014/04/17 07:03:59 bentley Exp $
COMMENT = n64 emulator core
-SHARED_LIBS = mupen64plus 2.2 # 2.0
-REVISION = 2
+SHARED_LIBS = mupen64plus 2.3 # 2.5
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@@ -20,6 +19,7 @@ MODULES = gcc4
MODGCC4_ARCHS =i386
MODGCC4_LANGS =c c++
-MAKE_FLAGS += TARGET=libmupen64plus.so.${LIBmupen64plus_VERSION}
+MAKE_FLAGS += TARGET=libmupen64plus.so.${LIBmupen64plus_VERSION} \
+ SONAME=libmupen64plus.so
.include bsd.port.mk
Index: core/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/core/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- core/distinfo 5 Sep 2013 03:26:30 - 1.3
+++ core/distinfo 30 Apr 2015 07:48:09 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-core-src-2.0.tar.gz) =
fph5Xb5GRrhYkZB49Ypu2U98+jCGffbPRO8z2mqqeig=
-SIZE (mupen64plus-core-src-2.0.tar.gz) = 1127862
+SHA256 (mupen64plus-core-src-2.5.tar.gz) =
Wemaeef4YlFyMuMRW9H3I3fj402nlcEYumF8R4yDlXg=
+SIZE (mupen64plus-core-src-2.5.tar.gz) = 895890
Index: core/patches/patch-projects_unix_Makefile
===
RCS file: core/patches/patch-projects_unix_Makefile
diff -N core/patches/patch-projects_unix_Makefile
--- /dev/null 1 Jan 1970 00:00:00 -
+++ core/patches/patch-projects_unix_Makefile 30 Apr 2015 07:48:09 -
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- projects/unix/Makefile.origWed Apr 29 02:17:34 2015
projects/unix/Makefile Wed Apr 29 02:17:39 2015
+@@ -636,7 +636,6 @@ install: $(TARGET)
+ $(INSTALL) -d $(DESTDIR)$(INCDIR)
+ $(INSTALL) -m 0644 ../../src/api/m64p_*.h $(DESTDIR)$(INCDIR)
+ -$(LDCONFIG) $(DESTDIR)$(LIBDIR)
+- if
Re: UPDATE: emulators/mupen64plus
On Thu, Jul 18, 2013 at 01:33:30AM -0400, Brad Smith wrote:
On 18/07/13 1:11 AM, Anthony J. Bentley wrote:
Matthew Dempsky writes:
On Sun, Jul 7, 2013 at 8:36 PM, Anthony J. Bentley anth...@cathet.uswrote:
Upstream released another graphics plugin, video-glide64mk2, but I haven't
made a port for it because it #includes thread, which doesn't seem to
appear with either GCC 4.6 or clang.
Is the source file C or C++?
C++. Below is the error message. I've attached a port for the plugin, which
currently does not build; of course, I could have missed something really
obvious. Extract from within /usr/ports/emulators/mupen64plus to try it.
c++ -fvisibility-inlines-hidden -std=gnu++0x -O2 -pipe -g -Wall -ffast-math
-fno-strict-aliasing -fvisibility=hidden -I../../src
-I../../src/Glitch64/inc -DGCC -mmmx -msse -fno-PIC -I/usr/include
-I/usr/local/include/libpng16 -I/usr/X11R6/include
-I/usr/include/dev/pci/drm -I/usr/local/include -I/usr/local/include/SDL
-D_GNU_SOURCE=1 -D_REENTRANT -I/usr/X11R6/include -DXTHREADS
-I/usr/local/include/mupen64plus -MD -D__unix__ -DTEXTURE_FILTER -c -o
_obj/GlideHQ/TxFilter.o ../../src/GlideHQ/TxFilter.cpp
../../src/GlideHQ/TxFilter.cpp:32:10: fatal error: 'thread' file not found
#include thread
^
1 error generated.
gmake: *** [_obj/GlideHQ/TxFilter.o] Error 1
That header does exist with GCC 4.6 / 4.8 and is new with C++11.
include/c++/${V}/thread
Anthony, the plugin compiles with gcc 4.6 on my computer. GCC uses
emutls on systems without TLS. Clang requires TLS support, so it doesn't
work on OpenBSD yet.
--
Juan Francisco Cantero Hurtado http://juanfra.info
Re: UPDATE: emulators/mupen64plus
Juan Francisco Cantero Hurtado writes:
On Thu, Jul 18, 2013 at 01:33:30AM -0400, Brad Smith wrote:
On 18/07/13 1:11 AM, Anthony J. Bentley wrote:
Matthew Dempsky writes:
On Sun, Jul 7, 2013 at 8:36 PM, Anthony J. Bentley anth...@cathet.uswro
te:
Upstream released another graphics plugin, video-glide64mk2, but I haven
't
made a port for it because it #includes thread, which doesn't seem to
appear with either GCC 4.6 or clang.
Is the source file C or C++?
C++. Below is the error message. I've attached a port for the plugin, whic
h
currently does not build; of course, I could have missed something really
obvious. Extract from within /usr/ports/emulators/mupen64plus to try it.
c++ -fvisibility-inlines-hidden -std=gnu++0x -O2 -pipe -g -Wall -ffast-ma
th -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/
inc -DGCC -mmmx -msse -fno-PIC -I/usr/include -I/usr/local/include/libpng16 -
I/usr/X11R6/include -I/usr/include/dev/pci/drm -I/usr/local/include -I/usr/lo
cal/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/X11R6/include -DXTHREADS
-I/usr/local/include/mupen64plus -MD -D__unix__ -DTEXTURE_FILTER -c -o _o
bj/GlideHQ/TxFilter.o ../../src/GlideHQ/TxFilter.cpp
../../src/GlideHQ/TxFilter.cpp:32:10: fatal error: 'thread' file not found
#include thread
^
1 error generated.
gmake: *** [_obj/GlideHQ/TxFilter.o] Error 1
That header does exist with GCC 4.6 / 4.8 and is new with C++11.
include/c++/${V}/thread
Anthony, the plugin compiles with gcc 4.6 on my computer. GCC uses
emutls on systems without TLS. Clang requires TLS support, so it doesn't
work on OpenBSD yet.
Okay, thanks. Here is a port for glide64mk2, which works well here on
Intel. This video plugin seems to be the most accurate one and the one
receiving the most attention from upstream. Anyone willing to ok this
and the rest of the mupen64plus update?
--
Anthony J. Bentley
mupen64plus-video-glide64mk2.tar.gz
Description: mupen64plus-video-glide64mk2.tar.gz
Re: UPDATE: emulators/mupen64plus
Hi Ryan, Ryan Freeman writes: Just a note, since the update to 2.0 certain aspects of the emu (with rice video) seem to work worse than they did before the update. Its hard to say why just yet as I was also testing radeon kms, though radeon kms + old ver didn't have the same issue. The good news is I went line-by-line in mupen64plus.cfg enabling and disabling options until i found one that made the odd blitting problem (making some games unplayable, as the junk showing up covers lots of gameplay area) go away. So, if yourself or others notices weird blitting where it used to not happen, check this default option: Mipmapping = 3 -- pretty sure thats where default was. I just turned it off, setting it to 0, and all the problems went away, making it run just as good (or better) than it did before. Thanks for testing. Did you use the same config file for both old and new mupen64plus? Was the mipmapping option set to 3 in the default generated mupen64plus.cfg in both versions, or did the default value change? Do you see this behavior on any other video cards?
Re: UPDATE: emulators/mupen64plus
Matthew Dempsky writes: On Sun, Jul 7, 2013 at 8:36 PM, Anthony J. Bentley anth...@cathet.uswrote: Upstream released another graphics plugin, video-glide64mk2, but I haven't made a port for it because it #includes thread, which doesn't seem to appear with either GCC 4.6 or clang. Is the source file C or C++? C++. Below is the error message. I've attached a port for the plugin, which currently does not build; of course, I could have missed something really obvious. Extract from within /usr/ports/emulators/mupen64plus to try it. c++ -fvisibility-inlines-hidden -std=gnu++0x -O2 -pipe -g -Wall -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC -mmmx -msse -fno-PIC -I/usr/include -I/usr/local/include/libpng16 -I/usr/X11R6/include -I/usr/include/dev/pci/drm -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -I/usr/X11R6/include -DXTHREADS -I/usr/local/include/mupen64plus -MD -D__unix__ -DTEXTURE_FILTER -c -o _obj/GlideHQ/TxFilter.o ../../src/GlideHQ/TxFilter.cpp ../../src/GlideHQ/TxFilter.cpp:32:10: fatal error: 'thread' file not found #include thread ^ 1 error generated. gmake: *** [_obj/GlideHQ/TxFilter.o] Error 1 mupen64plus-video-glide64mk2.tar.gz Description: mupen64plus-video-glide64mk2.tar.gz
Re: UPDATE: emulators/mupen64plus
On 18/07/13 1:11 AM, Anthony J. Bentley wrote:
Matthew Dempsky writes:
On Sun, Jul 7, 2013 at 8:36 PM, Anthony J. Bentley anth...@cathet.uswrote:
Upstream released another graphics plugin, video-glide64mk2, but I haven't
made a port for it because it #includes thread, which doesn't seem to
appear with either GCC 4.6 or clang.
Is the source file C or C++?
C++. Below is the error message. I've attached a port for the plugin, which
currently does not build; of course, I could have missed something really
obvious. Extract from within /usr/ports/emulators/mupen64plus to try it.
c++ -fvisibility-inlines-hidden -std=gnu++0x -O2 -pipe -g -Wall -ffast-math
-fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC -mmmx
-msse -fno-PIC -I/usr/include -I/usr/local/include/libpng16 -I/usr/X11R6/include
-I/usr/include/dev/pci/drm -I/usr/local/include -I/usr/local/include/SDL -D_GNU_SOURCE=1
-D_REENTRANT -I/usr/X11R6/include -DXTHREADS -I/usr/local/include/mupen64plus
-MD -D__unix__ -DTEXTURE_FILTER -c -o _obj/GlideHQ/TxFilter.o
../../src/GlideHQ/TxFilter.cpp
../../src/GlideHQ/TxFilter.cpp:32:10: fatal error: 'thread' file not found
#include thread
^
1 error generated.
gmake: *** [_obj/GlideHQ/TxFilter.o] Error 1
That header does exist with GCC 4.6 / 4.8 and is new with C++11.
include/c++/${V}/thread
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
Re: UPDATE: emulators/mupen64plus
On Sun, Jul 07, 2013 at 09:36:20PM -0600, Anthony J. Bentley wrote:
Hi,
Attached is an update to mupen64plus-2.0.
Upstream released another graphics plugin, video-glide64mk2, but I haven't
made a port for it because it #includes thread, which doesn't seem to
appear with either GCC 4.6 or clang.
Tested all plugins on intel/i386. arachnoid breaks with that specific driver
but this is not new (it works fine with software rendering and, IIRC, radeon).
meta/mupen64plus also needs to be bumped to 2.0.
Hey Anthony,
Just a note, since the update to 2.0 certain aspects of the emu
(with rice video) seem to work worse than they did before the update.
Its hard to say why just yet as I was also testing radeon kms, though
radeon kms + old ver didn't have the same issue.
The good news is I went line-by-line in mupen64plus.cfg enabling and
disabling options until i found one that made the odd blitting problem
(making some games unplayable, as the junk showing up covers lots of
gameplay area) go away.
So, if yourself or others notices weird blitting where it used to not
happen, check this default option:
Mipmapping = 3 -- pretty sure thats where default was.
I just turned it off, setting it to 0, and all the problems went away,
making it run just as good (or better) than it did before.
May be worth throwing into pkg-readme if many others notice the same
thing.
Cheers!
(my daughter really enjoys the old mario games, so thanks for spending
the time getting this going on openbsd to begin with)
-ryan
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile.inc
--- Makefile.inc 11 Mar 2013 11:06:04 - 1.5
+++ Makefile.inc 8 Jul 2013 02:11:31 -
@@ -2,7 +2,7 @@
ONLY_FOR_ARCHS ?=amd64 i386
SHARED_ONLY =Yes
-VERSION ?= 1.99.5
+VERSION ?= 2.0
DISTNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-src-${VERSION}
PKGNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-${VERSION}
HOMEPAGE ?= https://code.google.com/p/mupen64plus/
@@ -21,7 +21,7 @@ FAKE_FLAGS ?= PREFIX=${PREFIX} LDCONFIG
.if ${MUPEN64PLUS_MOD} != core
MAKE_FLAGS +=APIDIR=${LOCALBASE}/include/mupen64plus
-BUILD_DEPENDS += emulators/mupen64plus/core=1.99.5
+BUILD_DEPENDS += emulators/mupen64plus/core=2.0
.endif
WRKBUILD ?= ${WRKDIST}/projects/unix
Index: audio-sdl/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- audio-sdl/Makefile11 Mar 2013 11:06:04 - 1.4
+++ audio-sdl/Makefile8 Jul 2013 02:11:31 -
@@ -2,15 +2,16 @@
COMMENT =n64 emulator sdl audio plugin
-REVISION = 0
-
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB =SDL pthread samplerate
-LIB_DEPENDS =devel/sdl \
+WANTLIB =SDL pthread samplerate speexdsp
+LIB_DEPENDS =audio/speex \
+ devel/sdl \
audio/libsamplerate
MUPEN64PLUS_MOD =audio-sdl
+
+MAKE_FLAGS +=NO_OSS=1
.include bsd.port.mk
Index: audio-sdl/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- audio-sdl/distinfo13 Aug 2012 06:53:55 - 1.2
+++ audio-sdl/distinfo8 Jul 2013 02:11:31 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-audio-sdl-src-1.99.5.tar.gz) =
cbu0Tqs3RF+btfRmbZbjpmpAQvGCdGoWM5QOXIs+iZU=
-SIZE (mupen64plus-audio-sdl-src-1.99.5.tar.gz) = 23488
+SHA256 (mupen64plus-audio-sdl-src-2.0.tar.gz) =
lD/6a2za8M2iokRp36HY6VHIjEFHLe2eXJ7LwRE2MoY=
+SIZE (mupen64plus-audio-sdl-src-2.0.tar.gz) = 26084
Index: core/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- core/Makefile 11 Mar 2013 11:06:04 - 1.5
+++ core/Makefile 8 Jul 2013 02:11:32 -
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2013/03/11 11:06:04 espie Exp $
COMMENT =n64 emulator core
-SHARED_LIBS =mupen64plus 2.1 # 2.0
-
-REVISION = 0
+SHARED_LIBS =mupen64plus 2.2 # 2.0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
Index: core/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/core/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- core/distinfo 13 Aug 2012 06:53:55 - 1.2
+++
Re: UPDATE: emulators/mupen64plus
On Sun, Jul 7, 2013 at 8:36 PM, Anthony J. Bentley anth...@cathet.uswrote: Upstream released another graphics plugin, video-glide64mk2, but I haven't made a port for it because it #includes thread, which doesn't seem to appear with either GCC 4.6 or clang. Is the source file C or C++?
UPDATE: emulators/mupen64plus
Hi,
Attached is an update to mupen64plus-2.0.
Upstream released another graphics plugin, video-glide64mk2, but I haven't
made a port for it because it #includes thread, which doesn't seem to
appear with either GCC 4.6 or clang.
Tested all plugins on intel/i386. arachnoid breaks with that specific driver
but this is not new (it works fine with software rendering and, IIRC, radeon).
meta/mupen64plus also needs to be bumped to 2.0.
ok?
Index: Makefile.inc
===
RCS file: /cvs/ports/emulators/mupen64plus/Makefile.inc,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile.inc
--- Makefile.inc11 Mar 2013 11:06:04 - 1.5
+++ Makefile.inc8 Jul 2013 02:11:31 -
@@ -2,7 +2,7 @@
ONLY_FOR_ARCHS ?= amd64 i386
SHARED_ONLY = Yes
-VERSION ?= 1.99.5
+VERSION ?= 2.0
DISTNAME ?=mupen64plus-${MUPEN64PLUS_MOD}-src-${VERSION}
PKGNAME ?= mupen64plus-${MUPEN64PLUS_MOD}-${VERSION}
HOMEPAGE ?=https://code.google.com/p/mupen64plus/
@@ -21,7 +21,7 @@ FAKE_FLAGS ?= PREFIX=${PREFIX} LDCONFIG
.if ${MUPEN64PLUS_MOD} != core
MAKE_FLAGS += APIDIR=${LOCALBASE}/include/mupen64plus
-BUILD_DEPENDS += emulators/mupen64plus/core=1.99.5
+BUILD_DEPENDS += emulators/mupen64plus/core=2.0
.endif
WRKBUILD ?=${WRKDIST}/projects/unix
Index: audio-sdl/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- audio-sdl/Makefile 11 Mar 2013 11:06:04 - 1.4
+++ audio-sdl/Makefile 8 Jul 2013 02:11:31 -
@@ -2,15 +2,16 @@
COMMENT = n64 emulator sdl audio plugin
-REVISION = 0
-
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB = SDL pthread samplerate
-LIB_DEPENDS = devel/sdl \
+WANTLIB = SDL pthread samplerate speexdsp
+LIB_DEPENDS = audio/speex \
+ devel/sdl \
audio/libsamplerate
MUPEN64PLUS_MOD = audio-sdl
+
+MAKE_FLAGS += NO_OSS=1
.include bsd.port.mk
Index: audio-sdl/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/audio-sdl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- audio-sdl/distinfo 13 Aug 2012 06:53:55 - 1.2
+++ audio-sdl/distinfo 8 Jul 2013 02:11:31 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-audio-sdl-src-1.99.5.tar.gz) =
cbu0Tqs3RF+btfRmbZbjpmpAQvGCdGoWM5QOXIs+iZU=
-SIZE (mupen64plus-audio-sdl-src-1.99.5.tar.gz) = 23488
+SHA256 (mupen64plus-audio-sdl-src-2.0.tar.gz) =
lD/6a2za8M2iokRp36HY6VHIjEFHLe2eXJ7LwRE2MoY=
+SIZE (mupen64plus-audio-sdl-src-2.0.tar.gz) = 26084
Index: core/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/core/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- core/Makefile 11 Mar 2013 11:06:04 - 1.5
+++ core/Makefile 8 Jul 2013 02:11:32 -
@@ -1,9 +1,7 @@
# $OpenBSD: Makefile,v 1.5 2013/03/11 11:06:04 espie Exp $
COMMENT = n64 emulator core
-SHARED_LIBS = mupen64plus 2.1 # 2.0
-
-REVISION = 0
+SHARED_LIBS = mupen64plus 2.2 # 2.0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
Index: core/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/core/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- core/distinfo 13 Aug 2012 06:53:55 - 1.2
+++ core/distinfo 8 Jul 2013 02:11:32 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-core-src-1.99.5.tar.gz) =
o0+eiE8IDtwKXrz4z2I7ivxYJOmTLXl88em+BHkdfWM=
-SIZE (mupen64plus-core-src-1.99.5.tar.gz) = 1218594
+SHA256 (mupen64plus-core-src-2.0.tar.gz) =
fph5Xb5GRrhYkZB49Ypu2U98+jCGffbPRO8z2mqqeig=
+SIZE (mupen64plus-core-src-2.0.tar.gz) = 1127862
Index: input-sdl/Makefile
===
RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- input-sdl/Makefile 11 Mar 2013 11:06:04 - 1.4
+++ input-sdl/Makefile 8 Jul 2013 02:11:32 -
@@ -2,8 +2,6 @@
COMMENT = n64 emulator input plugin
-REVISION = 0
-
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
Index: input-sdl/distinfo
===
RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/distinfo,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 distinfo
--- input-sdl/distinfo 13 Aug 2012 06:53:55 - 1.2
+++ input-sdl/distinfo 8 Jul 2013 02:11:32 -
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-input-sdl-src-1.99.5.tar.gz) =
