From nobody Wed Dec 04 07:49:35 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 4Y38mv40mDz5g8Vj; Wed, 04 Dec 2024 07:49:35 +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 4Y38mv3Rz1z4kVn; Wed, 4 Dec 2024 07:49:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733298575; 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=XETHQnlWOuZqC9hMpO261LRxhUhkaS3WyIp1BSo/PTA=; b=dN8RoXwrCMZ9NpE3pRCXtJULU7jGZJl5TY9zqgX3wNR0DHVOvCW1lexOQ2N1vQCecqwZTu osqoj9YgBcgF8WEr1xFsRyWh9qIuz72LGJynQtfhf0PwkFse+aPotnQbmiPn3kx9OhfkI9 L8co/ivOMtO/wO5TcUDfQXrZnnq6OFtTTD9xt1Atk1aA6IlUn+VNKRMCSZv52c6A4VLA+X kwwQ5NAh7OMufSHxAXPwoOhMqDjQNEV1c4Dq20Y7yGvtj2HgY9a1Ka1K0dlXpRC4wdZvsk E/d2hh366ikIO15h82tscR6KTMDKT17/alTtw3F113RrrAUcXrac3Rijmj3a+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733298575; 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=XETHQnlWOuZqC9hMpO261LRxhUhkaS3WyIp1BSo/PTA=; b=P7lA2W2I9mTXaQ2Ebf7tkx2iVzmidBbX9s5IA033vCd6ZO/djtkxY5e3k/dPHdzJXz5qGc aqXGzjYvFcTQTPs3ckRY8LLJdh7KZQ/eW+4NZK7KPeXr0mppMu79MQJBfWcqYV5+ZtUNd3 VJRc+z1TP3nGr3VAipG4lms9olGULHx1u1CWBm2lB38Pfm78TTG6sxBUflxWM8lG74R4sz oBGKfQL7k6k0p0hK/wH4+S4t/YTcGIj0lZ99f1AaCk4KmcAj+YfkYgAESvN2JFON/nlf2w BobFBiOAkRF7uOWGR6nKJN/oVRtr4xncjX2hxIu9KizFcszb/VNexEXeCglmzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733298575; a=rsa-sha256; cv=none; b=Hc07jYBxfRe4wP0IuTE+HhLSq99Dg1ItnDq3X38dc+16a5LmZunins+MhIWAZ2otSYS8dH UMoGqRPtUdH02RwHFMKq+cu++gATPirZa/+/eAceEeZCy1IfWJGYyGl9BMkXbyEEetwg5C DE6GhvCFNHKOs8dP/Ic37K7SRSGo7cuyAOY1Kw3A9yI4IvsIGJLw8Y2R/TVjLdFUJINsU/ XfrAKhAlBAyVDT6Z1S0tjhtl+i7fLb6mAtpDfjWJQfS1menJhHnFkIoV4ByDMd0D5esWRw QcsVx6S8Jai6iOTBU5Y58IH3RKLsm4GpXTQzgu0vaaWUUOySYQUxliUIxpl+2w== 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 4Y38mv30mZzyq3; Wed, 4 Dec 2024 07:49:35 +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 4B47nZbK066888; Wed, 4 Dec 2024 07:49:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B47nZRN066885; Wed, 4 Dec 2024 07:49:35 GMT (envelope-from git) Date: Wed, 4 Dec 2024 07:49:35 GMT Message-Id: <202412040749.4B47nZRN066885@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: c2d6cbb076ad - main - emulators/duckstation: Rename to fbsd-duckstation 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: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c2d6cbb076ade911ef923ff95d90ec979abbc937 Auto-Submitted: auto-generated The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=c2d6cbb076ade911ef923ff95d90ec979abbc937 commit c2d6cbb076ade911ef923ff95d90ec979abbc937 Author: Ganael LAPLANCHE AuthorDate: 2024-12-04 07:44:00 +0000 Commit: Ganael LAPLANCHE CommitDate: 2024-12-04 07:44:00 +0000 emulators/duckstation: Rename to fbsd-duckstation Follow developer's will (expressed in private) to emphasize our port includes local patches and does not reflect the exact version of the original software. --- MOVED | 1 + emulators/Makefile | 2 +- emulators/{duckstation => fbsd-duckstation}/Makefile | 8 +++++--- emulators/{duckstation => fbsd-duckstation}/distinfo | 0 .../files/fbsd-duckstation.desktop} | 2 +- .../files/patch-dep-cubeb-CMakeLists.txt | 0 .../files/patch-dep-discord-rpc-CMakeLists.txt | 0 .../files/patch-relocate-resources.txt | 0 .../files/patch-src-common-byte_stream.cpp | 0 .../files/patch-src-util-CMakeLists.txt | 0 .../files/patch-src-util-platform_misc_unix.cpp | 0 emulators/{duckstation => fbsd-duckstation}/pkg-descr | 3 +++ emulators/{duckstation => fbsd-duckstation}/pkg-plist | 4 ++-- 13 files changed, 13 insertions(+), 7 deletions(-) diff --git a/MOVED b/MOVED index e6218aaa96a2..61604ee8523a 100644 --- a/MOVED +++ b/MOVED @@ -3747,3 +3747,4 @@ misc/gnuls||2024-11-30|Has expired: Outdated, consider using sysutils/coreutils science/grib_api|science/eccodes|2024-11-30|Has expired: Deprecated by upstream. Use science/eccodes instead www/kohana||2024-12-01|Has expired: Supports only PHP5, abandoned upstream devel/py-simple-term-menu|devel/py-simple_term_menu|2024-12-02|Upstream renamed +emulators/duckstation|emulators/fbsd-duckstation|2024-12-03|Developer asked to emphasize the port includes local patches diff --git a/emulators/Makefile b/emulators/Makefile index ce6f6bb811a4..473fd6fa5292 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -26,7 +26,6 @@ SUBDIR += dosbox-staging SUBDIR += dosbox-x SUBDIR += dps8m - SUBDIR += duckstation SUBDIR += dynamips-community SUBDIR += edumips64 SUBDIR += elliott-803 @@ -34,6 +33,7 @@ SUBDIR += emulationstation SUBDIR += es-de SUBDIR += fbneo + SUBDIR += fbsd-duckstation SUBDIR += fceux SUBDIR += flexemu SUBDIR += flycast diff --git a/emulators/duckstation/Makefile b/emulators/fbsd-duckstation/Makefile similarity index 89% rename from emulators/duckstation/Makefile rename to emulators/fbsd-duckstation/Makefile index f756def26126..1d2cfa7724c3 100644 --- a/emulators/duckstation/Makefile +++ b/emulators/fbsd-duckstation/Makefile @@ -1,4 +1,4 @@ -PORTNAME= duckstation +PORTNAME= fbsd-duckstation PORTVERSION= 20240614 DISTVERSIONPREFIX= v PORTREVISION= 2 @@ -33,6 +33,7 @@ USES= cmake compiler:c++20-lang gl jpeg kde:5 pkgconfig qt:6 sdl xorg USE_GITHUB= yes GH_ACCOUNT= stenzek +GH_PROJECT= duckstation # See: https://github.com/stenzek/duckstation/commits/latest GH_TAGNAME= v0.1-6937 @@ -56,9 +57,10 @@ do-install: ${COPYTREE_SHARE} resources/ ${STAGEDIR}${DATADIR}/ && \ ${COPYTREE_SHARE} translations/ ${STAGEDIR}${DATADIR}/ ${INSTALL_PROGRAM} \ - ${CONFIGURE_WRKSRC}/bin/duckstation-qt ${STAGEDIR}${PREFIX}/bin/ + ${CONFIGURE_WRKSRC}/bin/duckstation-qt \ + ${STAGEDIR}${PREFIX}/bin/fbsd-duckstation-qt ${INSTALL_DATA} ${CONFIGURE_WRKSRC}/bin/resources/images/duck.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/duckstation.png - ${INSTALL_DATA} ${FILESDIR}/duckstation.desktop ${STAGEDIR}${DESKTOPDIR} + ${INSTALL_DATA} ${FILESDIR}/fbsd-duckstation.desktop ${STAGEDIR}${DESKTOPDIR} .include diff --git a/emulators/duckstation/distinfo b/emulators/fbsd-duckstation/distinfo similarity index 100% rename from emulators/duckstation/distinfo rename to emulators/fbsd-duckstation/distinfo diff --git a/emulators/duckstation/files/duckstation.desktop b/emulators/fbsd-duckstation/files/fbsd-duckstation.desktop similarity index 90% rename from emulators/duckstation/files/duckstation.desktop rename to emulators/fbsd-duckstation/files/fbsd-duckstation.desktop index 8e79b154fcec..1ed1da9b1d50 100644 --- a/emulators/duckstation/files/duckstation.desktop +++ b/emulators/fbsd-duckstation/files/fbsd-duckstation.desktop @@ -6,7 +6,7 @@ Name=Duckstation StartupWMClass=Duckstation GenericName=PlayStation Emulator Comment=Sony PlayStation emulator -Exec=duckstation-qt +Exec=fbsd-duckstation-qt Icon=duckstation Keywords=game;emulator; Categories=Game;Emulator; diff --git a/emulators/duckstation/files/patch-dep-cubeb-CMakeLists.txt b/emulators/fbsd-duckstation/files/patch-dep-cubeb-CMakeLists.txt similarity index 100% rename from emulators/duckstation/files/patch-dep-cubeb-CMakeLists.txt rename to emulators/fbsd-duckstation/files/patch-dep-cubeb-CMakeLists.txt diff --git a/emulators/duckstation/files/patch-dep-discord-rpc-CMakeLists.txt b/emulators/fbsd-duckstation/files/patch-dep-discord-rpc-CMakeLists.txt similarity index 100% rename from emulators/duckstation/files/patch-dep-discord-rpc-CMakeLists.txt rename to emulators/fbsd-duckstation/files/patch-dep-discord-rpc-CMakeLists.txt diff --git a/emulators/duckstation/files/patch-relocate-resources.txt b/emulators/fbsd-duckstation/files/patch-relocate-resources.txt similarity index 100% rename from emulators/duckstation/files/patch-relocate-resources.txt rename to emulators/fbsd-duckstation/files/patch-relocate-resources.txt diff --git a/emulators/duckstation/files/patch-src-common-byte_stream.cpp b/emulators/fbsd-duckstation/files/patch-src-common-byte_stream.cpp similarity index 100% rename from emulators/duckstation/files/patch-src-common-byte_stream.cpp rename to emulators/fbsd-duckstation/files/patch-src-common-byte_stream.cpp diff --git a/emulators/duckstation/files/patch-src-util-CMakeLists.txt b/emulators/fbsd-duckstation/files/patch-src-util-CMakeLists.txt similarity index 100% rename from emulators/duckstation/files/patch-src-util-CMakeLists.txt rename to emulators/fbsd-duckstation/files/patch-src-util-CMakeLists.txt diff --git a/emulators/duckstation/files/patch-src-util-platform_misc_unix.cpp b/emulators/fbsd-duckstation/files/patch-src-util-platform_misc_unix.cpp similarity index 100% rename from emulators/duckstation/files/patch-src-util-platform_misc_unix.cpp rename to emulators/fbsd-duckstation/files/patch-src-util-platform_misc_unix.cpp diff --git a/emulators/duckstation/pkg-descr b/emulators/fbsd-duckstation/pkg-descr similarity index 68% rename from emulators/duckstation/pkg-descr rename to emulators/fbsd-duckstation/pkg-descr index b8425b6dab50..150bcf0a0fbf 100644 --- a/emulators/duckstation/pkg-descr +++ b/emulators/fbsd-duckstation/pkg-descr @@ -4,3 +4,6 @@ DuckStation is an simulator/emulator of the Sony PlayStation(TM) console, focusing on playability, speed, and long-term maintainability. The goal is to be as accurate as possible while maintaining performance suitable for low-end devices. + +That version of DuckStation includes local (FreeBSD-only) patches, mostly used +to fix build and relocate resources to common paths. diff --git a/emulators/duckstation/pkg-plist b/emulators/fbsd-duckstation/pkg-plist similarity index 99% rename from emulators/duckstation/pkg-plist rename to emulators/fbsd-duckstation/pkg-plist index fe2f56ae1d59..1afb21bf3728 100644 --- a/emulators/duckstation/pkg-plist +++ b/emulators/fbsd-duckstation/pkg-plist @@ -1,5 +1,5 @@ -bin/duckstation-qt -share/applications/duckstation.desktop +bin/fbsd-duckstation-qt +share/applications/fbsd-duckstation.desktop share/pixmaps/duckstation.png %%DATADIR%%/resources/chtdb.txt %%DATADIR%%/resources/discdb.yaml