Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 23 Mar 2020 20:55:08 +0000 (UTC)
From:      Niclas Zeising <zeising@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r529003 - in head: . x11/libxkbcommon
Message-ID:  <202003232055.02NKt8w4035630@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: zeising
Date: Mon Mar 23 20:55:08 2020
New Revision: 529003
URL: https://svnweb.freebsd.org/changeset/ports/529003

Log:
  x11/libxkbcommon: swtch to legacy rules on 11
  
  x11/libxkbcommon was switched to use evdev rules in r528813, but FreeBSD 11
  still needs the legacy rules.  Switch back to the legacy rules, but only on
  FreeBSD 11.
  Adjust the UPDATING entry to indicate that the switch to evdev rules by
  default is only on FreeBSD 12 and later, and that FreeBSD 11 still uses the
  legacy rules.

Modified:
  head/UPDATING
  head/x11/libxkbcommon/Makefile

Modified: head/UPDATING
==============================================================================
--- head/UPDATING	Mon Mar 23 19:21:13 2020	(r529002)
+++ head/UPDATING	Mon Mar 23 20:55:08 2020	(r529003)
@@ -26,15 +26,15 @@ you update your ports collection, before attempting an
 
   The libxkbcommon library (x11/libxkbcommon), used to handle keyboards
   in some applications, most notably kde and wayland, have been switched
-  to use evdev rules by default.  Some keys, most notably arrow keys, 
-  may not work in applications using libxkbcommon if you are using
-  xf86-input-keyboard rather than xf86-input-libinput.
+  to use evdev rules by default on FreeBSD 12 and later.  Some keys, most
+  notably arrow keys, may not work in applications using libxkbcommon if
+  you are using xf86-input-keyboard rather than xf86-input-libinput.
   If you have trouble with the keyboard keys, and if /var/log/Xorg.*.log
   shows that the "kbd" or "keyboard" driver is being used, you need to
   switch to legacy rules by setting the environment variable
   XKB_DEFAULT_RULES to xorg.
   This switch is made to match the default configuration on FreeBSD 12.1 and
-  later, the default configuration on FreeBSD 11.3 still requres the legacy
+  later, the default configuration on FreeBSD 11.3 still uses the legacy
   rules.
 
 20200316:

Modified: head/x11/libxkbcommon/Makefile
==============================================================================
--- head/x11/libxkbcommon/Makefile	Mon Mar 23 19:21:13 2020	(r529002)
+++ head/x11/libxkbcommon/Makefile	Mon Mar 23 20:55:08 2020	(r529003)
@@ -2,7 +2,7 @@
 
 PORTNAME=	libxkbcommon
 PORTVERSION=	0.10.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	https://xkbcommon.org/download/
 DIST_SUBDIR=	xorg/lib
@@ -21,4 +21,10 @@ MESON_ARGS=	-Denable-docs=false \
 		-Denable-wayland=false \
 		-Dx-locale-root="${PREFIX}/lib/X11/locale"
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1200000
+MESON_ARGS+=	-Ddefault-rules=xorg
+.endif
+
+.include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003232055.02NKt8w4035630>