summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--emulators/mupen64-base/Makefile.common2
-rw-r--r--emulators/mupen64-glide/files/patch-glidesys.h18
-rw-r--r--emulators/mupen64-tr64/files/patch-Makefile2
-rw-r--r--emulators/mupen64-tr64/files/patch-texture.c39
4 files changed, 51 insertions, 10 deletions
diff --git a/emulators/mupen64-base/Makefile.common b/emulators/mupen64-base/Makefile.common
index 98bf4d146809..f0be355c6414 100644
--- a/emulators/mupen64-base/Makefile.common
+++ b/emulators/mupen64-base/Makefile.common
@@ -1,3 +1,5 @@
+USE_DOS2UNIX= *.c *.cpp *.h *.H *.ini
+
DISTNAME= ${PORTNAME}_src-${MUPEN64VERSION}
PATCHDIR= ${.CURDIR}/files
WRKSRC?= ${WRKDIR}/${DISTNAME}
diff --git a/emulators/mupen64-glide/files/patch-glidesys.h b/emulators/mupen64-glide/files/patch-glidesys.h
index 27fe0cdb5d31..9576c283aedd 100644
--- a/emulators/mupen64-glide/files/patch-glidesys.h
+++ b/emulators/mupen64-glide/files/patch-glidesys.h
@@ -1,11 +1,11 @@
---- wrapper/glidesys.h.orig Sun Jun 13 23:58:12 2004
+--- wrapper/glidesys.h Sun Jun 13 23:58:12 2004
+++ wrapper/glidesys.h Thu Aug 12 17:14:11 2004
@@ -96,7 +96,7 @@
- #endif
-
- /* Check for OS */
--#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__)
-+#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || defined(__FreeBSD__)
- # define GLIDE_OS GLIDE_OS_UNIX
- #elif defined(__DOS__)
- # define GLIDE_OS GLIDE_OS_DOS32
+ #endif
+
+ /* Check for OS */
+-#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__)
++#if defined(__IRIX__) || defined(__sparc__) || defined(__linux__) || defined(__FreeBSD__)
+ # define GLIDE_OS GLIDE_OS_UNIX
+ #elif defined(__DOS__)
+ # define GLIDE_OS GLIDE_OS_DOS32
diff --git a/emulators/mupen64-tr64/files/patch-Makefile b/emulators/mupen64-tr64/files/patch-Makefile
index f72c828572da..1feb92c917cc 100644
--- a/emulators/mupen64-tr64/files/patch-Makefile
+++ b/emulators/mupen64-tr64/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig 2005-08-26 14:11:28.000000000 -0500
+--- Makefile 2005-08-26 14:11:28.000000000 -0500
+++ Makefile 2007-10-09 01:55:17.000000000 -0500
@@ -1,26 +1,26 @@
ifneq ("$(shell grep GTK2 config.h)","\#define GTK2_SUPPORT 1")
diff --git a/emulators/mupen64-tr64/files/patch-texture.c b/emulators/mupen64-tr64/files/patch-texture.c
new file mode 100644
index 000000000000..14266f666117
--- /dev/null
+++ b/emulators/mupen64-tr64/files/patch-texture.c
@@ -0,0 +1,39 @@
+--- texture.c 2007-11-07 17:32:05.000000000 -0500
++++ texture.c 2007-11-07 17:36:25.000000000 -0500
+@@ -3172,6 +3172,7 @@
+ _s32 x, y;
+ _u8 *dest = i_dst;
+ _u8 *src = i_src;
++ _u32 src_tmp;
+
+ int xc, yc;
+ int xl, yl;
+@@ -3193,6 +3194,7 @@
+ {
+ x = sx;
+ src = i_src + tstart + ((y * twidth + x) << 2);
++ src_tmp = (_u32)src;
+
+ if ((y & 1) && (swapped))
+ flip = 0x04;
+@@ -3201,13 +3203,13 @@
+
+ for(xc = 0; xc <= xl; xc++)
+ {
+- (_u32)src ^= flip; // wtf am I doing here?
+- src += 3;
+- *dest = *(_u8*)((_u32)src ^ flip); src--; dest++;
+- *dest = *(_u8*)((_u32)src ^ flip); src--; dest++;
+- *dest = *(_u8*)((_u32)src ^ flip); src--; dest++;
+- *dest = *(_u8*)((_u32)src ^ flip); dest++;
+- src += 4;
++ src_tmp ^= flip; // wtf am I doing here?
++ src_tmp += 3;
++ *dest = *(_u8*)(src_tmp ^ flip); src_tmp--; dest++;
++ *dest = *(_u8*)(src_tmp ^ flip); src_tmp--; dest++;
++ *dest = *(_u8*)(src_tmp ^ flip); src_tmp--; dest++;
++ *dest = *(_u8*)(src_tmp ^ flip); dest++;
++ src_tmp += 4;
+ //x += dx;
+ }
+ y += dy;