Wed Jun 24 13:28:27 2020 UTC ()
solarus: Make luajit optional. Should help aarch64 builds.

qt5-qttools is a build dependency, not a runtime dependency.


(nia)
diff -r1.46 -r1.47 pkgsrc/games/solarus/Makefile
diff -r0 -r1.1 pkgsrc/games/solarus/options.mk
cvs diff -r1.46 -r1.47 pkgsrc/games/solarus/Makefile (expand / switch to unified diff)

--- pkgsrc/games/solarus/Makefile 2020/06/02 08:23:56 1.46
+++ pkgsrc/games/solarus/Makefile 2020/06/24 13:28:26 1.47
@@ -1,40 +1,38 @@ @@ -1,40 +1,38 @@
1# $NetBSD: Makefile,v 1.46 2020/06/02 08:23:56 adam Exp $ 1# $NetBSD: Makefile,v 1.47 2020/06/24 13:28:26 nia Exp $
2 2
3VERSION= 1.5.1 3VERSION= 1.5.1
4DISTNAME= solarus-${VERSION}-src 4DISTNAME= solarus-${VERSION}-src
5PKGNAME= ${DISTNAME:S/-src//1} 5PKGNAME= ${DISTNAME:S/-src//1}
6PKGREVISION= 23 6PKGREVISION= 24
7CATEGORIES= games 7CATEGORIES= games
8MASTER_SITES= http://www.solarus-games.org/downloads/solarus/ 8MASTER_SITES= http://www.solarus-games.org/downloads/solarus/
9 9
10MAINTAINER= pkgsrc-users@NetBSD.org 10MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.solarus-games.org/solarus/ 11HOMEPAGE= http://www.solarus-games.org/solarus/
12COMMENT= Open-source Zelda-like 2D game engine licensed under GPL 12COMMENT= Open-source Zelda-like 2D game engine licensed under GPL
13LICENSE= gnu-gpl-v3 13LICENSE= gnu-gpl-v3
14 14
 15TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
 16
15WRKSRC= ${WRKDIR}/solarus-${VERSION} 17WRKSRC= ${WRKDIR}/solarus-${VERSION}
16USE_CMAKE= yes 18USE_CMAKE= yes
17USE_LANGUAGES= c c++ 19USE_LANGUAGES= c c++
18 20
19GCC_REQD+= 4.8 21GCC_REQD+= 4.8
20LDFLAGS.SunOS+= -lsocket -lnsl 22LDFLAGS.SunOS+= -lsocket -lnsl
21 23
22.include "../../x11/qt5-qttools/buildlink3.mk" 24.include "options.mk"
23.include "../../x11/qt5-qtbase/buildlink3.mk" 25.include "../../x11/qt5-qtbase/buildlink3.mk"
24.include "../../devel/physfs/buildlink3.mk" 26.include "../../devel/physfs/buildlink3.mk"
25.include "../../lang/LuaJIT2/buildlink3.mk" 
26LUA_VERSIONS_ACCEPTED= 51 
27BUILDLINK_API_DEPENDS.lua51+= lua51>=5.1.5 
28.include "../../lang/lua/buildlink3.mk" 
29.include "../../audio/libmodplug/buildlink3.mk" 27.include "../../audio/libmodplug/buildlink3.mk"
30.include "../../multimedia/libogg/buildlink3.mk" 28.include "../../multimedia/libogg/buildlink3.mk"
31.include "../../audio/libvorbis/buildlink3.mk" 29.include "../../audio/libvorbis/buildlink3.mk"
32.include "../../audio/openal-soft/buildlink3.mk" 30.include "../../audio/openal-soft/buildlink3.mk"
33BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12 31BUILDLINK_API_DEPENDS.SDL2_ttf+= SDL2_ttf>=2.0.12
34.include "../../fonts/SDL2_ttf/buildlink3.mk" 32.include "../../fonts/SDL2_ttf/buildlink3.mk"
35BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0 33BUILDLINK_API_DEPENDS.SDL2_image+= SDL2_image>=2.0.0
36.include "../../graphics/SDL2_image/buildlink3.mk" 34.include "../../graphics/SDL2_image/buildlink3.mk"
37BUILDLINK_API_DEPENDS.SDL2+= SDL2>=2.0.1 35BUILDLINK_API_DEPENDS.SDL2+= SDL2>=2.0.1
38.include "../../devel/SDL2/buildlink3.mk" 36.include "../../devel/SDL2/buildlink3.mk"
39.include "../../mk/pthread.buildlink3.mk" 37.include "../../mk/pthread.buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 38.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/games/solarus/options.mk
# $NetBSD: options.mk,v 1.1 2020/06/24 13:28:26 nia Exp $

PKG_OPTIONS_VAR=	PKG_OPTIONS.solarus
PKG_SUPPORTED_OPTIONS=	luajit

.include "../../lang/LuaJIT2/platform.mk"
.if !empty(PLATFORM_SUPPORTS_LUAJIT:M[Yy][Ee][Ss])
PKG_SUGGESTED_OPTIONS=	luajit
.endif

.include "../../mk/bsd.options.mk"

.if !empty(PKG_OPTIONS:Mluajit)
CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=ON
.  include "../../lang/LuaJIT2/buildlink3.mk"
.else
CMAKE_ARGS+=	-DSOLARUS_USE_LUAJIT=OFF
.  include "../../lang/lua51/buildlink3.mk"
.endif