package/x11r7/xdriver_xf86-input-*: mass switch to xorgproto

The new package xorgproto will combine and replace all current xproto_*
packages. For details read
https://lists.x.org/archives/xorg-announce/2018-February/002835.html

Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index 70e950dc74857b62c64b5f53076f908942e1a70b..fe4e451ed722602c88477bb257c65af553c8b798 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-evdev/Config.in
+++ b/package/x11r7/xdriver_xf86-input-evdev/Config.in
@@ -3,9 +3,7 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_EVDEV
        depends on BR2_PACKAGE_HAS_UDEV # libudev is configure dependency
        select BR2_PACKAGE_LIBEVDEV
        select BR2_PACKAGE_MTDEV
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Generic Linux input driver
 

diff --git a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
index 4933c42fda310060fc7e673f7707f1253ba81b63..ded7fa77f11e0d8fb58ab80b32e354ea90bd7d15 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
+++ b/package/x11r7/xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk
@@ -15,10 +15,8 @@ XDRIVER_XF86_INPUT_EVDEV_DEPENDENCIES = \
        host-pkgconf \
        libevdev \
        mtdev \
-       xproto_inputproto \
+       xorgproto \
        xserver_xorg-server \
-       xproto_randrproto \
-       xproto_xproto \
        udev
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-joystick/Config.in b/package/x11r7/xdriver_xf86-input-joystick/Config.in
index ff9f25f5494fc25d2473f2ded9449797779d403a..892d1a161b98aeb3202853df3ccf2b162104f31e 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-joystick/Config.in
+++ b/package/x11r7/xdriver_xf86-input-joystick/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_JOYSTICK
        bool "xf86-input-joystick"
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for joystick input devices

diff --git a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
index 5bc2a5cafb7c1314d8aac9e301be03739c6f29b1..0ec4be5e53fba835261db4e05b4f1d742e046669 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
+++ b/package/x11r7/xdriver_xf86-input-joystick/xdriver_xf86-input-joystick.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_JOYSTICK_SOURCE = xf86-input-joystick-$(XDRIVER_XF86_INPUT_JO
 XDRIVER_XF86_INPUT_JOYSTICK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_JOYSTICK_LICENSE = MIT
 XDRIVER_XF86_INPUT_JOYSTICK_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_JOYSTICK_DEPENDENCIES = xserver_xorg-server xorgproto
 XDRIVER_XF86_INPUT_JOYSTICK_AUTORECONF = YES
 
 define XDRIVER_XF86_INPUT_JOYSTICK_CONF

diff --git a/package/x11r7/xdriver_xf86-input-keyboard/Config.in b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
index 0a0352424eef5b8f24097834b0ac9d182c3d9600..ee23033b978063fb84b1312b3c904ad64412bb54 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-keyboard/Config.in
+++ b/package/x11r7/xdriver_xf86-input-keyboard/Config.in
@@ -1,8 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_KEYBOARD
        bool "xf86-input-keyboard"
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_KBPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Keyboard input driver

diff --git a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
index 01a6859cd4696dfe32e2cab6aa88a90f51542a1e..fb1e2896434762067b4696d99b18c1319a3dc7da 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
+++ b/package/x11r7/xdriver_xf86-input-keyboard/xdriver_xf86-input-keyboard.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_KEYBOARD_SOURCE = xf86-input-keyboard-$(XDRIVER_XF86_INPUT_KE
 XDRIVER_XF86_INPUT_KEYBOARD_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_KEYBOARD_LICENSE = MIT
 XDRIVER_XF86_INPUT_KEYBOARD_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_kbproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_KEYBOARD_DEPENDENCIES = xserver_xorg-server xorgproto
 XDRIVER_XF86_INPUT_KEYBOARD_CONF_OPTS = --disable-selective-werror
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-libinput/Config.in b/package/x11r7/xdriver_xf86-input-libinput/Config.in
index 0f2db1bd1aadfcfce10a4fed4e5acf2836b4a779..0cfbfc664a022bcaae31c2eda68acdfd10360da2 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-libinput/Config.in
+++ b/package/x11r7/xdriver_xf86-input-libinput/Config.in
@@ -3,8 +3,7 @@ config BR2_PACKAGE_XDRIVER_XF86_INPUT_LIBINPUT
        depends on BR2_ENABLE_LOCALE # libinput
        depends on BR2_PACKAGE_HAS_UDEV # libinput
        select BR2_PACKAGE_LIBINPUT
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          This is an X driver based on libinput. It is a thin wrapper
          around libinput, so while it does provide all features that

diff --git a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
index 89d0e5e3e74fad492a7b1a6fe8edbe3455ac06aa..b427d154cb6d07c62f43da8f56ac06ad7c0f6422 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
+++ b/package/x11r7/xdriver_xf86-input-libinput/xdriver_xf86-input-libinput.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_LIBINPUT_SOURCE = xf86-input-libinput-$(XDRIVER_XF86_INPUT_LI
 XDRIVER_XF86_INPUT_LIBINPUT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_LIBINPUT_LICENSE = MIT
 XDRIVER_XF86_INPUT_LIBINPUT_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xproto_inputproto xproto_xproto
+XDRIVER_XF86_INPUT_LIBINPUT_DEPENDENCIES = libinput xserver_xorg-server xorgproto
 XDRIVER_XF86_INPUT_LIBINPUT_AUTORECONF = YES
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-mouse/Config.in b/package/x11r7/xdriver_xf86-input-mouse/Config.in
index 20e1803a9905e5a660614415abebfcf1f9adb545..efa181e556d1dfa34cb6b40164832f2318f9e74c 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-mouse/Config.in
+++ b/package/x11r7/xdriver_xf86-input-mouse/Config.in
@@ -1,7 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_MOUSE
        bool "xf86-input-mouse"
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for mouse input devices

diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
index 97ee452f9c88d8e4c9110363661dceb0be8584d4..3886fa7aa15c6d2cae4e37d158e215b6a20ebece 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VE
 XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
 XDRIVER_XF86_INPUT_MOUSE_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_MOUSE_DEPENDENCIES = xserver_xorg-server xorgproto
 XDRIVER_XF86_INPUT_MOUSE_AUTORECONF = YES
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-synaptics/Config.in b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
index ffe1a2a448f0a85691e5aa16b26a962da267c507..b974265b31a94b887a79dea77407141544990101 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-synaptics/Config.in
+++ b/package/x11r7/xdriver_xf86-input-synaptics/Config.in
@@ -1,9 +1,7 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_SYNAPTICS
        bool "xf86-input-synaptics"
        select BR2_PACKAGE_LIBEVDEV
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
        select BR2_PACKAGE_MTDEV
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for synaptics input devices

diff --git a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
index 6bd9cc49c5251361a627e552176eb95821e0c51c..0708110e918d5c9158b979e39304d31404c4c0ab 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
+++ b/package/x11r7/xdriver_xf86-input-synaptics/xdriver_xf86-input-synaptics.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_SYNAPTICS_SOURCE = xf86-input-synaptics-$(XDRIVER_XF86_INPUT_
 XDRIVER_XF86_INPUT_SYNAPTICS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE = MIT
 XDRIVER_XF86_INPUT_SYNAPTICS_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto mtdev
+XDRIVER_XF86_INPUT_SYNAPTICS_DEPENDENCIES = libevdev xserver_xorg-server xorgproto mtdev
 XDRIVER_XF86_INPUT_SYNAPTICS_AUTORECONF = YES
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-tslib/Config.in b/package/x11r7/xdriver_xf86-input-tslib/Config.in
index 4e77abcb10d8ed365db18f62908d0c30f07e4d8d..9205cba6bd856ad2c92000d1bcd6843f71c80062 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-tslib/Config.in
+++ b/package/x11r7/xdriver_xf86-input-tslib/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB
        bool "xf86-input-tslib"
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        select BR2_PACKAGE_TSLIB
        help
          Touch screen library input driver

diff --git a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
index bf0ee4860dd730d87564f25788054253689f3697..f8944f35213823dea5968af4ee50ccbd63c90a1f 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
+++ b/package/x11r7/xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk
@@ -10,10 +10,8 @@ XDRIVER_XF86_INPUT_TSLIB_SITE = https://github.com/merge/xf86-input-tslib/releas
 XDRIVER_XF86_INPUT_TSLIB_LICENSE = MIT
 XDRIVER_XF86_INPUT_TSLIB_LICENSE_FILES = COPYING
 XDRIVER_XF86_INPUT_TSLIB_DEPENDENCIES = \
-       xproto_inputproto \
        xserver_xorg-server \
-       xproto_randrproto \
-       xproto_xproto \
+       xorgproto \
        tslib
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
index de989eb34a821816dd845cda531940711923f44e..d77def028d760b6323478bdca11b0a08a25e104a 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/Config.in
@@ -1,8 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_INPUT_VMMOUSE
        bool "xf86-input-vmmouse"
        depends on BR2_i386 || BR2_x86_64
-       select BR2_PACKAGE_XPROTO_INPUTPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          VMWare mouse input driver

diff --git a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
index 6e9cf8b7858c85e94aa54fa08651de1da0b131f4..b8c77de5f675d7db60ebe634604f848bbd5aa0e0 100644 (file)
--- a/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
+++ b/package/x11r7/xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_INPUT_VMMOUSE_SOURCE = xf86-input-vmmouse-$(XDRIVER_XF86_INPUT_VMMO
 XDRIVER_XF86_INPUT_VMMOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_INPUT_VMMOUSE_LICENSE = MIT
 XDRIVER_XF86_INPUT_VMMOUSE_LICENSE_FILES = COPYING
-XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xproto_inputproto xproto_randrproto xproto_xproto
+XDRIVER_XF86_INPUT_VMMOUSE_DEPENDENCIES = xserver_xorg-server xorgproto
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 XDRIVER_XF86_INPUT_VMMOUSE_CONF_OPTS += --with-libudev