From nobody Tue Jan 18 12:47:28 2022 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 3EE531963C9B; Tue, 18 Jan 2022 12:47:31 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JdT7j2wGJz3GvH; Tue, 18 Jan 2022 12:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642510050; 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=JSggAJxrmDvNv3mMrzc6iLZuLRcAyR2yBkRXIPOyHJE=; b=tfK9Ve315X3LG8DPR7funXj6nuL0k0NruEOhBHdme4gf06wXtKdRLYHEzlK8koNGBpcFgI 0X1kKZqfL2QqWqKR1mTMt9L9eEr2+OQeLoi/JCd1XsJPVlGyanuczOKJZglYsKnMDWL3WB tPLUC6Y+JQsWKmL1FxgEtQ21XU9eK/Y88lwr8HjGgOxcpmAFTLTRO2FMqSqZdFtNgDKrYV aXQJypPIxP+AxPx7HlY/8CmnLM/6AsfVnH+ePkFVwYSG4ON+YSi2zdSl+KSik63HJpaSA8 CwOjjSzOdn8cgoPhRxDYJRUROkWwFM6Ja9+kU/HSsdgF0m1yJ4yiFu0nZywOTw== 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 0902621988; Tue, 18 Jan 2022 12:47:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 20IClSFF050032; Tue, 18 Jan 2022 12:47:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IClSvK050031; Tue, 18 Jan 2022 12:47:28 GMT (envelope-from git) Date: Tue, 18 Jan 2022 12:47:28 GMT Message-Id: <202201181247.20IClSvK050031@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernhard Froehlich Subject: git: 419d603696d1 - main - games/kodi-addon-game.libretro.beetle-psx: Avoid bundling beetle_psx 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: decke X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 419d603696d1757f71c748bdc96cb64b4ede501e Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642510050; 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=JSggAJxrmDvNv3mMrzc6iLZuLRcAyR2yBkRXIPOyHJE=; b=X0OD9scafPb/0Y8ukNd3bPizaf0Evn3Th5MlSuWiDrObXwKg4JIm8+5UCO63xbONZ8aZyT EqzUH14f226Qay7a4j8ly+PK93wPO7El6tn0iUOcQ0zEiHJWWFmOcG+Dhz5ZtvNJky1lkK R6BKQCqzkM15H0/S0avDTVmvCJIGwwEQqT2ilGOw2k6PQfa9rAz+40THQ0PNIBSKMe5w6T p2fyQVO6g8/TTT8ilpbJh11nqNiqUVVicRkdSZOPKSxVKV3y+pZ2rV8I5w3evle8w//+FQ RsUfUNlLCn4LVGnGhEL3zezk6A2ziSnzXBI8JsmIWXLl5dbFUZWGH28YvJFirg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642510050; a=rsa-sha256; cv=none; b=sw33cNjmoJAzBdDkRDG/cTZfOgwGI0i890FRi1mhRAMk7EBkiqhs7YOApgu/HrXT1WoHc1 nSdlkmEL6jZBfxHftWqA9y45lfUqq3YXvNK27Ql5VK2DMtx1OWTJYfASIBmIvNoMyU6AJx Mv76iaisPpWBpWtFakah19T0hs+8rkYjnEpryUFiMI2hXQKk1eEAGSXVAi2dPTJnZwmJ2j pOONXSHpFYmTlSj88hgjX/UdVS0z0lweoeQfUORPzzgm/w19HOtBnuA8iS9YRTYWC3CZQm Ak8wtgyFApItSmJahDI68OEJCX5sSSKeoQyvDQDLVMMyhuBk9085c0QsmcBKoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by decke: URL: https://cgit.FreeBSD.org/ports/commit/?id=419d603696d1757f71c748bdc96cb64b4ede501e commit 419d603696d1757f71c748bdc96cb64b4ede501e Author: Bernhard Froehlich AuthorDate: 2022-01-18 12:45:28 +0000 Commit: Bernhard Froehlich CommitDate: 2022-01-18 12:45:28 +0000 games/kodi-addon-game.libretro.beetle-psx: Avoid bundling beetle_psx PR: 261111 Submitted by: Rozhuk Ivan (maintainer) --- games/kodi-addon-game.libretro.beetle-psx/Makefile | 50 +++++++++++----------- 1 file changed, 26 insertions(+), 24 deletions(-) diff --git a/games/kodi-addon-game.libretro.beetle-psx/Makefile b/games/kodi-addon-game.libretro.beetle-psx/Makefile index a91895c28c2a..4301cd81ff0c 100644 --- a/games/kodi-addon-game.libretro.beetle-psx/Makefile +++ b/games/kodi-addon-game.libretro.beetle-psx/Makefile @@ -3,6 +3,7 @@ PORTNAME= game.libretro.beetle-psx PORTVERSION= 0.9.44.36 DISTVERSIONSUFFIX= -Matrix +PORTREVISION= 1 CATEGORIES= games MAINTAINER= rozhuk.im@gmail.com @@ -10,31 +11,32 @@ COMMENT= Kodi game addon for Sony - PlayStation (Beetle PSX) LICENSE= GPLv2+ -LIB_DEPENDS= libtinyxml.so:textproc/tinyxml -RUN_DEPENDS= kodi-addon-game.libretro>=0:games/kodi-addon-game.libretro +LIBRETRO_PORT= libretro-beetle_psx -USES= cmake:noninja gmake kodi localbase +RUN_DEPENDS= kodi-addon-game.libretro>=0:games/kodi-addon-game.libretro \ + ${LIBRETRO_PORT}>=0:games/${LIBRETRO_PORT} + +NO_ARCH= yes + +USES= kodi USE_GITHUB= yes -GH_ACCOUNT= kodi-game \ - libretro:beetle_psx -GH_PROJECT= beetle-psx-libretro:beetle_psx -# Keep in sync with: depends/common/beetle-psx/beetle-psx.txt -GH_TAGNAME= e1836bde1b250d41c6f91c2b6f06444d989f1138:beetle_psx - -CMAKE_ARGS= -DBUILD_SHARED_LIBS=1 \ - -DADDONS_TO_BUILD=${PORTNAME} \ - -DBEETLE-PSX_LIB=depends/common/beetle-psx/mednafen_psx_libretro.so - -post-extract: - @${MV} ${WRKSRC_beetle_psx}/* ${WRKSRC}/depends/common/beetle-psx/ - -post-patch: - @${REINPLACE_CMD} -e 's|find_library(BEETLE-PSX_LIB.*|add_subdirectory(depends/common/beetle-psx)|g' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e 's|defined(BSD)|!defined(CLOCK_REALTIME)|g' \ - ${WRKSRC}/depends/common/beetle-psx/libretro-common/rthreads/rthreads.c - -post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/lib/libretro +GH_ACCOUNT= kodi-game + +do-build: + @${MKDIR} ${WRKSRC}/lib + @LIBRARY_FILENAME_FULL=`${MAKE} -C ../${LIBRETRO_PORT} -V PLIST_FILES | ${SED} 's| .*||g'` && \ + LIBRARY_FILENAME=`basename "$${LIBRARY_FILENAME_FULL}"` && \ + ${LN} -sf "${LOCALBASE}/$${LIBRARY_FILENAME_FULL}" ${WRKSRC}/lib/ && \ + ${REINPLACE_CMD} -e 's|@PLATFORM@|freebsd|g' \ + -e "s|@LIBRARY_FILENAME@|$${LIBRARY_FILENAME}|g" \ + ${WRKSRC}/${PORTNAME}/addon.xml.in + @${MV} ${WRKSRC}/${PORTNAME}/addon.xml.in ${WRKSRC}/${PORTNAME}/addon.xml + @${RM} -f ${WRKSRC}/${PORTNAME}/addon.xml.in.bak + +do-install: + @${MKDIR} ${STAGEDIR}${PREFIX}/lib/kodi/addons/${PORTNAME} \ + ${STAGEDIR}${PREFIX}/share/kodi/addons + @(cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} * ${STAGEDIR}${PREFIX}/lib/kodi/addons/${PORTNAME}) + @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${PORTNAME} ${STAGEDIR}${PREFIX}/share/kodi/addons) .include