mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 03:30:05 +02:00
ja2_stracciatella, build fix, force boost169 for build (#8604)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -8,18 +8,16 @@ JA2-Stracciatella."
|
||||
HOMEPAGE="https://ja2-stracciatella.github.io/"
|
||||
COPYRIGHT="2004 Strategy First Inc."
|
||||
LICENSE="SFI-SCLA"
|
||||
REVISION="2"
|
||||
REVISION="3"
|
||||
SOURCE_URI="https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="750c56b7011479dc89ce1f57f3da551d856a75eb87b545bc655dcbb87c42ba43"
|
||||
SOURCE_DIR="ja2-stracciatella-$portVersion"
|
||||
PATCHES="ja2_stracciatella-$portVersion.patchset"
|
||||
ADDITIONAL_FILES="
|
||||
ja2_stracciatella.rdef.in
|
||||
ja2_stracciatella.sh
|
||||
"
|
||||
ADDITIONAL_FILES="ja2_stracciatella.rdef.in
|
||||
ja2_stracciatella.sh"
|
||||
|
||||
ARCHITECTURES="all !x86_gcc2 ?x86"
|
||||
SECONDARY_ARCHITECTURES="?x86"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
PROVIDES="
|
||||
ja2_stracciatella$secondaryArchSuffix = $portVersion
|
||||
@@ -35,9 +33,9 @@ REQUIRES="
|
||||
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libboost_filesystem$secondaryArchSuffix >= 1.70.0
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.70.0
|
||||
devel:libgl$secondaryArchSuffix
|
||||
devel:libboost_filesystem$secondaryArchSuffix >= 1.69.0
|
||||
devel:libboost_system$secondaryArchSuffix >= 1.69.0
|
||||
devel:libGL$secondaryArchSuffix
|
||||
devel:libSDL2_2.0$secondaryArchSuffix
|
||||
devel:libz$secondaryArchSuffix
|
||||
"
|
||||
@@ -46,8 +44,8 @@ BUILD_PREREQUIRES="
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
cmd:ld$secondaryArchSuffix
|
||||
cmd:make
|
||||
cmd:python2
|
||||
cmd:rustc
|
||||
cmd:python3
|
||||
cmd:rustc$secondaryArchSuffix
|
||||
cmd:sed
|
||||
cmd:wget
|
||||
"
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
From 5893be972ebe1896ae3d5ab9c8882e050b7028e7 Mon Sep 17 00:00:00 2001
|
||||
From 266bb25d6e0ef56a8cad4e27bda06046813ef9f8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Wed, 7 Jun 2017 07:54:07 +0200
|
||||
Subject: [PATCH] PATCH: LC_ALL not defined on Haiku
|
||||
Subject: PATCH: LC_ALL not defined on Haiku
|
||||
|
||||
|
||||
diff --git a/src/sgp/SGP.cc b/src/sgp/SGP.cc
|
||||
@@ -22,13 +22,13 @@ index 033105e..4ce6808 100644
|
||||
|
||||
#if defined BROKEN_SWPRINTF
|
||||
--
|
||||
2.16.4
|
||||
2.37.3
|
||||
|
||||
|
||||
From d612275101c558e8380c57e2029fac9b835f7e47 Mon Sep 17 00:00:00 2001
|
||||
From 523f093a27b4ae15826a6c876e9b3d2a38ff4666 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Wed, 7 Jun 2017 07:57:36 +0200
|
||||
Subject: [PATCH] PATCH: dirent dirty fix
|
||||
Subject: PATCH: dirent dirty fix
|
||||
|
||||
|
||||
diff --git a/src/sgp/FileMan.cc b/src/sgp/FileMan.cc
|
||||
@@ -53,13 +53,13 @@ index a304a98..b6672fe 100644
|
||||
// SLOGI(DEBUG_TAG_FILEMAN,"Looking for %s/[ %s ] : %s", directory, name, result ? "success" : "failure");
|
||||
return result;
|
||||
--
|
||||
2.16.4
|
||||
2.37.3
|
||||
|
||||
|
||||
From 2c6099a9cbea2d6341565bf220e62c5028939a7e Mon Sep 17 00:00:00 2001
|
||||
From 3489ce612eba70341aedaa0f666ea6c360f9853c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Wed, 7 Jun 2017 17:57:57 +0200
|
||||
Subject: [PATCH] Patch: Haiku config file location
|
||||
Subject: Patch: Haiku config file location
|
||||
|
||||
|
||||
diff --git a/rust/src/stracciatella.rs b/rust/src/stracciatella.rs
|
||||
@@ -76,6 +76,144 @@ index 582600e..6e7915e 100644
|
||||
},
|
||||
None => Err(String::from("Could not find home directory")),
|
||||
--
|
||||
2.16.4
|
||||
2.37.3
|
||||
|
||||
|
||||
From ff4e1bdef8b6c06b9794205df074e5bdc569abbf Mon Sep 17 00:00:00 2001
|
||||
From: Begasus <begasus@gmail.com>
|
||||
Date: Sat, 6 May 2023 21:03:06 +0200
|
||||
Subject: fix path for SDL2 headers
|
||||
|
||||
|
||||
diff --git a/src/game/Utils/Timer_Control.cc b/src/game/Utils/Timer_Control.cc
|
||||
index 85a6df5..89bc2b5 100644
|
||||
--- a/src/game/Utils/Timer_Control.cc
|
||||
+++ b/src/game/Utils/Timer_Control.cc
|
||||
@@ -1,4 +1,4 @@
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "Debug.h"
|
||||
diff --git a/src/sgp/FileMan.cc b/src/sgp/FileMan.cc
|
||||
index b6672fe..f72da4b 100644
|
||||
--- a/src/sgp/FileMan.cc
|
||||
+++ b/src/sgp/FileMan.cc
|
||||
@@ -29,7 +29,7 @@
|
||||
|
||||
#if CASE_SENSITIVE_FS
|
||||
#include <dirent.h>
|
||||
-#include <SDL_rwops.h>
|
||||
+#include <SDL2/SDL_rwops.h>
|
||||
|
||||
#endif
|
||||
|
||||
diff --git a/src/sgp/Input.h b/src/sgp/Input.h
|
||||
index 4f64d65..d496a23 100644
|
||||
--- a/src/sgp/Input.h
|
||||
+++ b/src/sgp/Input.h
|
||||
@@ -2,8 +2,8 @@
|
||||
#define __INPUT_
|
||||
|
||||
#include "Types.h"
|
||||
-#include "SDL_events.h"
|
||||
-#include "SDL_keyboard.h"
|
||||
+#include "SDL2/SDL_events.h"
|
||||
+#include "SDL2/SDL_keyboard.h"
|
||||
|
||||
#define KEY_DOWN 0x0001
|
||||
#define KEY_UP 0x0002
|
||||
diff --git a/src/sgp/SGP.cc b/src/sgp/SGP.cc
|
||||
index 4ce6808..fb4c49e 100644
|
||||
--- a/src/sgp/SGP.cc
|
||||
+++ b/src/sgp/SGP.cc
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "VObject.h"
|
||||
#include "Video.h"
|
||||
#include "VSurface.h"
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
#include "UILayout.h"
|
||||
#include "GameRes.h"
|
||||
#include "GameState.h"
|
||||
diff --git a/src/sgp/Smack_Stub.h b/src/sgp/Smack_Stub.h
|
||||
index 6c1ae56..40dacfe 100644
|
||||
--- a/src/sgp/Smack_Stub.h
|
||||
+++ b/src/sgp/Smack_Stub.h
|
||||
@@ -2,7 +2,7 @@
|
||||
#define SMACK_STUB_H
|
||||
|
||||
#include "Types.h"
|
||||
-#include "SDL.h"
|
||||
+#include "SDL2/SDL.h"
|
||||
extern "C" {
|
||||
#include "smacker.h"
|
||||
}
|
||||
diff --git a/src/sgp/SoundMan.cc b/src/sgp/SoundMan.cc
|
||||
index 4d6c0cf..b89f221 100644
|
||||
--- a/src/sgp/SoundMan.cc
|
||||
+++ b/src/sgp/SoundMan.cc
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "Random.h"
|
||||
#include "SoundMan.h"
|
||||
#include "Timer.h"
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
#include <assert.h>
|
||||
#include <stdexcept>
|
||||
|
||||
diff --git a/src/sgp/Timer.h b/src/sgp/Timer.h
|
||||
index 50a4050..35249a3 100644
|
||||
--- a/src/sgp/Timer.h
|
||||
+++ b/src/sgp/Timer.h
|
||||
@@ -2,7 +2,7 @@
|
||||
#define TIMER_H
|
||||
|
||||
#include "Types.h"
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
|
||||
static inline UINT32 GetClock(void)
|
||||
{
|
||||
diff --git a/src/sgp/Types.h b/src/sgp/Types.h
|
||||
index 8ed9bcd..f2790fd 100644
|
||||
--- a/src/sgp/Types.h
|
||||
+++ b/src/sgp/Types.h
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdint.h>
|
||||
-#include <SDL_video.h>
|
||||
+#include <SDL2/SDL_video.h>
|
||||
|
||||
#include "Platform.h"
|
||||
#include "SGPStrings.h"
|
||||
diff --git a/src/sgp/VSurface.h b/src/sgp/VSurface.h
|
||||
index 21f41aa..ed350aa 100644
|
||||
--- a/src/sgp/VSurface.h
|
||||
+++ b/src/sgp/VSurface.h
|
||||
@@ -5,7 +5,7 @@
|
||||
#include "AutoPtr.h"
|
||||
#include "Buffer.h"
|
||||
#include "Types.h"
|
||||
-#include <SDL.h>
|
||||
+#include <SDL2/SDL.h>
|
||||
|
||||
|
||||
#define BACKBUFFER g_back_buffer
|
||||
diff --git a/src/sgp/Video.h b/src/sgp/Video.h
|
||||
index 2158ef3..da5eef6 100644
|
||||
--- a/src/sgp/Video.h
|
||||
+++ b/src/sgp/Video.h
|
||||
@@ -1,7 +1,7 @@
|
||||
#ifndef VIDEO_H
|
||||
#define VIDEO_H
|
||||
|
||||
-#include <SDL_video.h>
|
||||
+#include <SDL2/SDL_video.h>
|
||||
#include "Types.h"
|
||||
|
||||
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
||||
Reference in New Issue
Block a user