diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2023-09-30 17:06:29 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2023-09-30 18:23:49 +0000 |
| commit | 6688b6464142fa2377163e4677688b2423dbfc2f (patch) | |
| tree | 58e190abb2fa9c60009adbfdeaef7358b9fd39e8 | |
| parent | 63b8367b3342f78085e102731ea0708e12005d77 (diff) | |
| download | ports-6688b6464142fa2377163e4677688b2423dbfc2f.tar.gz ports-6688b6464142fa2377163e4677688b2423dbfc2f.zip | |
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)
| -rw-r--r-- | multimedia/arcan/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/arcan/distinfo | 2 | ||||
| -rw-r--r-- | multimedia/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() |