package/x11r7/xdriver_xf86-video-*: 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

Removed special dri2/dri3 handling because xorgproto always installs
dri3proto.

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-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
index 968c5e767c36d4e09b4a075e92bb713c9c1f092a..43090c7559bedca2763bde32001889f24989f13e 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
+++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
@@ -6,14 +6,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU
        select BR2_PACKAGE_LIBDRM_AMDGPU
        select BR2_PACKAGE_LIBEPOXY
        select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
-       select BR2_PACKAGE_XPROTO_DRI3PROTO
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          AMD GPU video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
index 5c1fb3f84404b495c57b26acdc14863a66fcd182..b8b7dcfe2febe77fa9ba180154a6d7b2f37a1d30 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
+++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk
@@ -12,14 +12,7 @@ XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \
        libdrm \
        xlib_libXcomposite \
-       xproto_dri3proto \
-       xproto_fontsproto \
-       xproto_glproto \
-       xproto_randrproto \
-       xproto_videoproto \
-       xproto_xextproto \
-       xproto_xf86driproto \
-       xproto_xproto \
+       xorgproto \
        xserver_xorg-server
 
 # xdriver_xf86-video-amdgpu requires O_CLOEXEC

diff --git a/package/x11r7/xdriver_xf86-video-ark/Config.in b/package/x11r7/xdriver_xf86-video-ark/Config.in
index cecedde024fd55fe498f1b789229d51850fd5051..e1219affa3ebf016d7dc4ef46cbdc1f1b86a87b2 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ark/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ark/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ARK
        bool "xf86-video-ark"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for ark cards

diff --git a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
index c0b905b8ddd61a6198dad7c48c006ed8a3129a22..3f2a63609e11dce2fd77b95899fa4bb190e16061 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
+++ b/package/x11r7/xdriver_xf86-video-ark/xdriver_xf86-video-ark.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_ARK_SOURCE = xf86-video-ark-$(XDRIVER_XF86_VIDEO_ARK_VERSION)
 XDRIVER_XF86_VIDEO_ARK_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_ARK_LICENSE = MIT
 XDRIVER_XF86_VIDEO_ARK_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_ARK_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-ast/Config.in b/package/x11r7/xdriver_xf86-video-ast/Config.in
index 5dfe95e537799cf925ec0fa680e6871dbac36ee9..2ebe8fc2fbf5cae14ed6cd2f092172346b2d9d8f 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ast/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ast/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AST
        bool "xf86-video-ast"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          No description available

diff --git a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
index 3c9eb9115954e410ccf4a6ab8f3af95573d950b1..b39bbf9a15a63f2196958136e4058193d43c65dd 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
+++ b/package/x11r7/xdriver_xf86-video-ast/xdriver_xf86-video-ast.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_AST_SOURCE = xf86-video-ast-$(XDRIVER_XF86_VIDEO_AST_VERSION)
 XDRIVER_XF86_VIDEO_AST_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_AST_LICENSE = MIT
 XDRIVER_XF86_VIDEO_AST_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xproto_fontsproto xproto_xproto xserver_xorg-server
+XDRIVER_XF86_VIDEO_AST_DEPENDENCIES = xorgproto xserver_xorg-server
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index 00d91bda51ec42f4ac0d573b1a98ce4e170f13b4..fdf1ebd18b7d4e7ec498392d6456409e232f5556 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -5,14 +5,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
        select BR2_PACKAGE_LIBDRM_RADEON
        select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
        select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XINERAMAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          ATI video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
index 8726695399c7e57f8220384c780af6e66a675c4c..d283f789f8815149a4d3b0b9383d1094a150a362 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
+++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk
@@ -12,17 +12,10 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \
        libdrm \
        xlib_libXcomposite \
-       xproto_fontsproto \
-       xproto_glproto \
-       xproto_randrproto \
-       xproto_videoproto \
-       xproto_xextproto \
-       xproto_xf86driproto \
-       xproto_xineramaproto \
-       xproto_xproto \
+       xorgproto \
        xserver_xorg-server
 
-ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO)$(BR2_PACKAGE_LIBEPOXY),yy)
+ifeq ($(BR2_PACKAGE_LIBEPOXY),y)
 XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --enable-glamor
 else
 XDRIVER_XF86_VIDEO_ATI_CONF_OPTS = --disable-glamor

diff --git a/package/x11r7/xdriver_xf86-video-cirrus/Config.in b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
index 11c9df8e0e07e1f3dc294757403915332a0f46a2..2987c3f0f026f0f797fecc1a0b17bdcb2731a638 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-cirrus/Config.in
+++ b/package/x11r7/xdriver_xf86-video-cirrus/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS
        bool "xf86-video-cirrus"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Cirrus Logic video driver

diff --git a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
index 78e8a9c05dbf683884840c332cf39127f55a03e5..fa776a24d64b519463828db5e2f208cb37d55f65 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
+++ b/package/x11r7/xdriver_xf86-video-cirrus/xdriver_xf86-video-cirrus.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_CIRRUS_SOURCE = xf86-video-cirrus-$(XDRIVER_XF86_VIDEO_CIRRUS
 XDRIVER_XF86_VIDEO_CIRRUS_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_CIRRUS_LICENSE = MIT
 XDRIVER_XF86_VIDEO_CIRRUS_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_CIRRUS_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-dummy/Config.in b/package/x11r7/xdriver_xf86-video-dummy/Config.in
index 00f7e1df4075ea80f88ddc3e055ba3d8b934b7f5..58c70a841346afb8cb35e2b7fb4665821089492e 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-dummy/Config.in
+++ b/package/x11r7/xdriver_xf86-video-dummy/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY
        bool "xf86-video-dummy"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for dummy cards

diff --git a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
index fff1495ef502fba38910caf55918341f5e0b2b53..3127f6cb1b973aea922cb0df8615769159b98fcb 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
+++ b/package/x11r7/xdriver_xf86-video-dummy/xdriver_xf86-video-dummy.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_DUMMY_SOURCE = xf86-video-dummy-$(XDRIVER_XF86_VIDEO_DUMMY_VE
 XDRIVER_XF86_VIDEO_DUMMY_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_DUMMY_LICENSE = MIT
 XDRIVER_XF86_VIDEO_DUMMY_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_DUMMY_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-fbdev/Config.in b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
index 9f7c5402b8d734e17882c667c5b5fa2f4c75b1bb..0ecba482fb8e45e881db74dcab667946569457b7 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-fbdev/Config.in
+++ b/package/x11r7/xdriver_xf86-video-fbdev/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV
        bool "xf86-video-fbdev"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          video driver for framebuffer device

diff --git a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
index 7d08c7da1886f178f2b2bf1190e2ded68b89b878..f39311e6116d4dafb12732ab92300a369868eb57 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
+++ b/package/x11r7/xdriver_xf86-video-fbdev/xdriver_xf86-video-fbdev.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_FBDEV_SOURCE = xf86-video-fbdev-$(XDRIVER_XF86_VIDEO_FBDEV_VE
 XDRIVER_XF86_VIDEO_FBDEV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_FBDEV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_FBDEV_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_FBDEV_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
index 7825901e9838b06b80bd74ba01767d2519fa636e..7acf93e2622c19c4c7537ce50988048124b32a49 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
+++ b/package/x11r7/xdriver_xf86-video-fbturbo/Config.in
@@ -2,13 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBTURBO
        bool "xf86-video-fbturbo"
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_PIXMAN
-       select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_LIBUMP
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          video driver, primarily optimized for the devices powered
          by the Allwinner SoC (A10, A13, A20). It can use some of

diff --git a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
index 15f4cd10937a53c9af4f922a742ff67c92002846..58a70416dd2bd19d02a01e9f23635804856a89c5 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
+++ b/package/x11r7/xdriver_xf86-video-fbturbo/xdriver_xf86-video-fbturbo.mk
@@ -12,12 +12,7 @@ XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES = \
        xserver_xorg-server \
        libdrm \
        pixman \
-       xproto_fontsproto \
-       xproto_randrproto \
-       xproto_renderproto \
-       xproto_videoproto \
-       xproto_xproto \
-       xproto_xf86driproto
+       xorgproto
 
 ifeq ($(BR2_PACKAGE_LIBPCIACCESS),y)
 XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libpciaccess
@@ -30,10 +25,6 @@ ifeq ($(BR2_PACKAGE_LIBUMP),y)
 XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += libump
 endif
 
-ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
-XDRIVER_XF86_VIDEO_FBTURBO_DEPENDENCIES += xproto_dri2proto
-endif
-
 define XDRIVER_XF86_VIDEO_FBTURBO_INSTALL_CONF_FILE
        $(INSTALL) -m 0644 -D $(@D)/xorg.conf $(TARGET_DIR)/etc/X11/xorg.conf
 endef

diff --git a/package/x11r7/xdriver_xf86-video-geode/Config.in b/package/x11r7/xdriver_xf86-video-geode/Config.in
index fe217b922cc8467a93a91ad5048e54f31dd7fadd..b432f2d4a121a018c247327c8030e4c0e0f9b7e2 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-geode/Config.in
+++ b/package/x11r7/xdriver_xf86-video-geode/Config.in
@@ -1,10 +1,6 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE
        bool "xf86-video-geode"
        depends on BR2_i386
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          video driver for geode device

diff --git a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
index 9138abdbeeaee0a40248420b329348beb8a75f0d..54616f65fef191e1b3e2f39396295f461fbbbd46 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
+++ b/package/x11r7/xdriver_xf86-video-geode/xdriver_xf86-video-geode.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_GEODE_SOURCE = xf86-video-geode-$(XDRIVER_XF86_VIDEO_GEODE_VE
 XDRIVER_XF86_VIDEO_GEODE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GEODE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_GEODE_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xproto
+XDRIVER_XF86_VIDEO_GEODE_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
index acae30b0b0813645ecbe5d6a20dcf51dfb119f34..c474f6c91284acec83c3fd9bd5382758ab9f05e4 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-glint/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -2,15 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
        bool "xf86-video-glint"
        depends on BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          GLINT/Permedia video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
index 52bc567e59c1ed483630b2aef38f2e26307e6a2d..fba0030757186f30dba2c4911f7f83325cf995bb 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
+++ b/package/x11r7/xdriver_xf86-video-glint/xdriver_xf86-video-glint.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_GLINT_SOURCE = xf86-video-glint-$(XDRIVER_XF86_VIDEO_GLINT_VE
 XDRIVER_XF86_VIDEO_GLINT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_GLINT_LICENSE = MIT
 XDRIVER_XF86_VIDEO_GLINT_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_GLINT_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-i128/Config.in b/package/x11r7/xdriver_xf86-video-i128/Config.in
index 30b240cc1fa06e31e314fcd18b42748eecb6d2a8..4f4810cc09a4734ad6ad1995b3a1b080e5bee414 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-i128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-i128/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128
        bool "xf86-video-i128"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Number 9 I128 video driver

diff --git a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
index 1bb760cee3bd0a40fc1c704cc0f21c8184bcd932..148fc3d1d0a59f95ad40d9fbd3a9fcb74f7d9d06 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
+++ b/package/x11r7/xdriver_xf86-video-i128/xdriver_xf86-video-i128.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_I128_SOURCE = xf86-video-i128-$(XDRIVER_XF86_VIDEO_I128_VERSI
 XDRIVER_XF86_VIDEO_I128_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_I128_LICENSE = MIT
 XDRIVER_XF86_VIDEO_I128_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_I128_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
index 5a0257305c63d90cf51ec6922d23beefb19de22e..13cee14deb5f56044a6f9b6d196d04f5ebbb5fe1 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in
@@ -6,8 +6,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV
        select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri
        select BR2_PACKAGE_MESA3D_DRI_DRIVER
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_XPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for iMX6 GPU (Vivante)
 

diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
index 222d74ac4ba2967748938d3d11ae4da9d9a8153f..091342754244936e61e8a82d6d524fbffbcdcfed 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
+++ b/package/x11r7/xdriver_xf86-video-imx-viv/xdriver_xf86-video-imx-viv.mk
@@ -8,7 +8,7 @@ XDRIVER_XF86_VIDEO_IMX_VIV_VERSION = rel_imx_4.9.x_1.0.0_ga
 XDRIVER_XF86_VIDEO_IMX_VIV_SITE = https://source.codeaurora.org/external/imx/xf86-video-imx-vivante
 XDRIVER_XF86_VIDEO_IMX_VIV_SITE_METHOD = git
 XDRIVER_XF86_VIDEO_IMX_VIV_DEPENDENCIES = imx-gpu-viv imx-gpu-g2d xserver_xorg-server \
-       xproto_xproto xproto_xf86driproto libdrm
+       xorgproto libdrm
 XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_IMX_VIV_LICENSE_FILES = COPYING-MIT
 XDRIVER_XF86_VIDEO_IMX_VIV_INSTALL_STAGING = YES

diff --git a/package/x11r7/xdriver_xf86-video-imx/Config.in b/package/x11r7/xdriver_xf86-video-imx/Config.in
index 398d49e1f03ce63c3f38e3a008b91bf785d9ecba..410a4584110ed38aabe9173b390b6cf16db40ea0 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-imx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-imx/Config.in
@@ -5,12 +5,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX
        depends on BR2_LINUX_KERNEL # linux/mxcfb.h
        depends on BR2_PACKAGE_GPU_AMD_BIN_MX51_OUTPUT_X11
        select BR2_PACKAGE_LIBZ160
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for iMX5 GPU
 

diff --git a/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk b/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
index 5684a6db18e0b37518a8548c91fe062cdf50c170..b80c6b77335e18ac18536adde11ec715a1e85b3e 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
+++ b/package/x11r7/xdriver_xf86-video-imx/xdriver_xf86-video-imx.mk
@@ -8,8 +8,7 @@ XDRIVER_XF86_VIDEO_IMX_VERSION = 11.09.01
 XDRIVER_XF86_VIDEO_IMX_SOURCE = xserver-xorg-video-imx-$(XDRIVER_XF86_VIDEO_IMX_VERSION).tar.gz
 XDRIVER_XF86_VIDEO_IMX_SITE = $(FREESCALE_IMX_SITE)
 XDRIVER_XF86_VIDEO_IMX_DEPENDENCIES = linux libz160 xserver_xorg-server \
-       xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto \
-       xproto_xf86dgaproto xproto_xproto
+       xorgproto
 XDRIVER_XF86_VIDEO_IMX_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -I$(LINUX_DIR)/include"
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index dc2fabf404f8a936e6afc2e708711e2df66fe667..c4152b7cf8e1065c2b5bc256be339de489b181e2 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -1,11 +1,10 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
        bool "xf86-video-intel"
        depends on (BR2_i386 || BR2_x86_64)
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
        select BR2_PACKAGE_LIBPCIACCESS
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_LIBDRM_INTEL
        select BR2_PACKAGE_XLIB_LIBXRANDR
+       select BR2_PACKAGE_XORGPROTO
        help
          Intel video driver

diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
index db96c9f6f892eee3daa529e8db28352ea1040dd5..66b0f9defeb306c54c9c8fbb5573c6fb0ccab185 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -27,26 +27,15 @@ XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \
        libdrm \
        libpciaccess \
        xlib_libXrandr \
-       xproto_fontsproto \
-       xproto_xproto \
+       xorgproto \
        xserver_xorg-server
 
 # X.org server support for DRI depends on a Mesa3D DRI driver
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri --enable-dri1
-# quote from configure.ac: "UXA doesn't build without DRI2 headers"
-ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri2 --enable-uxa
-else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri2 --disable-uxa
-endif
-ifeq ($(BR2_PACKAGE_XPROTO_DRI3PROTO),y)
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --enable-dri3
-else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri3
-endif
-else
-XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += --disable-dri
+XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \
+       --enable-dri2 \
+       --enable-dri3 \
+       --enable-uxa
 endif
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index 82de826ad7fdd828b9c7ec0f7d896031b4ae1b3a..71c89dd2955093e06426e2fdd62445a99c709673 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
        bool "xf86-video-mach64"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          mach64 video driver

diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
index ca24d39e430424c68a234d37e3157357b1b2ba05..e6f8d7471c4292438cf07e92902f09a493f714a6 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -10,7 +10,7 @@ XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT
 XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS = --disable-dri

diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index a504ec0c25017cf72236dff7347602085c8ee97a..15fb3b9f87a8076e29c9d4919aa9f169569f4ee2 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -2,14 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
        bool "xf86-video-mga"
        depends on BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Matrox video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
index 065a68ea6705632690e11849b6cd0e0471551d8a..bdc9f358847da462a4bf9e8b844b1cb666fca075 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
+++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
@@ -10,7 +10,7 @@ XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/dri
 XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT
 XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_glproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 XDRIVER_XF86_VIDEO_MGA_CONF_OPTS = --disable-dri

diff --git a/package/x11r7/xdriver_xf86-video-neomagic/Config.in b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
index f8c8c47fceb52b55e53f3266fa9399c35dd0db1f..5f36a48f409f8ef2b9712ca72b677bb11df0ea23 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-neomagic/Config.in
+++ b/package/x11r7/xdriver_xf86-video-neomagic/Config.in
@@ -1,11 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC
        bool "xf86-video-neomagic"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Neomagic video driver

diff --git a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
index cfd55361e73b083d5fda3f296233d3df4f6e63bf..93cd55a11bafa24d592d37cb3be41487528965b5 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
+++ b/package/x11r7/xdriver_xf86-video-neomagic/xdriver_xf86-video-neomagic.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_NEOMAGIC_SOURCE = xf86-video-neomagic-$(XDRIVER_XF86_VIDEO_NE
 XDRIVER_XF86_VIDEO_NEOMAGIC_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE = MIT
 XDRIVER_XF86_VIDEO_NEOMAGIC_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_NEOMAGIC_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/package/x11r7/xdriver_xf86-video-nouveau/Config.in
index 7e756e21078e4a50ebd582bdc22c9554c6b1f19a..c9fd2e3d2f2a38d436ec8fb71e5d697c8d44ef10 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-nouveau/Config.in
+++ b/package/x11r7/xdriver_xf86-video-nouveau/Config.in
@@ -4,11 +4,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU
        select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
        select BR2_PACKAGE_LIBDRM
        select BR2_PACKAGE_LIBDRM_NOUVEAU
-       select BR2_PACKAGE_XPROTO_DRI2PROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Nouveau video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
index e3969a2646aba25b0943f583a854eb8777b87f9b..41b6fd6d427976d4a6c535c4895c78ced25f1ce9 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
+++ b/package/x11r7/xdriver_xf86-video-nouveau/xdriver_xf86-video-nouveau.mk
@@ -12,11 +12,7 @@ XDRIVER_XF86_VIDEO_NOUVEAU_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_NOUVEAU_DEPENDENCIES = \
        host-pkgconf \
        libdrm \
-       xproto_dri2proto \
-       xproto_randrproto \
-       xproto_renderproto \
-       xproto_videoproto \
-       xproto_xextproto \
+       xorgproto \
        xserver_xorg-server
 
 # xdriver_xf86-video-nouveau requires O_CLOEXEC

diff --git a/package/x11r7/xdriver_xf86-video-nv/Config.in b/package/x11r7/xdriver_xf86-video-nv/Config.in
index 8898f56729360a87e127e2e5214abb569e48d69f..5ff8b798c6e2556f374ab434641c503c1014fa2d 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-nv/Config.in
+++ b/package/x11r7/xdriver_xf86-video-nv/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV
        bool "xf86-video-nv"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          NVIDIA video driver

diff --git a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
index 430ce4a1d1b47ee90c9cfe9fdd97311c2a83f829..1e5fc26ddb9be870d62ba2a832510e19c57d17bd 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
+++ b/package/x11r7/xdriver_xf86-video-nv/xdriver_xf86-video-nv.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_NV_SOURCE = xf86-video-nv-$(XDRIVER_XF86_VIDEO_NV_VERSION).ta
 XDRIVER_XF86_VIDEO_NV_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_NV_LICENSE = MIT
 XDRIVER_XF86_VIDEO_NV_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_NV_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 02723eca69209cc34a3631bcb4c42015838718c6..a93d14376b684fd6393346d4ad95a7917fef3dcb 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -5,12 +5,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
        select BR2_PACKAGE_XLIB_LIBXVMC
-       select BR2_PACKAGE_XPROTO_GLPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Openchrome, A free and Open Source video driver for the
          VIA/S3G UniChrome and UniChrome Pro graphics chipsets.

diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
index 9ab032b6bc5feb34b2a3ab80c660e88df5838217..0a669e186b33a85ff31d95289bf0c28345259453 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
+++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk
@@ -16,12 +16,6 @@ XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \
        xlib_libX11 \
        xlib_libXcomposite \
        xlib_libXvMC \
-       xproto_fontsproto \
-       xproto_glproto \
-       xproto_randrproto \
-       xproto_renderproto \
-       xproto_xextproto \
-       xproto_xf86driproto \
-       xproto_xproto
+       xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-qxl/Config.in b/package/x11r7/xdriver_xf86-video-qxl/Config.in
index 967ecaf527788595167a0c2b3220006be7b8f702..40f61fd69fd1840aad9c3f61d7844abae0901d5a 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-qxl/Config.in
+++ b/package/x11r7/xdriver_xf86-video-qxl/Config.in
@@ -5,8 +5,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_QXL
        select BR2_PACKAGE_LIBPCIACCESS
        select BR2_PACKAGE_SPICE_PROTOCOL
        select BR2_PACKAGE_XLIB_LIBXFONT2 if !BR2_PACKAGE_XLIB_LIBXFONT
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          QEMU QXL paravirt video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
index f410f8e95ff496d128fe97c7eea47d9ac0569d1b..ffbac05ec1c458d72c91003460360e6494073268 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
+++ b/package/x11r7/xdriver_xf86-video-qxl/xdriver_xf86-video-qxl.mk
@@ -16,8 +16,7 @@ XDRIVER_XF86_VIDEO_QXL_CONF_OPTS = \
 XDRIVER_XF86_VIDEO_QXL_DEPENDENCIES = \
        libpciaccess \
        spice-protocol \
-       xproto_fontsproto \
-       xproto_xproto \
+       xorgproto \
        xserver_xorg-server
 
 # configure doesn't look for drm headers in the appropiate place, so help it

diff --git a/package/x11r7/xdriver_xf86-video-r128/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in
index 22ba4931e69676c19ee8f4a0a80692fa533b60a9..e1e2dd2f30c471557d52b33e3697df7396fbf417 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-r128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-r128/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
        bool "xf86-video-r128"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          R128 video driver

diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
index 344b48415ccbcd86184c476395d60a083721aa9b..9dd9ef25e41b0a214da137055ea3291c9e1377fd 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
+++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk
@@ -10,7 +10,7 @@ XDRIVER_XF86_VIDEO_R128_SITE = http://xorg.freedesktop.org/releases/individual/d
 XDRIVER_XF86_VIDEO_R128_LICENSE = MIT
 XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_R128_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 XDRIVER_XF86_VIDEO_R128_CONF_OPTS = --disable-dri

diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
index 77dde8761982526cab250e7c1cf2528f466c1443..bc6ca5237048f43ccfd1b4dfa1a36144465e2aac 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-savage/Config.in
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -2,13 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
        bool "xf86-video-savage"
        depends on BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          S3 Savage video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
index ae1dea34aebcb28ca8412b088d93143a472c6f5d..d7311aa9182a11f18a1a695a1fa7cf71d09c2520 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
+++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk
@@ -10,7 +10,7 @@ XDRIVER_XF86_VIDEO_SAVAGE_SITE = http://xorg.freedesktop.org/releases/individual
 XDRIVER_XF86_VIDEO_SAVAGE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86driproto xproto_xproto
+XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS = --disable-dri

diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
index 727004a55a280fd2eb1c66435b49654a24f8c4e3..036a2f1c83123c3e8885d7afdc5d1d4236ed0c10 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SILICONMOTION
        bool "xf86-video-siliconmotion"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Silicon Motion video driver

diff --git a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
index 53b19f9fea2a725c446befd1d08b8b1a9d9aed2c..65fd8465352ced80ccd33d59cbf37be48b7b806b 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
+++ b/package/x11r7/xdriver_xf86-video-siliconmotion/xdriver_xf86-video-siliconmotion.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_VIDEO_SILICONMOTION_SOURCE = xf86-video-siliconmotion-$(XDRIVER_XF8
 XDRIVER_XF86_VIDEO_SILICONMOTION_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE = MIT
 XDRIVER_XF86_VIDEO_SILICONMOTION_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_SILICONMOTION_DEPENDENCIES = xserver_xorg-server xorgproto
 
 XDRIVER_XF86_VIDEO_SILICONMOTION_CONF_OPTS = --disable-selective-werror
 

diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
index 3c86bd403e8e3cad96b3868f63d6d0b27876b4c2..db01cf2afe3f4d0deecc28966f5db41e7b26f371 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-sis/Config.in
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -2,15 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
        bool "xf86-video-sis"
        depends on BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XINERAMAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          SiS and XGI video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
index 833246e35eb43914a7311c45939537279e7fd387..af80e15da9b00e48679d6de5d3cac982f2586f54 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
+++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk
@@ -10,7 +10,7 @@ XDRIVER_XF86_VIDEO_SIS_SITE = http://xorg.freedesktop.org/releases/individual/dr
 XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT
 XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_SIS_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xf86driproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
 XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --disable-dri

diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
index 96a69ba25ca978dcbbc0fe7e563d4e19a88320b8..959dc31049e0e26130aecab6140111f99de9f786 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -2,13 +2,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
        bool "xf86-video-tdfx"
        depends on BR2_PACKAGE_MESA3D
        select BR2_PACKAGE_LIBDRM
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DRIPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          3Dfx video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
index 471e6cf4d22fccbe241acbc6a8cd24683d0dc00e..6511eec7ad1c2b77e90c4c2fb9492ed2cff23d47 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
+++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk
@@ -12,13 +12,7 @@ XDRIVER_XF86_VIDEO_TDFX_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_TDFX_AUTORECONF = YES
 XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \
        libdrm \
-       xproto_fontsproto \
-       xproto_randrproto \
-       xproto_renderproto \
-       xproto_videoproto \
-       xproto_xextproto \
-       xproto_xf86driproto \
-       xproto_xproto \
+       xorgproto \
        xserver_xorg-server
 
 ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)

diff --git a/package/x11r7/xdriver_xf86-video-tga/Config.in b/package/x11r7/xdriver_xf86-video-tga/Config.in
index 9d03db3b38fb76f561761c0a2dfc648c7e86eac4..7c75661accb5d9acd634288e8ceb6453750b01ee 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-tga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tga/Config.in
@@ -1,11 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TGA
        bool "xf86-video-tga"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          X.Org driver for tga cards

diff --git a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
index 8af5ac81e192788fd3ec45709103ffb8719ff1ea..421b09be22e8bb667761fe813b8f7f35ab3aa8f6 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
+++ b/package/x11r7/xdriver_xf86-video-tga/xdriver_xf86-video-tga.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_TGA_SOURCE = xf86-video-tga-$(XDRIVER_XF86_VIDEO_TGA_VERSION)
 XDRIVER_XF86_VIDEO_TGA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TGA_LICENSE = MIT
 XDRIVER_XF86_VIDEO_TGA_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_TGA_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-trident/Config.in b/package/x11r7/xdriver_xf86-video-trident/Config.in
index 15ac3ea726bb7356b01ff899db06c4eae81e605f..ca7069c800d76b9960e91e100cda484f3221f5aa 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-trident/Config.in
+++ b/package/x11r7/xdriver_xf86-video-trident/Config.in
@@ -1,11 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TRIDENT
        bool "xf86-video-trident"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_VIDEOPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Trident video driver

diff --git a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
index 727744c53250c1cf595f1ebe721091cd2f617fb5..20ec4bbc24cf513d753e016ec20b038dcdffd401 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
+++ b/package/x11r7/xdriver_xf86-video-trident/xdriver_xf86-video-trident.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_TRIDENT_SOURCE = xf86-video-trident-$(XDRIVER_XF86_VIDEO_TRID
 XDRIVER_XF86_VIDEO_TRIDENT_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_TRIDENT_LICENSE = MIT
 XDRIVER_XF86_VIDEO_TRIDENT_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_videoproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_TRIDENT_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-vesa/Config.in b/package/x11r7/xdriver_xf86-video-vesa/Config.in
index 98f434704fe9c357a4c63056fced04c72b0d8886..fb4e4e8e93de04e439033fb9a7ae2193fad97612 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-vesa/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vesa/Config.in
@@ -1,9 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA
        bool "xf86-video-vesa"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Generic VESA video driver

diff --git a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
index d2a92051973836c91be348fcfb1cd4899585ceb0..425280a119482d7543e1c186c2b9430972030e77 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
+++ b/package/x11r7/xdriver_xf86-video-vesa/xdriver_xf86-video-vesa.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_VESA_SOURCE = xf86-video-vesa-$(XDRIVER_XF86_VIDEO_VESA_VERSI
 XDRIVER_XF86_VIDEO_VESA_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VESA_LICENSE = MIT
 XDRIVER_XF86_VIDEO_VESA_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xproto
+XDRIVER_XF86_VIDEO_VESA_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))

diff --git a/package/x11r7/xdriver_xf86-video-vmware/Config.in b/package/x11r7/xdriver_xf86-video-vmware/Config.in
index a3382d734654898f39e91608e310b9ed94c88fb7..6d937b47bbac0cc3b40a850e231ab5cc849b42c2 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-vmware/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vmware/Config.in
@@ -3,12 +3,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
        depends on BR2_PACKAGE_MESA3D
        depends on BR2_i386 || BR2_x86_64
        select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XINERAMAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          VMware SVGA video driver
 

diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
index 63a27a26dd660a073c42d1661139aee796f4a870..5f0cb77bf8834b643a042f16ef6bbfe1c9e341b1 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -9,7 +9,7 @@ XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE
 XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
 XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT
 XDRIVER_XF86_VIDEO_VMWARE_LICENSE_FILES = COPYING
-XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xineramaproto xproto_xproto
+XDRIVER_XF86_VIDEO_VMWARE_DEPENDENCIES = mesa3d xserver_xorg-server xorgproto
 
 ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
 XDRIVER_XF86_VIDEO_VMWARE_CONF_OPTS += --with-libudev

diff --git a/package/x11r7/xdriver_xf86-video-voodoo/Config.in b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
index f531676dab1b672c5ff59b9381b9652420fd9ea3..f4612120e4f45b8317b1ab4b1a3cce1809bf142c 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-voodoo/Config.in
+++ b/package/x11r7/xdriver_xf86-video-voodoo/Config.in
@@ -1,10 +1,5 @@
 config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO
        bool "xf86-video-voodoo"
-       select BR2_PACKAGE_XPROTO_FONTSPROTO
-       select BR2_PACKAGE_XPROTO_RANDRPROTO
-       select BR2_PACKAGE_XPROTO_RENDERPROTO
-       select BR2_PACKAGE_XPROTO_XEXTPROTO
-       select BR2_PACKAGE_XPROTO_XF86DGAPROTO
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        help
          Voodoo video driver

diff --git a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
index e1ef0c6ca337052733b9c09a0a83ddc5beac6217..d6deaa7974de2e9e91223544e70e650a73a8e2e5 100644 (file)
--- a/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
+++ b/package/x11r7/xdriver_xf86-video-voodoo/xdriver_xf86-video-voodoo.mk
@@ -9,6 +9,6 @@ XDRIVER_XF86_VIDEO_VOODOO_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-
 XDRIVER_XF86_VIDEO_VOODOO_LICENSE = MIT
 XDRIVER_XF86_VIDEO_VOODOO_LICENSE_FILES = COPYING
 XDRIVER_XF86_VIDEO_VOODOO_AUTORECONF = YES
-XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xproto_fontsproto xproto_randrproto xproto_renderproto xproto_xextproto xproto_xf86dgaproto xproto_xproto
+XDRIVER_XF86_VIDEO_VOODOO_DEPENDENCIES = xserver_xorg-server xorgproto
 
 $(eval $(autotools-package))