From nobody Mon Nov 21 17:24:24 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 4NGDlY0CjNz4jWKF; Mon, 21 Nov 2022 17:24:25 +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 4NGDlX6Z9mz3KgB; Mon, 21 Nov 2022 17:24:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669051464; 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=P22KVjYDZ7qhKIxpa7MzKIp9BNHOmIkR/YodBSgWNZQ=; b=Lo6W7yEeNXaJTU+4dlMggYSa2aQeaiAaf5nPs31LuHWhrlzfvTYYdClzyUnYEEQ0fycOTR bk4bhPo4OVMvF4yu8rmsed2vspeZz9qdNTo5QSqOmaFN1wJ5nTbsKR2FS9khf42y5mLF5Y Hx5nLAvpV4YHfABlBwFVjzC3ihomEXaFm2finEyfuF8qzgKb+Pb13EIs3VVFKXR0r088V1 4VZHh+lu9ZuHhmXG8K7PlpxRn17AFF8DNYX2D3dwZVYm9Ia2h5cOaTMvcV6LqsCuDnM+mV DqpEIcgUMKqlGhuKYUvRZYK0dfwhCmdm7Feu4QrAMIT62GmWHIhls2d7P2bjiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669051464; 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=P22KVjYDZ7qhKIxpa7MzKIp9BNHOmIkR/YodBSgWNZQ=; b=VA+uCzzPp1cX8MpJkuMyah4FCRVcImCWNrzsUGENHjwriMnc+Cy/SPJxevseYCZr6x5ohh IVF4KkSCT8tI4++xxywr5o9krzmIfO+zdXcaCeZSrzGFk+QS3uPMxIR1sMkHfSaE34L5aq JOIj3M0l2hXJ8XBjAES6npdsThtM0HBw1ZIu8eGMB5rXCLCRGiQoQVmff0ZKUZBisEK7NH pe13F+RQtlNmfQUOWzTMnRpvwWF/duRcTsCvhek+TVwTgHkOIxYy/Su07TvBJN8s7CxFIj DWq1wfu8OPgyJAHezYLRgpw8tnW1MbQK7b2c4W5ph3ZZbXobWmz8w5dSfQ+YOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669051464; a=rsa-sha256; cv=none; b=d2RWooRjnLI0xoOsv3me6DYIamQTdU/qVv0eW/2zZnKngrk2R5VAZ3Y4wV8yOhkDmUddK1 tCe4Oyt87qCh14KNyXGmzyILYO69vG1z695iVWUsRYqNAddVn63dw2wauUviknVVuccywj v18FIf7aIGSSXGxg37eSnf6g4SCIfmEtNATFSyI0/MMfY7Vu+wO2u3/+RrTB7x7VIi+Td3 blI1arnRwgvd8zdF/bLyeIwpFJ2iAmR7B0fhrUYP5jlvtsexUJ5P5DfbyG9yosePApetOC JMVJPR5O7BHSbVsxeACYcNLCIvRBG0n3KufZycjebX2V/s4ZXNuMsDObfMe8kg== 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 4NGDlX5cktz1BGG; Mon, 21 Nov 2022 17:24:24 +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 2ALHOOqt080917; Mon, 21 Nov 2022 17:24:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2ALHOOa8080916; Mon, 21 Nov 2022 17:24:24 GMT (envelope-from git) Date: Mon, 21 Nov 2022 17:24:24 GMT Message-Id: <202211211724.2ALHOOa8080916@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 0ab36cf8d98e - main - graphics/py-pyglet: update to 2.0.0 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: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ab36cf8d98e937794e29170f46d89426ab72483 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=0ab36cf8d98e937794e29170f46d89426ab72483 commit 0ab36cf8d98e937794e29170f46d89426ab72483 Author: Dmitry Marakasov AuthorDate: 2022-11-21 15:56:36 +0000 Commit: Dmitry Marakasov CommitDate: 2022-11-21 17:23:41 +0000 graphics/py-pyglet: update to 2.0.0 - Preserve pyglet 1.x as graphics/py-pyglet1 - Add mutual conflicts between graphics/py-pyglet1 and graphics/py-pyglet - Switch all consumers to graphics/py-pyglet1 as it's likely that no consumer is compatible with pyglet 2.x yet --- devel/py-trimesh/Makefile | 4 ++-- games/brainworkshop/Makefile | 3 ++- graphics/Makefile | 1 + graphics/py-glooey/Makefile | 4 +++- graphics/py-pyglet/Makefile | 4 +++- graphics/py-pyglet/distinfo | 6 +++--- graphics/py-pyglet1/Makefile | 23 +++++++++++++++++++++++ graphics/py-pyglet1/distinfo | 3 +++ graphics/py-pyglet1/pkg-descr | 3 +++ math/py-sympy/Makefile | 3 ++- 10 files changed, 45 insertions(+), 9 deletions(-) diff --git a/devel/py-trimesh/Makefile b/devel/py-trimesh/Makefile index 1b43c9c2b500..0eaac75d1bae 100644 --- a/devel/py-trimesh/Makefile +++ b/devel/py-trimesh/Makefile @@ -1,6 +1,6 @@ PORTNAME= trimesh PORTVERSION= 3.5.25 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel cad python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.md NEEDED_DEPENDS= ${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>0:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pyglet1>0:graphics/py-pyglet1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}Shapely>0:devel/py-shapely@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rtree>0:devel/py-rtree@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}svg_path>0:graphics/py-svg.path@${PY_FLAVOR} \ diff --git a/games/brainworkshop/Makefile b/games/brainworkshop/Makefile index 85c285ee2088..c0ccb9440694 100644 --- a/games/brainworkshop/Makefile +++ b/games/brainworkshop/Makefile @@ -1,6 +1,7 @@ PORTNAME= brainworkshop DISTVERSIONPREFIX= v DISTVERSION= 5.0.2 +PORTREVISION= 1 CATEGORIES= games python MAINTAINER= amdmi3@FreeBSD.org @@ -9,7 +10,7 @@ WWW= https://github.com/samcv/brainworkshop LICENSE= GPLv1+ # version not specified -RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyglet/__init__.py:graphics/py-pyglet@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet1>=0:graphics/py-pyglet1@${PY_FLAVOR} USE_GITHUB= yes GH_ACCOUNT= brain-workshop diff --git a/graphics/Makefile b/graphics/Makefile index 4b43687827f6..92fe658afe02 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -914,6 +914,7 @@ SUBDIR += py-pygeoapi SUBDIR += py-pygeos SUBDIR += py-pyglet + SUBDIR += py-pyglet1 SUBDIR += py-pygraph SUBDIR += py-pygraphviz SUBDIR += py-pyinsane2 diff --git a/graphics/py-glooey/Makefile b/graphics/py-glooey/Makefile index 13ba37d8d979..de4a0287478b 100644 --- a/graphics/py-glooey/Makefile +++ b/graphics/py-glooey/Makefile @@ -1,5 +1,6 @@ PORTNAME= glooey PORTVERSION= 0.3.3 +PORTREVISION= 1 CATEGORIES= graphics x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -11,7 +12,8 @@ WWW= https://pypi.org/project/glooey LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>0:graphics/py-pyglet@${PY_FLAVOR} \ +# see https://github.com/kxgames/glooey/issues/56 regarding pyglet2 support +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet1>0:graphics/py-pyglet1@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}more-itertools>0:devel/py-more-itertools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}vecrec>0:graphics/py-vecrec@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}autoprop>0:devel/py-autoprop@${PY_FLAVOR} \ diff --git a/graphics/py-pyglet/Makefile b/graphics/py-pyglet/Makefile index 183751944969..af1047762cda 100644 --- a/graphics/py-pyglet/Makefile +++ b/graphics/py-pyglet/Makefile @@ -1,5 +1,5 @@ PORTNAME= pyglet -PORTVERSION= 1.5.27 +PORTVERSION= 2.0.0 CATEGORIES= graphics multimedia x11-toolkits python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -17,4 +17,6 @@ USE_GL= gl glu USE_PYTHON= autoplist distutils NO_ARCH= yes +CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}${PORTNAME}1 + .include diff --git a/graphics/py-pyglet/distinfo b/graphics/py-pyglet/distinfo index af24f7d16e42..6e48f51122ce 100644 --- a/graphics/py-pyglet/distinfo +++ b/graphics/py-pyglet/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1663788533 -SHA256 (pyglet-1.5.27.zip) = 4d00e067451f3b10fd51b69764fddab65444372a2da344ee2b35f0a8e6ebf005 -SIZE (pyglet-1.5.27.zip) = 6978692 +TIMESTAMP = 1668703084 +SHA256 (pyglet-2.0.0.zip) = da3069e51d2241b122995982ef99f3eb1226477b3a704920a2e4e649778d09ad +SIZE (pyglet-2.0.0.zip) = 6639682 diff --git a/graphics/py-pyglet1/Makefile b/graphics/py-pyglet1/Makefile new file mode 100644 index 000000000000..e9803a2d597a --- /dev/null +++ b/graphics/py-pyglet1/Makefile @@ -0,0 +1,23 @@ +PORTNAME= pyglet +PORTVERSION= 1.5.27 +CATEGORIES= graphics multimedia x11-toolkits python +MASTER_SITES= CHEESESHOP +PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} +PKGNAMESUFFIX= 1 + +MAINTAINER= amdmi3@FreeBSD.org +COMMENT= Cross-platform windowing and multimedia library (legacy version) +WWW= https://pypi.org/project/pyglet/ \ + https://github.com/pyglet/pyglet + +LICENSE= BSD3CLAUSE +LICENSE_FILE= ${WRKSRC}/LICENSE + +USES= display:test gl python:3.6+ pytest zip +USE_GL= gl glu +USE_PYTHON= autoplist distutils +NO_ARCH= yes + +CONFLICTS_INSTALL=${PYTHON_PKGNAMEPREFIX}${PORTNAME} + +.include diff --git a/graphics/py-pyglet1/distinfo b/graphics/py-pyglet1/distinfo new file mode 100644 index 000000000000..246bf21e8b41 --- /dev/null +++ b/graphics/py-pyglet1/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1668705790 +SHA256 (pyglet-1.5.27.zip) = 4d00e067451f3b10fd51b69764fddab65444372a2da344ee2b35f0a8e6ebf005 +SIZE (pyglet-1.5.27.zip) = 6978692 diff --git a/graphics/py-pyglet1/pkg-descr b/graphics/py-pyglet1/pkg-descr new file mode 100644 index 000000000000..c04957dbce83 --- /dev/null +++ b/graphics/py-pyglet1/pkg-descr @@ -0,0 +1,3 @@ +pyglet provides an object-oriented programming interface for +developing games and other visually-rich applications for Windows, +Mac OS X and Linux. diff --git a/math/py-sympy/Makefile b/math/py-sympy/Makefile index 21cc2e544990..c6f5b635b66f 100644 --- a/math/py-sympy/Makefile +++ b/math/py-sympy/Makefile @@ -1,5 +1,6 @@ PORTNAME= sympy PORTVERSION= 1.11.1 +PORTREVISION= 1 CATEGORIES= math python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -20,7 +21,7 @@ NO_ARCH= yes OPTIONS_DEFINE= PYGLET PYGLET_DESC= Enable plotting support -PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet>=1.1.2:graphics/py-pyglet@${PY_FLAVOR} +PYGLET_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pyglet1>=1.1.2:graphics/py-pyglet1@${PY_FLAVOR} post-patch: @${REINPLACE_CMD} -e "s#share/man/man1#man/man1#" ${WRKSRC}/setup.py