Attachment #260244 for bug #286653




PORTNAME=	flycast
DISTVERSIONPREFIX=	v
DISTVERSION=	2.5
PORTREVISION=	4
CATEGORIES=	emulators

MAINTAINER=	bsdcode@disroot.org

LICENSE=	GPLv2
LICENSE_FILE=	${WRKSRC}/LICENSE

BUILD_DEPENDS=	asio>0:net/asio
LIB_DEPENDS=	libchdr.so:devel/libchdr \
		libcurl.so:ftp/curl \
		libminiupnpc.so:net/miniupnpc \
		libzip.so:archivers/libzip \
		libzstd.so:archivers/zstd

USES=		cmake compiler:c++20-lang pkgconfig sdl
USE_GITHUB=	yes
GH_ACCOUNT=	flyinghead
USE_SDL=	sdl2

.include "${.CURDIR}/Makefile.tuples"

CMAKE_ON=	USE_HOST_LIBCHDR

OPTIONS_DEFINE=		DOCS LUA OPENMP VULKAN
OPTIONS_DEFAULT=	ALSA AO LUA OPENMP OSS VULKAN
OPTIONS_GROUP=		AUDIO

ALSA_CMAKE_BOOL=	USE_ALSA

AO_LIB_DEPENDS=		libao.so:audio/libao
AO_CMAKE_BOOL=		USE_LIBAO

LUA_USES=		lua:52+
LUA_CMAKE_BOOL=		USE_LUA

PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
PULSEAUDIO_CMAKE_BOOL=	USE_PULSEAUDIO

VULKAN_BUILD_DEPENDS=	glslang>0:graphics/glslang \
			vulkan-headers>0:graphics/vulkan-headers
VULKAN_CMAKE_BOOL=	USE_HOST_GLSLANG \
			USE_VULKAN

post-install-DOCS-on:
	${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-4 Link Here

(-)b/emulators/flycast/Makefile.tuples (-1 / +1 lines)
1	GH_TUPLE= \	1	GH_TUPLE= \
2	vinniefalco:LuaBridge:fab7b33b896a42dcc865ba5ecdbacd9f409137f8:LuaBridge/core/deps/luabridge \	2	vinniefalco:LuaBridge:5d21e35633a1f87ed08af115b07d3386096f792b:LuaBridge/core/deps/luabridge \
3	GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:6eb62e1515072827db992c2befd80b71b2d04329:VulkanMemoryAllocator/core/deps/VulkanMemoryAllocator \	3	GPUOpen-LibrariesAndSDKs:VulkanMemoryAllocator:6eb62e1515072827db992c2befd80b71b2d04329:VulkanMemoryAllocator/core/deps/VulkanMemoryAllocator \
4	RetroAchievements:rcheevos:563230b1c249774b4852c944dc7cdcb952c9e8e8:rcheevos/core/deps/rcheevos \	4	RetroAchievements:rcheevos:563230b1c249774b4852c944dc7cdcb952c9e8e8:rcheevos/core/deps/rcheevos \

Lines 1-8 Link Here

(-)b/emulators/flycast/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1731443633	1	TIMESTAMP = 1746622585
2	SHA256 (flyinghead-flycast-v2.4_GH0.tar.gz) = 44b2ff5d172f7be2be9db613ebd22635760cfc846ddb4c25e1da0d8fa79b1a1b	2	SHA256 (flyinghead-flycast-v2.5_GH0.tar.gz) = 019cae6c0eb196f8222c6640e36be5e3d6b551f1c7782e66c831dbcb43ef6d11
3	SIZE (flyinghead-flycast-v2.4_GH0.tar.gz) = 30398953	3	SIZE (flyinghead-flycast-v2.5_GH0.tar.gz) = 34653480
4	SHA256 (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f409137f8_GH0.tar.gz) = d393adc6bf1659faf2683f6ef2766ee7223650c8087ce53f8ab529e44c1c1575	4	SHA256 (vinniefalco-LuaBridge-5d21e35633a1f87ed08af115b07d3386096f792b_GH0.tar.gz) = 75af9f79e1f818990fca3a9173dcc32a55f4ebd088c931193be4c9b2d8336abc
5	SIZE (vinniefalco-LuaBridge-fab7b33b896a42dcc865ba5ecdbacd9f409137f8_GH0.tar.gz) = 543800	5	SIZE (vinniefalco-LuaBridge-5d21e35633a1f87ed08af115b07d3386096f792b_GH0.tar.gz) = 1197538
6	SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 9afe46ce02681799ca907fb79990ff276877dfb6324d48da21b215b92649368d	6	SHA256 (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 9afe46ce02681799ca907fb79990ff276877dfb6324d48da21b215b92649368d
7	SIZE (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 877925	7	SIZE (GPUOpen-LibrariesAndSDKs-VulkanMemoryAllocator-6eb62e1515072827db992c2befd80b71b2d04329_GH0.tar.gz) = 877925
8	SHA256 (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8_GH0.tar.gz) = fab0809e60d8ed64a4a2bef2964315e9f4b6e770db4c963630441352d1dd21d1	8	SHA256 (RetroAchievements-rcheevos-563230b1c249774b4852c944dc7cdcb952c9e8e8_GH0.tar.gz) = fab0809e60d8ed64a4a2bef2964315e9f4b6e770db4c963630441352d1dd21d1




--- CMakeLists.txt.orig	2025-05-07 13:21:40 UTC
+++ CMakeLists.txt
@@ -1421,8 +1421,7 @@ if(USE_VULKAN)
 	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV)
 endif()
 
+if(USE_OSS)
+	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OSS)
+endif()
+
 if(NOT LIBRETRO)
 	find_package(ALSA)
-	if(ALSA_FOUND AND NOT ANDROID)
+	if(USE_ALSA AND ALSA_FOUND AND NOT ANDROID)
 		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()
 
-add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
-target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
-target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
+pkg_check_modules(libchdr REQUIRED libchdr)
+target_link_libraries(${PROJECT_NAME} PRIVATE ${libchdr_LINK_LIBRARIES})
 
 if(NOT WITH_SYSTEM_ZLIB)
 	set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.3.1")
@@ -490,7 +493,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND 
 find_package(PkgConfig)
 if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
 	pkg_check_modules(AO IMPORTED_TARGET ao)
-	if(AO_FOUND)
+	if(USE_AO AND AO_FOUND)
 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
 		target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::AO)
 	endif()
@@ -510,7 +513,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND 
 	endif()
 
 	pkg_check_modules(LIBPULSE IMPORTED_TARGET libpulse)
-	if(LIBPULSE_FOUND)
+	if(USE_PULSEAUDIO AND LIBPULSE_FOUND)
 		target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
 		target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
 	endif()
@@ -1338,8 +1341,7 @@ if(USE_VULKAN)
 		target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_METAL_EXT)
 	endif()
 




--- core/rend/vulkan/vulkan_context.cpp.orig	2025-05-07 13:47:18 UTC
+++ core/rend/vulkan/vulkan_context.cpp
@@ -42,6 +42,7 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
 #endif
 
 #include <memory>
+#include <set>
 #include <vulkan/vulkan_format_traits.hpp>
 
 void ReInitOSD();
@@ -147,7 +148,7 @@ bool VulkanContext::InitInstance(const char** extensio
@@ -146,7 +147,7 @@ bool VulkanContext::InitInstance(const char** extensio
 #if defined(__ANDROID__) && HOST_CPU == CPU_ARM64
 		vkGetInstanceProcAddr = loadVulkanDriver();
 #else
- 

Return to bug 286653

Lines 1-7 Link Here

(-)b/emulators/flycast/Makefile (-6 / +9 lines)
1	PORTNAME= flycast	1	PORTNAME= flycast
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 2.4	3	DISTVERSION= 2.5
4	PORTREVISION= 4
5	CATEGORIES= emulators	4	CATEGORIES= emulators
6		5
7	MAINTAINER= bsdcode@disroot.org	6	MAINTAINER= bsdcode@disroot.org
Lines 11-29 WWW= https://github.com/flyinghead/flycast Link Here
11	LICENSE= GPLv2	10	LICENSE= GPLv2
12	LICENSE_FILE= ${WRKSRC}/LICENSE	11	LICENSE_FILE= ${WRKSRC}/LICENSE
13		12
		13	BUILD_DEPENDS= asio>0:net/asio
14	LIB_DEPENDS= libchdr.so:devel/libchdr \	14	LIB_DEPENDS= libchdr.so:devel/libchdr \
15	libcurl.so:ftp/curl \	15	libcurl.so:ftp/curl \
16	libminiupnpc.so:net/miniupnpc \	16	libminiupnpc.so:net/miniupnpc \
17	libzip.so:archivers/libzip \	17	libzip.so:archivers/libzip \
18	libzstd.so:archivers/zstd	18	libzstd.so:archivers/zstd
19		19
20	USES= cmake compiler:c++17-lang pkgconfig sdl	20	USES= cmake compiler:c++20-lang pkgconfig sdl
21	USE_GITHUB= yes	21	USE_GITHUB= yes
22	GH_ACCOUNT= flyinghead	22	GH_ACCOUNT= flyinghead
23	USE_SDL= sdl2	23	USE_SDL= sdl2
24		24
25	.include "${.CURDIR}/Makefile.tuples"	25	.include "${.CURDIR}/Makefile.tuples"
26		26
		27	CMAKE_ON= USE_HOST_LIBCHDR
		28
27	OPTIONS_DEFINE= DOCS LUA OPENMP VULKAN	29	OPTIONS_DEFINE= DOCS LUA OPENMP VULKAN
28	OPTIONS_DEFAULT= ALSA AO LUA OPENMP OSS VULKAN	30	OPTIONS_DEFAULT= ALSA AO LUA OPENMP OSS VULKAN
29	OPTIONS_GROUP= AUDIO	31	OPTIONS_GROUP= AUDIO
Lines 39-45 ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib Link Here
39	ALSA_CMAKE_BOOL= USE_ALSA	41	ALSA_CMAKE_BOOL= USE_ALSA
40		42
41	AO_LIB_DEPENDS= libao.so:audio/libao	43	AO_LIB_DEPENDS= libao.so:audio/libao
42	AO_CMAKE_BOOL= USE_AO	44	AO_CMAKE_BOOL= USE_LIBAO
43		45
44	LUA_USES= lua:52+	46	LUA_USES= lua:52+
45	LUA_CMAKE_BOOL= USE_LUA	47	LUA_CMAKE_BOOL= USE_LUA
Lines 51-59 OSS_CMAKE_BOOL= USE_OSS Link Here
51	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio	53	PULSEAUDIO_LIB_DEPENDS= libpulse.so:audio/pulseaudio
52	PULSEAUDIO_CMAKE_BOOL= USE_PULSEAUDIO	54	PULSEAUDIO_CMAKE_BOOL= USE_PULSEAUDIO
53		55
54	VULKAN_BUILD_DEPENDS= glslang:graphics/glslang \	56	VULKAN_BUILD_DEPENDS= glslang>0:graphics/glslang \
55	vulkan-headers>0:graphics/vulkan-headers	57	vulkan-headers>0:graphics/vulkan-headers
56	VULKAN_CMAKE_BOOL= USE_HOST_GLSLANG USE_VULKAN	58	VULKAN_CMAKE_BOOL= USE_HOST_GLSLANG \
		59	USE_VULKAN
57		60
58	post-install-DOCS-on:	61	post-install-DOCS-on:
59	${MKDIR} ${STAGEDIR}${DOCSDIR}	62	${MKDIR} ${STAGEDIR}${DOCSDIR}

Lines 1-60 Link Here

(-)b/emulators/flycast/files/patch-CMakeLists.txt (-56 / +2 lines)
1	--- CMakeLists.txt.orig 2024-10-21 14:13:00 UTC	1	--- CMakeLists.txt.orig 2025-05-07 13:21:40 UTC
2	+++ CMakeLists.txt	2	+++ CMakeLists.txt
3	@@ -410,9 +410,13 @@ endif()	3	@@ -1421,8 +1421,7 @@ if(USE_VULKAN)
4	target_link_libraries(${PROJECT_NAME} PRIVATE glslang::glslang-default-resource-limits glslang::SPIRV)
5	endif()
6
7	+if(USE_OSS)
8	+ target_compile_definitions(${PROJECT_NAME} PRIVATE USE_OSS)
9	+endif()
10	+
11	if(NOT LIBRETRO)
12	find_package(ALSA)
13	- if(ALSA_FOUND AND NOT ANDROID)
14	+ if(USE_ALSA AND ALSA_FOUND AND NOT ANDROID)
15	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_ALSA)
16	target_include_directories(${PROJECT_NAME} PRIVATE ${ALSA_INCLUDE_DIRS})
17	target_link_libraries(${PROJECT_NAME} PRIVATE ${ALSA_LIBRARIES})
18	@@ -463,7 +467,7 @@ if(NOT LIBRETRO)
19	endif()
20
21	find_package(Lua 5.2)
22	- if(NOT APPLE AND LUA_FOUND)
23	+ if(USE_LUA AND NOT APPLE AND LUA_FOUND)
24	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LUA)
25	target_include_directories(${PROJECT_NAME} PRIVATE ${LUA_INCLUDE_DIR} core/deps/luabridge/Source)
26	list(TRANSFORM LUA_LIBRARIES REPLACE "\.dll" "")
27	@@ -471,9 +475,8 @@ endif()
28	endif()
29	endif()
30
31	-add_subdirectory(core/deps/libchdr EXCLUDE_FROM_ALL)
32	-target_link_libraries(${PROJECT_NAME} PRIVATE chdr-static)
33	-target_include_directories(${PROJECT_NAME} PRIVATE core/deps/libchdr/include)
34	+pkg_check_modules(libchdr REQUIRED libchdr)
35	+target_link_libraries(${PROJECT_NAME} PRIVATE ${libchdr_LINK_LIBRARIES})
36
37	if(NOT WITH_SYSTEM_ZLIB)
38	set(ZLIB_RELATIVE_PATH "core/deps/libchdr/deps/zlib-1.3.1")
39	@@ -490,7 +493,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND
40	find_package(PkgConfig)
41	if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND NOT LIBRETRO)
42	pkg_check_modules(AO IMPORTED_TARGET ao)
43	- if(AO_FOUND)
44	+ if(USE_AO AND AO_FOUND)
45	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_LIBAO)
46	target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::AO)
47	endif()
48	@@ -510,7 +513,7 @@ if(PKG_CONFIG_FOUND AND NOT ANDROID AND NOT APPLE AND
49	endif()
50
51	pkg_check_modules(LIBPULSE IMPORTED_TARGET libpulse)
52	- if(LIBPULSE_FOUND)
53	+ if(USE_PULSEAUDIO AND LIBPULSE_FOUND)
54	target_compile_definitions(${PROJECT_NAME} PRIVATE USE_PULSEAUDIO)
55	target_link_libraries(${PROJECT_NAME} PRIVATE PkgConfig::LIBPULSE)
56	endif()
57	@@ -1338,8 +1341,7 @@ if(USE_VULKAN)
58	target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_METAL_EXT)	4	target_compile_definitions(${PROJECT_NAME} PUBLIC VK_USE_PLATFORM_METAL_EXT)
59	endif()	5	endif()
60		6

Lines 1-14 Link Here

(-)b/emulators/flycast/files/patch-core_rend_vulkan_vulkan__context.cpp (-4 / +3 lines)
1	--- core/rend/vulkan/vulkan_context.cpp.orig 2024-10-21 14:13:00 UTC	1	--- core/rend/vulkan/vulkan_context.cpp.orig 2025-05-07 13:47:18 UTC
2	+++ core/rend/vulkan/vulkan_context.cpp	2	+++ core/rend/vulkan/vulkan_context.cpp
3	@@ -42,6 +42,7 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE	3	@@ -42,6 +42,7 @@ VULKAN_HPP_DEFAULT_DISPATCH_LOADER_DYNAMIC_STORAGE
4	#endif	4	#endif
5		5
6	#include <memory>	6	#include <memory>
7	+#include <set>	7	+#include <set>
		8	#include <vulkan/vulkan_format_traits.hpp>
8		9
9	void ReInitOSD();	10	void ReInitOSD();
10		11	@@ -147,7 +148,7 @@ bool VulkanContext::InitInstance(const char** extensio
11	@@ -146,7 +147,7 @@ bool VulkanContext::InitInstance(const char** extensio
12	#if defined(__ANDROID__) && HOST_CPU == CPU_ARM64	12	#if defined(__ANDROID__) && HOST_CPU == CPU_ARM64
13	vkGetInstanceProcAddr = loadVulkanDriver();	13	vkGetInstanceProcAddr = loadVulkanDriver();
14	#else	14	#else
15	-