From nobody Tue May 02 06:43:02 2023 X-Original-To: dev-commits-ports-branches@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 4Q9Vrk41TNz48Zcj; Tue, 2 May 2023 06:43:02 +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 4Q9Vrk3Khbz4TpR; Tue, 2 May 2023 06:43:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683009782; 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=EKpHdZQd1FkhPYMQXhVEadMreUojV4wwqlVpEk4ZU/4=; b=t8EPQy4qQ/mwWdH1KFIDj4gWxihS9pMH6T7Ur6ZKh+fHaKW6bBe01DaBNmatoLKPF4GEZF Sy7qx2rG+CwOlriX7vS+DF/2ynzB5gdVsu8oQFFtoi72ApzDgflr4QoY0VeQkNqOXc/dO+ /Q4jzxeaCcLk6PwlpYMzbW12YA3gozaZMR6qCqnuCn8xsgGzBkve0fSmaH8D5fyg1ArB3f 6b2PinRgw3xO2m+7duc5SdYh6O2JOs5UW0YSGcn1XPsYepzYlmUpz6QePPOic/LbNrVQj4 CGR2RO21GoGOMaqPkGUqPtu57Txxp3oIYSB0WfnyupY4FK4IyA9MvcHGX9n12w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683009782; 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=EKpHdZQd1FkhPYMQXhVEadMreUojV4wwqlVpEk4ZU/4=; b=OqJ9okDsgJ+IYz84G/paCm+2nDi/tpK1gE9G0zuunRWWyjJJNH+hcgzSJPBzqJBm+3/YBi 5aDHrtSoqayON+i1TA7yv0BqJGCKOIGxPKTLihaRbMTihjXa1j0f+uhL6MM8OlThPE0gzI 0vBfDpCZ/280NvklXdmaBous1J/kDckerzx6BTGl+iRKMKiGJewoaKSFr2nJu1cTk6YkZU lRSQ2uC50Bmn8wg5Md1Ld2O6rCvAgcwC+BViglIf4bgbb38ehDllA3GPvTXBy+rNG2bjMb i79tTvqOtuvmyKPza+nXaoCDDTb0hqjQ9ynmCmj+7Rdg+GTgj24V8qyKa80Qgg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683009782; a=rsa-sha256; cv=none; b=czZdxPv5V+L763N4zZzyCMkv/wh7H6XdYJNBM7u60iLbqAQKat7M6DI7kfm+jhIMoUycNv SoVkZvqWaBHa5JaOgHab3CNXDyugGQo47xBjKzbHJ/6W2Yy9UVAcJxU+hQSkFl0WkdEUgK 6beyr6f4vlUElP5u2EscQyeoxCKEwjf0iiKNmqJhIrHYfuJ85S0JwgqqZx0tSjblFIoRPh ImOnwOTmrW0sHx+aCMQV6PgP+kezj8Uy4KCWwLUGZINxGieBh1MNumLbt+FSuVh580Ahv1 xYPJcRj5SNqjl+2lOzkn4yVhFM7vJMGLglfgS1EwUiGvs92KkLK9XtgQnWgPeg== 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 4Q9Vrk2NSwzdVM; Tue, 2 May 2023 06:43:02 +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 3426h2i9010247; Tue, 2 May 2023 06:43:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3426h25L010246; Tue, 2 May 2023 06:43:02 GMT (envelope-from git) Date: Tue, 2 May 2023 06:43:02 GMT Message-Id: <202305020643.3426h25L010246@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 8c86204b79a2 - 2023Q2 - games/anki: Fix crashes with nVidia drivers List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 8c86204b79a203a15bd18017e306bc6d08a0305a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=8c86204b79a203a15bd18017e306bc6d08a0305a commit 8c86204b79a203a15bd18017e306bc6d08a0305a Author: Kai Knoblich AuthorDate: 2023-05-02 06:34:24 +0000 Commit: Kai Knoblich CommitDate: 2023-05-02 06:41:49 +0000 games/anki: Fix crashes with nVidia drivers * Prevent Anki from explicitly loading "libGL.so.1", which leads to segfaults in environments that have nVidia drivers in use. * Bump PORTREVISION due package change. PR: 270778 Reported by: bitbucket63-it@yahoo.com MFH: 2023Q2 (cherry picked from commit bdcfffd8573e09ef4c838b3dd1444fa15e508c4e) --- games/anki/Makefile | 2 +- games/anki/files/patch-qt_aqt_____init____.py | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/games/anki/Makefile b/games/anki/Makefile index 5fc8c01aaa4a..153ea7eee848 100644 --- a/games/anki/Makefile +++ b/games/anki/Makefile @@ -1,6 +1,6 @@ PORTNAME= anki DISTVERSION= 2.1.54 -PORTREVISION= 14 +PORTREVISION= 17 # Don't forget to update ${_MY_BUILDHASH} if DISTVERSION changes CATEGORIES= games education python MASTER_SITES= LOCAL/kai/:yarncache \ diff --git a/games/anki/files/patch-qt_aqt_____init____.py b/games/anki/files/patch-qt_aqt_____init____.py new file mode 100644 index 000000000000..6428c77633ba --- /dev/null +++ b/games/anki/files/patch-qt_aqt_____init____.py @@ -0,0 +1,13 @@ +Prevents runtime issues with nVidia drivers + +--- qt/aqt/__init__.py.orig 2023-04-15 12:54:44 UTC ++++ qt/aqt/__init__.py +@@ -369,7 +369,7 @@ def setupGL(pm: aqt.profiles.ProfileManager) -> None: + driver = pm.video_driver() + + # work around pyqt loading wrong GL library +- if is_lin: ++ if is_lin and not sys.platform.startswith("freebsd"): + import ctypes + + ctypes.CDLL("libGL.so.1", ctypes.RTLD_GLOBAL)