CVS commit: pkgsrc/games/solarus

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Wed Jun 24 13:28:27 UTC 2020

Modified Files:
        pkgsrc/games/solarus: Makefile
Added Files:
        pkgsrc/games/solarus: options.mk

Log Message:
solarus: Make luajit optional. Should help aarch64 builds.

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


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 pkgsrc/games/solarus/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/games/solarus/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/games/solarus/Makefile
diff -u pkgsrc/games/solarus/Makefile:1.46 pkgsrc/games/solarus/Makefile:1.47
--- pkgsrc/games/solarus/Makefile:1.46  Tue Jun  2 08:23:56 2020
+++ pkgsrc/games/solarus/Makefile       Wed Jun 24 13:28:26 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.46 2020/06/02 08:23:56 adam Exp $
+# $NetBSD: Makefile,v 1.47 2020/06/24 13:28:26 nia Exp $
 
 VERSION=       1.5.1
 DISTNAME=      solarus-${VERSION}-src
 PKGNAME=       ${DISTNAME:S/-src//1}
-PKGREVISION=   23
+PKGREVISION=   24
 CATEGORIES=    games
 MASTER_SITES=  http://www.solarus-games.org/downloads/solarus/
 
@@ -12,6 +12,8 @@ HOMEPAGE=     http://www.solarus-games.org/s
 COMMENT=       Open-source Zelda-like 2D game engine licensed under GPL
 LICENSE=       gnu-gpl-v3
 
+TOOL_DEPENDS+= qt5-qttools-[0-9]*:../../x11/qt5-qttools
+
 WRKSRC=                ${WRKDIR}/solarus-${VERSION}
 USE_CMAKE=     yes
 USE_LANGUAGES= c c++
@@ -19,13 +21,9 @@ USE_LANGUAGES=       c c++
 GCC_REQD+=     4.8
 LDFLAGS.SunOS+=        -lsocket -lnsl
 
-.include "../../x11/qt5-qttools/buildlink3.mk"
+.include "options.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"
 .include "../../devel/physfs/buildlink3.mk"
-.include "../../lang/LuaJIT2/buildlink3.mk"
-LUA_VERSIONS_ACCEPTED=         51
-BUILDLINK_API_DEPENDS.lua51+=  lua51>=5.1.5
-.include "../../lang/lua/buildlink3.mk"
 .include "../../audio/libmodplug/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"

Added files:

Index: pkgsrc/games/solarus/options.mk
diff -u /dev/null pkgsrc/games/solarus/options.mk:1.1
--- /dev/null   Wed Jun 24 13:28:27 2020
+++ pkgsrc/games/solarus/options.mk     Wed Jun 24 13:28:26 2020
@@ -0,0 +1,19 @@
+# $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