From nobody Tue Jan 18 12:47:27 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 385671963BB9; Tue, 18 Jan 2022 12:47:29 +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 4JdT7h1DPDz3Gk9; Tue, 18 Jan 2022 12:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642510048; 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=ffna7ayPp/zOYUGXzf1KkLWPhvT2LtnVmEA+X/43YFg=; b=ydTghCTARI8om1cz202sIuG+0bT0Ve1YuSrFeaUcKmKFVHxDvNZaJQiRqwYhlloUUmwmZi 2O+O9U9SO4Y+/RBMo+V6nJ6avk/W5Az8RPW6m4I29lKj7EhQXeeAyit9U21X9gpyDZZ/7R GMR73Es8W1YWLi5MYF+zq+rZmG1ZX39YKb8dQ1d5NRUTl0rFWhZf2rbDQ7QpktlV2yFQUP YvwvjB/lUDZl223Q7XRe0gjLpDQkvqnWRe5aPV+CCAxuavQ8LiRIxA1rd2XcAPsivGFSC+ ZGDJ7bKVb8rhSHj6djddPM1mjYZ+6BZTZbUFEVo+aceIgg11B+bC+M0Z2l4sbA== 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 DF8F92154F; Tue, 18 Jan 2022 12:47:27 +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 20IClRuP050005; Tue, 18 Jan 2022 12:47:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20IClRCA050004; Tue, 18 Jan 2022 12:47:27 GMT (envelope-from git) Date: Tue, 18 Jan 2022 12:47:27 GMT Message-Id: <202201181247.20IClRCA050004@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: 042db565be2c - main - games/kodi-addon-game.libretro.pcsx-rearmed: Avoid bundling pcsx_rearmed 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: 042db565be2c38f0efbdbcf374e2716c317491b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642510048; 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=ffna7ayPp/zOYUGXzf1KkLWPhvT2LtnVmEA+X/43YFg=; b=HEFcWiwsW2CEci98iGXOD7lMrSduGrHDcO4GA8C0uMqaliWFSHK9o1oMuozilSDdcW+acw hRqMuXcCGzpwjRNPZPrhpgen2Ym4cFZLq6871Hi2sZ921y7VXSqIfAnZGs7Y8yO+TVgbxh ql773LYXBwI2A8ZDu7crGG2CDEAYbPfHaegKOWToHSj9p812RnRZQAU4XIeBiSwnQpsSbr U9opGq2lKyvqc2sPqX+padu/3tZMXqqcbqfNIfMmd3ZbupfhIUhJk6jlf4vzmWunMnH2IF R+jw/UdrSPVKTUHyTfZKv76TyWfnpT9A+XXJswRFG+lmDrUdeqWjIUmmDCPa7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642510048; a=rsa-sha256; cv=none; b=ZYTJzuTBU47F5p1KTZj2MDc5ARJm+D1zimrhCytpCjdYo5+S53Jfm9eyfTbuaCBGREoIA9 18YiVAIyC45QIlRWLoq3fZkThU7gum6pjN3SujGv6ado9agTrKNjOSJxYcR9pmjbxXP4cx A9MnxDJICR8P8IusvuATjYwaGBYYv/PPwwsyQAdtV4+qbJi3g9m6h0I4LiDyP5Po5gaS15 F5ZuSE2K7IibSJCopeJbz67mEnqfgOTR5+craDkukQOs7vhzWSUdgd+kD284fPeWJuG3Q8 Cw3mdbosO8cnhEtqZbd7FJ5REoDzv/moradH9uxNNrFuLjyNgB9OaH/77q0tmQ== 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=042db565be2c38f0efbdbcf374e2716c317491b1 commit 042db565be2c38f0efbdbcf374e2716c317491b1 Author: Bernhard Froehlich AuthorDate: 2022-01-18 12:39:20 +0000 Commit: Bernhard Froehlich CommitDate: 2022-01-18 12:39:20 +0000 games/kodi-addon-game.libretro.pcsx-rearmed: Avoid bundling pcsx_rearmed PR: 261113 Submitted by: Rozhuk Ivan (maintainer) --- .../kodi-addon-game.libretro.pcsx-rearmed/Makefile | 47 ++++++++++++---------- .../kodi-addon-game.libretro.pcsx-rearmed/distinfo | 2 - 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/games/kodi-addon-game.libretro.pcsx-rearmed/Makefile b/games/kodi-addon-game.libretro.pcsx-rearmed/Makefile index 67bce2da1218..37e0b24c8774 100644 --- a/games/kodi-addon-game.libretro.pcsx-rearmed/Makefile +++ b/games/kodi-addon-game.libretro.pcsx-rearmed/Makefile @@ -3,37 +3,40 @@ PORTNAME= game.libretro.pcsx-rearmed PORTVERSION= 22.0.0.39 DISTVERSIONSUFFIX= -Matrix +PORTREVISION= 1 CATEGORIES= games MAINTAINER= rozhuk.im@gmail.com COMMENT= Kodi game addon for Sony - PlayStation (PCSX ReARMed) LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/depends/common/pcsx-rearmed/COPYING -LIB_DEPENDS= libtinyxml.so:textproc/tinyxml -RUN_DEPENDS= kodi-addon-game.libretro>=0:games/kodi-addon-game.libretro +LIBRETRO_PORT= libretro-pcsx_rearmed -USES= cmake:noninja gmake kodi -USE_GITHUB= yes -GH_ACCOUNT= kodi-game \ - libretro:pcsx_rearmed -GH_PROJECT= pcsx_rearmed:pcsx_rearmed -# Keep in sync with: depends/common/pcsx-rearmed/pcsx-rearmed.txt -GH_TAGNAME= 54686ee7ccbba7220aaf69892ad3d77515478776:pcsx_rearmed - -CMAKE_ARGS= -DBUILD_SHARED_LIBS=1 \ - -DADDONS_TO_BUILD=${PORTNAME} \ - -DPCSX-REARMED_LIB=depends/common/pcsx-rearmed/pcsx_rearmed_libretro.so +RUN_DEPENDS= kodi-addon-game.libretro>=0:games/kodi-addon-game.libretro \ + ${LIBRETRO_PORT}>=0:games/${LIBRETRO_PORT} -post-extract: - @${MV} ${WRKSRC_pcsx_rearmed}/* ${WRKSRC}/depends/common/pcsx-rearmed/ +NO_ARCH= yes -post-patch: - @${REINPLACE_CMD} -e 's|find_library(PCSX-REARMED_LIB.*|add_subdirectory(depends/common/pcsx-rearmed)|g' \ - ${WRKSRC}/CMakeLists.txt - -post-install: - ${RM} -rf ${STAGEDIR}${PREFIX}/lib/libretro +USES= kodi +USE_GITHUB= yes +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 diff --git a/games/kodi-addon-game.libretro.pcsx-rearmed/distinfo b/games/kodi-addon-game.libretro.pcsx-rearmed/distinfo index c27bbe294266..8656519e5150 100644 --- a/games/kodi-addon-game.libretro.pcsx-rearmed/distinfo +++ b/games/kodi-addon-game.libretro.pcsx-rearmed/distinfo @@ -1,5 +1,3 @@ TIMESTAMP = 1641911788 SHA256 (kodi-game-game.libretro.pcsx-rearmed-22.0.0.39-Matrix_GH0.tar.gz) = b6d72f04246a11052b32942913ffda1775313ac251db7f0c047707c74d191520 SIZE (kodi-game-game.libretro.pcsx-rearmed-22.0.0.39-Matrix_GH0.tar.gz) = 81858 -SHA256 (libretro-pcsx_rearmed-54686ee7ccbba7220aaf69892ad3d77515478776_GH0.tar.gz) = aeb8941cb9a262d4e9f94d6491c2cfaa823df759f40b30dd624c27a36f369fa1 -SIZE (libretro-pcsx_rearmed-54686ee7ccbba7220aaf69892ad3d77515478776_GH0.tar.gz) = 2289399