Attachment 255229 Details for Bug 282809 – unbreak i386 build

[patch] unbreak i386 build

0001-emulators-flycast-unbreak-i386-build.patch (text/plain), 2.76 KB, created by Stefan Schlosser on 2024-11-17 08:16:42 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Schlosser

Created: 2024-11-17 08:16:42 UTC

Size: 2.76 KB

patch

obsolete

>From dc17515bdfdce53c2225e768b454da518592f3e2 Mon Sep 17 00:00:00 2001
>From: Stefan Schlosser <bsdcode@disroot.org>
>Date: Sun, 17 Nov 2024 08:50:01 +0100
>Subject: [PATCH] emulators/flycast: unbreak i386 build
>
>Building with lua support fails on i386, see also [1]. Make lua support
>configurable with port option LUA and exclude this option on i386.
>
>[1] https://github.com/vinniefalco/LuaBridge/issues/302
>---
> emulators/flycast/Makefile                   | 14 +++++++++++---
> emulators/flycast/files/patch-CMakeLists.txt |  9 +++++++++
> 2 files changed, 20 insertions(+), 3 deletions(-)
>
>diff --git a/emulators/flycast/Makefile b/emulators/flycast/Makefile
>index 2fd11cb548c7..2c8eb537a503 100644
>--- a/emulators/flycast/Makefile
>+++ b/emulators/flycast/Makefile
>@@ -1,6 +1,7 @@
> PORTNAME=	flycast
> DISTVERSIONPREFIX=	v
> DISTVERSION=	2.4
>+PORTREVISION=	1
> CATEGORIES=	emulators
> 
> MAINTAINER=	bsdcode@disroot.org
>@@ -16,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
>@@ -36,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()
>-- 
>2.47.0
>

Flags:

bsdcode: maintainer-approval+

Actions: View | Diff

Attachments on bug 282809: 255229