Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

(Haiku) Updated CMake configuration to make ES-DE build on Haiku Nightly (but no longer on R1/beta4)

Browse source
This commit is contained in:
Leon Styhre 2024-08-11 21:56:02 +02:00
parent a841d4175a
commit 17f55fd8cf
2 changed files with 0 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
CMakeLists.txt
View file

@ -132,15 +132,6 @@ elseif(WIN32)
if(NOT EXISTS ${PROJECT_SOURCE_DIR}/external/pugixml/pugixml.dll) if(NOT EXISTS ${PROJECT_SOURCE_DIR}/external/pugixml/pugixml.dll)
message(FATAL_ERROR "-- You need to build the dependencies in ./external first") message(FATAL_ERROR "-- You need to build the dependencies in ./external first")
endif() endif()
elseif(HAIKU)
find_package(FreeImage REQUIRED)
find_package(Freetype REQUIRED)
find_package(HarfBuzz REQUIRED)
find_package(ICU REQUIRED)
find_package(Intl REQUIRED)
find_package(Libgit2 REQUIRED)
find_package(Pugixml REQUIRED)
find_package(SDL2 REQUIRED)
elseif(NOT EMSCRIPTEN AND NOT ANDROID) elseif(NOT EMSCRIPTEN AND NOT ANDROID)
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
find_package(FFmpeg REQUIRED) find_package(FFmpeg REQUIRED)
@ -515,17 +506,6 @@ elseif(ANDROID)
${CMAKE_CURRENT_SOURCE_DIR}/external/libgit2/include ${CMAKE_CURRENT_SOURCE_DIR}/external/libgit2/include
${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src ${CMAKE_CURRENT_SOURCE_DIR}/external/pugixml/src
${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_Android) ${CMAKE_CURRENT_SOURCE_DIR}/external/SDL_Android)
elseif(HAIKU)
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/external/curl/include
${CMAKE_CURRENT_SOURCE_DIR}/external/FFmpeg
${FreeImage_INCLUDE_DIRS}
${FREETYPE_INCLUDE_DIRS}
${GIT2_INCLUDE_PATH}
${HarfBuzz_INCLUDE_DIRS}
${ICU_INCLUDE_DIRS}
${PUGIXML_INCLUDE_DIRS}
${SDL2_INCLUDE_DIR})
else() else()
set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS} set(COMMON_INCLUDE_DIRS ${COMMON_INCLUDE_DIRS}
${FFMPEG_INCLUDE_DIRS} ${FFMPEG_INCLUDE_DIRS}
@ -658,23 +638,6 @@ elseif(EMSCRIPTEN)
${PROJECT_SOURCE_DIR}/libFreeImage.a ${PROJECT_SOURCE_DIR}/libFreeImage.a
${PROJECT_SOURCE_DIR}/libfreetype.a ${PROJECT_SOURCE_DIR}/libfreetype.a
${PROJECT_SOURCE_DIR}/libpugixml.a) ${PROJECT_SOURCE_DIR}/libpugixml.a)
elseif(HAIKU)
# This is just a temporary hack to get the application to build on Haiku r1beta4.
set(COMMON_LIBRARIES /boot/system/lib/libavcodec.so.58
/boot/system/lib/libavfilter.so.7
/boot/system/lib/libavformat.so.58
/boot/system/lib/libavutil.so.56
/boot/system/lib/libswresample.so.3
/boot/system/lib/libswscale.so.5
/boot/system/lib/libcurl.so.4
${Intl_LIBRARY}
${FreeImage_LIBRARIES}
${FREETYPE_LIBRARIES}
${GIT2_LIBRARY}
${HarfBuzz_LIBRARIES}
${ICU_LIBRARIES}
${PUGIXML_LIBRARIES}
${SDL2_LIBRARY})
else() else()
set(COMMON_LIBRARIES ${CURL_LIBRARIES} set(COMMON_LIBRARIES ${CURL_LIBRARIES}
${FFMPEG_LIBRARIES} ${FFMPEG_LIBRARIES}

6
es-core/src/components/VideoFFmpegComponent.cpp
View file

@ -605,11 +605,6 @@ bool VideoFFmpegComponent::setupAudioFilters()
std::string channelLayout(128, '\0'); std::string channelLayout(128, '\0');
#if defined(__HAIKU__)
// This is just a temporary hack to get the application to build on Haiku r1beta4.
av_get_channel_layout_string(&channelLayout[0], sizeof(channelLayout),
mAudioCodecContext->CHANNELS, mAudioCodecContext->channel_layout);
#else
#if LIBAVUTIL_VERSION_MAJOR >= 58 || \ #if LIBAVUTIL_VERSION_MAJOR >= 58 || \
(LIBAVUTIL_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MINOR >= 28) (LIBAVUTIL_VERSION_MAJOR >= 57 && LIBAVUTIL_VERSION_MINOR >= 28)
// FFmpeg 5.1 and above. // FFmpeg 5.1 and above.
@ -621,7 +616,6 @@ bool VideoFFmpegComponent::setupAudioFilters()
av_get_channel_layout_string(&channelLayout[0], sizeof(channelLayout), av_get_channel_layout_string(&channelLayout[0], sizeof(channelLayout),
mAudioCodecContext->CHANNELS, mAudioCodecContext->channel_layout); mAudioCodecContext->CHANNELS, mAudioCodecContext->channel_layout);
#endif #endif
#endif // __HAIKU__
std::string filterArguments; std::string filterArguments;
filterArguments.append("time_base=") filterArguments.append("time_base=")