Attachment 255102 Details for Bug 282698 – simplify port

[patch] simplify port

0001-emulators-es-de-simplify-port.patch (text/plain), 4.73 KB, created by Stefan Schlosser on 2024-11-11 17:29:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Schlosser

Created: 2024-11-11 17:29:47 UTC

Size: 4.73 KB

patch

obsolete

>From 4d5a350be9719aa7a385a35d9899e631a7873390 Mon Sep 17 00:00:00 2001
>From: Stefan Schlosser <bsdcode@disroot.org>
>Date: Mon, 11 Nov 2024 14:45:01 +0100
>Subject: [PATCH] emulators/es-de: simplify port
>
>The following changes are made to simplify the port:
> * remove unnecessary localbase from USES
> * promote unbundled utf8cpp include path to CMakeLists.txt instead of replacing
>   C include directive in ${WRKSRC}/es-core/utils/StringUtil.h
> * use CMake's modules for finding unbundled RapidJSON and rlottie package
> * this allows to remove the INCLUDE_DIRS for both libraries (CMake already does
>   the right thing when using find_package)
> * replace rlottie_LINK_LIBRARIES with the more proper rlottie_LIBRARIES
>---
> emulators/es-de/Makefile                   |  9 +++-----
> emulators/es-de/files/patch-CMakeLists.txt | 26 +++++++---------------
> 2 files changed, 11 insertions(+), 24 deletions(-)
>
>diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile
>index 4659133b99e3..19fda170ea07 100644
>--- a/emulators/es-de/Makefile
>+++ b/emulators/es-de/Makefile
>@@ -1,7 +1,7 @@
> PORTNAME=	es-de
> DISTVERSIONPREFIX=	v
> DISTVERSION=	3.1.0
>-PORTREVISION=	2
>+PORTREVISION=	3
> CATEGORIES=	emulators
> 
> MAINTAINER=	bsdcode@disroot.org
>@@ -26,12 +26,13 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
> 		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
>@@ -45,10 +46,6 @@ DEINIT_CMAKE_BOOL=	DEINIT_ON_LAUNCH
> NLS_USES=		gettext
> NLS_CMAKE_BOOL=		COMPILE_LOCALIZATIONS
> 
>-post-patch:
>-	${REINPLACE_CMD} 's|#include "utf8.h"|#include <utf8cpp/utf8.h>|g' \
>-		${WRKSRC}/es-core/src/utils/StringUtil.h
>-
> post-install-DOCS-on:
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${WRKSRC}/*.md ${STAGEDIR}${DOCSDIR}
>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
>@@ -4,8 +4,8 @@
>      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.
>@@ -33,7 +33,7 @@
>          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}
>@@ -43,31 +43,21 @@
> -                        ${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)
>@@ -75,7 +65,7 @@
>      endif()
>  endif()
>  
>-@@ -726,8 +724,3 @@ endif()
>+@@ -726,8 +723,3 @@ endif()
>  if(COMPILE_LOCALIZATIONS)
>      add_dependencies(es-pdf-convert localization)
>  endif()
>-- 
>2.47.0
>

Flags:

bsdcode: maintainer-approval+

Actions: View | Diff

Attachments on bug 282698: 255102