From nobody Fri Dec 06 06:26:52 2024 X-Original-To: dev-commits-ports-all@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 4Y4LrX3yZ8z5gQRV; Fri, 06 Dec 2024 06:26:52 +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 4Y4LrX3SWWz4R31; Fri, 6 Dec 2024 06:26:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733466412; 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=/gU5O2rWoFiC9r+2/UfN4NQanC4uwzHX7KCjl5jun/U=; b=bi5z48bM1eiKJF8pKuoT45QNw+1PZrbnf8ERpIDUVpU4a8PYGgXNAdbs/VNgcBskc5W2Ro l4XTrBw8RtoHN4c0fPYJnS7kAC8h+xLbw4QHHsSB9vglQMbatbz2U2zH015Ed0jn93glGj AP/vyhhR/ahLWE7Uu03eAF4mVQYzlWoqa5DGbgV7HLe4ZZ4diQosoSvmTKwzT61SYIqbzn abIuXS2klWK7ut2M+lE45z4C2wsdVpy0ojK5xmj2b4PW0Tk0xOiVIAiMXEiXwj9GZT64o3 MU/xv2D1O0dGA5wyFhF8Hv+rVkadND2w45aKZ92wb6VnMDU1dqwRnW4hPp7DOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733466412; 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=/gU5O2rWoFiC9r+2/UfN4NQanC4uwzHX7KCjl5jun/U=; b=K+Phyrpwg6uuHPklqBO9IcRIap6Xcv+g5znmjupoKUt775Q24Vu3AuLVAI2A2lvnLkkkNr WT9xvp++EnBleG5QyUweBE0ZjIg5il/8oXN0DJjCRVQVjW3bbNsgq45ez4R7BO+3c04RcS vNlPkPuQaYR4HpAh3rltIMFXIuYZI1mIm230hyShw+rt9hhz7bv0ybTBKSn13StbcrnuvT FPJV0uWKtH6wmpO9OeX9VDoCapoOl+6HZZgO6WtZoZ9o1ybLjJPsQJKEIj2NPYeNvYYW5+ OpF3+cET/ikVMp7FAZL8jQ8CIaZlYMblKrzLAvs2pyrvoUwOD5U78U5B6G/hTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733466412; a=rsa-sha256; cv=none; b=U2vznhjCzv/ieykc9Ys+B8YG7uzHDCB7XGQHsfNil86RoK7UZl+3NZjBNMhXwhfqbiKSVh iIcEgkE6a9Wt9iywSYBaXeLBECl+YxQgz5A9sCIDBUSA0cDNUejKOLLqVr8DNoTzo57xA3 HhF4m+yraDpauKvfmEY/SHQpkkT89cxyX5z7ZTmcpVI56mf0VhwG1J87n3/ZoyNOXvNJ7T nN/loLUCCssWDx6yzDHoE/+pzTuXzkW+saqc/s2z3PaH4nJTxPucpo7IFpqXBPGhWjKXm+ jnQ2tbQLgnq2V4tH/Kjs4knUvdEELMT7UJuX763RrYvP4WIE1SmPuT1fCyzqzQ== 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 4Y4LrX34S1zRF3; Fri, 6 Dec 2024 06:26:52 +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 4B66QqVf083067; Fri, 6 Dec 2024 06:26:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B66QqNx083064; Fri, 6 Dec 2024 06:26:52 GMT (envelope-from git) Date: Fri, 6 Dec 2024 06:26:52 GMT Message-Id: <202412060626.4B66QqNx083064@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 97aa0b148b9a - main - emulators/py-m64py: Update to 0.3.0.20241019 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 97aa0b148b9ae9183261e183ef197e6122b51092 Auto-Submitted: auto-generated The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=97aa0b148b9ae9183261e183ef197e6122b51092 commit 97aa0b148b9ae9183261e183ef197e6122b51092 Author: Jose Alonso Cardenas Marquez AuthorDate: 2024-12-06 06:25:37 +0000 Commit: Jose Alonso Cardenas Marquez CommitDate: 2024-12-06 06:25:37 +0000 emulators/py-m64py: Update to 0.3.0.20241019 ChangeLog at: https://github.com/mupen64plus/mupen64plus-ui-python/releases/tag/0.3.0 --- emulators/py-m64py/Makefile | 17 ++++++++-------- emulators/py-m64py/distinfo | 6 +++--- emulators/py-m64py/files/patch-setup.py | 13 ++++++++++++ .../py-m64py/files/patch-src_m64py_platform.py | 23 ++++++++-------------- 4 files changed, 33 insertions(+), 26 deletions(-) diff --git a/emulators/py-m64py/Makefile b/emulators/py-m64py/Makefile index 109876167cfd..00950781bc53 100644 --- a/emulators/py-m64py/Makefile +++ b/emulators/py-m64py/Makefile @@ -1,5 +1,5 @@ PORTNAME= m64py -DISTVERSION= 0.2.5.${RELEASE_DATE} +DISTVERSION= 0.3.0.${RELEASE_DATE} CATEGORIES= emulators python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,10 +10,10 @@ WWW= https://github.com/mupen64plus/mupen64plus-ui-python LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSES -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-pyqt>0:devel/py-qt5-pyqt@${PY_FLAVOR} \ +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt6-pyqt>0:devel/py-qt6-pyqt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysdl2>0:devel/py-pysdl2@${PY_FLAVOR} LIB_DEPENDS= libmupen64plus.so.2:emulators/mupen64plus-core -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-pyqt>0:devel/py-qt5-pyqt@${PY_FLAVOR} \ +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt6-pyqt>0:devel/py-qt6-pyqt@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pysdl2>0:devel/py-pysdl2@${PY_FLAVOR} \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-audio-sdl.so:emulators/mupen64plus-audio-sdl \ ${LOCALBASE}/lib/mupen64plus/mupen64plus-input-sdl.so:emulators/mupen64plus-input-sdl \ @@ -23,19 +23,20 @@ RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}qt5-pyqt>0:devel/py-qt5-pyqt@${PY_FLAVOR} \ USE_GITHUB= yes GH_ACCOUNT= mupen64plus GH_PROJECT= mupen64plus-ui-python -GH_TAGNAME= 90093ce3b353ff0fbe3277eb5d75130debdf0fab +GH_TAGNAME= caba742784e4183551d14a3b29228fc23300bcfb -USES= desktop-file-utils python qt:5 shebangfix +USES= desktop-file-utils python qt:6 shebangfix USE_PYTHON= autoplist distutils -USE_QT= linguisttools +USE_QT= base tools NO_ARCH= yes SHEBANG_FILES= ${WRKSRC}/bin/m64py -RELEASE_DATE= 20231226 +RELEASE_DATE= 20241019 post-patch: - ${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/m64py/platform.py + ${REINPLACE_CMD} -i "" -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/src/m64py/platform.py \ + ${WRKSRC}/setup.py .include diff --git a/emulators/py-m64py/distinfo b/emulators/py-m64py/distinfo index 6d59871e6f1a..7fb8c2f77e8f 100644 --- a/emulators/py-m64py/distinfo +++ b/emulators/py-m64py/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1704512889 -SHA256 (mupen64plus-mupen64plus-ui-python-0.2.5.20231226-90093ce3b353ff0fbe3277eb5d75130debdf0fab_GH0.tar.gz) = efa253ad87e5ef9d2509a343d3d217c2e143cd6d0b3031431db2f28553d8f21a -SIZE (mupen64plus-mupen64plus-ui-python-0.2.5.20231226-90093ce3b353ff0fbe3277eb5d75130debdf0fab_GH0.tar.gz) = 14669607 +TIMESTAMP = 1733464602 +SHA256 (mupen64plus-mupen64plus-ui-python-0.3.0.20241019-caba742784e4183551d14a3b29228fc23300bcfb_GH0.tar.gz) = e784c3c32fc49bab1d01e1f6626cdb85610c6e2470207532d5ee741b8b4faf30 +SIZE (mupen64plus-mupen64plus-ui-python-0.3.0.20241019-caba742784e4183551d14a3b29228fc23300bcfb_GH0.tar.gz) = 11387256 diff --git a/emulators/py-m64py/files/patch-setup.py b/emulators/py-m64py/files/patch-setup.py new file mode 100644 index 000000000000..b3baacdcaf65 --- /dev/null +++ b/emulators/py-m64py/files/patch-setup.py @@ -0,0 +1,13 @@ +--- setup.py.orig 2024-10-19 12:39:56 UTC ++++ setup.py +@@ -80,8 +80,8 @@ class BuildQt(setuptools.Command): + + def find_executable(self, name): + path = os.getenv("PATH").split(os.pathsep) +- path.extend(["/usr/lib64/qt6/bin", "/usr/lib64/qt6/libexec", +- "/usr/lib/qt6/bin", "/usr/lib/qt6/libexec", ++ path.extend(["", "/usr/lib64/qt6/bin", "/usr/lib64/qt6/libexec", "%%LOCALBASE%%/libexec/qt6/", ++ "/usr/lib/qt6/bin", "/usr/lib/qt6/libexec", "%%LOCALBASE%%/lib/qt6/bin", + "/usr/lib/x86_64-linux-gnu/qt6/bin", "/usr/lib/x86_64-linux-gnu/qt6/libexec"]) + + os.environ["PATH"] = os.pathsep.join(path) diff --git a/emulators/py-m64py/files/patch-src_m64py_platform.py b/emulators/py-m64py/files/patch-src_m64py_platform.py index 8490ad7a9c7a..0b06aa39c117 100644 --- a/emulators/py-m64py/files/patch-src_m64py_platform.py +++ b/emulators/py-m64py/files/patch-src_m64py_platform.py @@ -1,18 +1,11 @@ ---- src/m64py/platform.py.orig 2023-12-26 23:01:25 UTC +--- src/m64py/platform.py.orig 2024-12-06 06:23:09 UTC +++ src/m64py/platform.py -@@ -31,6 +31,15 @@ if sys.platform.startswith("linux"): - "/usr/lib/i386-linux-gnu/mupen64plus", +@@ -39,7 +39,7 @@ elif "bsd" in sys.platform: + CONFIG_DIR = os.environ.get("XDG_CONFIG_HOME") or os.path.join(os.path.expanduser("~"), ".config") + DEFAULT_DYNLIB = "libmupen64plus.so" + SEARCH_DIRS = [ +- "/usr/local/lib/mupen64plus", ++ "%%LOCALBASE%%/lib/mupen64plus", "." ] -+elif sys.platform.startswith("freebsd"): -+ DLL_EXT = ".so" -+ DLL_FILTER = "" -+ DEFAULT_DYNLIB = "libmupen64plus.so.2" -+ SEARCH_DIRS = [ -+ "%%LOCALBASE%%/lib/", -+ "%%LOCALBASE%%/lib/mupen64plus/", -+ "." -+ ] - elif sys.platform.startswith("openbsd"): - DLL_EXT = ".so" - DLL_FILTER = "" + elif sys.platform == "darwin":