haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Patch to allow sge to build on Haiku. Merges 2 patch from Kaliber with a third patch by scottmc

Browse Source
This commit is contained in:
Scott McCreary
2008-08-18 07:53:17 +00:00
parent d3cec5c5e5
commit 859eb300c9
1 changed files with 63 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
media-libs/sge/sge030809-haiku.diff Normal file
View File

@@ -0,0 +1,63 @@
diff -urN sge030809/Makefile sge030809-haiku/Makefile
--- sge030809/Makefile 2003-08-11 15:40:41.000000000 -0700
+++ sge030809-haiku/Makefile 2008-08-18 00:27:50.000000000 -0700
@@ -71,13 +71,13 @@
endif
install: shared
- @mkdir -p $(PREFIX_H)
- install -c -m 644 sge*.h $(PREFIX_H)
- @mkdir -p $(PREFIX)/lib
- install -c -m 644 libSGE.a $(PREFIX)/lib
- install -c libSGE.so $(PREFIX)/lib/libSGE.so.$(API_VER).$(SGE_VER)
- @cd $(PREFIX)/lib;\
+ @mkdir -p $(DESTDIR)$(PREFIX_H)
+ install -c -m 644 sge*.h $(DESTDIR)$(PREFIX_H)
+ @mkdir -p $(DESTDIR)$(PREFIX)/lib
+ install -c -m 644 libSGE.a $(DESTDIR)$(PREFIX)/lib
+ install -c libSGE.so $(DESTDIR)$(PREFIX)/lib/libSGE.so.$(API_VER).$(SGE_VER)
+ @cd $(DESTDIR)$(PREFIX)/lib;\
ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
ln -sf libSGE.so.$(API_VER) libSGE.so
- @echo "** Headerfiles installed in $(PREFIX_H)"
- @echo "** Library files installed in $(PREFIX)/lib"
+ @echo "** Headerfiles installed in $(DESTDIR)$(PREFIX_H)"
+ @echo "** Library files installed in $(DESTDIR)$(PREFIX)/lib"
diff -urN sge030809/Makefile.conf sge030809-haiku/Makefile.conf
--- sge030809/Makefile.conf 2003-08-11 15:43:35.000000000 -0700
+++ sge030809-haiku/Makefile.conf 2008-08-18 00:29:02.000000000 -0700
@@ -32,7 +32,7 @@
# Libs config
-SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+SGE_LIBS =$(shell sdl-config --libs)
# Is freetype-config available?
diff -urN sge030809/sge_tt_text.cpp sge030809-haiku/sge_tt_text.cpp
--- sge030809/sge_tt_text.cpp 2003-08-08 05:48:08.000000000 -0700
+++ sge030809-haiku/sge_tt_text.cpp 2008-08-18 00:27:36.000000000 -0700
@@ -36,10 +36,9 @@
#include "sge_textpp.h"
#ifndef _SGE_NOTTF
-#include <freetype/freetype.h>
-#include <freetype/ftoutln.h>
-#include <freetype/ttnameid.h>
-#include <freetype/internal/ftobjs.h>
+#include <ft2build.h>
+#include FT_FREETYPE_H
+#include FT_OUTLINE_H
/* The structure used to hold glyph information (cached) */
struct glyph {
@@ -294,7 +293,7 @@
}
memset(stream, 0, sizeof(*stream));
- stream->memory = _sge_library->memory;
+ stream->memory = NULL;
stream->read = RWread;
stream->descriptor.pointer = src;
stream->pos = (unsigned long)position;