* [Buildroot] [PATCH 2/5] package/x11r7/xserver_xorg-server: remove xfbdev
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
@ 2021-04-15 6:52 ` Bernd Kuhls
2021-04-26 6:52 ` Peter Korsgaard
2021-04-15 6:52 ` [Buildroot] [PATCH 3/5] package/x11r7/xserver_xorg-server: remove evdev input drivers for kdrive Bernd Kuhls
` (4 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2021-04-15 6:52 UTC (permalink / raw)
To: buildroot
Upstream removed the kdrive framebuffer device server:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=feed7e3f982a7ac14f6fe85ed2e1ec4a83700841
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 03f36f1b28..aaf3584772 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -90,14 +90,9 @@ endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
XSERVER_XORG_SERVER_CONF_OPTS += \
--enable-kdrive \
- --enable-xfbdev \
--disable-glx \
--disable-dri \
--disable-xsdl
-define XSERVER_CREATE_X_SYMLINK
- ln -f -s Xfbdev $(TARGET_DIR)/usr/bin/X
-endef
-XSERVER_XORG_SERVER_POST_INSTALL_TARGET_HOOKS += XSERVER_CREATE_X_SYMLINK
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-evdev
@@ -106,7 +101,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
endif
else # modular
-XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
+XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive
endif
ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 3/5] package/x11r7/xserver_xorg-server: remove evdev input drivers for kdrive
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
2021-04-15 6:52 ` [Buildroot] [PATCH 2/5] package/x11r7/xserver_xorg-server: remove xfbdev Bernd Kuhls
@ 2021-04-15 6:52 ` Bernd Kuhls
2021-04-26 6:53 ` Peter Korsgaard
2021-04-15 6:52 ` [Buildroot] [PATCH 4/5] package/x11r7/xserver_xorg-server: remove optional support for tslib Bernd Kuhls
` (3 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2021-04-15 6:52 UTC (permalink / raw)
To: buildroot
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>
---
Config.in.legacy | 6 ++++++
package/x11r7/xserver_xorg-server/Config.in | 18 ------------------
.../xserver_xorg-server/xserver_xorg-server.mk | 6 ------
3 files changed, 6 insertions(+), 24 deletions(-)
diff --git a/Config.in.legacy b/Config.in.legacy
index d22dca9a53..c2b0645eaf 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -146,6 +146,12 @@ endif
comment "Legacy options removed in 2021.05"
+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
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 1b9adadb5c..fcd3d0ae00 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/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
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index aaf3584772..8bd92b7ab6 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/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
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 4/5] package/x11r7/xserver_xorg-server: remove optional support for tslib
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
2021-04-15 6:52 ` [Buildroot] [PATCH 2/5] package/x11r7/xserver_xorg-server: remove xfbdev Bernd Kuhls
2021-04-15 6:52 ` [Buildroot] [PATCH 3/5] package/x11r7/xserver_xorg-server: remove evdev input drivers for kdrive Bernd Kuhls
@ 2021-04-15 6:52 ` Bernd Kuhls
2021-04-26 6:54 ` Peter Korsgaard
2021-04-15 6:52 ` [Buildroot] [PATCH 5/5] package/x11r7/xserver_xorg-server: remove unused configure option --disable-xsdl Bernd Kuhls
` (2 subsequent siblings)
5 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2021-04-15 6:52 UTC (permalink / raw)
To: buildroot
Upstream removed support for tslib:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=5c7ed785e3bdb9f0fbf8fbfdc93b5fdd2b2c7dbf
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 5 -----
1 file changed, 5 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 8bd92b7ab6..0ac34a63b5 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -106,11 +106,6 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
endif
# Optional packages
-ifeq ($(BR2_PACKAGE_TSLIB),y)
-XSERVER_XORG_SERVER_DEPENDENCIES += tslib
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-tslib LDFLAGS="-lts"
-endif
-
ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
XSERVER_XORG_SERVER_DEPENDENCIES += udev
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 5/5] package/x11r7/xserver_xorg-server: remove unused configure option --disable-xsdl
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
` (2 preceding siblings ...)
2021-04-15 6:52 ` [Buildroot] [PATCH 4/5] package/x11r7/xserver_xorg-server: remove optional support for tslib Bernd Kuhls
@ 2021-04-15 6:52 ` Bernd Kuhls
2021-04-26 6:55 ` Peter Korsgaard
2021-04-15 21:44 ` [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Yann E. MORIN
2021-04-26 6:51 ` Peter Korsgaard
5 siblings, 1 reply; 13+ messages in thread
From: Bernd Kuhls @ 2021-04-15 6:52 UTC (permalink / raw)
To: buildroot
Upstream removed this configure option:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=52bc6d944946e66ea2cc685feaeea40bb496ea83
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 0ac34a63b5..ae17dd535e 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -91,8 +91,7 @@ ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE),y)
XSERVER_XORG_SERVER_CONF_OPTS += \
--enable-kdrive \
--disable-glx \
- --disable-dri \
- --disable-xsdl
+ --disable-dri
else # modular
XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive
--
2.29.2
^ permalink raw reply related [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
` (3 preceding siblings ...)
2021-04-15 6:52 ` [Buildroot] [PATCH 5/5] package/x11r7/xserver_xorg-server: remove unused configure option --disable-xsdl Bernd Kuhls
@ 2021-04-15 21:44 ` Yann E. MORIN
2021-04-26 6:51 ` Peter Korsgaard
5 siblings, 0 replies; 13+ messages in thread
From: Yann E. MORIN @ 2021-04-15 21:44 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2021-04-15 08:52 +0200, Bernd Kuhls spake thusly:
> Upstream removed support for non-evdev input drivers for kdrive:
> https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=e7b8b7b131d8283c96ed0aff4593ab41441b5d3b
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Series of 5 applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> Config.in.legacy | 12 ++++++++++++
> package/x11r7/xserver_xorg-server/Config.in | 12 ------------
> .../x11r7/xserver_xorg-server/xserver_xorg-server.mk | 12 ------------
> 3 files changed, 12 insertions(+), 24 deletions(-)
>
> diff --git a/Config.in.legacy b/Config.in.legacy
> index 1f62348f9b..d22dca9a53 100644
> --- a/Config.in.legacy
> +++ b/Config.in.legacy
> @@ -146,6 +146,18 @@ endif
>
> comment "Legacy options removed in 2021.05"
>
> +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
> + bool "KDrive/TinyX kbd input driver removed"
> + select BR2_LEGACY
> + help
> + The kbd input driver in KDrive was removed.
> +
> +config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE
> + bool "KDrive/TinyX mouse input driver removed"
> + select BR2_LEGACY
> + help
> + The mouse input driver in KDrive was removed.
> +
> config BR2_PACKAGE_MESA3D_OSMESA_CLASSIC
> bool "mesa OSMesa (classic) option removed"
> select BR2_LEGACY
> diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
> index 3bf5af89be..1b9adadb5c 100644
> --- a/package/x11r7/xserver_xorg-server/Config.in
> +++ b/package/x11r7/xserver_xorg-server/Config.in
> @@ -90,18 +90,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_EVDEV
> Xfbdev -keybd evdev,,device=/dev/input/eventX
> -mouse evdev,,device=/dev/input/eventY
>
> -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD
> - bool "Enable KDrive/TinyX kbd input driver"
> - help
> - Enable kbd input driver in KDrive. It uses the console
> - keyboard as input device.
> -
> -config BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE
> - bool "Enable KDrive/TinyX mouse input driver"
> - help
> - Enable mouse input driver in KDrive. It supports PS/2 mice
> - and serial port mice.
> -
> endif
>
> comment "Optional Servers"
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index 3fa77cd4f0..03f36f1b28 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> @@ -105,18 +105,6 @@ else
> XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-evdev
> endif
>
> -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_KBD),y)
> -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-kbd
> -else
> -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-kbd
> -endif
> -
> -ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_KDRIVE_MOUSE),y)
> -XSERVER_XORG_SERVER_CONF_OPTS += --enable-kdrive-mouse
> -else
> -XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive-mouse
> -endif
> -
> else # modular
> XSERVER_XORG_SERVER_CONF_OPTS += --disable-kdrive --disable-xfbdev
> endif
> --
> 2.29.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 13+ messages in thread* [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive
2021-04-15 6:52 [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Bernd Kuhls
` (4 preceding siblings ...)
2021-04-15 21:44 ` [Buildroot] [PATCH 1/5] package/x11r7/xserver_xorg-server: remove non-evdev input drivers for kdrive Yann E. MORIN
@ 2021-04-26 6:51 ` Peter Korsgaard
5 siblings, 0 replies; 13+ messages in thread
From: Peter Korsgaard @ 2021-04-26 6:51 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> Upstream removed support for non-evdev input drivers for kdrive:
> https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?h=server-1.20-branch&id=e7b8b7b131d8283c96ed0aff4593ab41441b5d3b
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Committed to 2021.02.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 13+ messages in thread