From 4caaa338432a839f7692c511dce5c464002d1e83 Mon Sep 17 00:00:00 2001 From: Scott McCreary Date: Sun, 27 Oct 2013 05:32:55 -0700 Subject: [PATCH] Updated recipe for sge that now builds on gcc2, haven't checked yet on others. --- media-libs/sge/patches/sge-030809.patch | 13 ++++++++++ media-libs/sge/sge-030809.recipe | 32 ++++++++++++++++++------- 2 files changed, 37 insertions(+), 8 deletions(-) diff --git a/media-libs/sge/patches/sge-030809.patch b/media-libs/sge/patches/sge-030809.patch index 1f4197f76..8bd9ec3d9 100644 --- a/media-libs/sge/patches/sge-030809.patch +++ b/media-libs/sge/patches/sge-030809.patch @@ -69,3 +69,16 @@ diff -urN sge030809/sge_tt_text.cpp sge030809-haiku/sge_tt_text.cpp stream->read = RWread; stream->descriptor.pointer = src; stream->pos = (unsigned long)position; +--- sge030809/Makefile.conf 2013-10-27 04:16:27.931659776 -0700 ++++ sge030809-haiku/Makefile.conf 2013-10-27 04:45:27.596639744 -0700 +@@ -3,8 +3,8 @@ + # Comment/uncomment the following line to disable/enable build options + # (See README for more info) + C_COMP = y +-#USE_FT = n +-#USE_IMG = n ++USE_FT = y ++USE_IMG = y + #QUIET = y + + diff --git a/media-libs/sge/sge-030809.recipe b/media-libs/sge/sge-030809.recipe index 2f72dedc4..9fa632ddf 100644 --- a/media-libs/sge/sge-030809.recipe +++ b/media-libs/sge/sge-030809.recipe @@ -8,23 +8,23 @@ COPYRIGHT="1999-2003 Anders Lindstrom" REVISION="1" -ARCHITECTURES="?x86_gcc2 ?x86 ?x86_64" +ARCHITECTURES="x86_gcc2 ?x86 ?x86_64" PROVIDES=" sge = $portVersion compat >= 030809 + lib:libSGE = $portVersion compat >= 030809 " REQUIRES=" haiku >= $haikuVersion - lib:libSDL - lib:SDL_image - lib:freetype + libsdl + sdl_image + freetype " - +#TODO get freetype to work in sge as well BUILD_REQUIRES=" haiku_devel - devel:libSDL -# lib:libstdc++ what provides -lstdc++? + devel:libsdl devel:sdl_image # devel:freetype " @@ -36,6 +36,8 @@ BUILD_PREREQUIRES=" SOURCE_DIR="sge030809" +PATCHES="sge-030809.patch" + BUILD() { make @@ -43,5 +45,19 @@ BUILD() INSTALL() { - make install + make install PREFIX_H=$relativeIncludeDir PREFIX=$prefix + + prepareInstalledDevelLibs libSGE + + #devel package + packageEntries devel \ + $developDir } + +PROVIDES_devel=" + libSGE${secondaryArchSuffix}_devel = $portVersion compat >= 030809 + devel:libSGE$secondaryArchSuffix = $portVersion compat >= 030809 + " +REQUIRES_devel=" + libSGE$secondaryArchSuffix == $portVersion base + "