From nobody Tue Nov 12 18:31:43 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Xnw3z6KWHz5cvvZ; Tue, 12 Nov 2024 18:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xnw3z5gxqz4tms; Tue, 12 Nov 2024 18:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731436303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58EvXmqq3fMeAJSdjuNRYOhoXy3pvyIxPVmTnz112j0=; b=V9dT0otpebuD2f6TkLdO1Vy1Y/Sqv829/2b5YVtwa7eGborJtBx5B1pDzHqEI2paRZ2LvF FOoIUkK0zTl90o+XhAc2onyvp4XIqevvuEUl4+QoUbCcVAV75RUofagaJEKzHpzgjZLfmt egfj5ehYb1PSKoc9wwQqE10i+cXJVxIEuon+KVcIHvY57tyMJdPED4s/5I8fPPRdNH9J7H wT2LH9ixy5Pi8EizB3IkuklqYfRGvhOc6x3BbfuU1+0RRuYfhM8pWWGkB0dsVOB2hN2Czq 5O5vDDQ/hODsA6wwKLiJF9QDJuQjhoGxYCq1VzxHKSJIX4MLI1nRfWQxs8lT5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731436303; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58EvXmqq3fMeAJSdjuNRYOhoXy3pvyIxPVmTnz112j0=; b=WLy2h5Lbqg4zc0VYRH79BlU5O48Zl2NxyEO5CvBqG/pSPFUazurv2lkdEHuSJjBnUdj1/0 WKhRuXmDuVJUCthql+1JZG3SMVn9XGtdWmJtYiJBzBeAE+m0Ja0HH6sGapP0dqITGPjP6t GP7KpiN7C2yBBmYG5k96qoF92cQfv6VecbSE8RGGN44P8sDWULrxPEBV6dhepdhNxSEXRP Nd+Fh4iZFPHxabVsHyGij30VChRxeTv3O4emYqyEb5R9YtD4Yz13wGhI5gsSr5o4sfe32/ EDOCZmav4eDl9Sw/wbxOU8jzhnQ5iXCIw/Xne1KUQhq+Fb/OJna46mP3pRfxbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731436303; a=rsa-sha256; cv=none; b=FwYS3fqK1NUhkTw5I6qVr6PlJo3oYBonF5N6Bq0gsMPk9Vuk6G8+iYNMKKgNVPm1p0YLnN u1H9Q8gy+rOJvbjUp25UpVkb9vKMC+gpM6gRtBIp/IuFxnkQNU8Y/aPh6cA6nDbZibxm2m kttIU99wPzlMYFKlZQ4ccW3TRfR1z/FeVTuKpiF97KheWuFzMH73LrkMpyHGvE+rhEZf5A Ns6/ogE6ACSetSY4g8L6KOYz76cWVTq3YU76++b8g35mnejVv45OctS+KrkrNoyADC/6aY g0QPltErxarjp4tMGOYr0EescfC0y+Hv0+C5deGP6yDAb0HZtNZiruPCdEvN2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Xnw3z58TYzM2w; Tue, 12 Nov 2024 18:31:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ACIVhAq056210; Tue, 12 Nov 2024 18:31:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ACIVhuD056207; Tue, 12 Nov 2024 18:31:43 GMT (envelope-from git) Date: Tue, 12 Nov 2024 18:31:43 GMT Message-Id: <202411121831.4ACIVhuD056207@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Zsolt Udvari Subject: git: 9c26b7dfb8ba - main - emulators/es-de: Simplify port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: uzsolt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9c26b7dfb8ba801430daf3c364b86e6284857b70 Auto-Submitted: auto-generated The branch main has been updated by uzsolt: URL: https://cgit.FreeBSD.org/ports/commit/?id=9c26b7dfb8ba801430daf3c364b86e6284857b70 commit 9c26b7dfb8ba801430daf3c364b86e6284857b70 Author: Stefan Schlosser AuthorDate: 2024-11-12 18:29:13 +0000 Commit: Zsolt Udvari CommitDate: 2024-11-12 18:31:16 +0000 emulators/es-de: Simplify 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. PR: 282698 Approved by: submitter is maintainer --- emulators/es-de/Makefile | 15 ++++++--------- emulators/es-de/files/patch-CMakeLists.txt | 26 ++++++++------------------ 2 files changed, 14 insertions(+), 27 deletions(-) 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,7 +1,7 @@ PORTNAME= es-de DISTVERSIONPREFIX= v DISTVERSION= 3.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= emulators MAINTAINER= bsdcode@disroot.org @@ -26,28 +26,25 @@ 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 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} 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()