haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-03 13:38:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

goonies, fix references to libSDL*, fix build (#4025)

Browse Source 
* goonies, fix references to libSDL*, fix build

* fix missing libSDL_1.2
This commit is contained in:
Schrijvers Luc
2019-07-27 18:32:37 +02:00
committed by waddlesplash
parent 858a6b93b8
commit 15d7db467d
2 changed files with 53 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
games-arcade/goonies/goonies-1.4.1528.recipe
View File

@@ -15,39 +15,36 @@ treasure and escape back to save the Goon Docks from demolition?"
HOMEPAGE="http://www2.braingames.getput.com/goonies/"
COPYRIGHT="2006-2009 Brain Games"
LICENSE="GNU GPL v2"
REVISION="3"
REVISION="4"
SOURCE_URI="http://braingames.jorito.net/goonies/downloads/goonies.src_1.4.1528.tgz"
CHECKSUM_SHA256="9e9c1e67a41dfae512e975b6931828cdc82f07397921ca0a41a81c3020a73799"
CHECKSUM_SHA256="09e4a022ea4c31fe0f01393ba82ffaf44dbfbf0edcc2da9f569d9fe061382ce6"
PATCHES="goonies-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 x86"
ARCHITECTURES="!x86_gcc2 x86 x86_64"
SECONDARY_ARCHITECTURES="x86"
PROVIDES="
goonies$secondaryArchSuffix = $portVersion
app:goonies
app:Goonies
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libGL$secondaryArchSuffix
lib:libGLU$secondaryArchSuffix
lib:libsdl$secondaryArchSuffix
lib:libSDL_image$secondaryArchSuffix
lib:libSDL_mixer$secondaryArchSuffix
# lib:libSDL_sound$secondaryArchSuffix
# lib:libSDL_ttf$secondaryArchSuffix
lib:libSDL_1.2$secondaryArchSuffix
lib:libSDL_image_1.2$secondaryArchSuffix
lib:libSDL_mixer_1.2$secondaryArchSuffix
"
BUILD_REQUIRES="
devel:libglu$secondaryArchSuffix
devel:libsdl$secondaryArchSuffix
devel:libsdl_image$secondaryArchSuffix
devel:libsdl_mixer$secondaryArchSuffix
# devel:libsdl_sound$secondaryArchSuffix
# devel:libsdl_ttf$secondaryArchSuffix
haiku${secondaryArchSuffix}_devel
devel:libGL$secondaryArchSuffix
devel:libGLU$secondaryArchSuffix
devel:libSDL$secondaryArchSuffix
devel:libSDL_image$secondaryArchSuffix
devel:libSDL_mixer$secondaryArchSuffix
"
BUILD_PREREQUIRES="
haiku${secondaryArchSuffix}_devel
haiku_devel
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make

43
games-arcade/goonies/patches/goonies-1.4.1528.patchset
View File

@@ -1,4 +1,4 @@
From 1308538911e063913c3ec91962ff89cd80a732af Mon Sep 17 00:00:00 2001
From b9ed3dabcb67c1d212029721e5c017f3da493379 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Tue, 28 Jan 2014 22:43:44 +0100
Subject: Use the right compiler.
@@ -18,10 +18,10 @@ index df4bb3d..3ccca0c 100644
LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
RM = rm -f
--
2.7.0
2.21.0
From 724f286a201653c8594a9af2e9496c0d4456ceff Mon Sep 17 00:00:00 2001
From 14feef24fb6f2a79d3664441421681646df2adb4 Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Sat, 23 Jan 2016 13:22:49 +0300
Subject: main directory fix
@@ -50,5 +50,40 @@ index fb8fa0a..9e8a7c0 100644
srand(time(0));
--
2.7.0
2.21.0
From 1c49ac54587c4e3faf4096b1d59e348d8e869bce Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Fri, 19 Jul 2019 13:48:16 +0200
Subject: Fix build
diff --git a/src/auxiliar.cpp b/src/auxiliar.cpp
index ceab4de..c40d409 100644
--- a/src/auxiliar.cpp
+++ b/src/auxiliar.cpp
@@ -16,6 +16,11 @@
#include "math.h"
#include "string.h"
+#ifdef __HAIKU__
+typedef int boolean;
+#define HAVE_BOOLEAN
+#endif
+
#include "SDL.h"
#include "SDL_image.h"
@@ -94,7 +99,7 @@ SDL_Surface *load_maskedimage(char *imagefile, char *maskfile, char *path)
if (tmp == 0 ||
mask == 0)
- return false;
+ return (boolean)false;
res = SDL_DisplayFormatAlpha(tmp);
--
2.21.0