From fbfa3a63d544c8e7df7b1bf40e2dc740f7302a63 Mon Sep 17 00:00:00 2001 From: Schrijvers Luc Date: Thu, 6 Jul 2023 18:08:44 +0200 Subject: [PATCH] xmoto, fix references for lib:libsdl*, build fixes (#8996) --- games-sports/xmoto/xmoto-0.6.1.recipe | 31 ++++++++++++--------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/games-sports/xmoto/xmoto-0.6.1.recipe b/games-sports/xmoto/xmoto-0.6.1.recipe index 02e14bbbe..78b0feedb 100644 --- a/games-sports/xmoto/xmoto-0.6.1.recipe +++ b/games-sports/xmoto/xmoto-0.6.1.recipe @@ -6,7 +6,7 @@ difficult of the challenges." HOMEPAGE="https://xmoto.tuxfamily.org" COPYRIGHT="2005-2021 Tuxfamily" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="https://github.com/xmoto/xmoto/archive/$portVersion/$portVersion.tar.gz" CHECKSUM_SHA256="209c8c38b1742d0620d40f90365c7a56f67c86da826c80a76d37fa46ee9c9b66" PATCHES="xmoto-$portVersion.patchset" @@ -23,8 +23,8 @@ REQUIRES=" haiku$secondaryArchSuffix lib:libbz2$secondaryArchSuffix lib:libcurl$secondaryArchSuffix - lib:libgl$secondaryArchSuffix - lib:libglu$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libGLU$secondaryArchSuffix lib:libintl$secondaryArchSuffix lib:libjpeg$secondaryArchSuffix lib:liblua$secondaryArchSuffix >= 5.3 @@ -32,7 +32,7 @@ REQUIRES=" lib:libSDL_1.2$secondaryArchSuffix lib:libSDL_mixer_1.2$secondaryArchSuffix lib:libSDL_net_1.2$secondaryArchSuffix - lib:libSDL_ttf$secondaryArchSuffix + lib:libSDL_ttf_2.0$secondaryArchSuffix lib:libsqlite3$secondaryArchSuffix lib:libxml2$secondaryArchSuffix lib:libz$secondaryArchSuffix @@ -42,16 +42,17 @@ BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel devel:libbz2$secondaryArchSuffix devel:libcurl$secondaryArchSuffix - devel:libgl$secondaryArchSuffix - devel:libglu$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libGLU$secondaryArchSuffix + devel:libintl$secondaryArchSuffix devel:libjpeg$secondaryArchSuffix devel:liblua$secondaryArchSuffix >= 5.3 devel:libpng16$secondaryArchSuffix - devel:libSDL$secondaryArchSuffix + devel:libSDL_1.2$secondaryArchSuffix devel:libSDL_gfx$secondaryArchSuffix - devel:libSDL_mixer$secondaryArchSuffix - devel:libSDL_net$secondaryArchSuffix - devel:libSDL_ttf$secondaryArchSuffix + devel:libSDL_mixer_1.2$secondaryArchSuffix + devel:libSDL_net_1.2$secondaryArchSuffix + devel:libSDL_ttf_2.0$secondaryArchSuffix devel:libsqlite3$secondaryArchSuffix devel:libxml2$secondaryArchSuffix devel:libz$secondaryArchSuffix @@ -66,23 +67,19 @@ BUILD_PREREQUIRES=" BUILD() { - mkdir -p build - cd build - - cmake .. \ + cmake -Bbuild -S. -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=$appsDir/XMoto \ -DCMAKE_CXX_FLAGS=-DdDOUBLE \ -DODE_DOUBLE_PRECISION=ON \ -DPREFER_SYSTEM_ODE=OFF \ -DPREFER_SYSTEM_XDG=OFF - make $jobArgs + make -C build $jobArgs } INSTALL() { - cd build - make install + make -C build install mv $appsDir/XMoto/share/locale $appsDir/XMoto mv $appsDir/XMoto/share/xmoto/* $appsDir/XMoto