svn commit: r329345 - in head/emulators: . mupen64plus-video-glide64mk2 mupen64plus-video-glide64mk2/files

Fri Oct 4 17:19:43 UTC 2013

Author: acm
Date: Fri Oct  4 17:19:41 2013
New Revision: 329345
URL: http://svnweb.freebsd.org/changeset/ports/329345

Log:
  - Add new port: emulators/mupen64plus-video-glide64mk2

Added:
  head/emulators/mupen64plus-video-glide64mk2/
     - copied from r329342, head/emulators/mupen64plus-video-glide64/
  head/emulators/mupen64plus-video-glide64mk2/files/
  head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile   (contents, props changed)
  head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h   (contents, props changed)
  head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp   (contents, props changed)
Modified:
  head/emulators/Makefile
  head/emulators/mupen64plus-video-glide64mk2/Makefile

Modified: head/emulators/Makefile
==============================================================================

--- head/emulators/Makefile	Fri Oct  4 17:18:44 2013	(r329344)
+++ head/emulators/Makefile	Fri Oct  4 17:19:41 2013	(r329345)
@@ -114,6 +114,7 @@
     SUBDIR += mupen64plus-ui-console
     SUBDIR += mupen64plus-video-arachnoid
     SUBDIR += mupen64plus-video-glide64
+    SUBDIR += mupen64plus-video-glide64mk64
     SUBDIR += mupen64plus-video-rice
     SUBDIR += mupen64plus-video-z64
     SUBDIR += nonpareil

Modified: head/emulators/mupen64plus-video-glide64mk2/Makefile
==============================================================================
--- head/emulators/mupen64plus-video-glide64/Makefile	Fri Oct  4 17:03:57 2013	(r329342)
+++ head/emulators/mupen64plus-video-glide64mk2/Makefile	Fri Oct  4 17:19:41 2013	(r329345)
@@ -1,11 +1,9 @@
 # Created by: Jose Alonso Cardenas Marquez <acm at FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
-PKGNAMESUFFIX=	-video-glide64
-DISTFILES=	${PORTNAME}${PKGNAMESUFFIX}-src-${PORTVERSION}${EXTRACT_SUFX}:plugin
+PKGNAMESUFFIX=	-video-glide64mk2
 
-COMMENT=	Glide64 video plugin for Mupen64Plus
+COMMENT=	Glide64mk2 video plugin for Mupen64Plus
 
 LIB_DEPENDS=	mupen64plus.2:${PORTSDIR}/emulators/mupen64plus-core
 
@@ -19,9 +17,6 @@ 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}
-
 NO_STAGE=	yes
+
 .include "${MASTERDIR}/Makefile"

Added: head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-projects-unix_Makefile	Fri Oct  4 17:19:41 2013	(r329345)
@@ -0,0 +1,41 @@
+--- source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-07-03 19:28:17.000000000 -0500
++++ source/mupen64plus-video-glide64mk2/projects/unix/Makefile	2013-10-04 04:17:19.000000000 -0500
+@@ -125,7 +125,7 @@
+ OPTFLAGS ?= -O3 -flto
+ WARNFLAGS ?= -Wall
+ CFLAGS += $(OPTFLAGS) $(WARNFLAGS) -ffast-math -fno-strict-aliasing -fvisibility=hidden -I../../src -I../../src/Glitch64/inc -DGCC
+-CXXFLAGS += -fvisibility-inlines-hidden -std=gnu++0x
++CXXFLAGS += -fvisibility-inlines-hidden
+ LDFLAGS += $(SHARED)
+ BOOST_SUFFIX ?=
+ 
+@@ -186,6 +186,7 @@
+ endif
+ ifeq ($(OS), FREEBSD)
+   LDLIBS += -lc
++  CPPFLAGS += -DNO_FILTER_THREAD
+ endif
+ 
+ ifeq ($(origin PKG_CONFIG), undefined)
+@@ -199,6 +200,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!)
+@@ -292,8 +297,8 @@
+ endif
+ 
+ # set base program pointers and flags
+-CC        = $(CROSS_COMPILE)gcc
+-CXX       = $(CROSS_COMPILE)g++
++CC        ?= $(CROSS_COMPILE)gcc
++CXX       ?= $(CROSS_COMPILE)g++
+ RM       ?= rm -f
+ INSTALL  ?= install
+ MKDIR ?= mkdir -p

Added: head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-Glide64_Util.h	Fri Oct  4 17:19:41 2013	(r329345)
@@ -0,0 +1,13 @@
+--- source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2013-10-04 04:04:30.000000000 -0500
++++ source/mupen64plus-video-glide64mk2/src/Glide64/Util.h	2013-10-04 04:04:41.000000000 -0500
+@@ -90,9 +90,7 @@
+ 			lx = lc; \
+ 		}
+ 
+-#if defined(__GNUC__)
+-  #define bswap32(x) __builtin_bswap32(x)
+-#elif defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
++#if defined(_MSC_VER) && (defined(_M_IX86) || defined(_M_X64))
+   #include <stdlib.h>
+   #define bswap32(x) _byteswap_ulong(x)
+ #else

Added: head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/mupen64plus-video-glide64mk2/files/patch-source-mupen64plus-video-glide64mk2-src-GlideHQ_TxDbg.cpp	Fri Oct  4 17:19:41 2013	(r329345)
@@ -0,0 +1,25 @@
+--- source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp	2013-10-04 03:11:58.000000000 -0500
++++ source/mupen64plus-video-glide64mk2/src/GlideHQ/TxDbg.cpp	2013-10-04 03:16:46.000000000 -0500
+@@ -53,7 +53,7 @@
+ void
+ TxDbg::output(const int level, const wchar_t *format, ...)
+ {
+-#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
++#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
+   wchar_t newformat[4095];
+ #else
+   std::wstring newformat;
+@@ -65,8 +65,12 @@
+     return;
+ 
+   va_start(args, format);
+-#ifdef _GLIBCXX_HAVE_BROKEN_VSWPRINTF
++#if defined _GLIBCXX_HAVE_BROKEN_VSWPRINTF || defined (__FreeBSD__)
++#if defined(__FreeBSD__)
++  swprintf(newformat, sizeof(newformat)/sizeof(*newformat), L"%d:\t", level);
++#else
+   swprintf(newformat, L"%d:\t", level);
++#endif
+   wcscat(newformat, format);
+   vfwprintf(_dbgfile, newformat, args);
+ #else
