Explorar el Código

package/x11r7/xserver_xorg-server: remove evdev input drivers for kdrive

Upstream removed the evdev driver for kdrive:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=27819950e4158326e0f83a30f2e8968b932625ef

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 553a12352634023a77ba6742b3786f01359bd189)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Bernd Kuhls hace 4 años
padre
commit
1f6d61c0ff

+ 6 - 0
Config.in.legacy

@@ -146,6 +146,12 @@ endif
 
 comment "Legacy options removed in 2021.02"
 
+config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
+	bool "KDrive/TinyX evdev input driver removed"
+	select BR2_LEGACY
+	help
+	  The evdev input driver in KDrive was removed.
+
 config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
 	bool "KDrive/TinyX kbd input driver removed"
 	select BR2_LEGACY

+ 0 - 18
package/x11r7/xserver_xorg-server/Config.in

@@ -74,24 +74,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
 
 endchoice
 
-if BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE
-
-config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
-	bool "Enable KDrive/TinyX evdev input driver"
-	help
-	  Enable evdev input driver in KDrive. This allows KDrive to
-	  use input devices that are integrated in the Linux input
-	  subsystem, i.e have a /dev/input/eventX device file. This is
-	  most likely the input driver you want to use.
-
-	  This driver can then be enabled by running the X server
-	  using:
-
-	  Xfbdev -keybd evdev,,device=/dev/input/eventX
-	         -mouse evdev,,device=/dev/input/eventY
-
-endif
-
 comment "Optional Servers"
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB

+ 0 - 6
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk

@@ -94,12 +94,6 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
 	--disable-dri \
 	--disable-xsdl
 
-ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev
-else
-XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
-endif
-
 else # modular
 XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive
 endif