From nobody Sat Sep 30 02:59:44 2023 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 4RyBlP1XVXz4v9Fj; Sat, 30 Sep 2023 02:59:45 +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 4RyBlP10L9z4ZKc; Sat, 30 Sep 2023 02:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696042785; 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=kQAR9r2UynhPUAhCXejwpdAHNPF8qnSoO2XNPoUq6mU=; b=NyMyoxbm9/bWYzMdx1QRoqM0HEW7O9J7bgpPKZJst1JjItuYTbh+VPuTTLFJKZq94Qnx5t B2lr7Gu3wPKJ+u9196D+1ms31GufNpWRPJ8PrNHusCoi+fhDN4haOCGhNS6aU3OJkXrck3 AvxW5M7QTRiqQUWBba6Y94a0SFc99HYoKyhiLxNxNFv2p3naU49GfIeUNahPRMZyMgFkFY WAgYuxa3d/egwTGZaxxZrsM3NP6BVcXfBpM0CgUfiDbxPYbAXbR0xkWXFjAMUcrO0zGmlg Zk9e51w0o1BBWevCidD0RlTA7awhJ+dsJ/4yt7iuDVQPYQ/g5+uFPfMYUftYfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696042785; a=rsa-sha256; cv=none; b=J97rOhatxZcjqHqLaTJaRsJtN6FCvM5L2PYtDyii852+U8gHNdlPJF4h/JkW8+cNUOb01t wQ+PZQXcDh1/zl4NO8v0BBrVbC/u9mnMgqf5QyJoi01+YB6Add0rIJ5PsLNTEpcxaWkcJ/ ZM4UB+PNFzqZlCMS56FByE6SUe+lpUQb/p7miGBAxBE+MizSFixIMr05G8ZqJtC/P3oV9j hbMjsdytbgh6jd2UlLe1kmX2nnO1nRyMpEAZCvQVjrGvp9cdPvlIigf8Ol2O5yrPYbVunx m6P6H7YmUUFFH5IQKe4M11pplP8lMENf+Fc1nde5UBojxs6zWFKAbsy2xeKr+Q== 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=1696042785; 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=kQAR9r2UynhPUAhCXejwpdAHNPF8qnSoO2XNPoUq6mU=; b=QRvq/R4zFHTXQFVBI2nigg7b6nLRWw6VWeNr0MgA6mSJgx5i7H3FWS3vyLE2daM3YR+anx JSqH/zqAlp1B+HNDfP/LS7eBJ+iuEfq5oFM/SAZFHIsp959cvSCEuuAX+wNs2M3BqnmOb/ buq01iwu+t8NMLh2ULxCAxvgZ9+6XLtKseOtYIupdyybdEHgnU2ziI+6v6+oVmjGzm17wI GWgXodukWq3dLO1zzA7wYUt7n6iQo14d1476KviE7HfghJt0z3kFoeqCVC9fEVsQsijWTU 6FVdQafcjcM29qdVZH3wuva/z0EfM1+8g5RopY4oO4iNJ2rdk90q2HolpuC33A== 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 4RyBlP03jVzWPw; Sat, 30 Sep 2023 02:59:45 +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 38U2xi3S046665; Sat, 30 Sep 2023 02:59:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U2xiBE046662; Sat, 30 Sep 2023 02:59:44 GMT (envelope-from git) Date: Sat, 30 Sep 2023 02:59:44 GMT Message-Id: <202309300259.38U2xiBE046662@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 32d0b0d5e1b5 - 2023Q3 - multimedia/arcan: unbreak KMS support after cb7c09ae6a8e 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 32d0b0d5e1b5db3fb0a089a8eb30fb1891c27754 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=32d0b0d5e1b5db3fb0a089a8eb30fb1891c27754 commit 32d0b0d5e1b5db3fb0a089a8eb30fb1891c27754 Author: Jan Beich AuthorDate: 2023-09-30 02:09:56 +0000 Commit: Jan Beich CommitDate: 2023-09-30 02:59:39 +0000 multimedia/arcan: unbreak KMS support after cb7c09ae6a8e $ arcan console pid 12345 (arcan), jid 0, uid 1111: exited on signal 6 (no core dump - bad address) $ tail -1 /var/log/messages Sep 29 22:48:36 localhost arcan[12345]: stack overflow detected; terminated (lldb) bt * thread #2, name = 'arcan', stop reason = signal SIGABRT * frame #0: 0x00000008277faf5a libc.so.7`__sys_kill at kill.S:4 frame #1: 0x00000008277fe361 libc.so.7`__fail(msg="stack overflow detected; terminated") at stack_protector.c:120:8 frame #2: 0x00000008277fe2d0 libc.so.7`__stack_chk_fail at stack_protector.c:127:2 frame #3: 0x00000000002eb876 arcan`button_count(fd=5, bitn=1, got_mouse=0x000000082040a5cf, got_joy=0x000000082040a5ce) at event.c:0 (lldb) f 3 frame #3: 0x00000000002eb876 arcan`button_count(fd=5, bitn=1, got_mouse=0x000000082040a5cf, got_joy=0x000000082040a5ce) at event.c:0 844 #define bit_isset(ary, bit) (( ary[bit_longn(bit)] >> bit_ofs(bit)) & 1) 845 #define bit_count(x) ( ((x) - 1 ) / (sizeof(long) * 8 ) + 1 ) 846 -> 847 static size_t button_count(int fd, size_t bitn, bool* got_mouse, bool* got_joy) 848 { 849 size_t count = 0; 850 PR: 274163 Reported by: Albin "a12l" Otterhäll (cherry picked from commit 2258b3ebc4eea9aa93da7058a0df054475849f38) --- multimedia/arcan/Makefile | 2 +- .../arcan/files/patch-platform_cmake_CMakeLists.BSD | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/multimedia/arcan/Makefile b/multimedia/arcan/Makefile index 4d23ce46b92a..04c42c748903 100644 --- a/multimedia/arcan/Makefile +++ b/multimedia/arcan/Makefile @@ -1,6 +1,6 @@ PORTNAME= arcan DISTVERSION= 0.6.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ diff --git a/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD b/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD new file mode 100644 index 000000000000..af4661e3174a --- /dev/null +++ b/multimedia/arcan/files/patch-platform_cmake_CMakeLists.BSD @@ -0,0 +1,15 @@ +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()