From nobody Mon Nov 25 10:23:29 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xxhcf2cS7z5fcYh; Mon, 25 Nov 2024 10:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xxhcf122bz4hlT; Mon, 25 Nov 2024 10:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732530210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifEQRNbry1DZR95MeL5vzRDWR4/ZkMaipdcu6NKQWuo=; b=nx9zD/Zaz9AwJ1aDvaAoTqWxhvb6WExQwlagrCt3rr60eLMrwynz+2NDIX3nLiZvtBG22A GwoDWk5ErXKHhAiEgcmzf8FsHc32OuK4ywPuATq0BPtlDA9HFTgFQM24lRDScepjWHTiIO +eSUGUrtMmh0SgYxgnHxBywb2FObkkayNxQvqF+HVvflcMJdNV+Sk4yEHBwSqBDXTVCWNK 3SLiURRgiDbNH5lusM4WOwe4wbx17lJjxZmu3gA2PuMQ/Cecde/G46MRKZmuvEqFwekuZN ZpJW+di2umM+PPoMEgY83bMprBikhC7iMtC2S25qqNCGo8/cxUKp6KW19s/Gcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732530210; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ifEQRNbry1DZR95MeL5vzRDWR4/ZkMaipdcu6NKQWuo=; b=kztm6hOZlHQ8zJPz04XOIlidgKRdakBz3TYDVi2WWRYn0kDv5tyHVN7toJ9rRyUAFEbccf 33pMWh9Z2KLp6uMpPwqClYIAKl8eqs8MKaWgt0BSG6mqlry6gJu9u0R6oTa8vEjHu8IOag rURqjq3l6i/xT7twa1JYnJYY35rytjMAlT2CIfeiih2bc78A/NUmFhuoMVi74zoVYnPS2q PFcAW10A7p2RzLaDT7sYe/3Ig/lzCDx3KkYUy98ERx044JdMC0epqazVSGkN9urDK9niz2 N4tToMWPHR5eaSF85s5pGmLwCz8rWjzlXHzzMWNFG+ISqXtd+QS1xS5cvRnHJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732530210; a=rsa-sha256; cv=none; b=EI5VytzfjyxzZyu52Dist5C4byc8VDJo6Fxznzcp5MO1sLa9o6ccX5CajYRLKaLKXQ8fcb 1sU5YpY5hsw0SsXTeCUAhTGwZK/qebduZLv+gf4+sDVp5awAnUNbDOB+sEXdp+rn0bArOm LPck7BnPtEnE18zVySi/GOa/x6tv9P5WXdsqlFyGZ5frpf1tBIaY7vD46PSMOV5a0UsLmi 8XfpcuOnzhP22G/ifRiGBcX/L34S3833zWAKbm2rME8KlGr/gHaNE+U2Vc5OqScwBHSopJ t2+/flo9+l24diT7V63M0CiG70m8ZeDCTRaXnGRfoDddJWj4u20mRzpEtIUGOA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xxhcf0FrLzcL7; Mon, 25 Nov 2024 10:23:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4APANT3L012790; Mon, 25 Nov 2024 10:23:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4APANTGp012787; Mon, 25 Nov 2024 10:23:29 GMT (envelope-from git) Date: Mon, 25 Nov 2024 10:23:29 GMT Message-Id: <202411251023.4APANTGp012787@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: b104ca128231 - main - emulators/flycast: unbreak i386 build List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b104ca128231e3405a13ccc46c6dc453ca9cbe2f Auto-Submitted: auto-generated The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=b104ca128231e3405a13ccc46c6dc453ca9cbe2f commit b104ca128231e3405a13ccc46c6dc453ca9cbe2f Author: Stefan Schlosser AuthorDate: 2024-11-17 07:50:01 +0000 Commit: Robert Clausecker 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()