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

love: update to 0.9.1

Browse Source 
* It's now at least somehow working. Lots of crashes in Mesa (both
swrast and swpipe).
This commit is contained in:
Adrien Destugues
2014-09-03 19:27:26 +02:00
parent eb2e52395e
commit dd3b0791c5
2 changed files with 28 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
games-engines/love/love-0.9.0.recipe → games-engines/love/love-0.9.1.recipe
View File

@@ -4,9 +4,6 @@ Hi there! LÖVE is an *awesome* framework you can use to make 2D games in Lua.
It's free, open-source, and works on Windows, Mac OS X and Linux.
"
HOMEPAGE="http://love2d.org/"
SRC_URI="https://bitbucket.org/rude/love/downloads/love-0.9.0-linux-src.tar.gz"
CHECKSUM_SHA256="4f0d24945223fc3ba78f0a81799a179f06b97e9b0aea2c9c6ad532820a491611"
REVISION="1"
LICENSE="Zlib"
COPYRIGHT="2010-2014 Löve"
@@ -18,6 +15,11 @@ if [ $effectiveTargetArchitecture != x86_gcc2 ]; then
fi
SECONDARY_ARCHITECTURES="x86"
SRC_URI="https://bitbucket.org/rude/love/downloads/love-$portVersion-linux-src.tar.gz"
CHECKSUM_SHA256="04dd0946bd82ec839c454c161bf0e5da870f393af62d09dc229990f5176833de"
PATCHES="love-$portVersion.patchset"
REVISION="1"
PROVIDES="
love$secondaryArchSuffix = $portVersion
cmd:love$secondaryArchSuffix = $portVersion
@@ -77,7 +79,6 @@ BUILD_PREREQUIRES="
cmd:awk
"
PATCHES="love-0.9.0.patchset"
BUILD()
{
runConfigure ./configure

61
games-engines/love/patches/love-0.9.0.patchset → games-engines/love/patches/love-0.9.1.patchset
View File

@@ -1,11 +1,11 @@
From 4edf0f17b173499c71a974702e0b2735a4af580c Mon Sep 17 00:00:00 2001
From b3d9ed404fd92939782fd6ae4dee62dc86768270 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!)
Date: Tue, 2 Sep 2014 23:01:32 +0200
Subject: Fixup Glee for Haiku support.
diff --git a/src/modules/graphics/opengl/GLee.c b/src/modules/graphics/opengl/GLee.c
index 789e189..d118d6b 100644
index f0d1beb..d3307a8 100644
--- a/src/modules/graphics/opengl/GLee.c
+++ b/src/modules/graphics/opengl/GLee.c
@@ -42,7 +42,7 @@
@@ -17,6 +17,15 @@ index 789e189..d118d6b 100644
#define GLEE_USE_SDL
#ifdef GLEE_USE_SDL
#include <SDL2/SDL_video.h>
@@ -55,7 +55,7 @@ typedef GLuint(*GLEE_LINK_FUNCTION)(void);
GLboolean __GLeeInited=GL_FALSE;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__HAIKU__)
#define __stdcall /* nothing */
#endif
@@ -68,7 +68,7 @@ GLEE_FUNC __GLeeGetProcAddress(const char *extname)
{
#ifdef _WIN32
@@ -36,21 +45,21 @@ index 789e189..d118d6b 100644
Display *dpy=glXGetCurrentDisplay();
if(dpy)
diff --git a/src/modules/graphics/opengl/GLee.h b/src/modules/graphics/opengl/GLee.h
index 631cddc..42782ec 100644
index 07aadb1..92c3ef6 100644
--- a/src/modules/graphics/opengl/GLee.h
+++ b/src/modules/graphics/opengl/GLee.h
@@ -64,7 +64,9 @@
@@ -64,7 +64,10 @@
#define __glxext_h_ /* prevent glxext.h from being included */
#define GLX_GLXEXT_PROTOTYPES
#include <GL/gl.h>
- #include <GL/glx.h>
+ #ifndef __HAIKU__
+ #include <GL/glx.h>
+ #endif
#endif
+
+#ifndef __HAIKU__
#include <GL/glx.h>
+#endif
#ifndef APIENTRY
@@ -1152,7 +1154,7 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_igloo_interface;
typedef XID GLEE_GLXContextID;
#endif
@@ -1154,7 +1157,7 @@ GLEE_EXTERN GLboolean _GLEE_SGIX_igloo_interface;
DECLARE_HANDLE(HVIDEOINPUTDEVICENV);
#endif
@@ -59,7 +68,7 @@ index 631cddc..42782ec 100644
/* Mac OS X */
@@ -23178,7 +23180,7 @@ GLEE_EXTERN GLboolean _GLEE_WGL_NV_video_output;
@@ -23180,7 +23183,7 @@ GLEE_EXTERN GLboolean _GLEE_WGL_NV_video_output;
#define wglGetVideoInfoNV GLeeFuncPtr_wglGetVideoInfoNV
#endif
#endif
@@ -71,27 +80,3 @@ index 631cddc..42782ec 100644
--
1.8.3.4
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
* 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 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);
GLboolean __GLeeInited=GL_FALSE;
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(__HAIKU__)
#define __stdcall /* nothing */
#endif
--
1.8.3.4