From 42ffb7a5b11d69bb85a519ce333f4781eb83bdb6 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 29 Aug 2024 11:18:27 +0200 Subject: [PATCH] scummvm, revbump for openssl3 + build fix (#10980) Fixes build for timidity backend --- .../scummvm/patches/scummvm-2.8.1.patchset | 21 +++++++++++++++++++ games-engines/scummvm/scummvm-2.8.1.recipe | 7 ++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 games-engines/scummvm/patches/scummvm-2.8.1.patchset diff --git a/games-engines/scummvm/patches/scummvm-2.8.1.patchset b/games-engines/scummvm/patches/scummvm-2.8.1.patchset new file mode 100644 index 000000000..c8b42eb98 --- /dev/null +++ b/games-engines/scummvm/patches/scummvm-2.8.1.patchset @@ -0,0 +1,21 @@ +From d825c79377dc7fd133eed6fc33e9bc56d3041d82 Mon Sep 17 00:00:00 2001 +From: Schrijvers Luc +Date: Thu, 29 Aug 2024 10:55:49 +0200 +Subject: Haiku fix for _GNU_SOURCE + + +diff --git a/configure b/configure +index 480916a..cebcaea 100755 +--- a/configure ++++ b/configure +@@ -3231,6 +3231,7 @@ EOF + ;; + haiku*) + append_var DEFINES "-DSYSTEM_NOT_SUPPORTING_D_TYPE" ++ append_var DEFINES "-D_GNU_SOURCE" + # Needs -lnetwork for the timidity MIDI driver + append_var LIBS "-lnetwork" + _seq_midi=no +-- +2.45.2 + diff --git a/games-engines/scummvm/scummvm-2.8.1.recipe b/games-engines/scummvm/scummvm-2.8.1.recipe index b116323fc..17018006c 100644 --- a/games-engines/scummvm/scummvm-2.8.1.recipe +++ b/games-engines/scummvm/scummvm-2.8.1.recipe @@ -7,9 +7,10 @@ were never designed!" HOMEPAGE="https://www.scummvm.org/" COPYRIGHT="2001-2024 ScummVM Team" LICENSE="GNU GPL v3" -REVISION="1" +REVISION="2" SOURCE_URI="http://www.scummvm.org/frs/scummvm/$portVersion/scummvm-$portVersion.tar.gz" CHECKSUM_SHA256="4dff1f7a3ce87ea744914211a79e753dbae7e098250f1c6db70b0c773fd438c4" +PATCHES="scummvm-$portVersion.patchset" ADDITIONAL_FILES="scummvm.rdef.in" ARCHITECTURES="all !x86_gcc2" @@ -50,7 +51,7 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:liba52$secondaryArchSuffix devel:libbz2$secondaryArchSuffix - devel:libcrypto$secondaryArchSuffix + devel:libcrypto$secondaryArchSuffix >= 3 devel:libcurl$secondaryArchSuffix devel:libfaad$secondaryArchSuffix devel:libflac$secondaryArchSuffix @@ -67,7 +68,7 @@ BUILD_REQUIRES=" devel:libpng16$secondaryArchSuffix devel:libSDL2_2.0$secondaryArchSuffix devel:libSDL2_net_2.0$secondaryArchSuffix - devel:libssl$secondaryArchSuffix + devel:libssl$secondaryArchSuffix >= 3 devel:libtheora$secondaryArchSuffix devel:libvorbis$secondaryArchSuffix devel:libz$secondaryArchSuffix