From nobody Sat Sep 30 02:55:33 2023 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 4RyBfY3Tmtz4v8ly; Sat, 30 Sep 2023 02:55:33 +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 4RyBfY2zqVz4ZF8; Sat, 30 Sep 2023 02:55:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696042533; 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=3npYGPZD7s51/oG1UMxP88kBxzK2Z7XNzxzH+ukvHWY=; b=We+0dRO2iYGI8nP7CJ8y3E0E3ep+POKJeZFCVMY+ZoAWW61bmbnHaX1XQx7Ec67rzdke4X stPWdfDWXb+/jXIu6odLjSCREUDjRPOcONv6ZZkKeR/SaMDneFXGvQJYH1vj4yU/sezrzO kawusmL6PTtKAwG4lF8qo4GbRJEWbjNrSC/RUGRqgG7QXEXzrQnTfQAxd16Bu1iQCVBnQz YT+w+DUb9GCRsfRQwHKmsoj7Ca4B6YzG6L+OoQKZ2yLl7LfjiWrkDQgwPEkZkDbkdx85BR 1Da9Eo0pVWgdynoO6FFeVuzHsO/m3kGnb0u30fbXtebBMqPfXIU/M393z3RJLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696042533; a=rsa-sha256; cv=none; b=ncrN1I2Sd8YMg57tDr1Jk0A570QwbdqRaJ/mG8PCPcy3j/Jepx7PXHCYbCQQeSMgeDA1a3 737WcIPzUwbdHu70C6p3RuaB8JXrI1CoPD4OsCnxccnrl9fUFRi09kRz3lo0GUFr8f+8Oh qV+ebYef5uY1sC48c3ZNNeWsFqorC31qj/cDo2KLHXJaVle7ifm3dBc4ax7oep4y1QDACu 4RSbrz6pL6M6HbAKP5r10KTzlT7Y/d4+Vq5795vNxdBJXHT7EiM6xHJ2i7mcuwJJq/wewi 79Tz3qwCSskv2ZK9mdWrsRY1DKbU7tjvaO/NfBbhCGamoDKnSIk220+F0Igqjg== 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=1696042533; 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=3npYGPZD7s51/oG1UMxP88kBxzK2Z7XNzxzH+ukvHWY=; b=M94WLG/2CPIdMLm4Pwb0tW/F3zD18n53feoqgFgr/87NrIW9p/7qIDjtez5g2ZxyvwBcJs tcJUAnKgKvFPADDp3A7GmB1v9rI06ZthH5R5m8vtNSazZuGG2ceQFvuJQQAz+cguCe0f3o a00q6zZcaBYcVHOFmAZKZEW9+AgPwZHcr+8MqzcPHtHIbByuHSML2CpStJzcvGESkJAYPV dgZf8fHFfJwOj1izF1CguqOIssDn8hzBC+1OzydaukmiNvvUkkDCIOU28Idgua1b+9iWaa tRAIW60PnerI1BEvywRLdmDMnha8GfWW9tJeelH4ThLDMd3t30baKr5XTrRTEQ== 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 4RyBfY1kfZzVlD; Sat, 30 Sep 2023 02:55:33 +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 38U2tXA1045978; Sat, 30 Sep 2023 02:55:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38U2tXml045975; Sat, 30 Sep 2023 02:55:33 GMT (envelope-from git) Date: Sat, 30 Sep 2023 02:55:33 GMT Message-Id: <202309300255.38U2tXml045975@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 2258b3ebc4ee - main - multimedia/arcan: unbreak KMS support after cb7c09ae6a8e 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2258b3ebc4eea9aa93da7058a0df054475849f38 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=2258b3ebc4eea9aa93da7058a0df054475849f38 commit 2258b3ebc4eea9aa93da7058a0df054475849f38 Author: Jan Beich AuthorDate: 2023-09-30 02:09:56 +0000 Commit: Jan Beich CommitDate: 2023-09-30 02:52:05 +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 --- 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()