ja2_stracciatella: Fix build, use Boost 1.70 (#7906)

This commit is contained in:
robxnano
2023-03-06 10:45:24 +00:00
committed by GitHub
parent b0bf3a8296
commit d4172bf53b
2 changed files with 32 additions and 4 deletions

View File

@@ -1,14 +1,14 @@
SUMMARY="A port of Jagged Alliance 2 to SDL"
DESCRIPTION="The goal of the project is to make Jagged Alliance 2 available on \
a wide range of platforms, improve its stability, fix bugs and provide a \
stable platform for mod development. Moddability is still in the early stages.
stable platform for mod development. Moddability is still in the early stages.
Data files from the original game are still required and will be used by \
JA2-Stracciatella."
HOMEPAGE="https://ja2-stracciatella.github.io/"
COPYRIGHT="2004 Strategy First Inc."
LICENSE="SFI-SCLA"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/ja2-stracciatella/ja2-stracciatella/archive/v$portVersion.tar.gz"
CHECKSUM_SHA256="750c56b7011479dc89ce1f57f3da551d856a75eb87b545bc655dcbb87c42ba43"
SOURCE_DIR="ja2-stracciatella-$portVersion"
@@ -27,8 +27,8 @@ PROVIDES="
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix
lib:libboost_system$secondaryArchSuffix
lib:libboost_filesystem$secondaryArchSuffix >= 1.70.0
lib:libboost_system$secondaryArchSuffix >= 1.70.0
lib:libSDL2_2.0$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
@@ -62,6 +62,8 @@ BUILD()
-DSDL2_INCLUDE_DIR="$portPackageLinksDir/devel~libsdl2_2.0/$relativeIncludeDir/SDL2" \
-DLOCAL_GTEST_LIB=OFF \
-DWITH_UNITTESTS=OFF \
-DBUILD_SHARED_LIBS=ON \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX="$appsDir/JA2"
make $jobArgs

View File

@@ -78,3 +78,29 @@ index 582600e..6e7915e 100644
--
2.16.4
From c612d890cc4e448f95b5a085b7ed0dc01d76a2b0 Mon Sep 17 00:00:00 2001
From: robxnano <89391914+robxnano@users.noreply.github.com>
Date: Fri, 3 Mar 2023 21:34:43 +0000
Subject: [PATCH] Remove broken and unneeded find_package checks
---
rust/CMakeLists.txt | 3 ---
1 file changed, 3 deletions(-)
diff --git a/rust/CMakeLists.txt b/rust/CMakeLists.txt
index f74b3c7..95294d7 100644
--- a/rust/CMakeLists.txt
+++ b/rust/CMakeLists.txt
@@ -1,8 +1,5 @@
cmake_minimum_required(VERSION 3.1)
-find_package(Cargo 0.9.0 REQUIRED)
-find_package(Rustc 1.15.0 REQUIRED)
-
set(LIBSTRACCIATELLA_BUILD_SWITCHES "")
set(LIBSTRACCIATELLA_BUILD_TYPE "debug")
set(LIBSTRACCIATELLA_BUILD_DIR "${CMAKE_BINARY_DIR}/rust")
--
2.37.3