haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 19:50:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Löve: fix and finish recipe.

Browse Source 
Now it compile and runs, and crashes somewhere in SDL2.
This commit is contained in:
Adrien Destugues
2014-09-02 22:45:37 +02:00
parent 911f429107
commit 5e3575b4f4
2 changed files with 41 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
games-engines/love/love-0.9.0.recipe
View File

@@ -38,6 +38,14 @@ REQUIRES="
lib:libGL$secondaryArchSuffix
lib:libmpg123$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libpng$secondaryArchSuffix
lib:libmng$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libjasper$secondaryArchSuffix
lib:libbz2$secondaryArchSuffix
lib:libstdc++$secondaryArchSuffix
lib:libgcc_s$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel >= $haikuVersion
@@ -54,6 +62,12 @@ BUILD_REQUIRES="
devel:libGL$secondaryArchSuffix
devel:libmpg123$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libpng$secondaryArchSuffix
devel:libmng$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libjasper$secondaryArchSuffix
devel:libbz2$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:make
@@ -80,6 +94,11 @@ INSTALL()
packageEntries devel $developDir
}
TEST()
{
make check
}
PROVIDES_devel="
love${secondaryArchSuffix}_devel = $portVersion
devel:liblove$secondaryArchSuffix = $portVersion

26
games-engines/love/patches/love-0.9.0.patchset
View File

@@ -1,13 +1,31 @@
From 812eb4fa9c69400b4bd0c10e29db3ca14dc51bf0 Mon Sep 17 00:00:00 2001
From 4edf0f17b173499c71a974702e0b2735a4af580c Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 28 Jan 2014 20:25:18 +0100
Subject: Hack Glee to compile (we don't need GLX!)
diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
index 789e189..850a87d 100644
index 789e189..d118d6b 100644
--- a/src/modules/graphics/opengl/GLee.c
+++ b/src/modules/graphics/opengl/GLee.c
@@ -42,7 +42,7 @@
#include <string.h>
#include "GLee.h"
-#if defined(__APPLE__) || defined(__APPLE_CC__)
+#if defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
#define GLEE_USE_SDL
#ifdef GLEE_USE_SDL
#include <SDL2/SDL_video.h>
@@ -68,7 +68,7 @@ GLEE_FUNC __GLeeGetProcAddress(const char *extname)
{
#ifdef _WIN32
return (GLEE_FUNC)wglGetProcAddress(extname);
-#elif defined(__APPLE__) || defined(__APPLE_CC__)
+#elif defined(__APPLE__) || defined(__APPLE_CC__) || defined(__HAIKU__)
#if defined(GLEE_USE_SDL)
return SDL_GL_GetProcAddress(extname);
#else
@@ -22418,7 +22418,7 @@ const char *__GLeeGetExtStrPlat( void )
if (wglGetExtensionsStringARB)
@@ -54,7 +72,7 @@ index 631cddc..42782ec 100644
1.8.3.4
From cd63b6001a9dca28e0af9803b50f5127621ef1b7 Mon Sep 17 00:00:00 2001
From 25ae059ce6184be74588d6741d21326fcd7a3c8a Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 1 Apr 2014 22:32:15 +0200
Subject: Remove dupliczte definition of __stdcall
@@ -62,7 +80,7 @@ Subject: Remove dupliczte definition of __stdcall
* Haiku defines that to empty already, for legacy reasons.
diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
index 850a87d..1f46525 100644
index d118d6b..0555cca 100644
--- a/src/modules/graphics/opengl/GLee.c
+++ b/src/modules/graphics/opengl/GLee.c
@@ -55,7 +55,7 @@ typedef GLuint(*GLEE_LINK_FUNCTION)(void);