diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile index 4659133b99e3..6c702fed07e4 100644 --- a/emulators/es-de/Makefile +++ b/emulators/es-de/Makefile @@ -1,56 +1,53 @@ PORTNAME= es-de DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org COMMENT= Frontend for browsing and launching games WWW= https://es-de.org LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg \ ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson \ ${LOCALBASE}/include/utf8cpp/utf8.h:devel/utf8cpp LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg \ libcurl.so:ftp/curl \ libfreeimage.so:graphics/freeimage \ libfreetype.so:print/freetype2 \ libgit2.so:devel/libgit2 \ libharfbuzz.so:print/harfbuzz \ libicuuc.so:devel/icu \ libpoppler.so:graphics/poppler \ libpugixml.so:textproc/pugixml \ librlottie.so:graphics/rlottie -USES= cmake compiler:c++17-lang gl localbase pkgconfig sdl +USES= cmake compiler:c++17-lang gl pkgconfig sdl USE_GITLAB= yes GL_PROJECT= emulationstation-de USE_GL= opengl USE_SDL= sdl2 +CMAKE_ARGS= -DUTF8CPP_INCLUDE_DIR=${LOCALBASE}/include/utf8cpp CMAKE_ON= VIDEO_HW_DECODING OPTIONS_DEFINE= DEINIT DOCS NLS OPTIONS_DEFAULT= DEINIT OPTIONS_SUB= yes -DEINIT_DESC= Deinit frontend on emulator launch +DEINIT_DESC= Deinit frontend on emulator launch DEINIT_CMAKE_BOOL= DEINIT_ON_LAUNCH -NLS_USES= gettext -NLS_CMAKE_BOOL= COMPILE_LOCALIZATIONS - -post-patch: - ${REINPLACE_CMD} 's|#include "utf8.h"|#include |g' \ - ${WRKSRC}/es-core/src/utils/StringUtil.h +NLS_USES= gettext +NLS_CMAKE_BOOL= COMPILE_LOCALIZATIONS post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR} .include diff --git a/emulators/es-de/files/patch-CMakeLists.txt b/emulators/es-de/files/patch-CMakeLists.txt index df8948e11e5b..5396328f944a 100644 --- a/emulators/es-de/files/patch-CMakeLists.txt +++ b/emulators/es-de/files/patch-CMakeLists.txt @@ -1,86 +1,76 @@ --- CMakeLists.txt.orig 2024-09-13 16:19:36 UTC +++ CMakeLists.txt @@ -143,6 +143,8 @@ elseif(NOT EMSCRIPTEN AND NOT ANDROID) find_package(Libgit2 REQUIRED) find_package(Pugixml REQUIRED) find_package(SDL2 REQUIRED) -+ pkg_check_modules(rapidjson REQUIRED RapidJSON) -+ pkg_check_modules(rlottie REQUIRED rlottie) ++ find_package(RapidJSON REQUIRED) ++ find_package(rlottie REQUIRED) endif() # Add libCEC support. @@ -184,8 +186,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug) if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /std:c++17 /Od /DEBUG:FULL") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O0 -g3 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O0") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") endif() # If using Clang, then add additional debug data needed by GDB. # Comment this out if you're using LLDB for debugging as this flag makes the binary @@ -208,11 +209,11 @@ else() if(CMAKE_CXX_COMPILER_ID MATCHES MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNDEBUG /std:c++17 /O2 /DEBUG:NONE") else() - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -O2 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DNDEBUG -Wall -Wpedantic -Wsign-compare -Wnarrowing -Wmissing-field-initializers -Wunused-macros") if(APPLE) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2") else() - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -O2 -s") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -s") endif() endif() endif() -@@ -454,12 +455,7 @@ set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR} +@@ -454,12 +455,8 @@ set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR} # Include files. set(COMMON_INCLUDE_DIRS ${CURL_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/external/CImg - ${CMAKE_CURRENT_SOURCE_DIR}/external/glm ${CMAKE_CURRENT_SOURCE_DIR}/external/lunasvg/include - ${CMAKE_CURRENT_SOURCE_DIR}/external/rapidjson/include - ${CMAKE_CURRENT_SOURCE_DIR}/external/rlottie/inc - ${CMAKE_CURRENT_SOURCE_DIR}/external/utfcpp/source ++ ${UTF8CPP_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/es-core/src ${CMAKE_CURRENT_SOURCE_DIR}/es-pdf-converter/src) -@@ -515,7 +511,9 @@ else() - ${HarfBuzz_INCLUDE_DIRS} - ${ICU_INCLUDE_DIRS} - ${PUGIXML_INCLUDE_DIRS} -- ${SDL2_INCLUDE_DIR}) -+ ${SDL2_INCLUDE_DIR} -+ ${rapidjson_INCLUDE_DIRS} -+ ${rlottie_INCLUDE_DIRS}) - endif() - - # Add libCEC include directory. -@@ -647,7 +645,8 @@ else() +@@ -647,7 +644,8 @@ else() ${HarfBuzz_LIBRARIES} ${ICU_LIBRARIES} ${PUGIXML_LIBRARIES} - ${SDL2_LIBRARY}) + ${SDL2_LIBRARY} -+ ${rlottie_LINK_LIBRARIES}) ++ ${rlottie_LIBRARIES}) if(Intl_LIBRARY) # On Unix systems where the gettext functions are not part of the C standard library # we need to explicitly link with the libintl library. -@@ -662,7 +661,6 @@ if(NOT WIN32) +@@ -662,7 +660,6 @@ if(NOT WIN32) set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/android_${ANDROID_ABI}/librlottie.a) else() set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/liblunasvg.a) - set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/librlottie.a) endif() endif() -@@ -726,8 +724,3 @@ endif() +@@ -726,8 +723,3 @@ endif() if(COMPILE_LOCALIZATIONS) add_dependencies(es-pdf-convert localization) endif() - -add_dependencies(es-core rlottie) - -# Set lottie2gif to not be built. -set_target_properties(lottie2gif PROPERTIES EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_DEFAULT_BUILD 1)