Date: Mon, 25 Nov 2024 10:23:29 GMT From: Robert Clausecker <fuz@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: b104ca128231 - main - emulators/flycast: unbreak i386 build Message-ID: <202411251023.4APANTGp012787@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b104ca128231e3405a13ccc46c6dc453ca9cbe2f commit b104ca128231e3405a13ccc46c6dc453ca9cbe2f Author: Stefan Schlosser <bsdcode@disroot.org> AuthorDate: 2024-11-17 07:50:01 +0000 Commit: Robert Clausecker <fuz@FreeBSD.org> CommitDate: 2024-11-25 10:22:08 +0000 emulators/flycast: unbreak i386 build Building with lua support fails on i386. Make lua support configurable with port option LUA and exclude this option on i386. See also: https://github.com/vinniefalco/LuaBridge/issues/302 PR: 282809 --- emulators/flycast/Makefile | 13 ++++++++++--- emulators/flycast/files/patch-CMakeLists.txt | 9 +++++++++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/emulators/flycast/Makefile b/emulators/flycast/Makefile index f9285161e439..2c8eb537a503 100644 --- a/emulators/flycast/Makefile +++ b/emulators/flycast/Makefile @@ -17,18 +17,22 @@ LIB_DEPENDS= libchdr.so:devel/libchdr \ libzip.so:archivers/libzip \ libzstd.so:archivers/zstd -USES= cmake compiler:c++17-lang lua:52+ pkgconfig sdl +USES= cmake compiler:c++17-lang pkgconfig sdl USE_GITHUB= yes GH_ACCOUNT= flyinghead USE_SDL= sdl2 .include "${.CURDIR}/Makefile.tuples" -OPTIONS_DEFINE= DOCS OPENMP VULKAN -OPTIONS_DEFAULT= ALSA AO OPENMP OSS VULKAN +OPTIONS_DEFINE= DOCS LUA OPENMP VULKAN +OPTIONS_DEFAULT= ALSA AO LUA OPENMP OSS VULKAN OPTIONS_GROUP= AUDIO OPTIONS_GROUP_AUDIO= ALSA AO OSS PULSEAUDIO +# building with lua support fails on i386, see also +# https://github.com/vinniefalco/LuaBridge/issues/302 +OPTIONS_EXCLUDE_i386= LUA + VULKAN_DESC= Build with Vulkan support ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib @@ -37,6 +41,9 @@ ALSA_CMAKE_BOOL= USE_ALSA AO_LIB_DEPENDS= libao.so:audio/libao AO_CMAKE_BOOL= USE_AO +LUA_USES= lua:52+ +LUA_CMAKE_BOOL= USE_LUA + OPENMP_CMAKE_BOOL= USE_OPENMP OSS_CMAKE_BOOL= USE_OSS diff --git a/emulators/flycast/files/patch-CMakeLists.txt b/emulators/flycast/files/patch-CMakeLists.txt index 1c9626e3d7e4..8fdc9d16811a 100644 --- a/emulators/flycast/files/patch-CMakeLists.txt +++ b/emulators/flycast/files/patch-CMakeLists.txt @@ -15,6 +15,15 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE USE_ALSA) target_include_directories(${PROJECT_NAME} PRIVATE ${ALSA_INCLUDE_DIRS}) target_link_libraries(${PROJECT_NAME} PRIVATE ${ALSA_LIBRARIES}) +@@ -463,7 +467,7 @@ if(NOT LIBRETRO) + endif() + + find_package(Lua 5.2) +- if(NOT APPLE AND LUA_FOUND) ++ if(USE_LUA AND NOT APPLE AND LUA_FOUND) + target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA) + target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source) + list(TRANSFORM LUA_LIBRARIES REPLACE "\.dll" "") @@ -471,9 +475,8 @@ endif() endif() endif()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202411251023.4APANTGp012787>