Skip to content

Commit

Permalink
emulators/mupen64plus*: Update to 2.5.9
Browse files Browse the repository at this point in the history
  • Loading branch information
alonsobsd committed Jan 6, 2024
1 parent d5ebd5e commit 4fae70a
Show file tree
Hide file tree
Showing 35 changed files with 182 additions and 142 deletions.
8 changes: 8 additions & 0 deletions emulators/mupen64plus-audio-sdl/Makefile
Expand Up @@ -3,10 +3,18 @@ PKGNAMESUFFIX= -audio-sdl

COMMENT= Mupen64plus audio sdl plugin

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= cec70e42b4535ce5bd1be24e7d816c54b3e75673

USE_SDL= sdl2

DISTINFO_FILE= ${.CURDIR}/distinfo

MASTERDIR= ${.CURDIR}/../mupen64plus-core

OPTIONS_DEFINE= #

RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
3 changes: 3 additions & 0 deletions emulators/mupen64plus-audio-sdl/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1704508930
SHA256 (mupen64plus/mupen64plus-mupen64plus-audio-sdl-2.5.9.20230611-cec70e42b4535ce5bd1be24e7d816c54b3e75673_GH0.tar.gz) = 38361dcfd10e99ecc2ce99e4e33b1e27b686686d22723cee9ae727d1881438f8
SIZE (mupen64plus/mupen64plus-mupen64plus-audio-sdl-2.5.9.20230611-cec70e42b4535ce5bd1be24e7d816c54b3e75673_GH0.tar.gz) = 32156
15 changes: 9 additions & 6 deletions emulators/mupen64plus-core/Makefile
@@ -1,24 +1,27 @@
PORTNAME= mupen64plus
PORTVERSION?= 2.5
PORTREVISION?= 2
PORTVERSION?= 2.5.9.${RELEASE_DATE}
PORTREVISION?= 0
CATEGORIES= emulators
MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/releases/download/${PORTVERSION}/ \
LOCAL/acm/${PORTNAME} \
LOCAL/acm/${PORTNAME}/:plugin
PKGNAMESUFFIX?= -core
DIST_SUBDIR= ${PORTNAME}

MAINTAINER?= acm@FreeBSD.org
COMMENT?= Fork of Mupen64 Nintendo 64 emulator
WWW= https://www.mupen64plus.org/

USE_GITHUB= yes
GH_ACCOUNT= ${PORTNAME}
GH_PROJECT= ${PORTNAME}${PKGNAMESUFFIX}
GH_TAGNAME?= f500eb58f76e636e231c3cc2b3d904210f0677c9

USES+= gl gmake pkgconfig sdl
USE_GL?= yes
USE_GL?= glu
USE_SDL?= sdl2
USE_LDCONFIG?= yes
ONLY_FOR_ARCHS= i386 amd64
LDFLAGS_i386= -Wl,-znotext

RELEASE_DATE?= 20231104
OPTFLAGS= #

MAKE_ENV+= OPTFLAGS="${OPTFLAGS}"
Expand Down
30 changes: 14 additions & 16 deletions emulators/mupen64plus-core/Makefile.common
@@ -1,15 +1,13 @@
USES+= dos2unix
DOS2UNIX_GLOB= *.c *.cpp *.h *.H *.ini *.conf

DISTNAME= ${PORTNAME}-bundle-src-${PORTVERSION}
PATCHDIR= ${.CURDIR}/files
BUILD_WRKSRC?= ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
WRKSRC?= ${WRKDIR}/${DISTNAME}

EXTRACT_AFTER_ARGS?= "${DISTNAME}/source/${PORTNAME}-core/*" \
"${DISTNAME}/source/${PORTNAME}${PKGNAMESUFFIX}/*"
BUILD_WRKSRC?= ${WRKSRC}/projects/unix

.if ${PKGNAMESUFFIX} == "-core"
BUILD_DEPENDS= bash:shells/bash \
nasm:devel/nasm \
vulkan-headers>0:graphics/vulkan-headers
LIB_DEPENDS+= libfreetype.so:print/freetype2 \
libpng.so:graphics/png
USES+= minizip
Expand All @@ -31,14 +29,14 @@ post-patch:
@cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \
's|g++|${CXX}|g' -e 's|sdl-config|${SDL2_CONFIG}|g' Makefile
. if ${PKGNAMESUFFIX} == "-video-glide64mk2"
@cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \
@cd ${WRKSRC}/src && \
${REINPLACE_CMD} -e 's|#include <thread>||g' \
GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp && \
${REINPLACE_CMD} -e 's|(FxU32)NULL|(uintptr_t)NULL|g' \
Glide64/Main.cpp
. endif
. if ${PKGNAMESUFFIX} == "-video-glide64"
@cd ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/src && \
@cd ${WRKSRC}/src && \
${REINPLACE_CMD} -e 's|__builtin_ia32_loadups|_mm_loadu_ps|g' -e \
's|__builtin_ia32_storeups|_mm_storeu_ps|g' \
3dmath.cpp && \
Expand Down Expand Up @@ -88,36 +86,36 @@ do-install:
${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \
${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2.0.0

${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \
${INSTALL_DATA} ${WRKSRC}/data/* \
${STAGEDIR}${DATADIR}

@${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME}
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \
${INSTALL_DATA} ${WRKSRC}/src/api/m64p_*.h \
${STAGEDIR}${PREFIX}/include/${PORTNAME}

${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/RELEASE \
${INSTALL_DATA} ${WRKSRC}/RELEASE \
${STAGEDIR}${DOCSDIR}/RELEASE
${LN} -sf ${PREFIX}/lib/libmupen64plus.so.2.0.0 ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2
.else
. if ${PKGNAMESUFFIX} == "-ui-console"
${INSTALL_MAN} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/
${INSTALL_MAN} ${WRKSRC}/doc/mupen64plus.6 ${STAGEDIR}${PREFIX}/man/man6/
. endif

. if ${PKGNAMESUFFIX} == "-video-rice"
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR}
. endif

. if ${PKGNAMESUFFIX} == "-video-glide64"
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/data/Glide64.ini ${STAGEDIR}${DATADIR}
. endif

. if ${PKGNAMESUFFIX} == "-video-glide64mk2"
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR}
. endif

. if ${PKGNAMESUFFIX} == "-input-sdl"
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR}
${INSTALL_DATA} ${WRKSRC}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR}
. endif

. if ${PKGNAMESUFFIX} != "-ui-console"
Expand Down
5 changes: 3 additions & 2 deletions emulators/mupen64plus-core/distinfo
@@ -1,2 +1,3 @@
SHA256 (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66
SIZE (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 2178979
TIMESTAMP = 1704506387
SHA256 (mupen64plus/mupen64plus-mupen64plus-core-2.5.9.20231104-f500eb58f76e636e231c3cc2b3d904210f0677c9_GH0.tar.gz) = 4a5445d5f2eb97db88e294e606904728caffb208e422c8cf3d6266fab7ab1da4
SIZE (mupen64plus/mupen64plus-mupen64plus-core-2.5.9.20231104-f500eb58f76e636e231c3cc2b3d904210f0677c9_GH0.tar.gz) = 1731162
12 changes: 0 additions & 12 deletions emulators/mupen64plus-core/files/patch-39975200.c

This file was deleted.

This file was deleted.

8 changes: 8 additions & 0 deletions emulators/mupen64plus-input-sdl/Makefile
Expand Up @@ -3,6 +3,14 @@ PKGNAMESUFFIX= -input-sdl

COMMENT= Input plugin for Mupen64plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= fd7ffe63606b6cc4de7dab4e684c5aee68210681

DISTINFO_FILE= ${.CURDIR}/distinfo

MASTERDIR= ${.CURDIR}/../mupen64plus-core

RELEASE_DATE= 20231104

.include "${MASTERDIR}/Makefile"
3 changes: 3 additions & 0 deletions emulators/mupen64plus-input-sdl/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1704509047
SHA256 (mupen64plus/mupen64plus-mupen64plus-input-sdl-2.5.9.20231104-fd7ffe63606b6cc4de7dab4e684c5aee68210681_GH0.tar.gz) = f5cd57bd7262c037d5b27d07f0fea348db4d4426c607d2942d5933982aa27fdb
SIZE (mupen64plus/mupen64plus-mupen64plus-input-sdl-2.5.9.20231104-fd7ffe63606b6cc4de7dab4e684c5aee68210681_GH0.tar.gz) = 60676
4 changes: 2 additions & 2 deletions emulators/mupen64plus-plugins/Makefile
@@ -1,12 +1,12 @@
PORTNAME= mupen64plus
PORTVERSION= 2.5
PORTVERSION= 2.5.9
PORTREVISION= 0
CATEGORIES= emulators
PKGNAMESUFFIX= -plugins

MAINTAINER?= acm@FreeBSD.org
COMMENT= Third party plugins for Mupen64plus
WWW= https://code.google.com/p/mupen64plus/
WWW= https://github.com/mupen64plus

USES= metaport

Expand Down
10 changes: 5 additions & 5 deletions emulators/mupen64plus-rsp-cxd4/Makefile
@@ -1,6 +1,5 @@
PORTREVISION= 6
PORTREVISION= 0
PKGNAMESUFFIX= -rsp-cxd4
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin

COMMENT= Low-level RSP processor plugin for the Mupen64Plus

Expand All @@ -9,6 +8,8 @@ LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core
USE_GL= #
USE_SDL= #

GH_TAGNAME= 0a4e30f56033396e3ba47ec0fdd7acea3522362a

MASTERDIR= ${.CURDIR}/../mupen64plus-core

OPTIONS_DEFINE= #
Expand All @@ -19,8 +20,7 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
LDFLAGS+= -L${LOCALBASE}/lib

DISTINFO_FILE= ${.CURDIR}/distinfo
EXTRACT_AFTER_ARGS= #
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
WRKSRC= ${WRKDIR}

RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
5 changes: 3 additions & 2 deletions emulators/mupen64plus-rsp-cxd4/distinfo
@@ -1,2 +1,3 @@
SHA256 (mupen64plus/mupen64plus-rsp-cxd4-src-2.5.tar.gz) = 978d3b3d752020ce2d4ad663f6712345764d4987861db16076dc5ca396ee5881
SIZE (mupen64plus/mupen64plus-rsp-cxd4-src-2.5.tar.gz) = 56387
TIMESTAMP = 1704509220
SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-cxd4-2.5.9.20230611-0a4e30f56033396e3ba47ec0fdd7acea3522362a_GH0.tar.gz) = eac7675e9f80cf2fa6bae3b71bac5df578d4f8441a03f186f7d398316d30560e
SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-cxd4-2.5.9.20230611-0a4e30f56033396e3ba47ec0fdd7acea3522362a_GH0.tar.gz) = 74554
8 changes: 8 additions & 0 deletions emulators/mupen64plus-rsp-hle/Makefile
Expand Up @@ -2,8 +2,16 @@ PKGNAMESUFFIX= -rsp-hle

COMMENT= RSP plugin for Mupen64plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= f22dc143771f1a0784c7d62977722a68fa0bdf85

DISTINFO_FILE= ${.CURDIR}/distinfo

MASTERDIR= ${.CURDIR}/../mupen64plus-core

OPTIONS_DEFINE= #

RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
3 changes: 3 additions & 0 deletions emulators/mupen64plus-rsp-hle/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1704509321
SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-hle-2.5.9.20230611-f22dc143771f1a0784c7d62977722a68fa0bdf85_GH0.tar.gz) = c48b8e464cb2209598f629b9973011738808d559b827eb6b4b332770f2b95a6d
SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-hle-2.5.9.20230611-f22dc143771f1a0784c7d62977722a68fa0bdf85_GH0.tar.gz) = 59825
9 changes: 4 additions & 5 deletions emulators/mupen64plus-rsp-z64/Makefile
@@ -1,11 +1,12 @@
PORTREVISION= 1
PORTREVISION= 0
PKGNAMESUFFIX= -rsp-z64
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin

COMMENT= Low-level RSP processor plugin for the Mupen64Plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= ad877e263e6ee78839cbd12cdd150d17177079cf

USE_GL= #
USE_SDL= #

Expand All @@ -17,8 +18,6 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
LDFLAGS+= -L${LOCALBASE}/lib

DISTINFO_FILE= ${.CURDIR}/distinfo
EXTRACT_AFTER_ARGS= #
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
WRKSRC= ${WRKDIR}
RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
5 changes: 3 additions & 2 deletions emulators/mupen64plus-rsp-z64/distinfo
@@ -1,2 +1,3 @@
SHA256 (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = e671c63556160f00554b608ab5f24cd7a1c15eef4c4de4c94c8bde4d2baa5763
SIZE (mupen64plus/mupen64plus-rsp-z64-src-2.5.tar.gz) = 45594
TIMESTAMP = 1704509416
SHA256 (mupen64plus/mupen64plus-mupen64plus-rsp-z64-2.5.9.20230611-ad877e263e6ee78839cbd12cdd150d17177079cf_GH0.tar.gz) = 71a8d787f266760c4f109c38e83bd42fd086bf3b28854cba014aca0e4c9cb7c1
SIZE (mupen64plus/mupen64plus-mupen64plus-rsp-z64-2.5.9.20230611-ad877e263e6ee78839cbd12cdd150d17177079cf_GH0.tar.gz) = 47727
8 changes: 8 additions & 0 deletions emulators/mupen64plus-ui-console/Makefile
Expand Up @@ -3,8 +3,16 @@ PKGNAMESUFFIX= -ui-console

COMMENT= UI for Mupen64plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= 335e826aead146bd6a47d557d78b746e77f337c8

DISTINFO_FILE= ${.CURDIR}/distinfo

MASTERDIR= ${.CURDIR}/../mupen64plus-core

OPTIONS_DEFINE= #

RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
3 changes: 3 additions & 0 deletions emulators/mupen64plus-ui-console/distinfo
@@ -0,0 +1,3 @@
TIMESTAMP = 1704508976
SHA256 (mupen64plus/mupen64plus-mupen64plus-ui-console-2.5.9.20230611-335e826aead146bd6a47d557d78b746e77f337c8_GH0.tar.gz) = 7cfb03b9ad59d2b794adcd3af73e53af24c729cd5c6ec7ac00432f8bec97de70
SIZE (mupen64plus/mupen64plus-mupen64plus-ui-console-2.5.9.20230611-335e826aead146bd6a47d557d78b746e77f337c8_GH0.tar.gz) = 62362
9 changes: 4 additions & 5 deletions emulators/mupen64plus-video-arachnoid/Makefile
@@ -1,11 +1,12 @@
PORTREVISION= 2
PORTREVISION= 0
PKGNAMESUFFIX= -video-arachnoid
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin

COMMENT= The arachnoid video plugin for Mupen64plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= 8187d1135ced0102f99d8305b52e0e75b01ef917

USES+= gl
USE_GL= gl glu
USE_SDL= #
Expand All @@ -18,8 +19,6 @@ CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME}
LDFLAGS+= -L${LOCALBASE}/lib

DISTINFO_FILE= ${.CURDIR}/distinfo
EXTRACT_AFTER_ARGS= #
BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
WRKSRC= ${WRKDIR}
RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
5 changes: 3 additions & 2 deletions emulators/mupen64plus-video-arachnoid/distinfo
@@ -1,2 +1,3 @@
SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 9c1e9c6373d4a8f503fdf3a114f45c0c81f2da31955d90fe7bc1c2464fb92852
SIZE (mupen64plus/mupen64plus-video-arachnoid-src-2.5.tar.gz) = 128880
TIMESTAMP = 1704509486
SHA256 (mupen64plus/mupen64plus-mupen64plus-video-arachnoid-2.5.9.20230611-8187d1135ced0102f99d8305b52e0e75b01ef917_GH0.tar.gz) = dd7a4f1a1e10d44dc68de5ce58b607375dd5f3378ac38e856919a8c0bd7ccf20
SIZE (mupen64plus/mupen64plus-mupen64plus-video-arachnoid-2.5.9.20230611-8187d1135ced0102f99d8305b52e0e75b01ef917_GH0.tar.gz) = 131003
11 changes: 5 additions & 6 deletions emulators/mupen64plus-video-glide64/Makefile
@@ -1,11 +1,12 @@
PORTREVISION= 2
PORTREVISION= 0
PKGNAMESUFFIX= -video-glide64
DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin

COMMENT= Glide64 video plugin for Mupen64Plus

LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core

GH_TAGNAME= bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132

USES+= gl localbase:ldflags sdl
USE_CXXSTD= c++14
USE_GL= gl
Expand All @@ -14,13 +15,11 @@ USE_SDL= sdl2
CFLAGS+= -I${LOCALBASE}/include/${PORTNAME}

MASTERDIR= ${.CURDIR}/../mupen64plus-core
EXTRACT_AFTER_ARGS= #

BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix
WRKSRC= ${WRKDIR}

DISTINFO_FILE= ${.CURDIR}/distinfo

OPTIONS_DEFINE= #

RELEASE_DATE= 20230611

.include "${MASTERDIR}/Makefile"
5 changes: 3 additions & 2 deletions emulators/mupen64plus-video-glide64/distinfo
@@ -1,2 +1,3 @@
SHA256 (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = c5fc21df4d1bd9380e151bec694e649fcb0b0ef257c42da6a005d97d4b66a3de
SIZE (mupen64plus/mupen64plus-video-glide64-src-2.5.tar.gz) = 334145
TIMESTAMP = 1704509571
SHA256 (mupen64plus/mupen64plus-mupen64plus-video-glide64-2.5.9.20230611-bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132_GH0.tar.gz) = 7c74e2e57cf231cdd0c15bc425db57179abb56c58d2d7462e7ab16da0917da80
SIZE (mupen64plus/mupen64plus-mupen64plus-video-glide64-2.5.9.20230611-bdf9f5ca8e381e6c1c824aa70b26ad34f4eeb132_GH0.tar.gz) = 336890
4 changes: 2 additions & 2 deletions emulators/mupen64plus-video-glide64/files/patch-src_Util.h
@@ -1,5 +1,5 @@
--- mupen64plus-video-glide64/src/Util.h.orig 2015-06-19 14:41:15 UTC
+++ mupen64plus-video-glide64/src/Util.h
--- src/Util.h.orig 2015-06-19 14:41:15 UTC
+++ src/Util.h
@@ -93,7 +93,9 @@ void fix_tex_coord (VERTEX **v);
lx = lc; \
}
Expand Down

0 comments on commit 4fae70a

Please sign in to comment.