Index: head/emulators/Makefile =================================================================== --- head/emulators/Makefile (revision 389665) +++ head/emulators/Makefile (revision 389666) @@ -1,178 +1,179 @@ # $FreeBSD$ # COMMENT = Emulators for other operating systems SUBDIR += adamem SUBDIR += advancemame SUBDIR += advancemenu SUBDIR += advancemess SUBDIR += aftp SUBDIR += aqemu SUBDIR += atari800 SUBDIR += bfe SUBDIR += bochs SUBDIR += bsvc SUBDIR += catapult SUBDIR += cinc SUBDIR += cingb SUBDIR += cpmemu SUBDIR += cpmtools SUBDIR += cpmtools2 SUBDIR += darcnes SUBDIR += dboxfe SUBDIR += desmume SUBDIR += dgen-sdl SUBDIR += dolphin-emu SUBDIR += dosbox SUBDIR += doscmd SUBDIR += dtcyber SUBDIR += dynagen SUBDIR += dynagui SUBDIR += dynamips SUBDIR += dynamips-community SUBDIR += dynamips-devel SUBDIR += e-uae SUBDIR += fceux SUBDIR += fmsx SUBDIR += frodo SUBDIR += fs-uae SUBDIR += fs-uae-launcher SUBDIR += fuse SUBDIR += fuse-roms SUBDIR += fuse-utils SUBDIR += gbe SUBDIR += gem5 SUBDIR += generator SUBDIR += generator-cbiere SUBDIR += gens SUBDIR += gngb SUBDIR += gngeo SUBDIR += gns3 SUBDIR += gnuboy SUBDIR += gxemul SUBDIR += hatari SUBDIR += hercules SUBDIR += higan SUBDIR += hugo SUBDIR += hyperv-is SUBDIR += i386-wine SUBDIR += i386-wine-devel SUBDIR += i386-wine-staging SUBDIR += ia64sim SUBDIR += ines SUBDIR += javatari SUBDIR += joytran SUBDIR += jzintv SUBDIR += kcemu SUBDIR += klh10 SUBDIR += kqemu-kmod SUBDIR += kqemu-kmod-devel SUBDIR += lib765 SUBDIR += libdsk SUBDIR += libspectrum SUBDIR += linux-c6 SUBDIR += linux-f10 SUBDIR += linux_base-c6 SUBDIR += linux_base-f10 SUBDIR += lisaem SUBDIR += loemu SUBDIR += m2000 SUBDIR += mame SUBDIR += mastergear SUBDIR += mednafen SUBDIR += mess SUBDIR += minivmac SUBDIR += mtools SUBDIR += mupen64plus SUBDIR += mupen64plus-audio-sdl SUBDIR += mupen64plus-core SUBDIR += mupen64plus-input-sdl SUBDIR += mupen64plus-plugins + SUBDIR += mupen64plus-rsp-cxd4 SUBDIR += mupen64plus-rsp-hle SUBDIR += mupen64plus-rsp-z64 SUBDIR += mupen64plus-ui-console SUBDIR += mupen64plus-video-arachnoid SUBDIR += mupen64plus-video-glide64 SUBDIR += mupen64plus-video-glide64mk2 SUBDIR += mupen64plus-video-rice SUBDIR += mupen64plus-video-z64 SUBDIR += nonpareil SUBDIR += o2em SUBDIR += ods2reader SUBDIR += open-vm-tools SUBDIR += open-vm-tools-nox11 SUBDIR += openmsx SUBDIR += p5-Acme-6502 SUBDIR += parallels-tools SUBDIR += pcemu SUBDIR += pcsxr SUBDIR += pearpc SUBDIR += pipelight SUBDIR += ppsspp SUBDIR += ppsspp-devel SUBDIR += q4wine SUBDIR += qemu SUBDIR += qemu-devel SUBDIR += qemu-launcher SUBDIR += qemu-sbruno SUBDIR += qemu-user-static SUBDIR += qmc2 SUBDIR += qtemu SUBDIR += quasi88 SUBDIR += raine SUBDIR += rtc SUBDIR += rubygem-fission SUBDIR += sim6811 SUBDIR += simh SUBDIR += skyeye SUBDIR += snes9express SUBDIR += snes9x SUBDIR += snes9x-gtk SUBDIR += spim SUBDIR += stella SUBDIR += stonx SUBDIR += swine SUBDIR += tiemu3 SUBDIR += tilem SUBDIR += tme SUBDIR += tpm-emulator SUBDIR += tuxnes SUBDIR += uae SUBDIR += ucon64 SUBDIR += vba SUBDIR += vboxtool SUBDIR += vgb-bin SUBDIR += vgba-bin SUBDIR += vice SUBDIR += virtio-kmod SUBDIR += virtualbox-ose SUBDIR += virtualbox-ose-additions SUBDIR += virtualbox-ose-kmod SUBDIR += visualboyadvance-m SUBDIR += vmips SUBDIR += vmsbackup SUBDIR += vmw SUBDIR += vxtools SUBDIR += wine SUBDIR += wine-devel SUBDIR += wine-gecko SUBDIR += wine-gecko-devel SUBDIR += wine-mono SUBDIR += wine-mono-devel SUBDIR += wine-staging SUBDIR += wxmupen64plus SUBDIR += x48 SUBDIR += x49gp SUBDIR += xbraitenberg SUBDIR += xcpc SUBDIR += xen SUBDIR += xen-kernel SUBDIR += xhomer SUBDIR += xsystem35 SUBDIR += xzx SUBDIR += yabause SUBDIR += yape SUBDIR += zsnes .include Index: head/emulators/mupen64plus/Makefile =================================================================== --- head/emulators/mupen64plus/Makefile (revision 389665) +++ head/emulators/mupen64plus/Makefile (revision 389666) @@ -1,41 +1,41 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= mupen64plus -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.5 +PORTREVISION?= 0 CATEGORIES= emulators MASTER_SITES= # empty DISTFILES= # empty EXTRACT_ONLY= # empty -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= acm@FreeBSD.org COMMENT= Fork of Mupen64 Nintendo 64 emulator with plugins (meta port) # Mupen64 Emulator core and ui-console RUN_DEPENDS+= ${LOCALBASE}/lib/libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core RUN_DEPENDS+= mupen64plus:${PORTSDIR}/emulators/mupen64plus-ui-console # Audio plugins RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-audio-sdl.so:${PORTSDIR}/emulators/mupen64plus-audio-sdl # Input plugins RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-input-sdl.so:${PORTSDIR}/emulators/mupen64plus-input-sdl # Graphics plugins RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-rice.so:${PORTSDIR}/emulators/mupen64plus-video-rice RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64mk2.so:${PORTSDIR}/emulators/mupen64plus-video-glide64mk2 # RSP plugins RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-hle.so:${PORTSDIR}/emulators/mupen64plus-rsp-hle NO_MTREE= yes NO_BUILD= yes SUB_FILES= pkg-message do-install: # empty post-install: @${CAT} ${PKGMESSAGE} .include Index: head/emulators/mupen64plus-audio-sdl/Makefile =================================================================== --- head/emulators/mupen64plus-audio-sdl/Makefile (revision 389665) +++ head/emulators/mupen64plus-audio-sdl/Makefile (revision 389666) @@ -1,15 +1,15 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -audio-sdl COMMENT= Mupen64plus audio sdl plugin -USE_SDL= sdl +USE_SDL= sdl2 MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-core/Makefile =================================================================== --- head/emulators/mupen64plus-core/Makefile (revision 389665) +++ head/emulators/mupen64plus-core/Makefile (revision 389666) @@ -1,31 +1,30 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= mupen64plus -PORTVERSION?= 2.0 -PORTREVISION?= 4 +PORTVERSION?= 2.5 +PORTREVISION?= 0 CATEGORIES= emulators -MASTER_SITES= GOOGLE_CODE \ +MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}/releases/download/${PORTVERSION}/ \ LOCAL/acm/${PORTNAME} \ - GOOGLE_CODE:plugin \ - http://cdn.bitbucket.org/wahrhaft/${PORTNAME}${PKGNAMESUFFIX}/downloads/:plugin + LOCAL/acm/${PORTNAME}/:plugin PKGNAMESUFFIX?= -core DIST_SUBDIR= ${PORTNAME} -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= acm@FreeBSD.org COMMENT?= Fork of Mupen64 Nintendo 64 emulator #PROJECTHOST= bsdistfiles USES= gmake pkgconfig USE_GL?= yes -USE_SDL?= yes +USE_SDL?= sdl2 USE_LDCONFIG?= yes ONLY_FOR_ARCHS= i386 amd64 OPTFLAGS= # MAKE_ENV+= OPTFLAGS="${OPTFLAGS}" OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options .include "${.CURDIR}/../mupen64plus-core/Makefile.common" .include Index: head/emulators/mupen64plus-core/Makefile.common =================================================================== --- head/emulators/mupen64plus-core/Makefile.common (revision 389665) +++ head/emulators/mupen64plus-core/Makefile.common (revision 389666) @@ -1,122 +1,123 @@ USES+= dos2unix DOS2UNIX_GLOB= *.c *.cpp *.h *.H *.ini *.conf +DISTINFO_FILE= ${.CURDIR}/distinfo 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}/*" .if ${PKGNAMESUFFIX} == "-core" LIB_DEPENDS+= libfreetype.so:${PORTSDIR}/print/freetype2 \ libpng.so:${PORTSDIR}/graphics/png .else PLIST= ${WRKDIR}/pkg-plist .endif .if ${PKGNAMESUFFIX} == "-video-rice" LIB_DEPENDS+= libpng.so:${PORTSDIR}/graphics/png .endif .if ${PKGNAMESUFFIX} == "-video-glide64mk" LIB_DEPENDS+= libboost_thread.so:${PORTSDIR}/devel/boost-libs .endif .if ${PKGNAMESUFFIX} != "-core" post-patch: @cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \ - 's|g++|${CXX}|g' Makefile + 's|g++|${CXX}|g' -e 's|sdl-config|${SDL2_CONFIG}|g' Makefile . if ${PKGNAMESUFFIX} == "-video-glide64mk2" @cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \ ${REINPLACE_CMD} -e 's|#include ||g' \ GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp . endif . if ${PKGNAMESUFFIX} == "-video-glide64" @cd ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/src && \ ${REINPLACE_CMD} -e 's|__builtin_ia32_loadups|_mm_loadu_ps|g' -e \ 's|__builtin_ia32_storeups|_mm_storeu_ps|g' \ 3dmath.cpp . endif pre-install: @${RM} -f ${PLIST} . if ${PKGNAMESUFFIX} == "-video-rice" @${ECHO_CMD} "%%DATADIR%%/RiceVideoLinux.ini" >> ${PLIST} . endif . if ${PKGNAMESUFFIX} == "-video-glide64" @${ECHO_CMD} "%%DATADIR%%/Glide64.ini" >> ${PLIST} . endif . if ${PKGNAMESUFFIX} == "-video-glide64mk2" @${ECHO_CMD} "%%DATADIR%%/Glide64mk2.ini" >> ${PLIST} . endif . if ${PKGNAMESUFFIX} == "-input-sdl" @${ECHO_CMD} "%%DATADIR%%/InputAutoCfg.ini" >> ${PLIST} . endif . if ${PKGNAMESUFFIX} == "-ui-console" @${ECHO_CMD} "man/man6/mupen64plus.6.gz" >> ${PLIST} . endif . if ${PKGNAMESUFFIX} != "-ui-console" @${ECHO_CMD} "lib/${PORTNAME}/${PORTNAME}${PKGNAMESUFFIX}.so" >> ${PLIST} . else @${ECHO_CMD} "bin/${PORTNAME}" >> ${PLIST} . endif @${ECHO_CMD} "@dir %%DATADIR%%" >> ${PLIST} .else post-patch: @cd ${BUILD_WRKSRC} && ${REINPLACE_CMD} -e 's|gcc|${CC}|g' -e \ 's|g++|${CXX}|g' Makefile .endif do-install: @${MKDIR} ${STAGEDIR}${DATADIR} .if ${PKGNAMESUFFIX} == "-core" ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/libmupen64plus.so.2.0.0 \ ${STAGEDIR}${PREFIX}/lib/libmupen64plus.so.2.0.0 ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/* \ ${STAGEDIR}${DATADIR} @${MKDIR} ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src/api/m64p_*.h \ ${STAGEDIR}${PREFIX}/include/${PORTNAME} ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/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/ . endif . if ${PKGNAMESUFFIX} == "-video-rice" ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/RiceVideoLinux.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-video-glide64" ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-video-glide64mk2" ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} == "-input-sdl" ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${STAGEDIR}${DATADIR} . endif . if ${PKGNAMESUFFIX} != "-ui-console" @${MKDIR} ${STAGEDIR}${PREFIX}/lib/${PORTNAME} ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}.so ${STAGEDIR}${PREFIX}/lib/${PORTNAME} . else ${INSTALL_PROGRAM} ${BUILD_WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin . endif .endif Index: head/emulators/mupen64plus-core/distinfo =================================================================== --- head/emulators/mupen64plus-core/distinfo (revision 389665) +++ head/emulators/mupen64plus-core/distinfo (revision 389666) @@ -1,10 +1,2 @@ -SHA256 (mupen64plus/mupen64plus-bundle-src-2.0.tar.gz) = 2a269ca77797d7eb3759cbbfecbdc1d985e773e5be155d469c13f034e37e7e4d -SIZE (mupen64plus/mupen64plus-bundle-src-2.0.tar.gz) = 2352981 -SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-2.0.0.tar.gz) = 562cc896bc60e98c4e45a0716d3224830f42541ef526c8437699df103a88d75a -SIZE (mupen64plus/mupen64plus-video-arachnoid-src-2.0.0.tar.gz) = 126329 -SHA256 (mupen64plus/mupen64plus-video-glide64-src-2.0.0.tar.gz) = 5359dd1d69c24183bde519285625ac8cb7f4ac5d2069ccacc7bbb95a855c25f3 -SIZE (mupen64plus/mupen64plus-video-glide64-src-2.0.0.tar.gz) = 334935 -SHA256 (mupen64plus/mupen64plus-video-z64-src-2.0.0.tar.gz) = dec06a0afb8b403754faa26da36c6ada77f7918124516c6f449a9d90d3c4861f -SIZE (mupen64plus/mupen64plus-video-z64-src-2.0.0.tar.gz) = 65723 -SHA256 (mupen64plus/mupen64plus-rsp-z64-src-2.0.0.tar.gz) = df69eb722fae9a4edd7b764e9c9a459f6a6d3482225d469871c393c695f86e9b -SIZE (mupen64plus/mupen64plus-rsp-z64-src-2.0.0.tar.gz) = 44341 +SHA256 (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 9c75b9d826f2d24666175f723a97369b3a6ee159b307f7cc876bbb4facdbba66 +SIZE (mupen64plus/mupen64plus-bundle-src-2.5.tar.gz) = 2178979 Index: head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h =================================================================== --- head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h (revision 389665) +++ head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h (nonexistent) @@ -1,15 +0,0 @@ ---- source/mupen64plus-core/src/main/zip/ioapi.h 2011-12-17 21:07:15.000000000 -0500 -+++ source/mupen64plus-core/src/main/zip/ioapi.h 2011-12-17 21:08:43.000000000 -0500 -@@ -61,6 +61,12 @@ - #endif - #endif - -+#if defined(__FreeBSD__) -+#define fopen64 fopen -+#define ftello64 ftello -+#define fseeko64 fseeko -+#endif -+ - /* - #ifndef ZPOS64_T - #ifdef _WIN32 Property changes on: head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile =================================================================== --- head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile (revision 389665) +++ head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile (revision 389666) @@ -1,13 +1,26 @@ ---- source/mupen64plus-core/projects/unix/Makefile 2013-09-30 20:56:00.000000000 -0500 -+++ source/mupen64plus-core/projects/unix/Makefile 2013-09-30 20:59:47.000000000 -0500 -@@ -206,6 +206,10 @@ +--- source/mupen64plus-core/projects/unix/Makefile 2015-04-26 17:42:49.000000000 -0500 ++++ source/mupen64plus-core/projects/unix/Makefile 2015-06-12 17:54:03.000000000 -0500 +@@ -227,6 +227,10 @@ ZLIB_LDLIBS += -lz endif +ifeq ($(OS), FREEBSD) # use system zlib on FreeBSD + ZLIB_LDLIBS += -lz +endif + ifeq ($(origin ZLIB_CFLAGS) $(origin ZLIB_LDLIBS), undefined undefined) ifeq ($(shell $(PKG_CONFIG) --modversion zlib 2>/dev/null),) $(error No zlib development libraries found!) +@@ -247,6 +251,12 @@ + CFLAGS += $(LIBPNG_CFLAGS) + LDLIBS += $(LIBPNG_LDLIBS) + ++ifeq ($(OS), FREEBSD) ++ SDL_CFLAGS += $(shell $(SDL2_CONFIG) --cflags) ++ SDL_LDLIBS += $(shell $(SDL2_CONFIG) --libs) ++endif ++ ++ + # test for presence of SDL + ifeq ($(origin SDL_CFLAGS) $(origin SDL_LDLIBS), undefined undefined) + SDL_CONFIG = $(CROSS_COMPILE)sdl2-config Index: head/emulators/mupen64plus-core/pkg-plist =================================================================== --- head/emulators/mupen64plus-core/pkg-plist (revision 389665) +++ head/emulators/mupen64plus-core/pkg-plist (revision 389666) @@ -1,14 +1,13 @@ include/mupen64plus/m64p_common.h include/mupen64plus/m64p_config.h include/mupen64plus/m64p_debugger.h 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/libmupen64plus.so.2.0.0 %%DATADIR%%/font.ttf -%%DATADIR%%/mupen64plus.cht %%DATADIR%%/mupen64plus.ini %%DATADIR%%/mupencheat.txt %%PORTDOCS%%%%DOCSDIR%%/RELEASE Index: head/emulators/mupen64plus-input-sdl/Makefile =================================================================== --- head/emulators/mupen64plus-input-sdl/Makefile (revision 389665) +++ head/emulators/mupen64plus-input-sdl/Makefile (revision 389666) @@ -1,13 +1,13 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -input-sdl COMMENT= Input plugin for Mupen64plus MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTION_DEFINE= # .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-plugins/Makefile =================================================================== --- head/emulators/mupen64plus-plugins/Makefile (revision 389665) +++ head/emulators/mupen64plus-plugins/Makefile (revision 389666) @@ -1,49 +1,54 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PORTNAME= mupen64plus -PORTVERSION= 2.0 -PORTREVISION= 1 +PORTVERSION= 2.5 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= # empty PKGNAMESUFFIX= -plugins DISTFILES= # empty EXTRACT_ONLY= # empty -MAINTAINER?= ports@FreeBSD.org +MAINTAINER?= acm@FreeBSD.org COMMENT= Third party plugins for Mupen64plus -OPTIONS_DEFINE= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 +OPTIONS_DEFINE= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 RSP_CXD4 VIDEO_ARACHNOID_DESC= Arachnoid video plugin VIDEO_GLIDE64_DESC= Glide64 video plugin VIDEO_Z64_DESC= z64 video plugin RSP_Z64_DESC= z64 RSP plugin +RSP_CXD4_DESC= cxd4 RSP plugin -OPTIONS_DEFAULT= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 +OPTIONS_DEFAULT= VIDEO_ARACHNOID VIDEO_GLIDE64 VIDEO_Z64 RSP_Z64 RSP_CXD4 .include # Graphics plugins .if ${PORT_OPTIONS:MVIDEO_ARACHNOID} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-arachnoid.so:${PORTSDIR}/emulators/mupen64plus-video-arachnoid .endif .if ${PORT_OPTIONS:MVIDEO_GLIDE64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-glide64.so:${PORTSDIR}/emulators/mupen64plus-video-glide64 .endif .if ${PORT_OPTIONS:MVIDEO_Z64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-video-z64.so:${PORTSDIR}/emulators/mupen64plus-video-z64 .endif # RSP plugins .if ${PORT_OPTIONS:MRSP_Z64} RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-z64.so:${PORTSDIR}/emulators/mupen64plus-rsp-z64 +.endif + +.if ${PORT_OPTIONS:MRSP_CXD4} +RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAME}/mupen64plus-rsp-cxd4.so:${PORTSDIR}/emulators/mupen64plus-rsp-cxd4 .endif NO_MTREE= yes NO_BUILD= yes do-install: # empty .include Index: head/emulators/mupen64plus-rsp-z64/Makefile =================================================================== --- head/emulators/mupen64plus-rsp-z64/Makefile (revision 389665) +++ head/emulators/mupen64plus-rsp-z64/Makefile (revision 389666) @@ -1,25 +1,25 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PKGNAMESUFFIX= -rsp-z64 -DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin +DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin COMMENT= Low-level RSP processor plugin for the Mupen64Plus LIB_DEPENDS= libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core USE_GL= # USE_SDL= # MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-ui-console/Makefile =================================================================== --- head/emulators/mupen64plus-ui-console/Makefile (revision 389665) +++ head/emulators/mupen64plus-ui-console/Makefile (revision 389666) @@ -1,13 +1,13 @@ # Created by: Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -ui-console COMMENT= UI for Mupen64plus MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-video-arachnoid/Makefile =================================================================== --- head/emulators/mupen64plus-video-arachnoid/Makefile (revision 389665) +++ head/emulators/mupen64plus-video-arachnoid/Makefile (revision 389666) @@ -1,25 +1,25 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ PKGNAMESUFFIX= -video-arachnoid -DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin +DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin COMMENT= The arachnoid video plugin for Mupen64plus LIB_DEPENDS= libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core USE_GL= gl glu USE_SDL= # MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp =================================================================== --- head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp (revision 389665) +++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp (nonexistent) @@ -1,16 +0,0 @@ ---- mupen64plus-video-glide64/src/Main.cpp 2013-10-04 03:40:24.000000000 -0500 -+++ mupen64plus-video-glide64/src/Main.cpp 2013-10-04 03:41:24.000000000 -0500 -@@ -634,11 +634,8 @@ - for (i=0; i<0x200; i++) - { - // cur = ~*(data++), byteswapped --#if !defined(__GNUC__) -- cur = _byteswap_ulong(~*(data++)); --#else -- cur = __builtin_bswap32(~*(data++)); --#endif -+ -+ cur = bswap32(~*(data++)); - - for (b=0x80000000; b!=0; b>>=1) - { Property changes on: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp =================================================================== --- head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp (revision 389665) +++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp (nonexistent) @@ -1,24 +0,0 @@ ---- mupen64plus-video-glide64/src/rdp.cpp 2013-10-04 03:41:54.000000000 -0500 -+++ mupen64plus-video-glide64/src/rdp.cpp 2013-10-04 03:43:26.000000000 -0500 -@@ -67,21 +67,6 @@ - - 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)) -- #include -- #define bswap32(x) _byteswap_ulong(x) --#else --static inline uint32_t bswap32(uint32_t val) --{ -- return (((val & 0xff000000) >> 24) | -- ((val & 0x00ff0000) >> 8) | -- ((val & 0x0000ff00) << 8) | -- ((val & 0x000000ff) << 24)); --} --#endif -- - // global strings - const char *ACmp[4] = { "NONE", "THRESHOLD", "UNKNOWN", "DITHER" }; - Property changes on: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h =================================================================== --- head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h (revision 389665) +++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h (nonexistent) @@ -1,30 +0,0 @@ ---- mupen64plus-video-glide64/src/Util.h 2013-10-04 03:39:06.000000000 -0500 -+++ mupen64plus-video-glide64/src/Util.h 2013-10-04 03:43:01.000000000 -0500 -@@ -37,6 +37,8 @@ - #ifndef Util_H - #define Util_H - -+#include -+ - #include "winlnxdefs.h" - #include "rdp.h" - -@@ -91,5 +93,17 @@ - lx = lc; \ - } - --#endif // ifndef Util_H -+#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64)) -+ #include -+ #define bswap32(x) _byteswap_ulong(x) -+#else -+static inline uint32_t bswap32(uint32_t val) -+{ -+ return (((val & 0xff000000) >> 24) | -+ ((val & 0x00ff0000) >> 8) | -+ ((val & 0x0000ff00) << 8) | -+ ((val & 0x000000ff) << 24)); -+} -+#endif - -+#endif // ifndef Util_H Property changes on: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/emulators/mupen64plus-video-glide64/Makefile =================================================================== --- head/emulators/mupen64plus-video-glide64/Makefile (revision 389665) +++ head/emulators/mupen64plus-video-glide64/Makefile (revision 389666) @@ -1,26 +1,26 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 2 +PORTREVISION= 0 PKGNAMESUFFIX= -video-glide64 -DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin +DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin COMMENT= Glide64 video plugin for Mupen64Plus LIB_DEPENDS= libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core USE_GL= gl -USE_SDL= yes +USE_SDL= sdl2 MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-video-rice/Makefile =================================================================== --- head/emulators/mupen64plus-video-rice/Makefile (revision 389665) +++ head/emulators/mupen64plus-video-rice/Makefile (revision 389666) @@ -1,15 +1,15 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 4 +PORTREVISION= 0 PKGNAMESUFFIX= -video-rice COMMENT= The rice graphics plugin for Mupen64plus USE_GL= yes MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # .include "${MASTERDIR}/Makefile" Index: head/emulators/mupen64plus-video-z64/Makefile =================================================================== --- head/emulators/mupen64plus-video-z64/Makefile (revision 389665) +++ head/emulators/mupen64plus-video-z64/Makefile (revision 389666) @@ -1,26 +1,26 @@ # Created by: Jose Alonso Cardenas Marquez # $FreeBSD$ -PORTREVISION= 3 +PORTREVISION= 0 PKGNAMESUFFIX= -video-z64 -DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin +DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin COMMENT= Low-level RDP plugin for the Mupen64Plus LIB_DEPENDS= libmupen64plus.so.2:${PORTSDIR}/emulators/mupen64plus-core USE_GL= gl glu glew -USE_SDL= yes +USE_SDL= sdl2 MASTERDIR= ${.CURDIR}/../mupen64plus-core OPTIONS_DEFINE= # CFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/GL -I${LOCALBASE}/include/${PORTNAME} LDFLAGS+= -L${LOCALBASE}/lib EXTRACT_AFTER_ARGS= # BUILD_WRKSRC= ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/projects/unix WRKSRC= ${WRKDIR} .include "${MASTERDIR}/Makefile"