cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to mupen64plus-2.5.

Browse Source
This commit is contained in:
bentley 2015-05-11 09:40:40 +00:00
parent e82219970a
commit f2695456aa
20 changed files with 52 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emulators/mupen64plus/Makefile.inc
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile.inc,v 1.8 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile.inc,v 1.9 2015/05/11 09:40:40 bentley Exp $
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=true
.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

5
emulators/mupen64plus/audio-sdl/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.7 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator sdl audio plugin
REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
@ -13,6 +12,4 @@ LIB_DEPENDS = audio/speex \
MUPEN64PLUS_MOD = audio-sdl
MAKE_FLAGS += NO_OSS=1
.include <bsd.port.mk>

4
emulators/mupen64plus/audio-sdl/distinfo
View File

@ -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

8
emulators/mupen64plus/core/Makefile
View File

@ -1,8 +1,7 @@
# $OpenBSD: Makefile,v 1.9 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.10 2015/05/11 09:40:40 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>

4
emulators/mupen64plus/core/distinfo
View File

@ -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

11
emulators/mupen64plus/core/patches/patch-projects_unix_Makefile Normal file
View File

@ -0,0 +1,11 @@
$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)
$(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)"

13
emulators/mupen64plus/core/patches/patch-src_memory_memory_h Normal file
View File

@ -0,0 +1,13 @@
$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) \

23
emulators/mupen64plus/core/patches/patch-src_r4300_x86_rjump_c
View File

@ -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

4
emulators/mupen64plus/core/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.2 2012/08/13 06:53:55 bentley Exp $
@comment $OpenBSD: PLIST,v 1.3 2015/05/11 09:40:40 bentley Exp $
include/mupen64plus/
include/mupen64plus/m64p_common.h
include/mupen64plus/m64p_config.h
@ -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

3
emulators/mupen64plus/input-sdl/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.7 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator input plugin
REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes

4
emulators/mupen64plus/input-sdl/distinfo
View File

@ -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

5
emulators/mupen64plus/rsp-hle/Makefile
View File

@ -1,13 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.7 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator signal co-processor plugin
REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
WANTLIB = m stdc++
MUPEN64PLUS_MOD = rsp-hle
.include <bsd.port.mk>

4
emulators/mupen64plus/rsp-hle/distinfo
View File

@ -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

3
emulators/mupen64plus/ui-console/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.8 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.9 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator command-line ui plugin
REVISION = 0
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes

4
emulators/mupen64plus/ui-console/distinfo
View File

@ -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

3
emulators/mupen64plus/video-glide64mk2/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.4 2015/02/15 06:31:03 bentley Exp $
# $OpenBSD: Makefile,v 1.5 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator video plugin
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
REVISION = 2
MODULES = gcc4
MODGCC4_LANGS = c c++

4
emulators/mupen64plus/video-glide64mk2/distinfo
View File

@ -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

22
emulators/mupen64plus/video-glide64mk2/patches/patch-src_Glide64_TexBuffer_cpp
View File

@ -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));
}
}
}

3
emulators/mupen64plus/video-rice/Makefile
View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.7 2014/04/17 07:03:59 bentley Exp $
# $OpenBSD: Makefile,v 1.8 2015/05/11 09:40:40 bentley Exp $
COMMENT = n64 emulator opengl video plugin
# GPLv2+
PERMIT_PACKAGE_CDROM = Yes
REVISION = 1
WANTLIB = GL SDL m png pthread stdc++
LIB_DEPENDS = devel/sdl graphics/png

4
emulators/mupen64plus/video-rice/distinfo
View File

@ -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