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.inc 17 Apr 2014 07:03:59 -0000 1.8
+++ Makefile.inc 30 Apr 2015 07:48:09 -0000
@@ -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 -0000 1.6
+++ audio-sdl/Makefile 30 Apr 2015 07:48:09 -0000
@@ -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 -0000 1.3
+++ audio-sdl/distinfo 30 Apr 2015 07:48:09 -0000
@@ -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 -0000 1.9
+++ core/Makefile 30 Apr 2015 07:48:09 -0000
@@ -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 -0000 1.3
+++ core/distinfo 30 Apr 2015 07:48:09 -0000
@@ -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 -0000
+++ core/patches/patch-projects_unix_Makefile 30 Apr 2015 07:48:09 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- 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)
+ $(INSTALL) -d "$(DESTDIR)$(INCDIR)"
+ $(INSTALL) -m 0644 ../../src/api/m64p_*.h "$(DESTDIR)$(INCDIR)"
+ -$(LDCONFIG) "$(DESTDIR)$(LIBDIR)"
+- if [ ! -e "$(DESTDIR)$(LIBDIR)/$(SONAME)" ]; then ln -sf "$(TARGET)"
"$(DESTDIR)$(LIBDIR)/$(SONAME)"; fi
+
+ uninstall:
+ $(RM) "$(DESTDIR)$(LIBDIR)/$(TARGET)"
Index: core/patches/patch-src_memory_memory_h
===================================================================
RCS file: core/patches/patch-src_memory_memory_h
diff -N core/patches/patch-src_memory_memory_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ core/patches/patch-src_memory_memory_h 30 Apr 2015 07:48:09 -0000
@@ -0,0 +1,30 @@
+$OpenBSD$
+--- src/memory/memory.h.orig Wed Apr 29 01:35:40 2015
++++ src/memory/memory.h Wed Apr 29 01:36:22 2015
+@@ -22,6 +22,7 @@
+ #ifndef M64P_MEMORY_MEMORY_H
+ #define M64P_MEMORY_MEMORY_H
+
++#include <endian.h>
+ #include <stdint.h>
+
+ #define read_word_in_memory() readmem[address>>16]()
+@@ -48,17 +49,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))
+-#define sl(x) __builtin_bswap32(x)
+-#else
+-#define sl(mot) \
+-( \
+-((mot & 0x000000FF) << 24) | \
+-((mot & 0x0000FF00) << 8) | \
+-((mot & 0x00FF0000) >> 8) | \
+-((mot & 0xFF000000) >> 24) \
+-)
+-#endif
++#define sl(x) swap32(x)
+ #define S8 3
+ #define S16 2
+ #define Sh16 1
Index: core/patches/patch-src_r4300_x86_rjump_c
===================================================================
RCS file: core/patches/patch-src_r4300_x86_rjump_c
diff -N core/patches/patch-src_r4300_x86_rjump_c
--- core/patches/patch-src_r4300_x86_rjump_c 23 Jan 2014 20:08:48 -0000
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-$OpenBSD: patch-src_r4300_x86_rjump_c,v 1.1 2014/01/23 20:08:48 bentley Exp $
-
-Provide __GNUC_PREREQ for GCC 4.2.
-From upstream d54b026d6dd85d87711de6478622f87b64f5615c
-
---- src/r4300/x86/rjump.c.orig Wed Jul 3 08:06:28 2013
-+++ src/r4300/x86/rjump.c Thu Jan 23 12:51:02 2014
-@@ -101,6 +101,15 @@ void dyna_start(void *code)
- #elif defined(__GNUC__) && defined(__i386__)
- #if defined(__PIC__)
- /* for -fPIC (shared libraries) */
-+ #ifndef __GNUC_PREREQ
-+ # if defined __GNUC__ && defined __GNUC_MINOR__
-+ # define __GNUC_PREREQ(maj, min) \
-+ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-+ # else
-+ # define __GNUC_PREREQ(maj, min) 0
-+ # endif
-+ #endif
-+
- #if __GNUC_PREREQ (4, 7)
- # define GET_PC_THUNK_STR(reg) "__x86.get_pc_thunk." #reg
- #else
Index: core/pkg/PLIST
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/core/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 PLIST
--- core/pkg/PLIST 13 Aug 2012 06:53:55 -0000 1.2
+++ core/pkg/PLIST 30 Apr 2015 07:48:09 -0000
@@ -7,10 +7,8 @@ include/mupen64plus/m64p_frontend.h
include/mupen64plus/m64p_plugin.h
include/mupen64plus/m64p_types.h
include/mupen64plus/m64p_vidext.h
-lib/libmupen64plus.so.2
@lib lib/libmupen64plus.so.${LIBmupen64plus_VERSION}
share/mupen64plus/
share/mupen64plus/font.ttf
-share/mupen64plus/mupen64plus.cht
share/mupen64plus/mupen64plus.ini
share/mupen64plus/mupencheat.txt
Index: input-sdl/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/input-sdl/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- input-sdl/Makefile 17 Apr 2014 07:03:59 -0000 1.6
+++ input-sdl/Makefile 30 Apr 2015 07:48:09 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
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.3
diff -u -p -u -p -r1.3 distinfo
--- input-sdl/distinfo 5 Sep 2013 03:26:30 -0000 1.3
+++ input-sdl/distinfo 30 Apr 2015 07:48:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-input-sdl-src-2.0.tar.gz) =
tr5I6XhoPM7YwgitA+J4KMF6x7LaXmmdbDSUXbY9lbY=
-SIZE (mupen64plus-input-sdl-src-2.0.tar.gz) = 43553
+SHA256 (mupen64plus-input-sdl-src-2.5.tar.gz) =
ZeUoZnt/V6MHuSq7o3o2Ae4X6d2dMDun5BY7J/Pvdxs=
+SIZE (mupen64plus-input-sdl-src-2.5.tar.gz) = 50580
Index: rsp-hle/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/rsp-hle/Makefile,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 Makefile
--- rsp-hle/Makefile 17 Apr 2014 07:03:59 -0000 1.6
+++ rsp-hle/Makefile 30 Apr 2015 07:48:09 -0000
@@ -1,12 +1,9 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
COMMENT = n64 emulator signal co-processor plugin
-REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-
-WANTLIB = m stdc++
MUPEN64PLUS_MOD = rsp-hle
Index: rsp-hle/distinfo
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/rsp-hle/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- rsp-hle/distinfo 5 Sep 2013 03:26:30 -0000 1.3
+++ rsp-hle/distinfo 30 Apr 2015 07:48:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-rsp-hle-src-2.0.tar.gz) =
YcK9Fjs1BtIGlXumkN/RtNKSGmyKOIOrao7xIE3ntzY=
-SIZE (mupen64plus-rsp-hle-src-2.0.tar.gz) = 46291
+SHA256 (mupen64plus-rsp-hle-src-2.5.tar.gz) =
Sy4RGTdG4Pvk36eEJsEhTPLkJ3kTLrL2aL+I9JhRdwM=
+SIZE (mupen64plus-rsp-hle-src-2.5.tar.gz) = 46998
Index: ui-console/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/ui-console/Makefile,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 Makefile
--- ui-console/Makefile 17 Apr 2014 07:03:59 -0000 1.8
+++ ui-console/Makefile 30 Apr 2015 07:48:09 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.8 2014/04/17 07:03:59 bentley Exp $
COMMENT = n64 emulator command-line ui plugin
-REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
Index: ui-console/distinfo
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/ui-console/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- ui-console/distinfo 5 Sep 2013 03:26:31 -0000 1.3
+++ ui-console/distinfo 30 Apr 2015 07:48:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-ui-console-src-2.0.tar.gz) =
h7msCl67yDW6pOH7oPUOdGfofaZGmqKP2xluIEDlSHc=
-SIZE (mupen64plus-ui-console-src-2.0.tar.gz) = 37954
+SHA256 (mupen64plus-ui-console-src-2.5.tar.gz) =
cf7gEmeP+I8YEw4zmv2MVGeiZGt+UNp1ui1fo0K3Smc=
+SIZE (mupen64plus-ui-console-src-2.5.tar.gz) = 47852
Index: video-glide64mk2/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-glide64mk2/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- video-glide64mk2/Makefile 15 Feb 2015 06:31:03 -0000 1.4
+++ video-glide64mk2/Makefile 30 Apr 2015 07:48:09 -0000
@@ -4,7 +4,6 @@ COMMENT = n64 emulator video plugin
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-REVISION = 2
MODULES = gcc4
MODGCC4_LANGS = c c++
Index: video-glide64mk2/distinfo
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-glide64mk2/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- video-glide64mk2/distinfo 5 Sep 2013 03:32:36 -0000 1.1.1.1
+++ video-glide64mk2/distinfo 30 Apr 2015 07:48:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-video-glide64mk2-src-2.0.tar.gz) =
d2FZRDLpCu0t0SpfFrMGdMZbHxq60NmKxiOcOyxEpNU=
-SIZE (mupen64plus-video-glide64mk2-src-2.0.tar.gz) = 445166
+SHA256 (mupen64plus-video-glide64mk2-src-2.5.tar.gz) =
7z2uAITgeNhDYFq99QOeuLXdaP8UELT8Er3xlZKp/LY=
+SIZE (mupen64plus-video-glide64mk2-src-2.5.tar.gz) = 488988
Index: video-glide64mk2/patches/patch-src_Glide64_TexBuffer_cpp
===================================================================
RCS file: video-glide64mk2/patches/patch-src_Glide64_TexBuffer_cpp
diff -N video-glide64mk2/patches/patch-src_Glide64_TexBuffer_cpp
--- video-glide64mk2/patches/patch-src_Glide64_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_Glide64_TexBuffer_cpp,v 1.1 2015/02/15 06:31:03 bentley
Exp $
-Backwards memcpy.
---- src/Glide64/TexBuffer.cpp.orig Sat Feb 14 23:23:11 2015
-+++ src/Glide64/TexBuffer.cpp Sat Feb 14 23:23:14 2015
-@@ -293,7 +293,7 @@ int 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(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
-+ memmove(&(rdp.texbufs[i].images[j]),
&(rdp.texbufs[i].images[j+1]),
sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[i].count-j));
- }
- }
- }
-@@ -722,7 +722,7 @@ int FindTextureBuffer(wxUint32 addr, wxUint16 width)
- {
- rdp.texbufs[index].count--;
- if (j < rdp.texbufs[index].count)
-- memcpy(&(rdp.texbufs[index].images[j]),
&(rdp.texbufs[index].images[j+1]),
sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
-+ memmove(&(rdp.texbufs[index].images[j]),
&(rdp.texbufs[index].images[j+1]),
sizeof(TBUFF_COLOR_IMAGE)*(rdp.texbufs[index].count-j));
- }
- }
- }
Index: video-rice/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-rice/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- video-rice/Makefile 17 Apr 2014 07:03:59 -0000 1.7
+++ video-rice/Makefile 30 Apr 2015 07:48:09 -0000
@@ -4,7 +4,6 @@ COMMENT = n64 emulator opengl video plu
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
-REVISION = 1
WANTLIB = GL SDL m png pthread stdc++
LIB_DEPENDS = devel/sdl graphics/png
Index: video-rice/distinfo
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-rice/distinfo,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 distinfo
--- video-rice/distinfo 5 Sep 2013 03:26:32 -0000 1.3
+++ video-rice/distinfo 30 Apr 2015 07:48:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (mupen64plus-video-rice-src-2.0.tar.gz) =
PrB258OKtFyex1LTDgDsoCKp4Mbq0aIt8TrZSQLggjg=
-SIZE (mupen64plus-video-rice-src-2.0.tar.gz) = 362013
+SHA256 (mupen64plus-video-rice-src-2.5.tar.gz) =
lp9lufQvSLx+hA5O0TQiM+Q3HC7cpaqPNvacSyCVWCg=
+SIZE (mupen64plus-video-rice-src-2.5.tar.gz) = 339012
Index: video-z64/Makefile
===================================================================
RCS file: /cvs/ports/emulators/mupen64plus/video-z64/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- video-z64/Makefile 17 Apr 2014 07:03:59 -0000 1.5
+++ video-z64/Makefile 30 Apr 2015 07:48:10 -0000
@@ -11,7 +11,7 @@ PERMIT_PACKAGE_CDROM = Yes
WRKDIST = ${WRKDIR}/mupen64plus-${MUPEN64PLUS_MOD}
-WANTLIB = GL GLEW SDL c m pthread stdc++
+WANTLIB = GL GLEW GLU SDL c m pthread stdc++
LIB_DEPENDS = graphics/glew \
devel/sdl
