From nobody Sat Sep 30 18:24:11 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 4RybG3372Vz4vg0q;
Sat, 30 Sep 2023 18:24:11 +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 4RybG32fplz4bwm;
Sat, 30 Sep 2023 18:24:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1696098251;
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=HR2otWUGM0u7KpuDJ109PtvQJ2y0PoACI/5fCdePdGI=;
b=u3z1UjKBaZ675xRPULz/VoiPulniFqEeAQCo9O5KtvMl1ykQpR2oka6BcFwtB1EPx4yTrT
TL0DCYxRaH9lNCwrVofQfIQi8mbTidLW/kAwpQZEcVidmvDlrE4HGaoqCtGZu0bRSZ623z
4UTOP5W2Had9zLzBOjdMLuvVxD8qbfM7IFCIr3Lz9/VFtVGZue0DfaLnPezeuv/CqC4bo+
PCixIb7gSkUXLU6DhbV3HMGRPHCu+ZgDkjOh4uDEAO1h9JQRMcqJehVuUmDOrQHRASakGP
FairfH5Gl4XaajBe2jijYmwahez1OKK3j4/b2vDh6SYZYN/ELXuvVJ7jrOcX7g==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696098251; a=rsa-sha256; cv=none;
b=oe7vHb33SXIvilDpaxFZPKipiStAB80A3NhfYwmqBU026S70EhB0IPbww1TFANIzjKKl8O
kzMhKp8dpg50oqeFAA8rhb3qunwI8qnIrTEqmipY6M5CCKCr53bg83NoKUCpV6M45FpQ+m
Xc22IYRuH8VMBO2qihGRifm9dbwH4vwuNZT2I9k7mzhINjdUIqdL29K8+qMx4oMwoyhpSd
kQzA6vl/Z62ZVsmhFXxwYCZvnxuRwmQBjirQTuyLoIuQR3glIssI3u88bPZHzSSYeLctCW
sEMGXWvO8eV/kqERF89TzWHPX6X2LlOznHCnyVI2Y+ItGr1UilLCj5hv3L5mbQ==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1696098251;
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=HR2otWUGM0u7KpuDJ109PtvQJ2y0PoACI/5fCdePdGI=;
b=wZ2Wv/OMTRk5Xou5FF9aifaDROma6d0p0MiQEqkb7ysOUJWLpL5B9EEjUjyRkuKVdRirx4
gRxDJh0cosITrXiSiRaQPPL31xB1rXA5HAcNyGGBB36N5k8x8YpJpj2Gtnb6/6XN+DX7kK
A51CbNVYUQyNKuLPdrIO0NCn5pGz3JCEcs5fJiL0DcaKxopTAuXgrU59A4/5FZNzqMfCvY
Z11viGl28XnSAVJ2Eacuhx5y+/EtP9ZYa/L3ybwI3o8ZG/1A/fzdn2+OD6XZff7yONHOk0
VaFOGHBsSVJ4kmwZnF1n1wex0jobkiVX4vViVS7D8RzZn7xgOkhE79Ndxsfs8g==
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 4RybG31lFvzxR8;
Sat, 30 Sep 2023 18:24:11 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38UIOBW7093221;
Sat, 30 Sep 2023 18:24:11 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38UIOB7U093218;
Sat, 30 Sep 2023 18:24:11 GMT
(envelope-from git)
Date: Sat, 30 Sep 2023 18:24:11 GMT
Message-Id: <202309301824.38UIOB7U093218@gitrepo.freebsd.org>
To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org,
dev-commits-ports-branches@FreeBSD.org
From: Jan Beich <jbeich@FreeBSD.org>
Subject: git: 6688b6464142 - 2023Q3 - multimedia/arcan: restore
evdev support via upstream fix
List-Id: Commits to the quarterly branches of the FreeBSD ports repository <dev-commits-ports-branches.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches
List-Help: <mailto:dev-commits-ports-branches+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-branches@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-branches+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-branches+unsubscribe@freebsd.org>
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: jbeich
X-Git-Repository: ports
X-Git-Refname: refs/heads/2023Q3
X-Git-Reftype: branch
X-Git-Commit: 6688b6464142fa2377163e4677688b2423dbfc2f
Auto-Submitted: auto-generated
The branch 2023Q3 has been updated by jbeich:
URL: https://cgit.FreeBSD.org/ports/commit/?id=6688b6464142fa2377163e4677688b2423dbfc2f
commit 6688b6464142fa2377163e4677688b2423dbfc2f
Author: Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2023-09-30 17:06:29 +0000
Commit: Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2023-09-30 18:23:49 +0000
multimedia/arcan: restore evdev support via upstream fix
Arcan >= 0.6.1 respects XKB_DEFAULT_LAYOUT ("us" by default, similar
to Option "XkbLayout" in xorg.conf) instead of ARCAN_INPUT_KEYMAPS
(/usr/share/syscons/keymaps/us.iso.kbd by default). XKB_DEFAULT_* are
also used by other libxkbcommon consumers like Wayland compositors.
Users that prefer syscons input backend can override via Makefile.local e.g.,
$ echo CMAKE_ARGS+=-DINPUT_PLATFORM=syscons >/usr/ports/multimedia/arcan/Makefile.local
PR: 274163
(cherry picked from commit 5fea740a3d8e5092f60f0ba5ced4118c98841f28)
---
multimedia/arcan/Makefile | 3 ++-
multimedia/arcan/distinfo | 2 ++
.../arcan/files/patch-platform_cmake_CMakeLists.BSD | 15 ---------------
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile
index 04c42c748903..b83484e3e684 100644
--- a/multimedia/arcan/Makefile
+++ b/multimedia/arcan/Makefile
@@ -1,10 +1,11 @@
PORTNAME= arcan
DISTVERSION= 0.6.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= 9b807ac75c6f.patch:-p2 # https://github.com/letoram/arcan/issues/258
+PATCHFILES+= 9020c030cbd3.patch:-p2 # evdev crashfix
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Display Server, Multimedia Framework, Game Engine
diff --git a/multimedia/arcan/distinfo b/multimedia/arcan/distinfo
index 917534939345..b7f99d53f485 100644
--- a/multimedia/arcan/distinfo
+++ b/multimedia/arcan/distinfo
@@ -3,3 +3,5 @@ SHA256 (letoram-arcan-0.6.2.1_GH0.tar.gz) = 7bf083412bc61555472877313c13116431a0
SIZE (letoram-arcan-0.6.2.1_GH0.tar.gz) = 11812923
SHA256 (9b807ac75c6f.patch) = 158b194c6ac99922c3ad44e9887d471523a8044a5acdb4786754d9e0a1c6509b
SIZE (9b807ac75c6f.patch) = 1191
+SHA256 (9020c030cbd3.patch) = 1a2108c0cef32ec10ef62a8205992d870e5593a1be6ed22c0f897c308ffa8e50
+SIZE (9020c030cbd3.patch) = 3932
diff --git a/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD b/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD
deleted file mode 100644
index af4661e3174a..000000000000
--- a/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD
+++ /dev/null
@@ -1,15 +0,0 @@
-Partially revert https://github.com/letoram/arcan/commit/3c1674a8f5db
-
---- platform/cmake/CMakeLists.BSD.orig 2022-10-12 20:23:54 UTC
-+++ platform/cmake/CMakeLists.BSD
-@@ -74,6 +74,10 @@ else()
- set(BSD_VARIANT_DEFINITIONS
- -DCLOCK_MONOTONIC_RAW=CLOCK_REALTIME_FAST)
-
-+# FreeBSD 12.1 enabled evdev but Arcan crashes
-+ if(${INPUT_PLATFORM} STREQUAL "evdev")
-+ SET(INPUT_PLATFORM "syscons")
-+ endif()
- if (VIDEO_PLATFORM STREQUAL "egl-dri")
- list(APPEND ARCAN_PLATFORM ${PLATFORM_PATH}/psep_open.c)
- else()