svn commit: r389666 - in head/emulators: . mupen64plus mupen64plus-audio-sdl mupen64plus-core mupen64plus-core/files mupen64plus-input-sdl mupen64plus-plugins mupen64plus-rsp-z64 mupen64plus-ui-con...
Jose Alonso Cardenas Marquez
acm at FreeBSD.org
Mon Jun 15 03:27:56 UTC 2015
Author: acm
Date: Mon Jun 15 03:27:50 2015
New Revision: 389666
URL: https://svnweb.freebsd.org/changeset/ports/389666
Log:
- Update to 2.5
- Take maintainership
Deleted:
head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_src_main_zip_ioapi.h
head/emulators/mupen64plus-video-glide64/files/
Modified:
head/emulators/Makefile
head/emulators/mupen64plus-audio-sdl/Makefile
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-core/pkg-plist
head/emulators/mupen64plus-input-sdl/Makefile
head/emulators/mupen64plus-plugins/Makefile
head/emulators/mupen64plus-rsp-z64/Makefile
head/emulators/mupen64plus-ui-console/Makefile
head/emulators/mupen64plus-video-arachnoid/Makefile
head/emulators/mupen64plus-video-glide64/Makefile
head/emulators/mupen64plus-video-rice/Makefile
head/emulators/mupen64plus-video-z64/Makefile
head/emulators/mupen64plus/Makefile
Modified: head/emulators/Makefile
==============================================================================
--- head/emulators/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -89,6 +89,7 @@
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
Modified: head/emulators/mupen64plus-audio-sdl/Makefile
==============================================================================
--- head/emulators/mupen64plus-audio-sdl/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-audio-sdl/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,12 +1,12 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
PKGNAMESUFFIX= -audio-sdl
COMMENT= Mupen64plus audio sdl plugin
-USE_SDL= sdl
+USE_SDL= sdl2
MASTERDIR= ${.CURDIR}/../mupen64plus-core
Modified: head/emulators/mupen64plus-core/Makefile
==============================================================================
--- head/emulators/mupen64plus-core/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-core/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -2,23 +2,22 @@
# $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 at FreeBSD.org
+MAINTAINER?= acm at 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
Modified: head/emulators/mupen64plus-core/Makefile.common
==============================================================================
--- head/emulators/mupen64plus-core/Makefile.common Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-core/Makefile.common Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,6 +1,7 @@
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
@@ -27,7 +28,7 @@ LIB_DEPENDS+= libboost_thread.so:${PORT
.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 <thread>||g' \
Modified: head/emulators/mupen64plus-core/distinfo
==============================================================================
--- head/emulators/mupen64plus-core/distinfo Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-core/distinfo Mon Jun 15 03:27:50 2015 (r389666)
@@ -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
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 Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-core/files/patch-source_mupen64plus-core_projects_unix_Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,6 +1,6 @@
---- 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
@@ -11,3 +11,16 @@
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
Modified: head/emulators/mupen64plus-core/pkg-plist
==============================================================================
--- head/emulators/mupen64plus-core/pkg-plist Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-core/pkg-plist Mon Jun 15 03:27:50 2015 (r389666)
@@ -8,7 +8,6 @@ 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
Modified: head/emulators/mupen64plus-input-sdl/Makefile
==============================================================================
--- head/emulators/mupen64plus-input-sdl/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-input-sdl/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,7 +1,7 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
PKGNAMESUFFIX= -input-sdl
COMMENT= Input plugin for Mupen64plus
Modified: head/emulators/mupen64plus-plugins/Makefile
==============================================================================
--- head/emulators/mupen64plus-plugins/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-plugins/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -2,24 +2,25 @@
# $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 at FreeBSD.org
+MAINTAINER?= acm at 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 <bsd.port.pre.mk>
@@ -41,6 +42,10 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/${PORTNAM
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
Modified: head/emulators/mupen64plus-rsp-z64/Makefile
==============================================================================
--- head/emulators/mupen64plus-rsp-z64/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-rsp-z64/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -2,7 +2,7 @@
# $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
Modified: head/emulators/mupen64plus-ui-console/Makefile
==============================================================================
--- head/emulators/mupen64plus-ui-console/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-ui-console/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,7 +1,7 @@
# Created by: Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
+PORTREVISION= 0
PKGNAMESUFFIX= -ui-console
COMMENT= UI for Mupen64plus
Modified: head/emulators/mupen64plus-video-arachnoid/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-arachnoid/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-video-arachnoid/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -2,7 +2,7 @@
# $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
Modified: head/emulators/mupen64plus-video-glide64/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-glide64/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-video-glide64/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,16 +1,16 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $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
Modified: head/emulators/mupen64plus-video-rice/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-rice/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-video-rice/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,7 +1,7 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 4
+PORTREVISION= 0
PKGNAMESUFFIX= -video-rice
COMMENT= The rice graphics plugin for Mupen64plus
Modified: head/emulators/mupen64plus-video-z64/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-z64/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus-video-z64/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -1,16 +1,16 @@
# Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
# $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
Modified: head/emulators/mupen64plus/Makefile
==============================================================================
--- head/emulators/mupen64plus/Makefile Mon Jun 15 03:24:16 2015 (r389665)
+++ head/emulators/mupen64plus/Makefile Mon Jun 15 03:27:50 2015 (r389666)
@@ -2,14 +2,14 @@
# $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 at FreeBSD.org
+MAINTAINER?= acm at FreeBSD.org
COMMENT= Fork of Mupen64 Nintendo 64 emulator with plugins (meta port)
# Mupen64 Emulator core and ui-console
More information about the svn-ports-head
mailing list