aboutsummaryrefslogtreecommitdiffstats
path: root/emulators/mupen64-sdlinput
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
committermarcus <marcus@FreeBSD.org>2006-10-14 16:54:54 +0800
commit0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8 (patch)
tree17937489af4c767844fc63b684ae3e7b31948812 /emulators/mupen64-sdlinput
parente959473966b963953d63d5f00fae8751f2decf0f (diff)
downloadfreebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.gz
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.tar.zst
freebsd-ports-gnome-0deb7538cc6a5ae90f4e3e4bdbfe6d0ab974aed8.zip
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed. Submitted by: mezz, ahze, pav, and many others Approved by: portmgr (implicit, kris)
Diffstat (limited to 'emulators/mupen64-sdlinput')
-rw-r--r--emulators/mupen64-sdlinput/files/patch-SDL_ttf.c20
1 files changed, 16 insertions, 4 deletions
diff --git a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
index f0e6a0abe42b..c428262407bc 100644
--- a/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
+++ b/emulators/mupen64-sdlinput/files/patch-SDL_ttf.c
@@ -1,6 +1,6 @@
---- src/SDL_ttf.c.orig Wed Oct 15 02:44:17 2003
-+++ src/SDL_ttf.c Thu Aug 12 15:06:42 2004
-@@ -39,7 +39,8 @@
+--- src/SDL_ttf.c.orig Tue Oct 14 20:44:17 2003
++++ src/SDL_ttf.c Wed Oct 4 08:38:49 2006
+@@ -39,10 +39,10 @@
#define FREEA(p) free(p)
#endif
@@ -9,4 +9,16 @@
+#include FT_FREETYPE_H
#include <freetype/ftoutln.h>
#include <freetype/ttnameid.h>
- #include <freetype/internal/ftobjs.h>
+-#include <freetype/internal/ftobjs.h>
+
+ /** hack **/
+ #ifndef ft_open_stream
+@@ -272,7 +272,7 @@
+ }
+ memset(stream, 0, sizeof(*stream));
+
+- stream->memory = library->memory;
++ stream->memory = NULL;
+ stream->read = RWread;
+ stream->descriptor.pointer = src;
+ stream->pos = (unsigned long)position;