svn commit: r329344 - in head/emulators: mupen64plus mupen64plus-core mupen64plus-core/files mupen64plus-plugins mupen64plus-rsp-z64 mupen64plus-video-arachnoid mupen64plus-video-glide64 mupen64plu...
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Fri Oct 4 17:18:47 UTC 2013
Author: acm
Date: Fri Oct 4 17:18:44 2013
New Revision: 329344
URL: http://svnweb.freebsd.org/changeset/ports/329344
Log:
- Update to 2.0
Added:
head/emulators/mupen64plus-video-glide64/files/
head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp (contents, props changed)
head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h (contents, props changed)
head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp (contents, props changed)
Deleted:
head/emulators/mupen64plus-video-rice/files/
Modified:
head/emulators/mupen64plus-core/Makefile
head/emulators/mupen64plus-core/Makefile.common
head/emulators/mupen64plus-core/distinfo
head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile
head/emulators/mupen64plus-plugins/Makefile
head/emulators/mupen64plus-rsp-z64/Makefile
head/emulators/mupen64plus-video-arachnoid/Makefile
head/emulators/mupen64plus-video-glide64/Makefile
head/emulators/mupen64plus-video-z64/Makefile
head/emulators/mupen64plus/Makefile
Modified: head/emulators/mupen64plus-core/Makefile
==============================================================================
--- head/emulators/mupen64plus-core/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-core/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= mupen64plus
-PORTVERSION?= 1.99.4
-PORTREVISION?= 5
+PORTVERSION?= 2.0
+PORTREVISION?= 0
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} \
${MASTER_SITE_LOCAL:S,$,acm/${PORTNAME}/,} \
@@ -15,14 +15,16 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER?= acm at FreeBSD.org
COMMENT?= A fork of Mupen64 Nintendo 64 emulator
-PROJECTHOST= bsdistfiles
+#PROJECTHOST= bsdistfiles
USES= gmake pkgconfig
USE_GL?= yes
USE_SDL?= yes
USE_LDCONFIG?= yes
ONLY_FOR_ARCHS= i386 amd64
-MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}"
+OPTFLAGS= #
+
+MAKE_ENV+= PTHREAD_LIBS="${PTHREAD_LIBS}" OPTFLAGS="${OPTFLAGS}"
OPTIONSFILE= ${PORT_DBDIR}/${PORTNAME}${PKGNAMESUFFIX}/options
NO_STAGE= yes
Modified: head/emulators/mupen64plus-core/Makefile.common
==============================================================================
--- head/emulators/mupen64plus-core/Makefile.common Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-core/Makefile.common Fri Oct 4 17:18:44 2013 (r329344)
@@ -23,10 +23,18 @@ MAN6= mupen64plus.6
LIB_DEPENDS+= png15:${PORTSDIR}/graphics/png
.endif
+.if ${PKGNAMESUFFIX} == "-video-glide64mk"
+#USE_GCC= yes
+
+LIBDEPENDS+= boost_thread:${PORTSDIR}/devel/boost-libs
+.endif
+
.if ${PKGNAMESUFFIX} != "-core"
-post-extract:
-. if ${PKGNAMESUFFIX} == "-ui-console"
- @${GUNZIP_CMD} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/doc/${MAN6}.gz
+post-patch:
+. if ${PKGNAMESUFFIX} == "-video-glide64mk2"
+ @cd ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/src && \
+ ${REINPLACE_CMD} -e 's|#include <thread>||g' \
+ GlideHQ/TxQuantize.cpp GlideHQ/TxFilter.cpp
. endif
pre-install:
@@ -39,6 +47,10 @@ pre-install:
@${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
@@ -87,6 +99,11 @@ do-install:
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64.ini ${DATADIR}
. endif
+. if ${PKGNAMESUFFIX} == "-video-glide64mk2"
+ @${MKDIR} ${DATADIR}
+ ${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/Glide64mk2.ini ${DATADIR}
+. endif
+
. if ${PKGNAMESUFFIX} == "-input-sdl"
@${MKDIR} ${DATADIR}
${INSTALL_DATA} ${WRKSRC}/source/${PORTNAME}${PKGNAMESUFFIX}/data/InputAutoCfg.ini ${DATADIR}
Modified: head/emulators/mupen64plus-core/distinfo
==============================================================================
--- head/emulators/mupen64plus-core/distinfo Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-core/distinfo Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,10 +1,10 @@
-SHA256 (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 07f69ccefdf7224cb29a39c0525daa87807b44846ca14fcad97728d6a22f4da2
-SIZE (mupen64plus/mupen64plus-bundle-src-1.99.4.tar.gz) = 1699177
-SHA256 (mupen64plus/mupen64plus-video-arachnoid-src-1.99.4.tar.gz) = fbd1b2908185f020f521ba269b28062427834228e31657e58bac701a8b2a9b43
-SIZE (mupen64plus/mupen64plus-video-arachnoid-src-1.99.4.tar.gz) = 127863
-SHA256 (mupen64plus/mupen64plus-rsp-z64-src-1.99.4.tar.gz) = c2887c197962ac6ea9492fdf74822ad8c21659253353d0a65b29be67ad65ef8b
-SIZE (mupen64plus/mupen64plus-rsp-z64-src-1.99.4.tar.gz) = 44523
-SHA256 (mupen64plus/mupen64plus-video-z64-src-1.99.4.tar.gz) = 81fac289571ca54b8a1a2f53b901677368c0b9e9ea4a84b45e2eebcd08ad35cd
-SIZE (mupen64plus/mupen64plus-video-z64-src-1.99.4.tar.gz) = 65254
-SHA256 (mupen64plus/mupen64plus-video-glide64-src-1.99.4.tar.gz) = 76d62f869b80561e03b1463aa04401a39d283e8ab3ff1344cf7c1c420ea3fe79
-SIZE (mupen64plus/mupen64plus-video-glide64-src-1.99.4.tar.gz) = 339054
+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
Modified: head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile
==============================================================================
--- head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,30 +1,13 @@
---- source/mupen64plus-core/projects/unix/Makefile 2011-12-17 20:37:23.000000000 -0500
-+++ source/mupen64plus-core/projects/unix/Makefile 2011-12-17 20:39:06.000000000 -0500
-@@ -170,8 +170,10 @@
- ifeq ($(shell pkg-config --modversion libpng 2>/dev/null),)
- $(error No libpng development libraries found!)
+--- 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 @@
+ ZLIB_LDLIBS += -lz
endif
--ifeq ($(shell pkg-config --modversion zlib 2>/dev/null),)
-- $(error No zlib development libraries found!)
-+ifneq ($(OS), FREEBSD)
-+ ifeq ($(shell pkg-config --modversion zlib 2>/dev/null),)
-+ $(error No zlib development libraries found!)
-+ endif
- endif
- ifeq ($(shell pkg-config --modversion freetype2 2>/dev/null),)
- $(error No FreeType 2 development libraries found!)
-@@ -182,8 +184,14 @@
- ifeq ($(shell pkg-config --modversion glu 2>/dev/null),)
- $(error No OpenGL utility development libraries found!)
- endif
-+
-+ifeq ($(OS), FREEBSD)
-+CFLAGS += $(shell pkg-config --cflags libpng freetype2 gl glu)
-+LDLIBS += $(shell pkg-config --libs libpng freetype2 gl glu)
-+else
- CFLAGS += $(shell pkg-config --cflags libpng zlib freetype2 gl glu)
- LDLIBS += $(shell pkg-config --libs libpng zlib freetype2 gl glu)
-+endif
- # test for presence of SDL
- ifeq ($(shell which sdl-config 2>/dev/null),)
++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!)
Modified: head/emulators/mupen64plus-plugins/Makefile
==============================================================================
--- head/emulators/mupen64plus-plugins/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-plugins/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= mupen64plus
-PORTVERSION= 1.99.4
+PORTVERSION= 2.0
CATEGORIES= emulators
MASTER_SITES= # empty
PKGNAMESUFFIX= -plugins
Modified: head/emulators/mupen64plus-rsp-z64/Makefile
==============================================================================
--- head/emulators/mupen64plus-rsp-z64/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-rsp-z64/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,9 +1,8 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
PKGNAMESUFFIX= -rsp-z64
-DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
+DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin
COMMENT= Low-level RSP processor plugin for the Mupen64Plus
Modified: head/emulators/mupen64plus-video-arachnoid/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-arachnoid/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-video-arachnoid/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,9 +1,8 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
PKGNAMESUFFIX= -video-arachnoid
-DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
+DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin
COMMENT= The arachnoid video plugin for Mupen64plus
Modified: head/emulators/mupen64plus-video-glide64/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-glide64/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-video-glide64/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,9 +1,9 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 0
PKGNAMESUFFIX= -video-glide64
-DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
+DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin
COMMENT= Glide64 video plugin for Mupen64Plus
Added: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Main.cpp Fri Oct 4 17:18:44 2013 (r329344)
@@ -0,0 +1,16 @@
+--- 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)
+ {
Added: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_Util.h Fri Oct 4 17:18:44 2013 (r329344)
@@ -0,0 +1,30 @@
+--- 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 <stdint.h>
++
+ #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 <stdlib.h>
++ #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
Added: head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64/files/patch-mupen64plus-video-glide64-src_rdp.cpp Fri Oct 4 17:18:44 2013 (r329344)
@@ -0,0 +1,24 @@
+--- 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 <stdlib.h>
+- #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" };
+
Modified: head/emulators/mupen64plus-video-z64/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-z64/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus-video-z64/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -1,9 +1,8 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
PKGNAMESUFFIX= -video-z64
-DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
+DISTFILES= ${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}.0${EXTRACT_SUFX}:plugin
COMMENT= Low-level RDP plugin for the Mupen64Plus
Modified: head/emulators/mupen64plus/Makefile
==============================================================================
--- head/emulators/mupen64plus/Makefile Fri Oct 4 17:13:12 2013 (r329343)
+++ head/emulators/mupen64plus/Makefile Fri Oct 4 17:18:44 2013 (r329344)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= mupen64plus
-PORTVERSION= 1.99.4
-PORTREVISION= 3
+PORTVERSION= 2.0
CATEGORIES= emulators
MASTER_SITES= # empty
DISTFILES= # empty
@@ -24,6 +23,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAM
# 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
More information about the svn-ports-all
mailing list