git: f850054254bc - main - emulators/es-de: Update 3.3.0 => 3.4.0, remove NLS option

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Vladimir Druzenko <vvd_at_FreeBSD.org>
Date: Sat, 08 Nov 2025 14:13:44 UTC
The branch main has been updated by vvd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f850054254bcfba8ffd0f116e63bdf51b0d1cca4

commit f850054254bcfba8ffd0f116e63bdf51b0d1cca4
Author:     Stefan Schlosser <bsdcode@disroot.org>
AuthorDate: 2025-11-08 14:08:08 +0000
Commit:     Vladimir Druzenko <vvd@FreeBSD.org>
CommitDate: 2025-11-08 14:13:17 +0000

    emulators/es-de: Update 3.3.0 => 3.4.0, remove NLS option
    
    Changelog:
    https://gitlab.com/es-de/emulationstation-de/-/releases/v3.4.0
    
    * The NLS option has been removed and the port is compiling with enabled
      localization support unconditionally for now. Otherwise the program
      would fail to start if the NLS option is disabled, see also
      https://gitlab.com/es-de/emulationstation-de/-/issues/2031.
    
    * Simplify the utf8cpp include directory handling.
    
    PR:     290884
---
 emulators/es-de/Makefile                   | 14 ++++------
 emulators/es-de/distinfo                   |  6 ++---
 emulators/es-de/files/patch-CMakeLists.txt | 11 ++++----
 emulators/es-de/pkg-plist                  | 43 +++++++++++++++---------------
 4 files changed, 35 insertions(+), 39 deletions(-)

diff --git a/emulators/es-de/Makefile b/emulators/es-de/Makefile
index 38151a135909..290f6caea02d 100644
--- a/emulators/es-de/Makefile
+++ b/emulators/es-de/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	es-de
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.3.0
-PORTREVISION=	2
+DISTVERSION=	3.4.0
 CATEGORIES=	emulators
 
 MAINTAINER=	bsdcode@disroot.org
@@ -34,29 +33,26 @@ LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		librlottie.so:graphics/rlottie
 RUN_DEPENDS=	${_BR_DEPENDS}
 
-USES=		cmake compiler:c++17-lang gl pkgconfig sdl
+USES=		cmake compiler:c++17-lang gettext 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
 
+CFLAGS+=	-I${LOCALBASE}/include/utf8cpp
+
 EXTRACT_AFTER_ARGS=	--exclude external \
 			--no-same-owner --no-same-permissions
 
-OPTIONS_DEFINE=		DEINIT DOCS NLS
+OPTIONS_DEFINE=		DEINIT DOCS
 OPTIONS_DEFAULT=	DEINIT
-OPTIONS_SUB=		yes
 
 DEINIT_DESC=	Deinit frontend on emulator launch
 
 DEINIT_CMAKE_BOOL=	DEINIT_ON_LAUNCH
 
-NLS_USES=		gettext-runtime gettext-tools
-NLS_CMAKE_BOOL=		COMPILE_LOCALIZATIONS
-
 post-install:
 	${LN} -sf ${LOCALBASE}/share/fonts/Droid/DroidSansFallbackFull.ttf \
 		${STAGEDIR}${DATADIR}/resources/fonts
diff --git a/emulators/es-de/distinfo b/emulators/es-de/distinfo
index d77a0d35d056..134febcafe04 100644
--- a/emulators/es-de/distinfo
+++ b/emulators/es-de/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752597245
-SHA256 (emulationstation-de-v3.3.0.tar.bz2) = e191f2ab66fdb0aea98369c4e5d94dd414a873d00b0129dfb65a502429f7eb93
-SIZE (emulationstation-de-v3.3.0.tar.bz2) = 72775703
+TIMESTAMP = 1762549978
+SHA256 (emulationstation-de-v3.4.0.tar.bz2) = 4b79cdb528a62654005b25fadbf9c3955e7c45615c4aa81084773b054db47765
+SIZE (emulationstation-de-v3.4.0.tar.bz2) = 72850580
diff --git a/emulators/es-de/files/patch-CMakeLists.txt b/emulators/es-de/files/patch-CMakeLists.txt
index 026d2b000666..da331bf892e9 100644
--- a/emulators/es-de/files/patch-CMakeLists.txt
+++ b/emulators/es-de/files/patch-CMakeLists.txt
@@ -1,4 +1,4 @@
---- CMakeLists.txt.orig	2025-04-04 15:03:07 UTC
+--- CMakeLists.txt.orig	2025-11-07 15:20:22 UTC
 +++ CMakeLists.txt
 @@ -155,6 +155,8 @@ elseif(NOT EMSCRIPTEN AND NOT ANDROID AND NOT IOS)
      find_package(Libgit2 REQUIRED)
@@ -33,18 +33,17 @@
          endif()
      endif()
  endif()
-@@ -540,7 +541,9 @@ else()
+@@ -540,7 +541,8 @@ else()
                              ${HarfBuzz_INCLUDE_DIRS}
                              ${ICU_INCLUDE_DIRS}
                              ${PUGIXML_INCLUDE_DIRS}
 -                            ${SDL2_INCLUDE_DIR})
 +                            ${SDL2_INCLUDE_DIR}
-+                            ${UTF8CPP_INCLUDE_DIR}
 +                            ${lunasvg_INCLUDE_DIRS})
  endif()
  
  # Add libCEC include directory.
-@@ -698,7 +701,9 @@ else()
+@@ -694,7 +696,9 @@ else()
                           ${HarfBuzz_LIBRARIES}
                           ${ICU_LIBRARIES}
                           ${PUGIXML_LIBRARIES}
@@ -55,7 +54,7 @@
      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.
-@@ -714,9 +719,6 @@ if(NOT WIN32)
+@@ -710,9 +714,6 @@ if(NOT WIN32)
      elseif(IOS)
          set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/liblunasvg.a)
          set(COMMON_LIBRARIES ${COMMON_LIBRARIES} ${PROJECT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/librlottie.a)
@@ -65,7 +64,7 @@
      endif()
  endif()
  
-@@ -770,18 +772,9 @@ add_subdirectory(es-pdf-converter)
+@@ -766,18 +767,9 @@ add_subdirectory(es-pdf-converter)
  endif()
  
  add_subdirectory(es-pdf-converter)
diff --git a/emulators/es-de/pkg-plist b/emulators/es-de/pkg-plist
index 75a84449b9d3..7af051cc6c6e 100644
--- a/emulators/es-de/pkg-plist
+++ b/emulators/es-de/pkg-plist
@@ -230,27 +230,28 @@ share/applications/org.es_de.frontend.desktop
 %%DATADIR%%/resources/graphics/textinput_focused.svg
 %%DATADIR%%/resources/graphics/white.png
 %%DATADIR%%/resources/graphics/window_icon_256.png
-%%NLS%%%%DATADIR%%/resources/locale/bs_BA/LC_MESSAGES/bs_BA.mo
-%%NLS%%%%DATADIR%%/resources/locale/ca_ES/LC_MESSAGES/ca_ES.mo
-%%NLS%%%%DATADIR%%/resources/locale/de_DE/LC_MESSAGES/de_DE.mo
-%%NLS%%%%DATADIR%%/resources/locale/en_GB/LC_MESSAGES/en_GB.mo
-%%NLS%%%%DATADIR%%/resources/locale/en_US/LC_MESSAGES/en_US.mo
-%%NLS%%%%DATADIR%%/resources/locale/es_ES/LC_MESSAGES/es_ES.mo
-%%NLS%%%%DATADIR%%/resources/locale/fr_FR/LC_MESSAGES/fr_FR.mo
-%%NLS%%%%DATADIR%%/resources/locale/hr_HR/LC_MESSAGES/hr_HR.mo
-%%NLS%%%%DATADIR%%/resources/locale/it_IT/LC_MESSAGES/it_IT.mo
-%%NLS%%%%DATADIR%%/resources/locale/ja_JP/LC_MESSAGES/ja_JP.mo
-%%NLS%%%%DATADIR%%/resources/locale/ko_KR/LC_MESSAGES/ko_KR.mo
-%%NLS%%%%DATADIR%%/resources/locale/nl_NL/LC_MESSAGES/nl_NL.mo
-%%NLS%%%%DATADIR%%/resources/locale/pl_PL/LC_MESSAGES/pl_PL.mo
-%%NLS%%%%DATADIR%%/resources/locale/pt_BR/LC_MESSAGES/pt_BR.mo
-%%NLS%%%%DATADIR%%/resources/locale/pt_PT/LC_MESSAGES/pt_PT.mo
-%%NLS%%%%DATADIR%%/resources/locale/ro_RO/LC_MESSAGES/ro_RO.mo
-%%NLS%%%%DATADIR%%/resources/locale/ru_RU/LC_MESSAGES/ru_RU.mo
-%%NLS%%%%DATADIR%%/resources/locale/sr_RS/LC_MESSAGES/sr_RS.mo
-%%NLS%%%%DATADIR%%/resources/locale/sv_SE/LC_MESSAGES/sv_SE.mo
-%%NLS%%%%DATADIR%%/resources/locale/zh_CN/LC_MESSAGES/zh_CN.mo
-%%NLS%%%%DATADIR%%/resources/locale/zh_TW/LC_MESSAGES/zh_TW.mo
+%%DATADIR%%/resources/locale/ar_SA/LC_MESSAGES/ar_SA.mo
+%%DATADIR%%/resources/locale/bs_BA/LC_MESSAGES/bs_BA.mo
+%%DATADIR%%/resources/locale/ca_ES/LC_MESSAGES/ca_ES.mo
+%%DATADIR%%/resources/locale/de_DE/LC_MESSAGES/de_DE.mo
+%%DATADIR%%/resources/locale/en_GB/LC_MESSAGES/en_GB.mo
+%%DATADIR%%/resources/locale/en_US/LC_MESSAGES/en_US.mo
+%%DATADIR%%/resources/locale/es_ES/LC_MESSAGES/es_ES.mo
+%%DATADIR%%/resources/locale/fr_FR/LC_MESSAGES/fr_FR.mo
+%%DATADIR%%/resources/locale/hr_HR/LC_MESSAGES/hr_HR.mo
+%%DATADIR%%/resources/locale/it_IT/LC_MESSAGES/it_IT.mo
+%%DATADIR%%/resources/locale/ja_JP/LC_MESSAGES/ja_JP.mo
+%%DATADIR%%/resources/locale/ko_KR/LC_MESSAGES/ko_KR.mo
+%%DATADIR%%/resources/locale/nl_NL/LC_MESSAGES/nl_NL.mo
+%%DATADIR%%/resources/locale/pl_PL/LC_MESSAGES/pl_PL.mo
+%%DATADIR%%/resources/locale/pt_BR/LC_MESSAGES/pt_BR.mo
+%%DATADIR%%/resources/locale/pt_PT/LC_MESSAGES/pt_PT.mo
+%%DATADIR%%/resources/locale/ro_RO/LC_MESSAGES/ro_RO.mo
+%%DATADIR%%/resources/locale/ru_RU/LC_MESSAGES/ru_RU.mo
+%%DATADIR%%/resources/locale/sr_RS/LC_MESSAGES/sr_RS.mo
+%%DATADIR%%/resources/locale/sv_SE/LC_MESSAGES/sv_SE.mo
+%%DATADIR%%/resources/locale/zh_CN/LC_MESSAGES/zh_CN.mo
+%%DATADIR%%/resources/locale/zh_TW/LC_MESSAGES/zh_TW.mo
 %%DATADIR%%/resources/shaders/glsl/blur_horizontal.glsl
 %%DATADIR%%/resources/shaders/glsl/blur_vertical.glsl
 %%DATADIR%%/resources/shaders/glsl/core.glsl