From c5da5501e4e5a8432fca026b9646ca47fb2824ad Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 7 Jul 2023 08:31:02 +0200
Subject: [PATCH] widelands, fix references for lib:libsdl*, build fixes
 (#9000)

---
 games-strategy/widelands/widelands-1.0.recipe | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/games-strategy/widelands/widelands-1.0.recipe b/games-strategy/widelands/widelands-1.0.recipe
index 35977a231..8baf9b12a 100644
--- a/games-strategy/widelands/widelands-1.0.recipe
+++ b/games-strategy/widelands/widelands-1.0.recipe
@@ -7,7 +7,7 @@ through playable tutorials."
 HOMEPAGE="https://www.widelands.org/"
 COPYRIGHT="2009-2021 By the Widelands Development Team"
 LICENSE="GNU GPL v2"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/widelands/widelands/archive/refs/tags/v$portVersion.tar.gz"
 CHECKSUM_SHA256="1dab0c4062873cc72c5e0558f9e9620b0ef185f1a78923a77c4ce5b9ed76031a"
 SOURCE_DIR="widelands-$portVersion"
@@ -36,7 +36,7 @@ REQUIRES="
 	lib:libpng16$secondaryArchSuffix
 	lib:libSDL2_2.0$secondaryArchSuffix
 	lib:libSDL2_image_2.0$secondaryArchSuffix
-	lib:libSDL2_ttf$secondaryArchSuffix
+	lib:libSDL2_ttf_2.0$secondaryArchSuffix
 	lib:libSDL2_mixer_2.0$secondaryArchSuffix
 	lib:libz$secondaryArchSuffix
 	"
@@ -45,17 +45,18 @@ BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libboost_system$secondaryArchSuffix >= 1.69.0
 	devel:libcurl$secondaryArchSuffix
-	devel:libgl$secondaryArchSuffix
+	devel:libGL$secondaryArchSuffix
 	devel:libglew$secondaryArchSuffix
 	devel:libGLU$secondaryArchSuffix
 	devel:libicuuc$secondaryArchSuffix >= 66
+	devel:libintl$secondaryArchSuffix
 	devel:libjpeg$secondaryArchSuffix
 	devel:libopenal$secondaryArchSuffix
 	devel:libpng16$secondaryArchSuffix
-	devel:libSDL2$secondaryArchSuffix
-	devel:libSDL2_image$secondaryArchSuffix
-	devel:libSDL2_ttf$secondaryArchSuffix
-	devel:libSDL2_mixer$secondaryArchSuffix
+	devel:libSDL2_2.0$secondaryArchSuffix
+	devel:libSDL2_image_2.0$secondaryArchSuffix
+	devel:libSDL2_ttf_2.0$secondaryArchSuffix
+	devel:libSDL2_mixer_2.0$secondaryArchSuffix
 	devel:libvorbis$secondaryArchSuffix
 	devel:libz$secondaryArchSuffix
 	"
@@ -70,10 +71,8 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	mkdir -p build
-	cd build
 	LDFLAGS="-lbsd -lnetwork -lintl" \
-		cmake .. \
+		cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \
 		-DCMAKE_INSTALL_PREFIX=$appsDir/WideLands \
 		-DWL_INSTALL_DATADIR=$appsDir/WideLands/data \
 		-DOPTION_BUILD_WEBSITE_TOOLS=OFF \
@@ -82,13 +81,12 @@ BUILD()
 		-DCMAKE_CXX_FLAGS="-D_BSD_SOURCE" \
 		-DCMAKE_C_FLAGS="-D_BSD_SOURCE" \
 		-DCMAKE_BUILD_TYPE=Release
-	make $jobArgs
+	make -C build $jobArgs
 }
 
 INSTALL()
 {
-	cd build
-	make install
+	make -C build install
 
 	mv $appsDir/WideLands/widelands $appsDir/WideLands/WideLands
 	rm -rf $appsDir/share