* [Buildroot] [PATCH v3 01/22] package/x11r7/xorgproto: new package
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:20 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 02/22] package/efl: switch to xorgproto Bernd Kuhls
` (21 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Quoting initial release notes:
https://lists.x.org/archives/xorg-announce/2018-February/002835.html
"This package combines the protocol headers, which were formerly
scattered in individual packages. At this point none of them are
changing rapidly enough to justify such fine granularity, particularly
when what changes do occur tend to affect multiple extensions at once
(Present and DRI3 for example). The individual protocols are still
installed as separate pkg-config modules, and consumers should continue
to use the per-protocol package version numbers."
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/Config.in | 1 +
package/x11r7/xorgproto/Config.in | 5 +++
package/x11r7/xorgproto/xorgproto.hash | 43 +++++++++++++++++++++
package/x11r7/xorgproto/xorgproto.mk | 53 ++++++++++++++++++++++++++
4 files changed, 102 insertions(+)
create mode 100644 package/x11r7/xorgproto/Config.in
create mode 100644 package/x11r7/xorgproto/xorgproto.hash
create mode 100644 package/x11r7/xorgproto/xorgproto.mk
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index ddceaa407f..4648fcb5f6 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -229,6 +229,7 @@ if BR2_PACKAGE_XORG7
endmenu
menu "X11R7 X protocols"
source package/x11r7/xcb-proto/Config.in
+ source package/x11r7/xorgproto/Config.in
source package/x11r7/xproto_applewmproto/Config.in
source package/x11r7/xproto_bigreqsproto/Config.in
source package/x11r7/xproto_compositeproto/Config.in
diff --git a/package/x11r7/xorgproto/Config.in b/package/x11r7/xorgproto/Config.in
new file mode 100644
index 0000000000..af38eb436e
--- /dev/null
+++ b/package/x11r7/xorgproto/Config.in
@@ -0,0 +1,5 @@
+config BR2_PACKAGE_XORGPROTO
+ bool "xorgproto"
+ help
+ This package combines the protocol headers, which were
+ formerly scattered in individual packages.
diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash
new file mode 100644
index 0000000000..c4e7795751
--- /dev/null
+++ b/package/x11r7/xorgproto/xorgproto.hash
@@ -0,0 +1,43 @@
+# From https://lists.x.org/archives/xorg-announce/2018-February/002841.html
+md5 81557ca47ee66a4e54590fcdadd28114 xorgproto-2018.4.tar.bz2
+sha1 2e4a3db312e1ce81e15515dfcac52ba0aa5a920c xorgproto-2018.4.tar.bz2
+sha256 fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0 xorgproto-2018.4.tar.bz2
+sha512 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2
+# Locally computed
+sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto
+sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto
+sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto
+sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto
+sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto
+sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto
+sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto
+sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto
+sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto
+sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto
+sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto
+sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto
+sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto
+sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto
+sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto
+sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING-panoramixproto
+sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto
+sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto
+sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto
+sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto
+sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto
+sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto
+sha256 403e7be948674530ad40669b1e3a31adeddb656502f3b0ef810d5d3cc35d0b52 COPYING-resourceproto
+sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYING-scrnsaverproto
+sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto
+sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto
+sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto
+sha256 da4a28570230228b9bd80a701c5d8752f8609394de2e0d46d26d978bd07610db COPYING-x11proto
+sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto
+sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto
+sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto
+sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86dgaproto
+sha256 4a05d06752388d9db71ee1006f371d4fb2c316a821fc2fc272db90b3ef978334 COPYING-xf86driproto
+sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86miscproto
+sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto
+sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto
+sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto
diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk
new file mode 100644
index 0000000000..3f7d25b068
--- /dev/null
+++ b/package/x11r7/xorgproto/xorgproto.mk
@@ -0,0 +1,53 @@
+################################################################################
+#
+# xorgproto
+#
+################################################################################
+
+XORGPROTO_VERSION = 2018.4
+XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2
+XORGPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
+XORGPROTO_LICENSE = MIT
+XORGPROTO_LICENSE_FILES = \
+ COPYING-applewmproto \
+ COPYING-bigreqsproto \
+ COPYING-compositeproto \
+ COPYING-damageproto \
+ COPYING-dmxproto \
+ COPYING-dri2proto \
+ COPYING-dri3proto \
+ COPYING-evieproto \
+ COPYING-fixesproto \
+ COPYING-fontcacheproto \
+ COPYING-fontsproto \
+ COPYING-glproto \
+ COPYING-inputproto \
+ COPYING-kbproto \
+ COPYING-lg3dproto \
+ COPYING-panoramixproto \
+ COPYING-pmproto \
+ COPYING-presentproto \
+ COPYING-printproto \
+ COPYING-randrproto \
+ COPYING-recordproto \
+ COPYING-renderproto \
+ COPYING-resourceproto \
+ COPYING-scrnsaverproto \
+ COPYING-trapproto \
+ COPYING-videoproto \
+ COPYING-windowswmproto \
+ COPYING-x11proto \
+ COPYING-xcmiscproto \
+ COPYING-xextproto \
+ COPYING-xf86bigfontproto \
+ COPYING-xf86dgaproto \
+ COPYING-xf86driproto \
+ COPYING-xf86miscproto \
+ COPYING-xf86rushproto \
+ COPYING-xf86vidmodeproto \
+ COPYING-xineramaproto
+XORGPROTO_INSTALL_STAGING = YES
+XORGPROTO_INSTALL_TARGET = NO
+
+$(eval $(autotools-package))
+$(eval $(host-autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 01/22] package/x11r7/xorgproto: new package
2018-06-30 11:08 ` [Buildroot] [PATCH v3 01/22] package/x11r7/xorgproto: new package Bernd Kuhls
@ 2018-07-02 21:20 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:20 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> Quoting initial release notes:
> https://lists.x.org/archives/xorg-announce/2018-February/002835.html
>
> "This package combines the protocol headers, which were formerly
> scattered in individual packages. At this point none of them are
> changing rapidly enough to justify such fine granularity, particularly
> when what changes do occur tend to affect multiple extensions at once
> (Present and DRI3 for example). The individual protocols are still
> installed as separate pkg-config modules, and consumers should continue
> to use the per-protocol package version numbers."
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
However, a comment: I was puzzled as wy you needed a host variant, but
since this new package is supposed to replace the existing ones, and
some are host packages, it makes sense.
A little note to that effect in the commit log would have been nice.
My reviewed-by is still valid, of course.
Regards,
Yann E. MORIN.
> ---
> package/x11r7/Config.in | 1 +
> package/x11r7/xorgproto/Config.in | 5 +++
> package/x11r7/xorgproto/xorgproto.hash | 43 +++++++++++++++++++++
> package/x11r7/xorgproto/xorgproto.mk | 53 ++++++++++++++++++++++++++
> 4 files changed, 102 insertions(+)
> create mode 100644 package/x11r7/xorgproto/Config.in
> create mode 100644 package/x11r7/xorgproto/xorgproto.hash
> create mode 100644 package/x11r7/xorgproto/xorgproto.mk
>
> diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
> index ddceaa407f..4648fcb5f6 100644
> --- a/package/x11r7/Config.in
> +++ b/package/x11r7/Config.in
> @@ -229,6 +229,7 @@ if BR2_PACKAGE_XORG7
> endmenu
> menu "X11R7 X protocols"
> source package/x11r7/xcb-proto/Config.in
> + source package/x11r7/xorgproto/Config.in
> source package/x11r7/xproto_applewmproto/Config.in
> source package/x11r7/xproto_bigreqsproto/Config.in
> source package/x11r7/xproto_compositeproto/Config.in
> diff --git a/package/x11r7/xorgproto/Config.in b/package/x11r7/xorgproto/Config.in
> new file mode 100644
> index 0000000000..af38eb436e
> --- /dev/null
> +++ b/package/x11r7/xorgproto/Config.in
> @@ -0,0 +1,5 @@
> +config BR2_PACKAGE_XORGPROTO
> + bool "xorgproto"
> + help
> + This package combines the protocol headers, which were
> + formerly scattered in individual packages.
> diff --git a/package/x11r7/xorgproto/xorgproto.hash b/package/x11r7/xorgproto/xorgproto.hash
> new file mode 100644
> index 0000000000..c4e7795751
> --- /dev/null
> +++ b/package/x11r7/xorgproto/xorgproto.hash
> @@ -0,0 +1,43 @@
> +# From https://lists.x.org/archives/xorg-announce/2018-February/002841.html
> +md5 81557ca47ee66a4e54590fcdadd28114 xorgproto-2018.4.tar.bz2
> +sha1 2e4a3db312e1ce81e15515dfcac52ba0aa5a920c xorgproto-2018.4.tar.bz2
> +sha256 fee885e0512899ea5280c593fdb2735beb1693ad170c22ebcc844470eec415a0 xorgproto-2018.4.tar.bz2
> +sha512 2db682d10280ca58cdc04d8eb9fef30c111d4cd379de9fec86cff317865b859a576de5426447be9231d24be9762cc1d684c57383a99ad499398e8b7d62b1c03c xorgproto-2018.4.tar.bz2
> +# Locally computed
> +sha256 aacd931f191b610902aee1e526090c2858aabc07969441fa2537ffd3e7049555 COPYING-applewmproto
> +sha256 dabc025f93129a0eb2d17f37c719dbe5ecbcb5bc8f7bc7f4ce89fe04576cc0c2 COPYING-bigreqsproto
> +sha256 ab587ca94282c1e60797ffe4a77aea195418387db20ec7e0c24cedf2c844f8c1 COPYING-compositeproto
> +sha256 f67a18cb46c4c203c5122b4a901cfcc3178b2a62f83f31ca5fef5bdca3966094 COPYING-damageproto
> +sha256 819e8dcd3dd2a44850c350331aa492230f86bccb0983dd739dec5ba36d7d2b8e COPYING-dmxproto
> +sha256 0c306691492c4d7a8cda1ec3847668b797887dddcd7e986b4c166ae27619af7d COPYING-dri2proto
> +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-dri3proto
> +sha256 0aa43d03da3cedbd9882c0ded621b0d855353eb9e551f9eed940d75c8a0b03c1 COPYING-evieproto
> +sha256 65cb0b867b00fb27f066a37353713b265645b3301146562570d7638ed2ddd548 COPYING-fixesproto
> +sha256 1ab381e978bff63d68be2e4f235d51935f3f16f3ba3bebf83afa99a70c0484a2 COPYING-fontcacheproto
> +sha256 f4af05774b02ae149357cc26f7bf5ef1116c2e09373c2492081a3a1892c58417 COPYING-fontsproto
> +sha256 823deb4673d3f26aa8c90e704888299648f00be3262f9363eaeecedcd65b936d COPYING-glproto
> +sha256 5e083a2ace0215a6084c877c023a6079952ba803d692488203ba4269196debe3 COPYING-inputproto
> +sha256 d397a67d4b28e897bc5fce79b2b917df9905b54f961fc3ad1f49c7fe3803f92c COPYING-kbproto
> +sha256 7a5dd5d4c989c167da50f15879959f42bbda960e06d0a0aea7197f61fe1dc846 COPYING-lg3dproto
> +sha256 27d8cbdcde7a0bd062ce49cdf8c672201452a64e3e6823f09b1beffe2c4b8eff COPYING-panoramixproto
> +sha256 8442b5f22f2fb13017a4302a906e7dedc899267b41f613558970941120170128 COPYING-pmproto
> +sha256 64a579d1a0b3347301d87c94698a58ea7933d0ae6ca7e8fdd702fde2ea376301 COPYING-presentproto
> +sha256 6b890b118261694865988378dbba876bcd9caa1a421c5c0d626116948bc0ae35 COPYING-printproto
> +sha256 41c13dcd09147ed2440286f2fb8151df8ebee06deee4ed78ddf094601c216d3d COPYING-randrproto
> +sha256 ee10aee0f1697ffdbe870a39f037361d4f7136f2976bb7919a41b3f66407caee COPYING-recordproto
> +sha256 9e48921a94da36d7a69fe71809223ee0bb46370db9842dccdeeb55b5a9946872 COPYING-renderproto
> +sha256 403e7be948674530ad40669b1e3a31adeddb656502f3b0ef810d5d3cc35d0b52 COPYING-resourceproto
> +sha256 fcbd3c628bf4d28ee3e6032054bf44bbe58f3b1a944dad856a8d3eb6b37ea412 COPYING-scrnsaverproto
> +sha256 d6d3513f5a7099748dc387f54498d799380b45f8a444f13aa98aa45a860ae55b COPYING-trapproto
> +sha256 f8f49bbad61967ebc890fb79fff5bfb7cfc1c341aa8f8dee13eb3fb534040b47 COPYING-videoproto
> +sha256 eb183a00c61bb47992f096b6993ed7ec17518bea9c285fe87efff7f622cc6c12 COPYING-windowswmproto
> +sha256 da4a28570230228b9bd80a701c5d8752f8609394de2e0d46d26d978bd07610db COPYING-x11proto
> +sha256 5531d18cfcc944dab39991f63f182cbbce3fe493ba0c7cf08a25c0d01ee84482 COPYING-xcmiscproto
> +sha256 fb42146c6c06a200a9b121220eb692ff9101ba0fbd0b224b9e16a016c59ae86a COPYING-xextproto
> +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86bigfontproto
> +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86dgaproto
> +sha256 4a05d06752388d9db71ee1006f371d4fb2c316a821fc2fc272db90b3ef978334 COPYING-xf86driproto
> +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86miscproto
> +sha256 3591964e01a9cdfc9cc4149a847a431a3f3d98328cc9e5864c7a7831b29c4058 COPYING-xf86rushproto
> +sha256 942bb46a3503a708948491699171b00b9e0dfb47818d9268b160bccc5f51a4b9 COPYING-xf86vidmodeproto
> +sha256 b2d8cda803e900915ce10f0ba735ff2c033b39c7cc5a8a436667ca583d4066fa COPYING-xineramaproto
> diff --git a/package/x11r7/xorgproto/xorgproto.mk b/package/x11r7/xorgproto/xorgproto.mk
> new file mode 100644
> index 0000000000..3f7d25b068
> --- /dev/null
> +++ b/package/x11r7/xorgproto/xorgproto.mk
> @@ -0,0 +1,53 @@
> +################################################################################
> +#
> +# xorgproto
> +#
> +################################################################################
> +
> +XORGPROTO_VERSION = 2018.4
> +XORGPROTO_SOURCE = xorgproto-$(XORGPROTO_VERSION).tar.bz2
> +XORGPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
> +XORGPROTO_LICENSE = MIT
> +XORGPROTO_LICENSE_FILES = \
> + COPYING-applewmproto \
> + COPYING-bigreqsproto \
> + COPYING-compositeproto \
> + COPYING-damageproto \
> + COPYING-dmxproto \
> + COPYING-dri2proto \
> + COPYING-dri3proto \
> + COPYING-evieproto \
> + COPYING-fixesproto \
> + COPYING-fontcacheproto \
> + COPYING-fontsproto \
> + COPYING-glproto \
> + COPYING-inputproto \
> + COPYING-kbproto \
> + COPYING-lg3dproto \
> + COPYING-panoramixproto \
> + COPYING-pmproto \
> + COPYING-presentproto \
> + COPYING-printproto \
> + COPYING-randrproto \
> + COPYING-recordproto \
> + COPYING-renderproto \
> + COPYING-resourceproto \
> + COPYING-scrnsaverproto \
> + COPYING-trapproto \
> + COPYING-videoproto \
> + COPYING-windowswmproto \
> + COPYING-x11proto \
> + COPYING-xcmiscproto \
> + COPYING-xextproto \
> + COPYING-xf86bigfontproto \
> + COPYING-xf86dgaproto \
> + COPYING-xf86driproto \
> + COPYING-xf86miscproto \
> + COPYING-xf86rushproto \
> + COPYING-xf86vidmodeproto \
> + COPYING-xineramaproto
> +XORGPROTO_INSTALL_STAGING = YES
> +XORGPROTO_INSTALL_TARGET = NO
> +
> +$(eval $(autotools-package))
> +$(eval $(host-autotools-package))
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 02/22] package/efl: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 01/22] package/x11r7/xorgproto: new package Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:21 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 03/22] package/gstreamer1/gst1-plugins-base: " Bernd Kuhls
` (20 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/efl/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/efl/Config.in b/package/efl/Config.in
index b9b285d8da..5be6d63765 100644
--- a/package/efl/Config.in
+++ b/package/efl/Config.in
@@ -168,7 +168,7 @@ config BR2_PACKAGE_EFL_X_XLIB
select BR2_PACKAGE_XLIB_LIBXRENDER
select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
select BR2_PACKAGE_XLIB_LIBXTST
- select BR2_PACKAGE_XPROTO_GLPROTO
+ select BR2_PACKAGE_XORGPROTO
config BR2_PACKAGE_EFL_WAYLAND
bool "Wayland support"
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 02/22] package/efl: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 02/22] package/efl: switch to xorgproto Bernd Kuhls
@ 2018-07-02 21:21 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:21 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/efl/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/efl/Config.in b/package/efl/Config.in
> index b9b285d8da..5be6d63765 100644
> --- a/package/efl/Config.in
> +++ b/package/efl/Config.in
> @@ -168,7 +168,7 @@ config BR2_PACKAGE_EFL_X_XLIB
> select BR2_PACKAGE_XLIB_LIBXRENDER
> select BR2_PACKAGE_XLIB_LIBXSCRNSAVER
> select BR2_PACKAGE_XLIB_LIBXTST
> - select BR2_PACKAGE_XPROTO_GLPROTO
> + select BR2_PACKAGE_XORGPROTO
>
> config BR2_PACKAGE_EFL_WAYLAND
> bool "Wayland support"
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 03/22] package/gstreamer1/gst1-plugins-base: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 01/22] package/x11r7/xorgproto: new package Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 02/22] package/efl: switch to xorgproto Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:23 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 04/22] package/libdri2: " Bernd Kuhls
` (19 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/gstreamer1/gst1-plugins-base/Config.in | 2 +-
package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
index 531fac4f47..340926ecb9 100644
--- a/package/gstreamer1/gst1-plugins-base/Config.in
+++ b/package/gstreamer1/gst1-plugins-base/Config.in
@@ -164,7 +164,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX
depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
depends on !BR2_PACKAGE_RPI_USERLAND # x11
select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XPROTO_GLPROTO
+ select BR2_PACKAGE_XORGPROTO
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
help
diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
index 3ad841bdd3..da58638b30 100644
--- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
+++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
@@ -46,7 +46,7 @@ endif
ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y)
GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx
-GST1_PLUGINS_BASE_DEPENDENCIES += xproto_glproto xlib_libXrender
+GST1_PLUGINS_BASE_DEPENDENCIES += xorgproto xlib_libXrender
else
GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx
endif
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 03/22] package/gstreamer1/gst1-plugins-base: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 03/22] package/gstreamer1/gst1-plugins-base: " Bernd Kuhls
@ 2018-07-02 21:23 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:23 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/gstreamer1/gst1-plugins-base/Config.in | 2 +-
> package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in
> index 531fac4f47..340926ecb9 100644
> --- a/package/gstreamer1/gst1-plugins-base/Config.in
> +++ b/package/gstreamer1/gst1-plugins-base/Config.in
> @@ -164,7 +164,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX
> depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X
> depends on !BR2_PACKAGE_RPI_USERLAND # x11
> select BR2_PACKAGE_XLIB_LIBXRENDER
> - select BR2_PACKAGE_XPROTO_GLPROTO
> + select BR2_PACKAGE_XORGPROTO
> select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11
> select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM
> help
> diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> index 3ad841bdd3..da58638b30 100644
> --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk
> @@ -46,7 +46,7 @@ endif
>
> ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX),y)
> GST1_PLUGINS_BASE_CONF_OPTS += --enable-glx
> -GST1_PLUGINS_BASE_DEPENDENCIES += xproto_glproto xlib_libXrender
> +GST1_PLUGINS_BASE_DEPENDENCIES += xorgproto xlib_libXrender
> else
> GST1_PLUGINS_BASE_CONF_OPTS += --disable-glx
> endif
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 04/22] package/libdri2: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (2 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 03/22] package/gstreamer1/gst1-plugins-base: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:23 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 05/22] package/libvdpau: " Bernd Kuhls
` (18 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/libdri2/Config.in | 2 +-
package/libdri2/libdri2.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libdri2/Config.in b/package/libdri2/Config.in
index a10df7404a..fa3f76e8f3 100644
--- a/package/libdri2/Config.in
+++ b/package/libdri2/Config.in
@@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBDRI2
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_DRI2PROTO
+ select BR2_PACKAGE_XORGPROTO
help
Library for the DRI2 extension to the X Window System.
diff --git a/package/libdri2/libdri2.mk b/package/libdri2/libdri2.mk
index 22854b5060..79f38c680b 100644
--- a/package/libdri2/libdri2.mk
+++ b/package/libdri2/libdri2.mk
@@ -6,7 +6,7 @@
LIBDRI2_VERSION = 4f1eef3183df2b270c3d5cbef07343ee5127a6a4
LIBDRI2_SITE = $(call github,robclark,libdri2,$(LIBDRI2_VERSION))
-LIBDRI2_DEPENDENCIES = xlib_libXext xproto_dri2proto xlib_libXdamage libdrm
+LIBDRI2_DEPENDENCIES = xlib_libXext xlib_libXdamage xorgproto libdrm
LIBDRI2_LICENSE = MIT
LIBDRI2_LICENSE_FILES = COPYING
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 04/22] package/libdri2: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 04/22] package/libdri2: " Bernd Kuhls
@ 2018-07-02 21:23 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:23 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/libdri2/Config.in | 2 +-
> package/libdri2/libdri2.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/libdri2/Config.in b/package/libdri2/Config.in
> index a10df7404a..fa3f76e8f3 100644
> --- a/package/libdri2/Config.in
> +++ b/package/libdri2/Config.in
> @@ -5,7 +5,7 @@ config BR2_PACKAGE_LIBDRI2
> select BR2_PACKAGE_LIBDRM
> select BR2_PACKAGE_XLIB_LIBXDAMAGE
> select BR2_PACKAGE_XLIB_LIBXEXT
> - select BR2_PACKAGE_XPROTO_DRI2PROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> Library for the DRI2 extension to the X Window System.
>
> diff --git a/package/libdri2/libdri2.mk b/package/libdri2/libdri2.mk
> index 22854b5060..79f38c680b 100644
> --- a/package/libdri2/libdri2.mk
> +++ b/package/libdri2/libdri2.mk
> @@ -6,7 +6,7 @@
>
> LIBDRI2_VERSION = 4f1eef3183df2b270c3d5cbef07343ee5127a6a4
> LIBDRI2_SITE = $(call github,robclark,libdri2,$(LIBDRI2_VERSION))
> -LIBDRI2_DEPENDENCIES = xlib_libXext xproto_dri2proto xlib_libXdamage libdrm
> +LIBDRI2_DEPENDENCIES = xlib_libXext xlib_libXdamage xorgproto libdrm
> LIBDRI2_LICENSE = MIT
> LIBDRI2_LICENSE_FILES = COPYING
>
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 05/22] package/libvdpau: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (3 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 04/22] package/libdri2: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:31 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 06/22] package/mesa3d: " Bernd Kuhls
` (17 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/libvdpau/libvdpau.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk
index f29da1e406..93446dbf28 100644
--- a/package/libvdpau/libvdpau.mk
+++ b/package/libvdpau/libvdpau.mk
@@ -18,8 +18,8 @@ LIBVDPAU_DEPENDENCIES = host-pkgconf xlib_libX11 xlib_libXext
LIBVDPAU_CONF_OPTS = --with-module-dir=/usr/lib/vdpau
-ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
-LIBVDPAU_DEPENDENCIES += xproto_dri2proto
+ifeq ($(BR2_PACKAGE_XORGPROTO),y)
+LIBVDPAU_DEPENDENCIES += xorgproto
LIBVDPAU_CONF_OPTS += --enable-dri2
else
LIBVDPAU_CONF_OPTS += --disable-dri2
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 05/22] package/libvdpau: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 05/22] package/libvdpau: " Bernd Kuhls
@ 2018-07-02 21:31 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:31 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>o
Regards,
Yann E. MORIN.
> ---
> package/libvdpau/libvdpau.mk | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/libvdpau/libvdpau.mk b/package/libvdpau/libvdpau.mk
> index f29da1e406..93446dbf28 100644
> --- a/package/libvdpau/libvdpau.mk
> +++ b/package/libvdpau/libvdpau.mk
> @@ -18,8 +18,8 @@ LIBVDPAU_DEPENDENCIES = host-pkgconf xlib_libX11 xlib_libXext
>
> LIBVDPAU_CONF_OPTS = --with-module-dir=/usr/lib/vdpau
>
> -ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
> -LIBVDPAU_DEPENDENCIES += xproto_dri2proto
> +ifeq ($(BR2_PACKAGE_XORGPROTO),y)
> +LIBVDPAU_DEPENDENCIES += xorgproto
> LIBVDPAU_CONF_OPTS += --enable-dri2
> else
> LIBVDPAU_CONF_OPTS += --disable-dri2
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 06/22] package/mesa3d: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (4 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 05/22] package/libvdpau: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:30 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass " Bernd Kuhls
` (16 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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 dri3 handling because xorgproto always installs dri3proto.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/mesa3d/Config.in | 18 ++++--------------
package/mesa3d/mesa3d.mk | 8 +++-----
2 files changed, 7 insertions(+), 19 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 8c1877fbc1..dd36a5e0fd 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -8,9 +8,7 @@ menuconfig BR2_PACKAGE_MESA3D
select BR2_PACKAGE_EXPAT
select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
- select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
@@ -59,15 +57,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
config BR2_PACKAGE_MESA3D_DRI_DRIVER
bool
select BR2_PACKAGE_MESA3D_DRIVER
- # xlib-libxshmfence needs sync_4, so we cannot select it if
- # BR2_TOOLCHAIN_HAS_SYNC_4 is false. xproto-presentproto
- # doesn't need sync_4, but it is only needed in conjunction
- # with xlib-libxshmfence and dri3proto to provide dri3
- # support, so we also only select it if sync_4 is available.
- select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
- (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
- select BR2_PACKAGE_XPROTO_PRESENTPROTO if \
- (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
+ select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4
config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
bool
@@ -221,9 +211,9 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
depends on BR2_i386 || BR2_x86_64
depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h
depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
- depends on BR2_PACKAGE_XORG7 # xproto_dri3proto
+ depends on BR2_PACKAGE_XORG7 # xorgproto
select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
- select BR2_PACKAGE_XPROTO_DRI3PROTO
+ select BR2_PACKAGE_XORGPROTO
help
Vulkan driver for Intel hardware from Ivy Bridge onward.
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 6e1e27f62f..cafc41f97d 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -57,13 +57,11 @@ endif
ifeq ($(BR2_PACKAGE_XORG7),y)
MESA3D_DEPENDENCIES += \
- xproto_xf86driproto \
- xproto_dri2proto \
- xproto_glproto \
xlib_libX11 \
xlib_libXext \
xlib_libXdamage \
xlib_libXfixes \
+ xorgproto \
libxcb
MESA3D_CONF_OPTS += --enable-glx --disable-mangling
# quote from mesa3d configure "Building xa requires at least one non swrast gallium driver."
@@ -113,8 +111,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
MESA3D_CONF_OPTS += \
--without-dri-drivers --disable-dri3
else
-ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
-MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y)
+MESA3D_DEPENDENCIES += xlib_libxshmfence
MESA3D_CONF_OPTS += --enable-dri3
else
MESA3D_CONF_OPTS += --disable-dri3
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 06/22] package/mesa3d: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 06/22] package/mesa3d: " Bernd Kuhls
@ 2018-07-02 21:30 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:30 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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 dri3 handling because xorgproto always installs dri3proto.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/mesa3d/Config.in | 18 ++++--------------
> package/mesa3d/mesa3d.mk | 8 +++-----
> 2 files changed, 7 insertions(+), 19 deletions(-)
>
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index 8c1877fbc1..dd36a5e0fd 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -8,9 +8,7 @@ menuconfig BR2_PACKAGE_MESA3D
> select BR2_PACKAGE_EXPAT
> select BR2_PACKAGE_HAS_LIBGL if BR2_PACKAGE_XORG7
> select BR2_PACKAGE_WAYLAND_PROTOCOLS if BR2_PACKAGE_WAYLAND
> - select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_XORG7
> + select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
> select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
> select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
> @@ -59,15 +57,7 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
> config BR2_PACKAGE_MESA3D_DRI_DRIVER
> bool
> select BR2_PACKAGE_MESA3D_DRIVER
> - # xlib-libxshmfence needs sync_4, so we cannot select it if
> - # BR2_TOOLCHAIN_HAS_SYNC_4 is false. xproto-presentproto
> - # doesn't need sync_4, but it is only needed in conjunction
> - # with xlib-libxshmfence and dri3proto to provide dri3
> - # support, so we also only select it if sync_4 is available.
> - select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
> - (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
> - select BR2_PACKAGE_XPROTO_PRESENTPROTO if \
> - (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
> + select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4
>
> config BR2_PACKAGE_MESA3D_VULKAN_DRIVER
> bool
> @@ -221,9 +211,9 @@ config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL
> depends on BR2_i386 || BR2_x86_64
> depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18 # memfd.h
> depends on BR2_TOOLCHAIN_USES_GLIBC # ifunc, static_assert
> - depends on BR2_PACKAGE_XORG7 # xproto_dri3proto
> + depends on BR2_PACKAGE_XORG7 # xorgproto
> select BR2_PACKAGE_MESA3D_VULKAN_DRIVER
> - select BR2_PACKAGE_XPROTO_DRI3PROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> Vulkan driver for Intel hardware from Ivy Bridge onward.
>
> diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
> index 6e1e27f62f..cafc41f97d 100644
> --- a/package/mesa3d/mesa3d.mk
> +++ b/package/mesa3d/mesa3d.mk
> @@ -57,13 +57,11 @@ endif
>
> ifeq ($(BR2_PACKAGE_XORG7),y)
> MESA3D_DEPENDENCIES += \
> - xproto_xf86driproto \
> - xproto_dri2proto \
> - xproto_glproto \
> xlib_libX11 \
> xlib_libXext \
> xlib_libXdamage \
> xlib_libXfixes \
> + xorgproto \
> libxcb
> MESA3D_CONF_OPTS += --enable-glx --disable-mangling
> # quote from mesa3d configure "Building xa requires at least one non swrast gallium driver."
> @@ -113,8 +111,8 @@ ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),)
> MESA3D_CONF_OPTS += \
> --without-dri-drivers --disable-dri3
> else
> -ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
> -MESA3D_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto xproto_presentproto
> +ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y)
> +MESA3D_DEPENDENCIES += xlib_libxshmfence
> MESA3D_CONF_OPTS += --enable-dri3
> else
> MESA3D_CONF_OPTS += --disable-dri3
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (5 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 06/22] package/mesa3d: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:35 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 08/22] package/x11r7/xdriver_xf86-input-*: " Bernd Kuhls
` (15 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xapp_mkfontscale/Config.in | 1 +
package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 ++--
package/x11r7/xapp_rgb/Config.in | 2 +-
package/x11r7/xapp_rgb/xapp_rgb.mk | 2 +-
package/x11r7/xapp_sessreg/Config.in | 2 +-
package/x11r7/xapp_sessreg/xapp_sessreg.mk | 2 +-
package/x11r7/xapp_xconsole/Config.in | 2 +-
package/x11r7/xapp_xconsole/xapp_xconsole.mk | 2 +-
package/x11r7/xapp_xdm/Config.in | 3 +--
package/x11r7/xapp_xdm/xapp_xdm.mk | 10 +++++++++-
package/x11r7/xapp_xdriinfo/Config.in | 2 +-
package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +-
package/x11r7/xapp_xfindproxy/Config.in | 3 +--
package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk | 3 +--
package/x11r7/xapp_xfs/Config.in | 2 +-
package/x11r7/xapp_xfs/xapp_xfs.mk | 2 +-
package/x11r7/xapp_xsetpointer/Config.in | 2 +-
package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk | 2 +-
18 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/package/x11r7/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in
index 540dd455ff..510c439da8 100644
--- a/package/x11r7/xapp_mkfontscale/Config.in
+++ b/package/x11r7/xapp_mkfontscale/Config.in
@@ -3,5 +3,6 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBFONTENC
+ select BR2_PACKAGE_XORGPROTO
help
create an index of scalable font files for X
diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
index 12416b4d6b..a07d2f4fbd 100644
--- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
+++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
@@ -9,9 +9,9 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_MKFONTSCALE_LICENSE = MIT
XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
-XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
+XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto
HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \
- host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
+ host-zlib host-freetype host-xlib_libfontenc host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xapp_rgb/Config.in b/package/x11r7/xapp_rgb/Config.in
index 038b849d4b..7198b5f1a4 100644
--- a/package/x11r7/xapp_rgb/Config.in
+++ b/package/x11r7/xapp_rgb/Config.in
@@ -1,5 +1,5 @@
config BR2_PACKAGE_XAPP_RGB
bool "rgb"
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
uncompile an rgb color-name database
diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
index 82878abad0..d63576f44d 100644
--- a/package/x11r7/xapp_rgb/xapp_rgb.mk
+++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
@@ -9,6 +9,6 @@ XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_RGB_LICENSE = MIT
XAPP_RGB_LICENSE_FILES = COPYING
-XAPP_RGB_DEPENDENCIES = xproto_xproto
+XAPP_RGB_DEPENDENCIES = xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_sessreg/Config.in b/package/x11r7/xapp_sessreg/Config.in
index 0796bc1bca..c9048b3b7e 100644
--- a/package/x11r7/xapp_sessreg/Config.in
+++ b/package/x11r7/xapp_sessreg/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XAPP_SESSREG
bool "sessreg"
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
manage utmp/wtmp entries for non-init clients
diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
index c6e9463d3b..46935aed9a 100644
--- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
+++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
@@ -9,6 +9,6 @@ XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app
XAPP_SESSREG_LICENSE = MIT
XAPP_SESSREG_LICENSE_FILES = COPYING
-XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
+XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xconsole/Config.in b/package/x11r7/xapp_xconsole/Config.in
index 7baf4ff6af..3d796bd3c1 100644
--- a/package/x11r7/xapp_xconsole/Config.in
+++ b/package/x11r7/xapp_xconsole/Config.in
@@ -4,7 +4,7 @@ config BR2_PACKAGE_XAPP_XCONSOLE
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXAW
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XLIB_LIBXMU
+ select BR2_PACKAGE_XORGPROTO
help
xconsole - monitor system console messages with X
diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
index 52656de83c..a91b98dc60 100644
--- a/package/x11r7/xapp_xconsole/xapp_xconsole.mk
+++ b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
@@ -10,7 +10,7 @@ XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XCONSOLE_LICENSE = MIT
XAPP_XCONSOLE_LICENSE_FILES = COPYING
XAPP_XCONSOLE_DEPENDENCIES = \
- xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \
+ xlib_libX11 xlib_libXaw xlib_libXt xorgproto \
xlib_libXmu
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
index 69829701ca..af816a1349 100644
--- a/package/x11r7/xapp_xdm/Config.in
+++ b/package/x11r7/xapp_xdm/Config.in
@@ -10,7 +10,6 @@ config BR2_PACKAGE_XAPP_XDM
select BR2_PACKAGE_XLIB_LIBXDMCP
select BR2_PACKAGE_XLIB_LIBXINERAMA
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_XINERAMAPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org xdm application
diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
index 8f846a82aa..2c213a6bf0 100644
--- a/package/x11r7/xapp_xdm/xapp_xdm.mk
+++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
@@ -10,7 +10,15 @@ XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDM_LICENSE = MIT
XAPP_XDM_LICENSE_FILES = COPYING
XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
-XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
+XAPP_XDM_DEPENDENCIES = \
+ xapp_sessreg \
+ xapp_xrdb \
+ xlib_libX11 \
+ xlib_libXaw \
+ xlib_libXdmcp \
+ xlib_libXinerama \
+ xlib_libXt \
+ xorgproto
XAPP_XDM_CONF_OPTS = \
--with-utmp-file=/var/adm/utmpx \
--with-wtmp-file=/var/adm/wtmpx
diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
index 2b204d9171..df65b491ab 100644
--- a/package/x11r7/xapp_xdriinfo/Config.in
+++ b/package/x11r7/xapp_xdriinfo/Config.in
@@ -2,7 +2,7 @@ config BR2_PACKAGE_XAPP_XDRIINFO
bool "xdriinfo"
depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_GLPROTO
+ select BR2_PACKAGE_XORGPROTO
help
query configuration information of DRI drivers
diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
index 00dea8c7ad..7f7aac9e15 100644
--- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
+++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
@@ -9,6 +9,6 @@ XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XDRIINFO_LICENSE = MIT
XAPP_XDRIINFO_LICENSE_FILES = COPYING
-XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xproto_glproto
+XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfindproxy/Config.in b/package/x11r7/xapp_xfindproxy/Config.in
index b186ab65bc..e452dc9658 100644
--- a/package/x11r7/xapp_xfindproxy/Config.in
+++ b/package/x11r7/xapp_xfindproxy/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_XAPP_XFINDPROXY
bool "xfindproxy"
select BR2_PACKAGE_XLIB_LIBICE
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+ select BR2_PACKAGE_XORGPROTO
help
xfindproxy utilizes the Proxy Management Protocol to
communicate with a proxy manager to locate available X11
diff --git a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
index 7662a902a2..7832e0ca96 100644
--- a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
+++ b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
@@ -12,7 +12,6 @@ XAPP_XFINDPROXY_LICENSE_FILES = COPYING
XAPP_XFINDPROXY_DEPENDENCIES = \
xlib_libICE \
xlib_libXt \
- xproto_xproto \
- xproto_xproxymanagementprotocol
+ xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xfs/Config.in b/package/x11r7/xapp_xfs/Config.in
index b708af8c0c..19e675b265 100644
--- a/package/x11r7/xapp_xfs/Config.in
+++ b/package/x11r7/xapp_xfs/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_XAPP_XFS
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_XLIB_LIBFS
select BR2_PACKAGE_XLIB_LIBXFONT2
- select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X font server
diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
index f4fe35dfb7..9177a65b9c 100644
--- a/package/x11r7/xapp_xfs/xapp_xfs.mk
+++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
@@ -9,6 +9,6 @@ XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XFS_LICENSE = MIT
XAPP_XFS_LICENSE_FILES = COPYING
-XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xproto_fontsproto
+XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xapp_xsetpointer/Config.in b/package/x11r7/xapp_xsetpointer/Config.in
index 2b0b4624e8..0deb6d8112 100644
--- a/package/x11r7/xapp_xsetpointer/Config.in
+++ b/package/x11r7/xapp_xsetpointer/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XAPP_XSETPOINTER
bool "xsetpointer"
- select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXI
+ select BR2_PACKAGE_XORGPROTO
help
set an X Input device as the main pointer
diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
index f56cdd58a1..a34b7e637d 100644
--- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
+++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
@@ -9,6 +9,6 @@ XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
XAPP_XSETPOINTER_LICENSE = MIT
XAPP_XSETPOINTER_LICENSE_FILES = COPYING
-XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
+XAPP_XSETPOINTER_DEPENDENCIES = xlib_libX11 xlib_libXi xorgproto
$(eval $(autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass " Bernd Kuhls
@ 2018-07-02 21:35 ` Yann E. MORIN
2018-07-13 19:56 ` Bernd Kuhls
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:35 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/x11r7/xapp_mkfontscale/Config.in | 1 +
> package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk | 4 ++--
> package/x11r7/xapp_rgb/Config.in | 2 +-
> package/x11r7/xapp_rgb/xapp_rgb.mk | 2 +-
> package/x11r7/xapp_sessreg/Config.in | 2 +-
> package/x11r7/xapp_sessreg/xapp_sessreg.mk | 2 +-
> package/x11r7/xapp_xconsole/Config.in | 2 +-
> package/x11r7/xapp_xconsole/xapp_xconsole.mk | 2 +-
> package/x11r7/xapp_xdm/Config.in | 3 +--
> package/x11r7/xapp_xdm/xapp_xdm.mk | 10 +++++++++-
> package/x11r7/xapp_xdriinfo/Config.in | 2 +-
> package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +-
> package/x11r7/xapp_xfindproxy/Config.in | 3 +--
> package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk | 3 +--
> package/x11r7/xapp_xfs/Config.in | 2 +-
> package/x11r7/xapp_xfs/xapp_xfs.mk | 2 +-
> package/x11r7/xapp_xsetpointer/Config.in | 2 +-
> package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk | 2 +-
> 18 files changed, 27 insertions(+), 21 deletions(-)
>
> diff --git a/package/x11r7/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in
> index 540dd455ff..510c439da8 100644
> --- a/package/x11r7/xapp_mkfontscale/Config.in
> +++ b/package/x11r7/xapp_mkfontscale/Config.in
> @@ -3,5 +3,6 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE
> select BR2_PACKAGE_FREETYPE
> select BR2_PACKAGE_XLIB_LIBX11
> select BR2_PACKAGE_XLIB_LIBFONTENC
> + select BR2_PACKAGE_XORGPROTO
So, xapp_mkfontscale did select no xproto, and now it selects all...
> help
> create an index of scalable font files for X
> diff --git a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
> index 12416b4d6b..a07d2f4fbd 100644
> --- a/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
> +++ b/package/x11r7/xapp_mkfontscale/xapp_mkfontscale.mk
> @@ -9,9 +9,9 @@ XAPP_MKFONTSCALE_SOURCE = mkfontscale-$(XAPP_MKFONTSCALE_VERSION).tar.bz2
> XAPP_MKFONTSCALE_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_MKFONTSCALE_LICENSE = MIT
> XAPP_MKFONTSCALE_LICENSE_FILES = COPYING
> -XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
> +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto
> HOST_XAPP_MKFONTSCALE_DEPENDENCIES = \
> - host-zlib host-freetype host-xlib_libfontenc host-xproto_xproto
> + host-zlib host-freetype host-xlib_libfontenc host-xorgproto
... because it was a missing dependency.
So it should have been in a separate patch, so that the fix stands out.
Regards,
Yann E. MORIN.
>
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> diff --git a/package/x11r7/xapp_rgb/Config.in b/package/x11r7/xapp_rgb/Config.in
> index 038b849d4b..7198b5f1a4 100644
> --- a/package/x11r7/xapp_rgb/Config.in
> +++ b/package/x11r7/xapp_rgb/Config.in
> @@ -1,5 +1,5 @@
> config BR2_PACKAGE_XAPP_RGB
> bool "rgb"
> - select BR2_PACKAGE_XPROTO_XPROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> uncompile an rgb color-name database
> diff --git a/package/x11r7/xapp_rgb/xapp_rgb.mk b/package/x11r7/xapp_rgb/xapp_rgb.mk
> index 82878abad0..d63576f44d 100644
> --- a/package/x11r7/xapp_rgb/xapp_rgb.mk
> +++ b/package/x11r7/xapp_rgb/xapp_rgb.mk
> @@ -9,6 +9,6 @@ XAPP_RGB_SOURCE = rgb-$(XAPP_RGB_VERSION).tar.bz2
> XAPP_RGB_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_RGB_LICENSE = MIT
> XAPP_RGB_LICENSE_FILES = COPYING
> -XAPP_RGB_DEPENDENCIES = xproto_xproto
> +XAPP_RGB_DEPENDENCIES = xorgproto
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_sessreg/Config.in b/package/x11r7/xapp_sessreg/Config.in
> index 0796bc1bca..c9048b3b7e 100644
> --- a/package/x11r7/xapp_sessreg/Config.in
> +++ b/package/x11r7/xapp_sessreg/Config.in
> @@ -1,6 +1,6 @@
> config BR2_PACKAGE_XAPP_SESSREG
> bool "sessreg"
> select BR2_PACKAGE_XLIB_LIBX11
> - select BR2_PACKAGE_XPROTO_XPROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> manage utmp/wtmp entries for non-init clients
> diff --git a/package/x11r7/xapp_sessreg/xapp_sessreg.mk b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
> index c6e9463d3b..46935aed9a 100644
> --- a/package/x11r7/xapp_sessreg/xapp_sessreg.mk
> +++ b/package/x11r7/xapp_sessreg/xapp_sessreg.mk
> @@ -9,6 +9,6 @@ XAPP_SESSREG_SOURCE = sessreg-$(XAPP_SESSREG_VERSION).tar.bz2
> XAPP_SESSREG_SITE = https://xorg.freedesktop.org/archive/individual/app
> XAPP_SESSREG_LICENSE = MIT
> XAPP_SESSREG_LICENSE_FILES = COPYING
> -XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xproto_xproto
> +XAPP_SESSREG_DEPENDENCIES = xlib_libX11 xorgproto
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_xconsole/Config.in b/package/x11r7/xapp_xconsole/Config.in
> index 7baf4ff6af..3d796bd3c1 100644
> --- a/package/x11r7/xapp_xconsole/Config.in
> +++ b/package/x11r7/xapp_xconsole/Config.in
> @@ -4,7 +4,7 @@ config BR2_PACKAGE_XAPP_XCONSOLE
> select BR2_PACKAGE_XLIB_LIBX11
> select BR2_PACKAGE_XLIB_LIBXAW
> select BR2_PACKAGE_XLIB_LIBXT
> - select BR2_PACKAGE_XPROTO_XPROTO
> select BR2_PACKAGE_XLIB_LIBXMU
> + select BR2_PACKAGE_XORGPROTO
> help
> xconsole - monitor system console messages with X
> diff --git a/package/x11r7/xapp_xconsole/xapp_xconsole.mk b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
> index 52656de83c..a91b98dc60 100644
> --- a/package/x11r7/xapp_xconsole/xapp_xconsole.mk
> +++ b/package/x11r7/xapp_xconsole/xapp_xconsole.mk
> @@ -10,7 +10,7 @@ XAPP_XCONSOLE_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XCONSOLE_LICENSE = MIT
> XAPP_XCONSOLE_LICENSE_FILES = COPYING
> XAPP_XCONSOLE_DEPENDENCIES = \
> - xlib_libX11 xlib_libXaw xlib_libXt xproto_xproto \
> + xlib_libX11 xlib_libXaw xlib_libXt xorgproto \
> xlib_libXmu
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_xdm/Config.in b/package/x11r7/xapp_xdm/Config.in
> index 69829701ca..af816a1349 100644
> --- a/package/x11r7/xapp_xdm/Config.in
> +++ b/package/x11r7/xapp_xdm/Config.in
> @@ -10,7 +10,6 @@ config BR2_PACKAGE_XAPP_XDM
> select BR2_PACKAGE_XLIB_LIBXDMCP
> select BR2_PACKAGE_XLIB_LIBXINERAMA
> select BR2_PACKAGE_XLIB_LIBXT
> - select BR2_PACKAGE_XPROTO_XINERAMAPROTO
> - select BR2_PACKAGE_XPROTO_XPROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> X.Org xdm application
> diff --git a/package/x11r7/xapp_xdm/xapp_xdm.mk b/package/x11r7/xapp_xdm/xapp_xdm.mk
> index 8f846a82aa..2c213a6bf0 100644
> --- a/package/x11r7/xapp_xdm/xapp_xdm.mk
> +++ b/package/x11r7/xapp_xdm/xapp_xdm.mk
> @@ -10,7 +10,15 @@ XAPP_XDM_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XDM_LICENSE = MIT
> XAPP_XDM_LICENSE_FILES = COPYING
> XAPP_XDM_CONF_ENV = ac_cv_file__dev_urandom=yes
> -XAPP_XDM_DEPENDENCIES = xapp_sessreg xapp_xrdb xlib_libX11 xlib_libXaw xlib_libXdmcp xlib_libXinerama xlib_libXt xproto_xineramaproto xproto_xproto
> +XAPP_XDM_DEPENDENCIES = \
> + xapp_sessreg \
> + xapp_xrdb \
> + xlib_libX11 \
> + xlib_libXaw \
> + xlib_libXdmcp \
> + xlib_libXinerama \
> + xlib_libXt \
> + xorgproto
> XAPP_XDM_CONF_OPTS = \
> --with-utmp-file=/var/adm/utmpx \
> --with-wtmp-file=/var/adm/wtmpx
> diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
> index 2b204d9171..df65b491ab 100644
> --- a/package/x11r7/xapp_xdriinfo/Config.in
> +++ b/package/x11r7/xapp_xdriinfo/Config.in
> @@ -2,7 +2,7 @@ config BR2_PACKAGE_XAPP_XDRIINFO
> bool "xdriinfo"
> depends on BR2_PACKAGE_HAS_LIBGL
> select BR2_PACKAGE_XLIB_LIBX11
> - select BR2_PACKAGE_XPROTO_GLPROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> query configuration information of DRI drivers
>
> diff --git a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
> index 00dea8c7ad..7f7aac9e15 100644
> --- a/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
> +++ b/package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk
> @@ -9,6 +9,6 @@ XAPP_XDRIINFO_SOURCE = xdriinfo-$(XAPP_XDRIINFO_VERSION).tar.bz2
> XAPP_XDRIINFO_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XDRIINFO_LICENSE = MIT
> XAPP_XDRIINFO_LICENSE_FILES = COPYING
> -XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xproto_glproto
> +XAPP_XDRIINFO_DEPENDENCIES = libgl xlib_libX11 xorgproto
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_xfindproxy/Config.in b/package/x11r7/xapp_xfindproxy/Config.in
> index b186ab65bc..e452dc9658 100644
> --- a/package/x11r7/xapp_xfindproxy/Config.in
> +++ b/package/x11r7/xapp_xfindproxy/Config.in
> @@ -2,8 +2,7 @@ config BR2_PACKAGE_XAPP_XFINDPROXY
> bool "xfindproxy"
> select BR2_PACKAGE_XLIB_LIBICE
> select BR2_PACKAGE_XLIB_LIBXT
> - select BR2_PACKAGE_XPROTO_XPROTO
> - select BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
> + select BR2_PACKAGE_XORGPROTO
> help
> xfindproxy utilizes the Proxy Management Protocol to
> communicate with a proxy manager to locate available X11
> diff --git a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
> index 7662a902a2..7832e0ca96 100644
> --- a/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
> +++ b/package/x11r7/xapp_xfindproxy/xapp_xfindproxy.mk
> @@ -12,7 +12,6 @@ XAPP_XFINDPROXY_LICENSE_FILES = COPYING
> XAPP_XFINDPROXY_DEPENDENCIES = \
> xlib_libICE \
> xlib_libXt \
> - xproto_xproto \
> - xproto_xproxymanagementprotocol
> + xorgproto
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_xfs/Config.in b/package/x11r7/xapp_xfs/Config.in
> index b708af8c0c..19e675b265 100644
> --- a/package/x11r7/xapp_xfs/Config.in
> +++ b/package/x11r7/xapp_xfs/Config.in
> @@ -3,6 +3,6 @@ config BR2_PACKAGE_XAPP_XFS
> depends on BR2_USE_MMU # fork()
> select BR2_PACKAGE_XLIB_LIBFS
> select BR2_PACKAGE_XLIB_LIBXFONT2
> - select BR2_PACKAGE_XPROTO_FONTSPROTO
> + select BR2_PACKAGE_XORGPROTO
> help
> X font server
> diff --git a/package/x11r7/xapp_xfs/xapp_xfs.mk b/package/x11r7/xapp_xfs/xapp_xfs.mk
> index f4fe35dfb7..9177a65b9c 100644
> --- a/package/x11r7/xapp_xfs/xapp_xfs.mk
> +++ b/package/x11r7/xapp_xfs/xapp_xfs.mk
> @@ -9,6 +9,6 @@ XAPP_XFS_SOURCE = xfs-$(XAPP_XFS_VERSION).tar.bz2
> XAPP_XFS_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XFS_LICENSE = MIT
> XAPP_XFS_LICENSE_FILES = COPYING
> -XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xproto_fontsproto
> +XAPP_XFS_DEPENDENCIES = xlib_libFS xlib_libXfont2 xorgproto
>
> $(eval $(autotools-package))
> diff --git a/package/x11r7/xapp_xsetpointer/Config.in b/package/x11r7/xapp_xsetpointer/Config.in
> index 2b0b4624e8..0deb6d8112 100644
> --- a/package/x11r7/xapp_xsetpointer/Config.in
> +++ b/package/x11r7/xapp_xsetpointer/Config.in
> @@ -1,7 +1,7 @@
> config BR2_PACKAGE_XAPP_XSETPOINTER
> bool "xsetpointer"
> - select BR2_PACKAGE_XPROTO_INPUTPROTO
> select BR2_PACKAGE_XLIB_LIBX11
> select BR2_PACKAGE_XLIB_LIBXI
> + select BR2_PACKAGE_XORGPROTO
> help
> set an X Input device as the main pointer
> diff --git a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
> index f56cdd58a1..a34b7e637d 100644
> --- a/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
> +++ b/package/x11r7/xapp_xsetpointer/xapp_xsetpointer.mk
> @@ -9,6 +9,6 @@ XAPP_XSETPOINTER_SOURCE = xsetpointer-$(XAPP_XSETPOINTER_VERSION).tar.bz2
> XAPP_XSETPOINTER_SITE = http://xorg.freedesktop.org/releases/individual/app
> XAPP_XSETPOINTER_LICENSE = MIT
> XAPP_XSETPOINTER_LICENSE_FILES = COPYING
> -XAPP_XSETPOINTER_DEPENDENCIES = xproto_inputproto xlib_libX11 xlib_libXi
> +XAPP_XSETPOINTER_DEPENDENCIES = xlib_libX11 xlib_libXi xorgproto
>
> $(eval $(autotools-package))
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass switch to xorgproto
2018-07-02 21:35 ` Yann E. MORIN
@ 2018-07-13 19:56 ` Bernd Kuhls
0 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-07-13 19:56 UTC (permalink / raw)
To: buildroot
Hi Yann,
Am Mon, 02 Jul 2018 23:35:06 +0200 schrieb Yann E. MORIN:
>> --- a/package/x11r7/xapp_mkfontscale/Config.in
>> +++ b/package/x11r7/xapp_mkfontscale/Config.in
>> @@ -3,5 +3,6 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE
>> select BR2_PACKAGE_FREETYPE
>> select BR2_PACKAGE_XLIB_LIBX11
>> select BR2_PACKAGE_XLIB_LIBFONTENC
>> + select BR2_PACKAGE_XORGPROTO
>
> So, xapp_mkfontscale did select no xproto, and now it selects all...
[...]
>> -XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xproto_xproto
>> +XAPP_MKFONTSCALE_DEPENDENCIES = zlib freetype xlib_libfontenc xorgproto
[...]
>
> ... because it was a missing dependency.
>
> So it should have been in a separate patch, so that the fix stands out.
sent http://patchwork.ozlabs.org/patch/943794/
Regards, Bernd
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 08/22] package/x11r7/xdriver_xf86-input-*: mass switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (6 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 07/22] package/x11r7/xapp_*: mass " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:37 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 09/22] package/x11r7/xdriver_xf86-video-*: " Bernd Kuhls
` (14 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xdriver_xf86-input-evdev/Config.in | 4 +---
.../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk | 4 +---
package/x11r7/xdriver_xf86-input-joystick/Config.in | 4 +---
.../xdriver_xf86-input-joystick.mk | 2 +-
package/x11r7/xdriver_xf86-input-keyboard/Config.in | 5 +----
.../xdriver_xf86-input-keyboard.mk | 2 +-
package/x11r7/xdriver_xf86-input-libinput/Config.in | 3 +--
.../xdriver_xf86-input-libinput.mk | 2 +-
package/x11r7/xdriver_xf86-input-mouse/Config.in | 4 +---
.../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +-
package/x11r7/xdriver_xf86-input-synaptics/Config.in | 4 +---
.../xdriver_xf86-input-synaptics.mk | 2 +-
package/x11r7/xdriver_xf86-input-tslib/Config.in | 4 +---
.../xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk | 4 +---
package/x11r7/xdriver_xf86-input-vmmouse/Config.in | 4 +---
.../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk | 2 +-
16 files changed, 16 insertions(+), 36 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
index 70e950dc74..fe4e451ed7 100644
--- 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 4933c42fda..ded7fa77f1 100644
--- 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 ff9f25f549..892d1a161b 100644
--- 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 5bc2a5cafb..0ec4be5e53 100644
--- 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 0a0352424e..ee23033b97 100644
--- 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 01a6859cd4..fb1e289643 100644
--- 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 0f2db1bd1a..0cfbfc664a 100644
--- 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 1723b3fcf8..8642806c8b 100644
--- 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 20e1803a99..efa181e556 100644
--- 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 5bcbeb70fd..88af9d2361 100644
--- 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 ffe1a2a448..b974265b31 100644
--- 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 6bd9cc49c5..0708110e91 100644
--- 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 4e77abcb10..9205cba6bd 100644
--- 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 bf0ee4860d..f8944f3521 100644
--- 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 de989eb34a..d77def028d 100644
--- 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 6e9cf8b785..b8c77de5f6 100644
--- 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
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 08/22] package/x11r7/xdriver_xf86-input-*: mass switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 08/22] package/x11r7/xdriver_xf86-input-*: " Bernd Kuhls
@ 2018-07-02 21:37 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:37 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/x11r7/xdriver_xf86-input-evdev/Config.in | 4 +---
> .../xdriver_xf86-input-evdev/xdriver_xf86-input-evdev.mk | 4 +---
> package/x11r7/xdriver_xf86-input-joystick/Config.in | 4 +---
> .../xdriver_xf86-input-joystick.mk | 2 +-
> package/x11r7/xdriver_xf86-input-keyboard/Config.in | 5 +----
> .../xdriver_xf86-input-keyboard.mk | 2 +-
> package/x11r7/xdriver_xf86-input-libinput/Config.in | 3 +--
> .../xdriver_xf86-input-libinput.mk | 2 +-
> package/x11r7/xdriver_xf86-input-mouse/Config.in | 4 +---
> .../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +-
> package/x11r7/xdriver_xf86-input-synaptics/Config.in | 4 +---
> .../xdriver_xf86-input-synaptics.mk | 2 +-
> package/x11r7/xdriver_xf86-input-tslib/Config.in | 4 +---
> .../xdriver_xf86-input-tslib/xdriver_xf86-input-tslib.mk | 4 +---
> package/x11r7/xdriver_xf86-input-vmmouse/Config.in | 4 +---
> .../xdriver_xf86-input-vmmouse/xdriver_xf86-input-vmmouse.mk | 2 +-
> 16 files changed, 16 insertions(+), 36 deletions(-)
>
> diff --git a/package/x11r7/xdriver_xf86-input-evdev/Config.in b/package/x11r7/xdriver_xf86-input-evdev/Config.in
> index 70e950dc74..fe4e451ed7 100644
> --- 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 4933c42fda..ded7fa77f1 100644
> --- 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 ff9f25f549..892d1a161b 100644
> --- 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 5bc2a5cafb..0ec4be5e53 100644
> --- 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 0a0352424e..ee23033b97 100644
> --- 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 01a6859cd4..fb1e289643 100644
> --- 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 0f2db1bd1a..0cfbfc664a 100644
> --- 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 1723b3fcf8..8642806c8b 100644
> --- 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 20e1803a99..efa181e556 100644
> --- 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 5bcbeb70fd..88af9d2361 100644
> --- 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 ffe1a2a448..b974265b31 100644
> --- 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 6bd9cc49c5..0708110e91 100644
> --- 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 4e77abcb10..9205cba6bd 100644
> --- 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 bf0ee4860d..f8944f3521 100644
> --- 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 de989eb34a..d77def028d 100644
> --- 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 6e9cf8b785..b8c77de5f6 100644
> --- 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
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 09/22] package/x11r7/xdriver_xf86-video-*: mass switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (7 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 08/22] package/x11r7/xdriver_xf86-input-*: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:46 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: " Bernd Kuhls
` (13 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../x11r7/xdriver_xf86-video-amdgpu/Config.in | 9 +-------
.../xdriver_xf86-video-amdgpu.mk | 9 +-------
.../x11r7/xdriver_xf86-video-ark/Config.in | 6 +-----
.../xdriver_xf86-video-ark.mk | 2 +-
.../x11r7/xdriver_xf86-video-ast/Config.in | 3 +--
.../xdriver_xf86-video-ast.mk | 2 +-
.../x11r7/xdriver_xf86-video-ati/Config.in | 9 +-------
.../xdriver_xf86-video-ati.mk | 11 ++--------
.../x11r7/xdriver_xf86-video-cirrus/Config.in | 7 +------
.../xdriver_xf86-video-cirrus.mk | 2 +-
.../x11r7/xdriver_xf86-video-dummy/Config.in | 7 +------
.../xdriver_xf86-video-dummy.mk | 2 +-
.../x11r7/xdriver_xf86-video-fbdev/Config.in | 6 +-----
.../xdriver_xf86-video-fbdev.mk | 2 +-
.../xdriver_xf86-video-fbturbo/Config.in | 8 +------
.../xdriver_xf86-video-fbturbo.mk | 11 +---------
.../x11r7/xdriver_xf86-video-geode/Config.in | 6 +-----
.../xdriver_xf86-video-geode.mk | 2 +-
.../x11r7/xdriver_xf86-video-glint/Config.in | 10 +--------
.../xdriver_xf86-video-glint.mk | 2 +-
.../x11r7/xdriver_xf86-video-i128/Config.in | 7 +------
.../xdriver_xf86-video-i128.mk | 2 +-
.../xdriver_xf86-video-imx-viv/Config.in | 3 +--
.../xdriver_xf86-video-imx-viv.mk | 2 +-
.../x11r7/xdriver_xf86-video-imx/Config.in | 7 +------
.../xdriver_xf86-video-imx.mk | 3 +--
.../x11r7/xdriver_xf86-video-intel/Config.in | 3 +--
.../xdriver_xf86-video-intel.mk | 21 +++++--------------
.../x11r7/xdriver_xf86-video-mach64/Config.in | 6 +-----
.../xdriver_xf86-video-mach64.mk | 2 +-
.../x11r7/xdriver_xf86-video-mga/Config.in | 9 +-------
.../xdriver_xf86-video-mga.mk | 2 +-
.../xdriver_xf86-video-neomagic/Config.in | 8 +------
.../xdriver_xf86-video-neomagic.mk | 2 +-
.../xdriver_xf86-video-nouveau/Config.in | 6 +-----
.../xdriver_xf86-video-nouveau.mk | 6 +-----
package/x11r7/xdriver_xf86-video-nv/Config.in | 7 +------
.../xdriver_xf86-video-nv.mk | 2 +-
.../xdriver_xf86-video-openchrome/Config.in | 7 +------
.../xdriver_xf86-video-openchrome.mk | 8 +------
.../x11r7/xdriver_xf86-video-qxl/Config.in | 3 +--
.../xdriver_xf86-video-qxl.mk | 3 +--
.../x11r7/xdriver_xf86-video-r128/Config.in | 6 +-----
.../xdriver_xf86-video-r128.mk | 2 +-
.../x11r7/xdriver_xf86-video-savage/Config.in | 8 +------
.../xdriver_xf86-video-savage.mk | 2 +-
.../Config.in | 7 +------
.../xdriver_xf86-video-siliconmotion.mk | 2 +-
.../x11r7/xdriver_xf86-video-sis/Config.in | 10 +--------
.../xdriver_xf86-video-sis.mk | 2 +-
.../x11r7/xdriver_xf86-video-tdfx/Config.in | 8 +------
.../xdriver_xf86-video-tdfx.mk | 8 +------
.../x11r7/xdriver_xf86-video-tga/Config.in | 8 +------
.../xdriver_xf86-video-tga.mk | 2 +-
.../xdriver_xf86-video-trident/Config.in | 8 +------
.../xdriver_xf86-video-trident.mk | 2 +-
.../x11r7/xdriver_xf86-video-vesa/Config.in | 6 +-----
.../xdriver_xf86-video-vesa.mk | 2 +-
.../x11r7/xdriver_xf86-video-vmware/Config.in | 7 +------
.../xdriver_xf86-video-vmware.mk | 2 +-
.../x11r7/xdriver_xf86-video-voodoo/Config.in | 7 +------
.../xdriver_xf86-video-voodoo.mk | 2 +-
62 files changed, 67 insertions(+), 269 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
index 968c5e767c..43090c7559 100644
--- 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 5c1fb3f844..b8b7dcfe2f 100644
--- 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 cecedde024..e1219affa3 100644
--- 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 c0b905b8dd..3f2a63609e 100644
--- 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 5dfe95e537..2ebe8fc2fb 100644
--- 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 3c9eb91159..b39bbf9a15 100644
--- 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 00d91bda51..fdf1ebd18b 100644
--- 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 8726695399..d283f789f8 100644
--- 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 11c9df8e0e..2987c3f0f0 100644
--- 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 78e8a9c05d..fa776a24d6 100644
--- 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 00f7e1df40..58c70a8413 100644
--- 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 fff1495ef5..3127f6cb1b 100644
--- 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 9f7c5402b8..0ecba482fb 100644
--- 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 7d08c7da18..f39311e611 100644
--- 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 7825901e98..7acf93e262 100644
--- 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 15f4cd1093..58a70416dd 100644
--- 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 fe217b922c..b432f2d4a1 100644
--- 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 9138abdbee..54616f65fe 100644
--- 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 acae30b0b0..c474f6c912 100644
--- 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 52bc567e59..fba0030757 100644
--- 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 30b240cc1f..4f4810cc09 100644
--- 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 1bb760cee3..148fc3d1d0 100644
--- 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 5a0257305c..13cee14deb 100644
--- 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 222d74ac4b..0913427542 100644
--- 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 398d49e1f0..410a458411 100644
--- 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 5684a6db18..b80c6b7733 100644
--- 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 dc2fabf404..c4152b7cf8 100644
--- 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 fa0f650dbe..31cdf4b065 100644
--- 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 82de826ad7..71c89dd295 100644
--- 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 599036033d..7f77b4883f 100644
--- 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 a504ec0c25..15fb3b9f87 100644
--- 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 065a68ea67..bdc9f35884 100644
--- 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 f8c8c47fce..5f36a48f40 100644
--- 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 cfd55361e7..93cd55a11b 100644
--- 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 7e756e2107..c9fd2e3d2f 100644
--- 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 e3969a2646..41b6fd6d42 100644
--- 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 8898f56729..5ff8b798c6 100644
--- 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 430ce4a1d1..1e5fc26ddb 100644
--- 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 02723eca69..a93d14376b 100644
--- 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 9ab032b6bc..0a669e186b 100644
--- 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 967ecaf527..40f61fd69f 100644
--- 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 f410f8e95f..ffbac05ec1 100644
--- 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 22ba4931e6..e1e2dd2f30 100644
--- 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 344b48415c..9dd9ef25e4 100644
--- 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 77dde87619..bc6ca52370 100644
--- 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 ae1dea34ae..d7311aa918 100644
--- 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 727004a55a..036a2f1c83 100644
--- 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 53b19f9fea..65fd846535 100644
--- 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 3c86bd403e..db01cf2afe 100644
--- 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 833246e35e..af80e15da9 100644
--- 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 96a69ba25c..959dc31049 100644
--- 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 471e6cf4d2..6511eec7ad 100644
--- 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 9d03db3b38..7c75661acc 100644
--- 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 8af5ac81e1..421b09be22 100644
--- 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 15ac3ea726..ca7069c800 100644
--- 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 727744c532..20ec4bbc24 100644
--- 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 98f434704f..fb4e4e8e93 100644
--- 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 d2a9205197..425280a119 100644
--- 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 a3382d7346..6d937b47bb 100644
--- 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 1b2066d277..3ba6b332a3 100644
--- 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 f531676dab..f4612120e4 100644
--- 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 e1ef0c6ca3..d6deaa7974 100644
--- 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))
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 09/22] package/x11r7/xdriver_xf86-video-*: mass switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 09/22] package/x11r7/xdriver_xf86-video-*: " Bernd Kuhls
@ 2018-07-02 21:46 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:46 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
There are a few cases where dependencies are seemingly dropped. But
fortunately, there was a previous patch explaining that the DRI proto is
now always installed, so it makes sense to simplify the conditions
around DRI2/3 support.
Still, a note in the commit log for posterity would have been nice..
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> .../x11r7/xdriver_xf86-video-amdgpu/Config.in | 9 +-------
> .../xdriver_xf86-video-amdgpu.mk | 9 +-------
> .../x11r7/xdriver_xf86-video-ark/Config.in | 6 +-----
> .../xdriver_xf86-video-ark.mk | 2 +-
> .../x11r7/xdriver_xf86-video-ast/Config.in | 3 +--
> .../xdriver_xf86-video-ast.mk | 2 +-
> .../x11r7/xdriver_xf86-video-ati/Config.in | 9 +-------
> .../xdriver_xf86-video-ati.mk | 11 ++--------
> .../x11r7/xdriver_xf86-video-cirrus/Config.in | 7 +------
> .../xdriver_xf86-video-cirrus.mk | 2 +-
> .../x11r7/xdriver_xf86-video-dummy/Config.in | 7 +------
> .../xdriver_xf86-video-dummy.mk | 2 +-
> .../x11r7/xdriver_xf86-video-fbdev/Config.in | 6 +-----
> .../xdriver_xf86-video-fbdev.mk | 2 +-
> .../xdriver_xf86-video-fbturbo/Config.in | 8 +------
> .../xdriver_xf86-video-fbturbo.mk | 11 +---------
> .../x11r7/xdriver_xf86-video-geode/Config.in | 6 +-----
> .../xdriver_xf86-video-geode.mk | 2 +-
> .../x11r7/xdriver_xf86-video-glint/Config.in | 10 +--------
> .../xdriver_xf86-video-glint.mk | 2 +-
> .../x11r7/xdriver_xf86-video-i128/Config.in | 7 +------
> .../xdriver_xf86-video-i128.mk | 2 +-
> .../xdriver_xf86-video-imx-viv/Config.in | 3 +--
> .../xdriver_xf86-video-imx-viv.mk | 2 +-
> .../x11r7/xdriver_xf86-video-imx/Config.in | 7 +------
> .../xdriver_xf86-video-imx.mk | 3 +--
> .../x11r7/xdriver_xf86-video-intel/Config.in | 3 +--
> .../xdriver_xf86-video-intel.mk | 21 +++++--------------
> .../x11r7/xdriver_xf86-video-mach64/Config.in | 6 +-----
> .../xdriver_xf86-video-mach64.mk | 2 +-
> .../x11r7/xdriver_xf86-video-mga/Config.in | 9 +-------
> .../xdriver_xf86-video-mga.mk | 2 +-
> .../xdriver_xf86-video-neomagic/Config.in | 8 +------
> .../xdriver_xf86-video-neomagic.mk | 2 +-
> .../xdriver_xf86-video-nouveau/Config.in | 6 +-----
> .../xdriver_xf86-video-nouveau.mk | 6 +-----
> package/x11r7/xdriver_xf86-video-nv/Config.in | 7 +------
> .../xdriver_xf86-video-nv.mk | 2 +-
> .../xdriver_xf86-video-openchrome/Config.in | 7 +------
> .../xdriver_xf86-video-openchrome.mk | 8 +------
> .../x11r7/xdriver_xf86-video-qxl/Config.in | 3 +--
> .../xdriver_xf86-video-qxl.mk | 3 +--
> .../x11r7/xdriver_xf86-video-r128/Config.in | 6 +-----
> .../xdriver_xf86-video-r128.mk | 2 +-
> .../x11r7/xdriver_xf86-video-savage/Config.in | 8 +------
> .../xdriver_xf86-video-savage.mk | 2 +-
> .../Config.in | 7 +------
> .../xdriver_xf86-video-siliconmotion.mk | 2 +-
> .../x11r7/xdriver_xf86-video-sis/Config.in | 10 +--------
> .../xdriver_xf86-video-sis.mk | 2 +-
> .../x11r7/xdriver_xf86-video-tdfx/Config.in | 8 +------
> .../xdriver_xf86-video-tdfx.mk | 8 +------
> .../x11r7/xdriver_xf86-video-tga/Config.in | 8 +------
> .../xdriver_xf86-video-tga.mk | 2 +-
> .../xdriver_xf86-video-trident/Config.in | 8 +------
> .../xdriver_xf86-video-trident.mk | 2 +-
> .../x11r7/xdriver_xf86-video-vesa/Config.in | 6 +-----
> .../xdriver_xf86-video-vesa.mk | 2 +-
> .../x11r7/xdriver_xf86-video-vmware/Config.in | 7 +------
> .../xdriver_xf86-video-vmware.mk | 2 +-
> .../x11r7/xdriver_xf86-video-voodoo/Config.in | 7 +------
> .../xdriver_xf86-video-voodoo.mk | 2 +-
> 62 files changed, 67 insertions(+), 269 deletions(-)
>
> diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in
> index 968c5e767c..43090c7559 100644
> --- 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 5c1fb3f844..b8b7dcfe2f 100644
> --- 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 cecedde024..e1219affa3 100644
> --- 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 c0b905b8dd..3f2a63609e 100644
> --- 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 5dfe95e537..2ebe8fc2fb 100644
> --- 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 3c9eb91159..b39bbf9a15 100644
> --- 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 00d91bda51..fdf1ebd18b 100644
> --- 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 8726695399..d283f789f8 100644
> --- 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 11c9df8e0e..2987c3f0f0 100644
> --- 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 78e8a9c05d..fa776a24d6 100644
> --- 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 00f7e1df40..58c70a8413 100644
> --- 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 fff1495ef5..3127f6cb1b 100644
> --- 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 9f7c5402b8..0ecba482fb 100644
> --- 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 7d08c7da18..f39311e611 100644
> --- 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 7825901e98..7acf93e262 100644
> --- 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 15f4cd1093..58a70416dd 100644
> --- 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 fe217b922c..b432f2d4a1 100644
> --- 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 9138abdbee..54616f65fe 100644
> --- 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 acae30b0b0..c474f6c912 100644
> --- 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 52bc567e59..fba0030757 100644
> --- 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 30b240cc1f..4f4810cc09 100644
> --- 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 1bb760cee3..148fc3d1d0 100644
> --- 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 5a0257305c..13cee14deb 100644
> --- 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 222d74ac4b..0913427542 100644
> --- 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 398d49e1f0..410a458411 100644
> --- 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 5684a6db18..b80c6b7733 100644
> --- 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 dc2fabf404..c4152b7cf8 100644
> --- 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 fa0f650dbe..31cdf4b065 100644
> --- 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 82de826ad7..71c89dd295 100644
> --- 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 599036033d..7f77b4883f 100644
> --- 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 a504ec0c25..15fb3b9f87 100644
> --- 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 065a68ea67..bdc9f35884 100644
> --- 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 f8c8c47fce..5f36a48f40 100644
> --- 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 cfd55361e7..93cd55a11b 100644
> --- 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 7e756e2107..c9fd2e3d2f 100644
> --- 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 e3969a2646..41b6fd6d42 100644
> --- 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 8898f56729..5ff8b798c6 100644
> --- 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 430ce4a1d1..1e5fc26ddb 100644
> --- 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 02723eca69..a93d14376b 100644
> --- 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 9ab032b6bc..0a669e186b 100644
> --- 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 967ecaf527..40f61fd69f 100644
> --- 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 f410f8e95f..ffbac05ec1 100644
> --- 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 22ba4931e6..e1e2dd2f30 100644
> --- 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 344b48415c..9dd9ef25e4 100644
> --- 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 77dde87619..bc6ca52370 100644
> --- 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 ae1dea34ae..d7311aa918 100644
> --- 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 727004a55a..036a2f1c83 100644
> --- 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 53b19f9fea..65fd846535 100644
> --- 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 3c86bd403e..db01cf2afe 100644
> --- 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 833246e35e..af80e15da9 100644
> --- 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 96a69ba25c..959dc31049 100644
> --- 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 471e6cf4d2..6511eec7ad 100644
> --- 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 9d03db3b38..7c75661acc 100644
> --- 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 8af5ac81e1..421b09be22 100644
> --- 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 15ac3ea726..ca7069c800 100644
> --- 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 727744c532..20ec4bbc24 100644
> --- 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 98f434704f..fb4e4e8e93 100644
> --- 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 d2a9205197..425280a119 100644
> --- 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 a3382d7346..6d937b47bb 100644
> --- 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 1b2066d277..3ba6b332a3 100644
> --- 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 f531676dab..f4612120e4 100644
> --- 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 e1ef0c6ca3..d6deaa7974 100644
> --- 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))
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (8 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 09/22] package/x11r7/xdriver_xf86-video-*: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:48 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass " Bernd Kuhls
` (12 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xkeyboard-config/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/x11r7/xkeyboard-config/Config.in b/package/x11r7/xkeyboard-config/Config.in
index 5d1d6a72ed..c941742421 100644
--- a/package/x11r7/xkeyboard-config/Config.in
+++ b/package/x11r7/xkeyboard-config/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG
# Runtime dependencies
select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
- select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
+ select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
help
keyboard configuration database for X
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: " Bernd Kuhls
@ 2018-07-02 21:48 ` Yann E. MORIN
2018-07-13 19:55 ` Bernd Kuhls
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:48 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
> package/x11r7/xkeyboard-config/Config.in | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/x11r7/xkeyboard-config/Config.in b/package/x11r7/xkeyboard-config/Config.in
> index 5d1d6a72ed..c941742421 100644
> --- a/package/x11r7/xkeyboard-config/Config.in
> +++ b/package/x11r7/xkeyboard-config/Config.in
> @@ -3,7 +3,7 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG
> # Runtime dependencies
> select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
> - select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
> + select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
I'm always a bit warry about dependencies selected, that are not in the
.mk. Is it missing there?
But since that is not a problem your patch introduces:
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> help
> keyboard configuration database for X
>
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: switch to xorgproto
2018-07-02 21:48 ` Yann E. MORIN
@ 2018-07-13 19:55 ` Bernd Kuhls
2018-07-15 15:44 ` Yann E. MORIN
0 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-07-13 19:55 UTC (permalink / raw)
To: buildroot
Hi Yann,
Am Mon, 02 Jul 2018 23:48:01 +0200 schrieb Yann E. MORIN:
>> --- a/package/x11r7/xkeyboard-config/Config.in
>> +++ b/package/x11r7/xkeyboard-config/Config.in
>> @@ -3,7 +3,7 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG
>> # Runtime dependencies
>> select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
>> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
>> - select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
>> + select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
>
> I'm always a bit warry about dependencies selected, that are not in the
> .mk. Is it missing there?
Afaics they are not missing in the.mk file because these packages are
marked as runtime dependencies in Config.in.
Regards, Bernd
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: switch to xorgproto
2018-07-13 19:55 ` Bernd Kuhls
@ 2018-07-15 15:44 ` Yann E. MORIN
2018-07-21 13:25 ` Bernd Kuhls
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-15 15:44 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-07-13 21:55 +0200, Bernd Kuhls spake thusly:
> Am Mon, 02 Jul 2018 23:48:01 +0200 schrieb Yann E. MORIN:
> >> --- a/package/x11r7/xkeyboard-config/Config.in
> >> +++ b/package/x11r7/xkeyboard-config/Config.in
> >> @@ -3,7 +3,7 @@ config BR2_PACKAGE_XKEYBOARD_CONFIG
> >> # Runtime dependencies
Here ^^^
> >> select BR2_PACKAGE_XAPP_XKBCOMP if BR2_PACKAGE_XORG7
> >> select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
> >> - select BR2_PACKAGE_XPROTO_XPROTO if BR2_PACKAGE_XORG7
> >> + select BR2_PACKAGE_XORGPROTO if BR2_PACKAGE_XORG7
> >
> > I'm always a bit warry about dependencies selected, that are not in the
> > .mk. Is it missing there?
>
> Afaics they are not missing in the.mk file because these packages are
> marked as runtime dependencies in Config.in.
As noted above, yes, they are marlked "runtime dependencies".
However, I find it hard to believe that the xorg-proto, which supposedly
provides prototype information, is only a runtime dependency.
Similarly, I also find it hard to accept that xlib-libx11 is only a
runtime dependency.
I am afraid that only xapp-xkbcomp is actually a runtime dependency. The
rest are really build-time dependencies. /me thinks.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: switch to xorgproto
2018-07-15 15:44 ` Yann E. MORIN
@ 2018-07-21 13:25 ` Bernd Kuhls
0 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-07-21 13:25 UTC (permalink / raw)
To: buildroot
Am Sun, 15 Jul 2018 17:44:41 +0200 schrieb Yann E. MORIN:
> However, I find it hard to believe that the xorg-proto, which supposedly
> provides prototype information, is only a runtime dependency.
>
> Similarly, I also find it hard to accept that xlib-libx11 is only a
> runtime dependency.
>
> I am afraid that only xapp-xkbcomp is actually a runtime dependency. The
> rest are really build-time dependencies. /me thinks.
Hi Yann,
xkeyboard-config does not install any binary files, only keyboard
configuration data. No part of this package links to libx11 during the
build. These commits done by Thomas and Peter introduced the current
Config.in content and provide background information about the x11
runtime dependencies:
https://git.buildroot.net/buildroot/commit/?
id=dde83bc4639a7bf80ddd0d66b9ea3a8cc0157d65
https://git.buildroot.net/buildroot/commit/?
id=2ce67935e80b2ea6b24f22ebf1e810eae3dcefe0
Regards, Bernd
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (9 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 10/22] package/x11r7/xkeyboard-config: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:57 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 12/22] package/x11r7/xutil_makedepend: " Bernd Kuhls
` (11 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xlib_libFS/Config.in | 3 +--
package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
package/x11r7/xlib_libICE/Config.in | 2 +-
package/x11r7/xlib_libICE/xlib_libICE.mk | 2 +-
package/x11r7/xlib_libSM/Config.in | 2 +-
package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
package/x11r7/xlib_libX11/Config.in | 6 +-----
package/x11r7/xlib_libX11/xlib_libX11.mk | 14 +++-----------
package/x11r7/xlib_libXScrnSaver/Config.in | 2 +-
.../x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
package/x11r7/xlib_libXau/Config.in | 2 +-
package/x11r7/xlib_libXau/xlib_libXau.mk | 4 ++--
package/x11r7/xlib_libXaw/Config.in | 2 +-
package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
package/x11r7/xlib_libXcomposite/Config.in | 3 +--
.../x11r7/xlib_libXcomposite/xlib_libXcomposite.mk | 2 +-
package/x11r7/xlib_libXcursor/Config.in | 2 +-
package/x11r7/xlib_libXcursor/xlib_libXcursor.mk | 4 ++--
package/x11r7/xlib_libXdamage/Config.in | 3 +--
package/x11r7/xlib_libXdamage/xlib_libXdamage.mk | 2 +-
package/x11r7/xlib_libXdmcp/Config.in | 2 +-
package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 4 ++--
package/x11r7/xlib_libXext/Config.in | 3 +--
package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
package/x11r7/xlib_libXfixes/Config.in | 4 +---
package/x11r7/xlib_libXfixes/xlib_libXfixes.mk | 5 ++---
package/x11r7/xlib_libXfont/Config.in | 3 +--
package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 ++--
package/x11r7/xlib_libXfont2/Config.in | 3 +--
package/x11r7/xlib_libXfont2/xlib_libXfont2.mk | 6 ++----
package/x11r7/xlib_libXft/Config.in | 2 +-
package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +-
package/x11r7/xlib_libXi/Config.in | 3 +--
package/x11r7/xlib_libXi/xlib_libXi.mk | 5 ++---
package/x11r7/xlib_libXinerama/Config.in | 2 +-
package/x11r7/xlib_libXinerama/xlib_libXinerama.mk | 2 +-
package/x11r7/xlib_libXmu/Config.in | 2 +-
package/x11r7/xlib_libXmu/xlib_libXmu.mk | 2 +-
package/x11r7/xlib_libXpm/Config.in | 2 +-
package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
package/x11r7/xlib_libXrandr/Config.in | 4 +---
package/x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
package/x11r7/xlib_libXrender/Config.in | 3 +--
package/x11r7/xlib_libXrender/xlib_libXrender.mk | 4 ++--
package/x11r7/xlib_libXres/Config.in | 3 +--
package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
package/x11r7/xlib_libXt/Config.in | 3 +--
package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +-
package/x11r7/xlib_libXtst/Config.in | 2 +-
package/x11r7/xlib_libXtst/xlib_libXtst.mk | 2 +-
package/x11r7/xlib_libXv/Config.in | 3 +--
package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
package/x11r7/xlib_libXvMC/Config.in | 3 +--
package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
package/x11r7/xlib_libXxf86dga/Config.in | 3 +--
package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
package/x11r7/xlib_libXxf86vm/Config.in | 3 +--
package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
package/x11r7/xlib_libdmx/Config.in | 2 +-
package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
package/x11r7/xlib_libfontenc/Config.in | 2 +-
package/x11r7/xlib_libfontenc/xlib_libfontenc.mk | 4 ++--
package/x11r7/xlib_libxkbfile/Config.in | 2 +-
package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 4 ++--
package/x11r7/xlib_libxshmfence/Config.in | 2 +-
.../x11r7/xlib_libxshmfence/xlib_libxshmfence.mk | 2 +-
66 files changed, 78 insertions(+), 112 deletions(-)
diff --git a/package/x11r7/xlib_libFS/Config.in b/package/x11r7/xlib_libFS/Config.in
index 0c8a7290c1..6ff0bcc36e 100644
--- a/package/x11r7/xlib_libFS/Config.in
+++ b/package/x11r7/xlib_libFS/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_XLIB_LIBFS
bool "libFS"
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_XPROTO_FONTSPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org FS library
diff --git a/package/x11r7/xlib_libFS/xlib_libFS.mk b/package/x11r7/xlib_libFS/xlib_libFS.mk
index a3c58b90d9..56f2dc3cba 100644
--- a/package/x11r7/xlib_libFS/xlib_libFS.mk
+++ b/package/x11r7/xlib_libFS/xlib_libFS.mk
@@ -10,7 +10,7 @@ XLIB_LIBFS_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFS_LICENSE = MIT
XLIB_LIBFS_LICENSE_FILES = COPYING
XLIB_LIBFS_INSTALL_STAGING = YES
-XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xproto_xproto xproto_fontsproto host-pkgconf
+XLIB_LIBFS_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf
XLIB_LIBFS_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libICE/Config.in b/package/x11r7/xlib_libICE/Config.in
index d63f935602..ccdd400396 100644
--- a/package/x11r7/xlib_libICE/Config.in
+++ b/package/x11r7/xlib_libICE/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBICE
bool "libICE"
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org ICE library
diff --git a/package/x11r7/xlib_libICE/xlib_libICE.mk b/package/x11r7/xlib_libICE/xlib_libICE.mk
index e2a4e7d387..982e8fdef1 100644
--- a/package/x11r7/xlib_libICE/xlib_libICE.mk
+++ b/package/x11r7/xlib_libICE/xlib_libICE.mk
@@ -10,6 +10,6 @@ XLIB_LIBICE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBICE_LICENSE = MIT
XLIB_LIBICE_LICENSE_FILES = COPYING
XLIB_LIBICE_INSTALL_STAGING = YES
-XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xproto_xproto host-pkgconf
+XLIB_LIBICE_DEPENDENCIES = xlib_xtrans xorgproto host-pkgconf
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libSM/Config.in b/package/x11r7/xlib_libSM/Config.in
index ef83b531f8..02ee2bd232 100644
--- a/package/x11r7/xlib_libSM/Config.in
+++ b/package/x11r7/xlib_libSM/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_XLIB_LIBSM
bool "libSM"
select BR2_PACKAGE_XLIB_LIBICE
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org SM library
diff --git a/package/x11r7/xlib_libSM/xlib_libSM.mk b/package/x11r7/xlib_libSM/xlib_libSM.mk
index 30640bd101..9049cea234 100644
--- a/package/x11r7/xlib_libSM/xlib_libSM.mk
+++ b/package/x11r7/xlib_libSM/xlib_libSM.mk
@@ -10,7 +10,7 @@ XLIB_LIBSM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBSM_LICENSE = MIT
XLIB_LIBSM_LICENSE_FILES = COPYING
XLIB_LIBSM_INSTALL_STAGING = YES
-XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xproto_xproto
+XLIB_LIBSM_DEPENDENCIES = xlib_libICE xlib_xtrans xorgproto
XLIB_LIBSM_CONF_OPTS = --without-libuuid
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libX11/Config.in b/package/x11r7/xlib_libX11/Config.in
index 3ad8d00ae5..d69c51b91e 100644
--- a/package/x11r7/xlib_libX11/Config.in
+++ b/package/x11r7/xlib_libX11/Config.in
@@ -5,10 +5,6 @@ config BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_XTRANS
select BR2_PACKAGE_XLIB_LIBXAU
select BR2_PACKAGE_XLIB_LIBXDMCP
- select BR2_PACKAGE_XPROTO_KBPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org X11 library
diff --git a/package/x11r7/xlib_libX11/xlib_libX11.mk b/package/x11r7/xlib_libX11/xlib_libX11.mk
index 64344da737..e2266cdfad 100644
--- a/package/x11r7/xlib_libX11/xlib_libX11.mk
+++ b/package/x11r7/xlib_libX11/xlib_libX11.mk
@@ -16,12 +16,8 @@ XLIB_LIBX11_DEPENDENCIES = \
xlib_xtrans \
xlib_libXau \
xlib_libXdmcp \
- xproto_kbproto \
- xproto_xproto \
- xproto_xextproto \
- xproto_inputproto \
- xproto_xf86bigfontproto \
- host-xproto_xproto
+ xorgproto \
+ host-xorgproto
HOST_XLIB_LIBX11_DEPENDENCIES = \
host-libxcb \
@@ -29,11 +25,7 @@ HOST_XLIB_LIBX11_DEPENDENCIES = \
host-xlib_xtrans \
host-xlib_libXau \
host-xlib_libXdmcp \
- host-xproto_kbproto \
- host-xproto_xproto \
- host-xproto_xextproto \
- host-xproto_inputproto \
- host-xproto_xf86bigfontproto
+ host-xorgproto
XLIB_LIBX11_CONF_OPTS = \
--disable-malloc0returnsnull \
diff --git a/package/x11r7/xlib_libXScrnSaver/Config.in b/package/x11r7/xlib_libXScrnSaver/Config.in
index 5df9a00c72..05c96d74cd 100644
--- a/package/x11r7/xlib_libXScrnSaver/Config.in
+++ b/package/x11r7/xlib_libXScrnSaver/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_XLIB_LIBXSCRNSAVER
bool "libXScrnSaver"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org XScrnSaver library
diff --git a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
index f22ee983c0..f7e0aceb8f 100644
--- a/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
+++ b/package/x11r7/xlib_libXScrnSaver/xlib_libXScrnSaver.mk
@@ -10,7 +10,7 @@ XLIB_LIBXSCRNSAVER_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXSCRNSAVER_LICENSE = MIT
XLIB_LIBXSCRNSAVER_LICENSE_FILES = COPYING
XLIB_LIBXSCRNSAVER_INSTALL_STAGING = YES
-XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_scrnsaverproto
+XLIB_LIBXSCRNSAVER_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXSCRNSAVER_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXau/Config.in b/package/x11r7/xlib_libXau/Config.in
index a220f01970..0323faa3ea 100644
--- a/package/x11r7/xlib_libXau/Config.in
+++ b/package/x11r7/xlib_libXau/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXAU
bool "libXau"
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
help
X.Org Xau library
diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
index 1c50cb2e4e..d8bac5426a 100644
--- a/package/x11r7/xlib_libXau/xlib_libXau.mk
+++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
@@ -10,9 +10,9 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXAU_LICENSE = MIT
XLIB_LIBXAU_LICENSE_FILES = COPYING
XLIB_LIBXAU_INSTALL_STAGING = YES
-XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xproto_xproto
+XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xorgproto
HOST_XLIB_LIBXAU_DEPENDENCIES = \
- host-pkgconf host-xutil_util-macros host-xproto_xproto
+ host-pkgconf host-xutil_util-macros xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXaw/Config.in b/package/x11r7/xlib_libXaw/Config.in
index 3695bb679f..bda4ded26d 100644
--- a/package/x11r7/xlib_libXaw/Config.in
+++ b/package/x11r7/xlib_libXaw/Config.in
@@ -4,6 +4,6 @@ config BR2_PACKAGE_XLIB_LIBXAW
select BR2_PACKAGE_XLIB_LIBXT
select BR2_PACKAGE_XLIB_LIBXMU
select BR2_PACKAGE_XLIB_LIBXPM
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xaw library
diff --git a/package/x11r7/xlib_libXaw/xlib_libXaw.mk b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
index d78adffeda..17d51a9570 100644
--- a/package/x11r7/xlib_libXaw/xlib_libXaw.mk
+++ b/package/x11r7/xlib_libXaw/xlib_libXaw.mk
@@ -10,6 +10,6 @@ XLIB_LIBXAW_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXAW_LICENSE = MIT
XLIB_LIBXAW_LICENSE_FILES = COPYING
XLIB_LIBXAW_INSTALL_STAGING = YES
-XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xproto_xproto
+XLIB_LIBXAW_DEPENDENCIES = xlib_libX11 xlib_libXt xlib_libXmu xlib_libXpm xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXcomposite/Config.in b/package/x11r7/xlib_libXcomposite/Config.in
index 14da977af0..b417140aea 100644
--- a/package/x11r7/xlib_libXcomposite/Config.in
+++ b/package/x11r7/xlib_libXcomposite/Config.in
@@ -1,9 +1,8 @@
config BR2_PACKAGE_XLIB_LIBXCOMPOSITE
bool "libXcomposite"
- select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xcomposite library
diff --git a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
index f0e59cba1d..e84b52e3fd 100644
--- a/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
+++ b/package/x11r7/xlib_libXcomposite/xlib_libXcomposite.mk
@@ -10,6 +10,6 @@ XLIB_LIBXCOMPOSITE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXCOMPOSITE_LICENSE = MIT
XLIB_LIBXCOMPOSITE_LICENSE_FILES = COPYING
XLIB_LIBXCOMPOSITE_INSTALL_STAGING = YES
-XLIB_LIBXCOMPOSITE_DEPENDENCIES = xproto_compositeproto xlib_libX11 xlib_libXext xlib_libXfixes xproto_xproto
+XLIB_LIBXCOMPOSITE_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXfixes xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXcursor/Config.in b/package/x11r7/xlib_libXcursor/Config.in
index 6519cc7667..0c70f95918 100644
--- a/package/x11r7/xlib_libXcursor/Config.in
+++ b/package/x11r7/xlib_libXcursor/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXCURSOR
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXFIXES
select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xcursor library
diff --git a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
index b27aa653e9..6ee76039e0 100644
--- a/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
+++ b/package/x11r7/xlib_libXcursor/xlib_libXcursor.mk
@@ -10,10 +10,10 @@ XLIB_LIBXCURSOR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXCURSOR_LICENSE = MIT
XLIB_LIBXCURSOR_LICENSE_FILES = COPYING
XLIB_LIBXCURSOR_INSTALL_STAGING = YES
-XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xproto_xproto
+XLIB_LIBXCURSOR_DEPENDENCIES = xlib_libX11 xlib_libXfixes xlib_libXrender xorgproto
HOST_XLIB_LIBXCURSOR_DEPENDENCIES = \
host-xlib_libX11 host-xlib_libXfixes host-xlib_libXrender \
- host-xproto_xproto
+ host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXdamage/Config.in b/package/x11r7/xlib_libXdamage/Config.in
index 242748663c..d1a07dea9e 100644
--- a/package/x11r7/xlib_libXdamage/Config.in
+++ b/package/x11r7/xlib_libXdamage/Config.in
@@ -1,8 +1,7 @@
config BR2_PACKAGE_XLIB_LIBXDAMAGE
bool "libXdamage"
- select BR2_PACKAGE_XPROTO_DAMAGEPROTO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXFIXES
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xdamage library
diff --git a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
index 9f982eef10..d52b4e0e24 100644
--- a/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
+++ b/package/x11r7/xlib_libXdamage/xlib_libXdamage.mk
@@ -10,6 +10,6 @@ XLIB_LIBXDAMAGE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXDAMAGE_LICENSE = MIT
XLIB_LIBXDAMAGE_LICENSE_FILES = COPYING
XLIB_LIBXDAMAGE_INSTALL_STAGING = YES
-XLIB_LIBXDAMAGE_DEPENDENCIES = xproto_damageproto xlib_libX11 xlib_libXfixes xproto_xproto
+XLIB_LIBXDAMAGE_DEPENDENCIES = xlib_libX11 xlib_libXfixes xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXdmcp/Config.in b/package/x11r7/xlib_libXdmcp/Config.in
index 218ff1598b..832822e912 100644
--- a/package/x11r7/xlib_libXdmcp/Config.in
+++ b/package/x11r7/xlib_libXdmcp/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXDMCP
bool "libXdmcp"
select BR2_PACKAGE_XUTIL_UTIL_MACROS
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xdmcp library
diff --git a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
index ec1b861b92..179234e73f 100644
--- a/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
+++ b/package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk
@@ -10,8 +10,8 @@ XLIB_LIBXDMCP_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXDMCP_LICENSE = MIT
XLIB_LIBXDMCP_LICENSE_FILES = COPYING
XLIB_LIBXDMCP_INSTALL_STAGING = YES
-XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xproto_xproto
-HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xproto_xproto
+XLIB_LIBXDMCP_DEPENDENCIES = xutil_util-macros xorgproto
+HOST_XLIB_LIBXDMCP_DEPENDENCIES = host-xutil_util-macros host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXext/Config.in b/package/x11r7/xlib_libXext/Config.in
index 823a165bf2..58c9ce55ea 100644
--- a/package/x11r7/xlib_libXext/Config.in
+++ b/package/x11r7/xlib_libXext/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXEXT
bool "libXext"
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xext library
diff --git a/package/x11r7/xlib_libXext/xlib_libXext.mk b/package/x11r7/xlib_libXext/xlib_libXext.mk
index 211c85360a..02fee222b6 100644
--- a/package/x11r7/xlib_libXext/xlib_libXext.mk
+++ b/package/x11r7/xlib_libXext/xlib_libXext.mk
@@ -10,7 +10,7 @@ XLIB_LIBXEXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXEXT_LICENSE = MIT
XLIB_LIBXEXT_LICENSE_FILES = COPYING
XLIB_LIBXEXT_INSTALL_STAGING = YES
-XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXEXT_DEPENDENCIES = xlib_libX11 xorgproto
XLIB_LIBXEXT_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXfixes/Config.in b/package/x11r7/xlib_libXfixes/Config.in
index 9bbabb2558..2c3b6684f8 100644
--- a/package/x11r7/xlib_libXfixes/Config.in
+++ b/package/x11r7/xlib_libXfixes/Config.in
@@ -1,8 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXFIXES
bool "libXfixes"
- select BR2_PACKAGE_XPROTO_FIXESPROTO
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xfixes library
diff --git a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
index b7d835bb30..f563ba34ec 100644
--- a/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
+++ b/package/x11r7/xlib_libXfixes/xlib_libXfixes.mk
@@ -10,10 +10,9 @@ XLIB_LIBXFIXES_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXFIXES_LICENSE = MIT
XLIB_LIBXFIXES_LICENSE_FILES = COPYING
XLIB_LIBXFIXES_INSTALL_STAGING = YES
-XLIB_LIBXFIXES_DEPENDENCIES = xproto_fixesproto xlib_libX11 xproto_xextproto xproto_xproto
+XLIB_LIBXFIXES_DEPENDENCIES = xlib_libX11 xorgproto
HOST_XLIB_LIBXFIXES_DEPENDENCIES = \
- host-xproto_fixesproto host-xlib_libX11 host-xproto_xextproto \
- host-xproto_xproto
+ host-xlib_libX11 host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libXfont/Config.in b/package/x11r7/xlib_libXfont/Config.in
index cc1da0ea39..4658027da8 100644
--- a/package/x11r7/xlib_libXfont/Config.in
+++ b/package/x11r7/xlib_libXfont/Config.in
@@ -3,8 +3,7 @@ config BR2_PACKAGE_XLIB_LIBXFONT
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_XLIB_LIBFONTENC
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XFONT_ENCODINGS
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xfont library
diff --git a/package/x11r7/xlib_libXfont/xlib_libXfont.mk b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
index 30163eec6f..61b6f99785 100644
--- a/package/x11r7/xlib_libXfont/xlib_libXfont.mk
+++ b/package/x11r7/xlib_libXfont/xlib_libXfont.mk
@@ -12,11 +12,11 @@ XLIB_LIBXFONT_LICENSE_FILES = COPYING
XLIB_LIBXFONT_AUTORECONF = YES
XLIB_LIBXFONT_INSTALL_STAGING = YES
-XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xproto_fontsproto xproto_xproto xfont_encodings
+XLIB_LIBXFONT_DEPENDENCIES = freetype xlib_libfontenc xlib_xtrans xorgproto
HOST_XLIB_LIBXFONT_DEPENDENCIES = \
host-freetype host-xlib_libfontenc host-xlib_xtrans \
- host-xproto_fontsproto host-xproto_xproto host-xfont_encodings
+ host-xorgproto
XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs
HOST_XLIB_LIBXFONT_CONF_OPTS = --disable-devel-docs
diff --git a/package/x11r7/xlib_libXfont2/Config.in b/package/x11r7/xlib_libXfont2/Config.in
index 6cba46586b..fc2ebfe22c 100644
--- a/package/x11r7/xlib_libXfont2/Config.in
+++ b/package/x11r7/xlib_libXfont2/Config.in
@@ -3,8 +3,7 @@ config BR2_PACKAGE_XLIB_LIBXFONT2
select BR2_PACKAGE_FREETYPE
select BR2_PACKAGE_XLIB_LIBFONTENC
select BR2_PACKAGE_XLIB_XTRANS
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XFONT_ENCODINGS
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xfont library
diff --git a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
index 3f1bdee435..ba2c7540cb 100644
--- a/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
+++ b/package/x11r7/xlib_libXfont2/xlib_libXfont2.mk
@@ -14,16 +14,14 @@ XLIB_LIBXFONT2_DEPENDENCIES = \
freetype \
xlib_libfontenc \
xlib_xtrans \
- xproto_fontsproto \
- xproto_xproto \
+ xorgproto \
xfont_encodings
HOST_XLIB_LIBXFONT2_DEPENDENCIES = \
host-freetype \
host-xlib_libfontenc \
host-xlib_xtrans \
- host-xproto_fontsproto \
- host-xproto_xproto \
+ host-xorgproto \
host-xfont_encodings
XLIB_LIBXFONT2_CONF_OPTS = --disable-devel-docs
diff --git a/package/x11r7/xlib_libXft/Config.in b/package/x11r7/xlib_libXft/Config.in
index 6eef170177..84967a55e3 100644
--- a/package/x11r7/xlib_libXft/Config.in
+++ b/package/x11r7/xlib_libXft/Config.in
@@ -5,6 +5,6 @@ config BR2_PACKAGE_XLIB_LIBXFT
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xft library
diff --git a/package/x11r7/xlib_libXft/xlib_libXft.mk b/package/x11r7/xlib_libXft/xlib_libXft.mk
index de9b47093b..64415cfd30 100644
--- a/package/x11r7/xlib_libXft/xlib_libXft.mk
+++ b/package/x11r7/xlib_libXft/xlib_libXft.mk
@@ -11,6 +11,6 @@ XLIB_LIBXFT_LICENSE = MIT
XLIB_LIBXFT_LICENSE_FILES = COPYING
XLIB_LIBXFT_AUTORECONF = YES
XLIB_LIBXFT_INSTALL_STAGING = YES
-XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xproto_xproto
+XLIB_LIBXFT_DEPENDENCIES = fontconfig freetype xlib_libX11 xlib_libXext xlib_libXrender xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXi/Config.in b/package/x11r7/xlib_libXi/Config.in
index 3ae22d6305..3131306902 100644
--- a/package/x11r7/xlib_libXi/Config.in
+++ b/package/x11r7/xlib_libXi/Config.in
@@ -1,9 +1,8 @@
config BR2_PACKAGE_XLIB_LIBXI
bool "libXi"
- select BR2_PACKAGE_XPROTO_XPROTO
- select BR2_PACKAGE_XPROTO_INPUTPROTO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXFIXES
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xi library
diff --git a/package/x11r7/xlib_libXi/xlib_libXi.mk b/package/x11r7/xlib_libXi/xlib_libXi.mk
index d593c1e95a..2833738911 100644
--- a/package/x11r7/xlib_libXi/xlib_libXi.mk
+++ b/package/x11r7/xlib_libXi/xlib_libXi.mk
@@ -12,11 +12,10 @@ XLIB_LIBXI_LICENSE_FILES = COPYING
XLIB_LIBXI_INSTALL_STAGING = YES
XLIB_LIBXI_DEPENDENCIES = \
host-pkgconf \
- xproto_inputproto \
- xproto_xproto \
xlib_libX11 \
xlib_libXext \
- xlib_libXfixes
+ xlib_libXfixes \
+ xorgproto
XLIB_LIBXI_CONF_OPTS = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXinerama/Config.in b/package/x11r7/xlib_libXinerama/Config.in
index 5a79b4eb76..f8ea959537 100644
--- a/package/x11r7/xlib_libXinerama/Config.in
+++ b/package/x11r7/xlib_libXinerama/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_XLIB_LIBXINERAMA
bool "libXinerama"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_XINERAMAPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xinerama library
diff --git a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
index ee8bf55602..f62cecaddd 100644
--- a/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
+++ b/package/x11r7/xlib_libXinerama/xlib_libXinerama.mk
@@ -10,7 +10,7 @@ XLIB_LIBXINERAMA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXINERAMA_LICENSE = MIT
XLIB_LIBXINERAMA_LICENSE_FILES = COPYING
XLIB_LIBXINERAMA_INSTALL_STAGING = YES
-XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xineramaproto
+XLIB_LIBXINERAMA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXINERAMA_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXmu/Config.in b/package/x11r7/xlib_libXmu/Config.in
index ed239dc11c..b588920835 100644
--- a/package/x11r7/xlib_libXmu/Config.in
+++ b/package/x11r7/xlib_libXmu/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXMU
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xmu library
diff --git a/package/x11r7/xlib_libXmu/xlib_libXmu.mk b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
index 261f871387..b3f3db3e5d 100644
--- a/package/x11r7/xlib_libXmu/xlib_libXmu.mk
+++ b/package/x11r7/xlib_libXmu/xlib_libXmu.mk
@@ -10,6 +10,6 @@ XLIB_LIBXMU_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXMU_LICENSE = MIT
XLIB_LIBXMU_LICENSE_FILES = COPYING
XLIB_LIBXMU_INSTALL_STAGING = YES
-XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto
+XLIB_LIBXMU_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXpm/Config.in b/package/x11r7/xlib_libXpm/Config.in
index 528498cb43..9a15d77d8c 100644
--- a/package/x11r7/xlib_libXpm/Config.in
+++ b/package/x11r7/xlib_libXpm/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXPM
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXT
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xpm library
diff --git a/package/x11r7/xlib_libXpm/xlib_libXpm.mk b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
index 09f897ea09..7e11c4b5aa 100644
--- a/package/x11r7/xlib_libXpm/xlib_libXpm.mk
+++ b/package/x11r7/xlib_libXpm/xlib_libXpm.mk
@@ -12,7 +12,7 @@ XLIB_LIBXPM_LICENSE_FILES = COPYING
XLIB_LIBXPM_INSTALL_STAGING = YES
# we patch configure.ac
XLIB_LIBXPM_AUTORECONF = YES
-XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xproto_xproto \
+XLIB_LIBXPM_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt xorgproto \
$(if $(BR2_PACKAGE_LIBICONV),libiconv) \
$(TARGET_NLS_DEPENDENCIES)
diff --git a/package/x11r7/xlib_libXrandr/Config.in b/package/x11r7/xlib_libXrandr/Config.in
index 3b3ebd5790..e019ca5ef8 100644
--- a/package/x11r7/xlib_libXrandr/Config.in
+++ b/package/x11r7/xlib_libXrandr/Config.in
@@ -1,10 +1,8 @@
config BR2_PACKAGE_XLIB_LIBXRANDR
bool "libXrandr"
- select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXRENDER
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xrandr library
diff --git a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
index 0fd298c50d..1bfd78f73d 100644
--- a/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
+++ b/package/x11r7/xlib_libXrandr/xlib_libXrandr.mk
@@ -10,7 +10,7 @@ XLIB_LIBXRANDR_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRANDR_LICENSE = MIT
XLIB_LIBXRANDR_LICENSE_FILES = COPYING
XLIB_LIBXRANDR_INSTALL_STAGING = YES
-XLIB_LIBXRANDR_DEPENDENCIES = xproto_randrproto xlib_libX11 xlib_libXext xlib_libXrender xproto_renderproto xproto_xproto
+XLIB_LIBXRANDR_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXrender xorgproto
XLIB_LIBXRANDR_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXrender/Config.in b/package/x11r7/xlib_libXrender/Config.in
index c723e4df46..4487ef1faa 100644
--- a/package/x11r7/xlib_libXrender/Config.in
+++ b/package/x11r7/xlib_libXrender/Config.in
@@ -1,7 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXRENDER
bool "libXrender"
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xrender library
diff --git a/package/x11r7/xlib_libXrender/xlib_libXrender.mk b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
index 6134c45386..870f94386e 100644
--- a/package/x11r7/xlib_libXrender/xlib_libXrender.mk
+++ b/package/x11r7/xlib_libXrender/xlib_libXrender.mk
@@ -10,9 +10,9 @@ XLIB_LIBXRENDER_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRENDER_LICENSE = MIT
XLIB_LIBXRENDER_LICENSE_FILES = COPYING
XLIB_LIBXRENDER_INSTALL_STAGING = YES
-XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xproto_renderproto xproto_xproto
+XLIB_LIBXRENDER_DEPENDENCIES = xlib_libX11 xorgproto
HOST_XLIB_LIBXRENDER_DEPENDENCIES = \
- host-xlib_libX11 host-xproto_renderproto host-xproto_xproto
+ host-xlib_libX11 host-xorgproto
XLIB_LIBXRENDER_CONF_OPTS = --disable-malloc0returnsnull
diff --git a/package/x11r7/xlib_libXres/Config.in b/package/x11r7/xlib_libXres/Config.in
index 39abbbfd33..4e135ed3aa 100644
--- a/package/x11r7/xlib_libXres/Config.in
+++ b/package/x11r7/xlib_libXres/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XLIB_LIBXRES
bool "libXres"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_RESOURCEPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org XRes library
diff --git a/package/x11r7/xlib_libXres/xlib_libXres.mk b/package/x11r7/xlib_libXres/xlib_libXres.mk
index 0075e8f60b..72f2ec4424 100644
--- a/package/x11r7/xlib_libXres/xlib_libXres.mk
+++ b/package/x11r7/xlib_libXres/xlib_libXres.mk
@@ -10,7 +10,7 @@ XLIB_LIBXRES_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXRES_LICENSE = MIT
XLIB_LIBXRES_LICENSE_FILES = COPYING
XLIB_LIBXRES_INSTALL_STAGING = YES
-XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_resourceproto xproto_xproto
+XLIB_LIBXRES_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXRES_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXt/Config.in b/package/x11r7/xlib_libXt/Config.in
index 6557e20bcd..0f55780886 100644
--- a/package/x11r7/xlib_libXt/Config.in
+++ b/package/x11r7/xlib_libXt/Config.in
@@ -2,8 +2,7 @@ config BR2_PACKAGE_XLIB_LIBXT
bool "libXt"
select BR2_PACKAGE_XLIB_LIBSM
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_KBPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
select BR2_PACKAGE_XCB_PROTO
select BR2_PACKAGE_LIBXCB
help
diff --git a/package/x11r7/xlib_libXt/xlib_libXt.mk b/package/x11r7/xlib_libXt/xlib_libXt.mk
index 4715ac642f..946fd517a7 100644
--- a/package/x11r7/xlib_libXt/xlib_libXt.mk
+++ b/package/x11r7/xlib_libXt/xlib_libXt.mk
@@ -10,7 +10,7 @@ XLIB_LIBXT_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXT_LICENSE = MIT
XLIB_LIBXT_LICENSE_FILES = COPYING
XLIB_LIBXT_INSTALL_STAGING = YES
-XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xproto_kbproto xproto_xproto xcb-proto libxcb host-xproto_xproto
+XLIB_LIBXT_DEPENDENCIES = xlib_libSM xlib_libX11 xorgproto xcb-proto libxcb host-xorgproto
XLIB_LIBXT_CONF_OPTS = --disable-malloc0returnsnull --disable-install-makestrs
XLIB_LIBXT_AUTORECONF = YES
diff --git a/package/x11r7/xlib_libXtst/Config.in b/package/x11r7/xlib_libXtst/Config.in
index 8853bde8d4..2c7db22468 100644
--- a/package/x11r7/xlib_libXtst/Config.in
+++ b/package/x11r7/xlib_libXtst/Config.in
@@ -3,6 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXTST
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXI
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_RECORDPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xtst library
diff --git a/package/x11r7/xlib_libXtst/xlib_libXtst.mk b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
index d71290ae40..e0d7e8217c 100644
--- a/package/x11r7/xlib_libXtst/xlib_libXtst.mk
+++ b/package/x11r7/xlib_libXtst/xlib_libXtst.mk
@@ -15,6 +15,6 @@ XLIB_LIBXTST_DEPENDENCIES = \
xlib_libX11 \
xlib_libXext \
xlib_libXi \
- xproto_recordproto
+ xorgproto
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXv/Config.in b/package/x11r7/xlib_libXv/Config.in
index 90f07f34be..d3e57445a3 100644
--- a/package/x11r7/xlib_libXv/Config.in
+++ b/package/x11r7/xlib_libXv/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XLIB_LIBXV
bool "libXv"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_VIDEOPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xv library
diff --git a/package/x11r7/xlib_libXv/xlib_libXv.mk b/package/x11r7/xlib_libXv/xlib_libXv.mk
index 0e02439fa8..0ff99b9380 100644
--- a/package/x11r7/xlib_libXv/xlib_libXv.mk
+++ b/package/x11r7/xlib_libXv/xlib_libXv.mk
@@ -10,7 +10,7 @@ XLIB_LIBXV_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXV_LICENSE = ISC-like
XLIB_LIBXV_LICENSE_FILES = COPYING
XLIB_LIBXV_INSTALL_STAGING = YES
-XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_videoproto xproto_xproto
+XLIB_LIBXV_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXV_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXvMC/Config.in b/package/x11r7/xlib_libXvMC/Config.in
index 90c0e74e45..5cc6ec766a 100644
--- a/package/x11r7/xlib_libXvMC/Config.in
+++ b/package/x11r7/xlib_libXvMC/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXVMC
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXV
- select BR2_PACKAGE_XPROTO_VIDEOPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org XvMC library
diff --git a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
index cb39c29f21..c970182fe5 100644
--- a/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
+++ b/package/x11r7/xlib_libXvMC/xlib_libXvMC.mk
@@ -10,7 +10,7 @@ XLIB_LIBXVMC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXVMC_LICENSE = MIT
XLIB_LIBXVMC_LICENSE_FILES = COPYING
XLIB_LIBXVMC_INSTALL_STAGING = YES
-XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xproto_videoproto xproto_xproto
+XLIB_LIBXVMC_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXv xorgproto
XLIB_LIBXVMC_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86dga/Config.in b/package/x11r7/xlib_libXxf86dga/Config.in
index 8276b7178f..918ea0f150 100644
--- a/package/x11r7/xlib_libXxf86dga/Config.in
+++ b/package/x11r7/xlib_libXxf86dga/Config.in
@@ -3,7 +3,6 @@ config BR2_PACKAGE_XLIB_LIBXXF86DGA
depends on BR2_USE_MMU # fork()
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xxf86dga library
diff --git a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
index eea756bdb2..59ebd2b413 100644
--- a/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
+++ b/package/x11r7/xlib_libXxf86dga/xlib_libXxf86dga.mk
@@ -10,7 +10,7 @@ XLIB_LIBXXF86DGA_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86DGA_LICENSE = MIT
XLIB_LIBXXF86DGA_LICENSE_FILES = COPYING
XLIB_LIBXXF86DGA_INSTALL_STAGING = YES
-XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86dgaproto xproto_xproto
+XLIB_LIBXXF86DGA_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXXF86DGA_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libXxf86vm/Config.in b/package/x11r7/xlib_libXxf86vm/Config.in
index 9e32188ec8..c3b11f4218 100644
--- a/package/x11r7/xlib_libXxf86vm/Config.in
+++ b/package/x11r7/xlib_libXxf86vm/Config.in
@@ -2,7 +2,6 @@ config BR2_PACKAGE_XLIB_LIBXXF86VM
bool "libXxf86vm"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org Xxf86vm library
diff --git a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
index f650fe4e2a..2106451c74 100644
--- a/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
+++ b/package/x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk
@@ -10,7 +10,7 @@ XLIB_LIBXXF86VM_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXXF86VM_LICENSE = MIT
XLIB_LIBXXF86VM_LICENSE_FILES = COPYING
XLIB_LIBXXF86VM_INSTALL_STAGING = YES
-XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_xf86vidmodeproto xproto_xproto
+XLIB_LIBXXF86VM_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBXXF86VM_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libdmx/Config.in b/package/x11r7/xlib_libdmx/Config.in
index 879f6895c3..99cddb638a 100644
--- a/package/x11r7/xlib_libdmx/Config.in
+++ b/package/x11r7/xlib_libdmx/Config.in
@@ -2,6 +2,6 @@ config BR2_PACKAGE_XLIB_LIBDMX
bool "libdmx"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXEXT
- select BR2_PACKAGE_XPROTO_DMXPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org dmx library
diff --git a/package/x11r7/xlib_libdmx/xlib_libdmx.mk b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
index fbe3067fe1..6a289eee02 100644
--- a/package/x11r7/xlib_libdmx/xlib_libdmx.mk
+++ b/package/x11r7/xlib_libdmx/xlib_libdmx.mk
@@ -10,7 +10,7 @@ XLIB_LIBDMX_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBDMX_LICENSE = MIT
XLIB_LIBDMX_LICENSE_FILES = COPYING
XLIB_LIBDMX_INSTALL_STAGING = YES
-XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xproto_dmxproto
+XLIB_LIBDMX_DEPENDENCIES = xlib_libX11 xlib_libXext xorgproto
XLIB_LIBDMX_CONF_OPTS = --disable-malloc0returnsnull
$(eval $(autotools-package))
diff --git a/package/x11r7/xlib_libfontenc/Config.in b/package/x11r7/xlib_libfontenc/Config.in
index d25e96a5a5..38cb8333c0 100644
--- a/package/x11r7/xlib_libfontenc/Config.in
+++ b/package/x11r7/xlib_libfontenc/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBFONTENC
bool "libfontenc"
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
select BR2_PACKAGE_ZLIB
help
X.Org fontenc library
diff --git a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
index e2c4c6e8d9..526aea9fe5 100644
--- a/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
+++ b/package/x11r7/xlib_libfontenc/xlib_libfontenc.mk
@@ -10,8 +10,8 @@ XLIB_LIBFONTENC_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBFONTENC_LICENSE = MIT
XLIB_LIBFONTENC_LICENSE_FILES = COPYING
XLIB_LIBFONTENC_INSTALL_STAGING = YES
-XLIB_LIBFONTENC_DEPENDENCIES = zlib xproto_xproto
-HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xproto_xproto
+XLIB_LIBFONTENC_DEPENDENCIES = zlib xorgproto
+HOST_XLIB_LIBFONTENC_DEPENDENCIES = host-zlib host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libxkbfile/Config.in b/package/x11r7/xlib_libxkbfile/Config.in
index ccd35fa10f..0d7e466005 100644
--- a/package/x11r7/xlib_libxkbfile/Config.in
+++ b/package/x11r7/xlib_libxkbfile/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXKBFILE
bool "libxkbfile"
select BR2_PACKAGE_XLIB_LIBX11
- select BR2_PACKAGE_XPROTO_KBPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org xkbfile library
diff --git a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
index c69d73118f..97755fae84 100644
--- a/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
+++ b/package/x11r7/xlib_libxkbfile/xlib_libxkbfile.mk
@@ -10,8 +10,8 @@ XLIB_LIBXKBFILE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXKBFILE_LICENSE = MIT
XLIB_LIBXKBFILE_LICENSE_FILES = COPYING
XLIB_LIBXKBFILE_INSTALL_STAGING = YES
-XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xproto_kbproto
-HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xproto_kbproto
+XLIB_LIBXKBFILE_DEPENDENCIES = xlib_libX11 xorgproto
+HOST_XLIB_LIBXKBFILE_DEPENDENCIES = host-xlib_libX11 host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
diff --git a/package/x11r7/xlib_libxshmfence/Config.in b/package/x11r7/xlib_libxshmfence/Config.in
index d4e87b3e81..710476b357 100644
--- a/package/x11r7/xlib_libxshmfence/Config.in
+++ b/package/x11r7/xlib_libxshmfence/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XLIB_LIBXSHMFENCE
bool "libxshmfence"
depends on BR2_TOOLCHAIN_HAS_SYNC_4
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
help
X.Org shmfence library
diff --git a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
index f51cf0d5cb..f395ebe172 100644
--- a/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
+++ b/package/x11r7/xlib_libxshmfence/xlib_libxshmfence.mk
@@ -10,7 +10,7 @@ XLIB_LIBXSHMFENCE_SITE = http://xorg.freedesktop.org/releases/individual/lib
XLIB_LIBXSHMFENCE_LICENSE = MIT
XLIB_LIBXSHMFENCE_LICENSE_FILES = COPYING
XLIB_LIBXSHMFENCE_INSTALL_STAGING = YES
-XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xproto_xproto
+XLIB_LIBXSHMFENCE_DEPENDENCIES = host-pkgconf xorgproto
# 0001-configure.ac-call-AC_USE_SYSTEM_EXTENSIONS.patch
XLIB_LIBXSHMFENCE_AUTORECONF = YES
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass " Bernd Kuhls
@ 2018-07-02 21:57 ` Yann E. MORIN
2018-07-21 13:38 ` Bernd Kuhls
0 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:57 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[--SNIP--]
> diff --git a/package/x11r7/xlib_libXau/xlib_libXau.mk b/package/x11r7/xlib_libXau/xlib_libXau.mk
> index 1c50cb2e4e..d8bac5426a 100644
> --- a/package/x11r7/xlib_libXau/xlib_libXau.mk
> +++ b/package/x11r7/xlib_libXau/xlib_libXau.mk
> @@ -10,9 +10,9 @@ XLIB_LIBXAU_SITE = http://xorg.freedesktop.org/releases/individual/lib
> XLIB_LIBXAU_LICENSE = MIT
> XLIB_LIBXAU_LICENSE_FILES = COPYING
> XLIB_LIBXAU_INSTALL_STAGING = YES
> -XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xproto_xproto
> +XLIB_LIBXAU_DEPENDENCIES = host-pkgconf xutil_util-macros xorgproto
> HOST_XLIB_LIBXAU_DEPENDENCIES = \
> - host-pkgconf host-xutil_util-macros host-xproto_xproto
> + host-pkgconf host-xutil_util-macros xorgproto
Did you mean host-xorgproto instead?
[--SNIP--]
> diff --git a/package/x11r7/xlib_libXt/Config.in b/package/x11r7/xlib_libXt/Config.in
> index 6557e20bcd..0f55780886 100644
> --- a/package/x11r7/xlib_libXt/Config.in
> +++ b/package/x11r7/xlib_libXt/Config.in
> @@ -2,8 +2,7 @@ config BR2_PACKAGE_XLIB_LIBXT
> bool "libXt"
> select BR2_PACKAGE_XLIB_LIBSM
> select BR2_PACKAGE_XLIB_LIBX11
> - select BR2_PACKAGE_XPROTO_KBPROTO
> - select BR2_PACKAGE_XPROTO_XPROTO
> + select BR2_PACKAGE_XORGPROTO
> select BR2_PACKAGE_XCB_PROTO
To be sure, xcb-proto is still a separate package, right?
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass switch to xorgproto
2018-07-02 21:57 ` Yann E. MORIN
@ 2018-07-21 13:38 ` Bernd Kuhls
0 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-07-21 13:38 UTC (permalink / raw)
To: buildroot
Hi Yann,
Am Mon, 02 Jul 2018 23:57:54 +0200 schrieb Yann E. MORIN:
>> HOST_XLIB_LIBXAU_DEPENDENCIES = \
>> - host-pkgconf host-xutil_util-macros host-xproto_xproto
>> + host-pkgconf host-xutil_util-macros xorgproto
>
> Did you mean host-xorgproto instead?
Oops, yes, will be fixed in the next iteration, thanks!
>> select BR2_PACKAGE_XCB_PROTO
>
> To be sure, xcb-proto is still a separate package, right?
It looks like both packages are still developed seperately.
Xcb-proto received its last release in February 2018 and its last commit
in March ( https://cgit.freedesktop.org/xcb/proto ) while xorgproto was
also released in February of this year: https://cgit.freedesktop.org/xorg/
proto/xorgproto/log/
Regards, Bernd
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 12/22] package/x11r7/xutil_makedepend: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (10 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 11/22] package/x11r7/xlib_*: mass " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 21:59 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 13/22] package/x11r7/xserver_xorg-server: " Bernd Kuhls
` (10 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xutil_makedepend/Config.in | 1 +
package/x11r7/xutil_makedepend/xutil_makedepend.mk | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/package/x11r7/xutil_makedepend/Config.in b/package/x11r7/xutil_makedepend/Config.in
index 0b091b0e34..fdf2fb92c1 100644
--- a/package/x11r7/xutil_makedepend/Config.in
+++ b/package/x11r7/xutil_makedepend/Config.in
@@ -1,4 +1,5 @@
config BR2_PACKAGE_XUTIL_MAKEDEPEND
bool "makedepend"
+ select BR2_PACKAGE_XORGPROTO
help
No description available
diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
index 6fd3c1ae36..8a058efcec 100644
--- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
+++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
@@ -10,8 +10,8 @@ XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
XUTIL_MAKEDEPEND_LICENSE = MIT
XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING
-XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
-HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto
+XUTIL_MAKEDEPEND_DEPENDENCIES = xorgproto
+HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xorgproto
$(eval $(autotools-package))
$(eval $(host-autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 12/22] package/x11r7/xutil_makedepend: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 12/22] package/x11r7/xutil_makedepend: " Bernd Kuhls
@ 2018-07-02 21:59 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 21:59 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> package/x11r7/xutil_makedepend/Config.in | 1 +
> package/x11r7/xutil_makedepend/xutil_makedepend.mk | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/package/x11r7/xutil_makedepend/Config.in b/package/x11r7/xutil_makedepend/Config.in
> index 0b091b0e34..fdf2fb92c1 100644
> --- a/package/x11r7/xutil_makedepend/Config.in
> +++ b/package/x11r7/xutil_makedepend/Config.in
> @@ -1,4 +1,5 @@
> config BR2_PACKAGE_XUTIL_MAKEDEPEND
> bool "makedepend"
> + select BR2_PACKAGE_XORGPROTO
> help
> No description available
> diff --git a/package/x11r7/xutil_makedepend/xutil_makedepend.mk b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
> index 6fd3c1ae36..8a058efcec 100644
> --- a/package/x11r7/xutil_makedepend/xutil_makedepend.mk
> +++ b/package/x11r7/xutil_makedepend/xutil_makedepend.mk
> @@ -10,8 +10,8 @@ XUTIL_MAKEDEPEND_SITE = http://xorg.freedesktop.org/releases/individual/util
> XUTIL_MAKEDEPEND_LICENSE = MIT
> XUTIL_MAKEDEPEND_LICENSE_FILES = COPYING
>
> -XUTIL_MAKEDEPEND_DEPENDENCIES = xproto_xproto
> -HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xproto_xproto
> +XUTIL_MAKEDEPEND_DEPENDENCIES = xorgproto
> +HOST_XUTIL_MAKEDEPEND_DEPENDENCIES = host-xorgproto
>
> $(eval $(autotools-package))
> $(eval $(host-autotools-package))
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 13/22] package/x11r7/xserver_xorg-server: switch to xorgproto
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (11 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 12/22] package/x11r7/xutil_makedepend: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-02 22:06 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 14/22] package/x11r7/xproto_*: mass removal Bernd Kuhls
` (9 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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 handling for various xproto packages because xorgproto
always installs all available protocols.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xserver_xorg-server/Config.in | 28 ++---------
.../xserver_xorg-server.mk | 48 +++----------------
2 files changed, 9 insertions(+), 67 deletions(-)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 3107e2c1e5..16422316fc 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -32,27 +32,9 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XLIB_LIBXKBFILE
select BR2_PACKAGE_XLIB_XTRANS
select BR2_PACKAGE_XDATA_XBITMAPS
- select BR2_PACKAGE_XPROTO_BIGREQSPROTO
- select BR2_PACKAGE_XPROTO_COMPOSITEPROTO
- select BR2_PACKAGE_XPROTO_DAMAGEPROTO
- select BR2_PACKAGE_XPROTO_FIXESPROTO
- select BR2_PACKAGE_XPROTO_FONTSPROTO
- select BR2_PACKAGE_XPROTO_GLPROTO
- select BR2_PACKAGE_XPROTO_INPUTPROTO
- select BR2_PACKAGE_XPROTO_KBPROTO
- select BR2_PACKAGE_XPROTO_RANDRPROTO
- select BR2_PACKAGE_XPROTO_RENDERPROTO
- select BR2_PACKAGE_XPROTO_RESOURCEPROTO
- select BR2_PACKAGE_XPROTO_VIDEOPROTO
- select BR2_PACKAGE_XPROTO_XCMISCPROTO
- select BR2_PACKAGE_XPROTO_XEXTPROTO
- select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
- select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
- select BR2_PACKAGE_XPROTO_XPROTO
+ select BR2_PACKAGE_XORGPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
select BR2_PACKAGE_XKEYBOARD_CONFIG
- select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD
help
X.Org X server
@@ -82,13 +64,11 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
bool "1.19.6"
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
select BR2_PACKAGE_XLIB_LIBXFONT2
- select BR2_PACKAGE_XPROTO_PRESENTPROTO
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
bool "1.17.4"
select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
select BR2_PACKAGE_XLIB_LIBXFONT
- select BR2_PACKAGE_XPROTO_PRESENTPROTO
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
bool "1.14.7"
@@ -111,11 +91,9 @@ choice
config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
bool "Modular X.org"
depends on BR2_INSTALL_LIBSTDCPP
- select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
- BR2_PACKAGE_XPROTO_DRI2PROTO)
+ select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBPCIACCESS
- select BR2_PACKAGE_XLIB_LIBXSHMFENCE if \
- (BR2_PACKAGE_XPROTO_DRI3PROTO && BR2_TOOLCHAIN_HAS_SYNC_4)
+ select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_TOOLCHAIN_HAS_SYNC_4
help
This variant of the X.org server is the full-blown variant,
as used by desktop GNU/Linux distributions. The drivers (for
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index d605a2c742..79cf94dfed 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -32,24 +32,7 @@ XSERVER_XORG_SERVER_DEPENDENCIES = \
xlib_libxkbfile \
xlib_xtrans \
xdata_xbitmaps \
- xproto_bigreqsproto \
- xproto_compositeproto \
- xproto_damageproto \
- xproto_fixesproto \
- xproto_fontsproto \
- xproto_glproto \
- xproto_inputproto \
- xproto_kbproto \
- xproto_randrproto \
- xproto_renderproto \
- xproto_resourceproto \
- xproto_videoproto \
- xproto_xcmiscproto \
- xproto_xextproto \
- xproto_xf86bigfontproto \
- xproto_xf86dgaproto \
- xproto_xf86vidmodeproto \
- xproto_xproto \
+ xorgproto \
xkeyboard-config \
pixman \
mcookie \
@@ -73,8 +56,7 @@ XSERVER_XORG_SERVER_CONF_OPTS += \
--with-systemd-daemon \
--enable-systemd-logind
XSERVER_XORG_SERVER_DEPENDENCIES += \
- systemd \
- xproto_dri2proto
+ systemd
else
XSERVER_XORG_SERVER_CONF_OPTS += \
--without-systemd-daemon \
@@ -89,12 +71,6 @@ else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-xwayland
endif
-# Present protocol only required for xserver 1.15+, but does not matter if
-# enabled for older versions as they don't use it (not even optionally).
-ifeq ($(BR2_PACKAGE_XPROTO_PRESENTPROTO),y)
-XSERVER_XORG_SERVER_DEPENDENCIES += xproto_presentproto
-endif
-
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg
XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
@@ -144,7 +120,7 @@ endif
ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri --enable-glx
-XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d xproto_xf86driproto
+XSERVER_XORG_SERVER_DEPENDENCIES += mesa3d
else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri --disable-glx
endif
@@ -165,7 +141,7 @@ ifeq ($(BR2_PACKAGE_HAS_UDEV),y)
XSERVER_XORG_SERVER_DEPENDENCIES += udev
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev
# udev kms support depends on libdrm and dri2
-ifeq ($(BR2_PACKAGE_LIBDRM)$(BR2_PACKAGE_XPROTO_DRI2PROTO),yy)
+ifeq ($(BR2_PACKAGE_LIBDRM),y)
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
@@ -188,13 +164,6 @@ else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
endif
-ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
-XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
-XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
-else
-XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
-endif
-
ifeq ($(BR2_PACKAGE_XLIB_LIBXFONT2),y)
XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXfont2
endif
@@ -214,14 +183,9 @@ XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite
endif
ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y)
-ifeq ($(BR2_PACKAGE_XPROTO_DRI2PROTO),y)
-XSERVER_XORG_SERVER_DEPENDENCIES += xproto_dri2proto
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri2
-else
-XSERVER_XORG_SERVER_CONF_OPTS += --disable-dri2
-endif
-ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE)$(BR2_PACKAGE_XPROTO_DRI3PROTO),yy)
-XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence xproto_dri3proto
+ifeq ($(BR2_PACKAGE_XLIB_LIBXSHMFENCE),y)
+XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libxshmfence
XSERVER_XORG_SERVER_CONF_OPTS += --enable-dri3
ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy)
XSERVER_XORG_SERVER_DEPENDENCIES += libepoxy
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 13/22] package/x11r7/xserver_xorg-server: switch to xorgproto
2018-06-30 11:08 ` [Buildroot] [PATCH v3 13/22] package/x11r7/xserver_xorg-server: " Bernd Kuhls
@ 2018-07-02 22:06 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-02 22:06 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> 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 handling for various xproto packages because xorgproto
> always installs all available protocols.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[--SNIP--]
> diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> index d605a2c742..79cf94dfed 100644
> --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
> +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
[--SNIP--]
> @@ -188,13 +164,6 @@ else
> XSERVER_XORG_SERVER_CONF_OPTS += --disable-libunwind
> endif
>
> -ifeq ($(BR2_PACKAGE_XPROTO_RECORDPROTO),y)
> -XSERVER_XORG_SERVER_DEPENDENCIES += xproto_recordproto
> -XSERVER_XORG_SERVER_CONF_OPTS += --enable-record
> -else
> -XSERVER_XORG_SERVER_CONF_OPTS += --disable-record
> -endif
Where is --enable-record now gone?
Since xorgproto installs all protocols, we should be in the same
situation as when xproto-record was previously enabled, no?
So, --enable-record should now be always enabled.
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 14/22] package/x11r7/xproto_*: mass removal
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (12 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 13/22] package/x11r7/xserver_xorg-server: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-03 21:35 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 15/22] package/x11r7/xdriver_xf86-video-intel: bump version Bernd Kuhls
` (8 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
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
After switching to xorgproto the old xproto_* packages are removed.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
Config.in.legacy | 240 ++++++++++++++++++
package/x11r7/Config.in | 30 ---
package/x11r7/xproto_applewmproto/Config.in | 4 -
.../xproto_applewmproto.hash | 3 -
.../xproto_applewmproto.mk | 15 --
package/x11r7/xproto_bigreqsproto/Config.in | 4 -
.../xproto_bigreqsproto.hash | 2 -
.../xproto_bigreqsproto.mk | 15 --
package/x11r7/xproto_compositeproto/Config.in | 4 -
.../xproto_compositeproto.hash | 3 -
.../xproto_compositeproto.mk | 15 --
package/x11r7/xproto_damageproto/Config.in | 4 -
.../xproto_damageproto.hash | 3 -
.../xproto_damageproto/xproto_damageproto.mk | 15 --
package/x11r7/xproto_dmxproto/Config.in | 4 -
.../xproto_dmxproto/xproto_dmxproto.hash | 3 -
.../x11r7/xproto_dmxproto/xproto_dmxproto.mk | 15 --
package/x11r7/xproto_dri2proto/Config.in | 4 -
.../xproto_dri2proto/xproto_dri2proto.hash | 2 -
.../xproto_dri2proto/xproto_dri2proto.mk | 15 --
package/x11r7/xproto_dri3proto/Config.in | 4 -
.../xproto_dri3proto/xproto_dri3proto.hash | 2 -
.../xproto_dri3proto/xproto_dri3proto.mk | 15 --
package/x11r7/xproto_fixesproto/Config.in | 4 -
.../xproto_fixesproto/xproto_fixesproto.hash | 3 -
.../xproto_fixesproto/xproto_fixesproto.mk | 16 --
package/x11r7/xproto_fontcacheproto/Config.in | 4 -
.../xproto_fontcacheproto.hash | 3 -
.../xproto_fontcacheproto.mk | 16 --
package/x11r7/xproto_fontsproto/Config.in | 4 -
.../xproto_fontsproto/xproto_fontsproto.hash | 2 -
.../xproto_fontsproto/xproto_fontsproto.mk | 16 --
package/x11r7/xproto_glproto/Config.in | 4 -
.../x11r7/xproto_glproto/xproto_glproto.hash | 2 -
.../x11r7/xproto_glproto/xproto_glproto.mk | 15 --
package/x11r7/xproto_inputproto/Config.in | 4 -
.../xproto_inputproto/xproto_inputproto.hash | 2 -
.../xproto_inputproto/xproto_inputproto.mk | 16 --
package/x11r7/xproto_kbproto/Config.in | 4 -
.../x11r7/xproto_kbproto/xproto_kbproto.hash | 2 -
.../x11r7/xproto_kbproto/xproto_kbproto.mk | 16 --
package/x11r7/xproto_presentproto/Config.in | 5 -
.../xproto_presentproto.hash | 2 -
.../xproto_presentproto.mk | 16 --
package/x11r7/xproto_randrproto/Config.in | 4 -
.../xproto_randrproto/xproto_randrproto.hash | 3 -
.../xproto_randrproto/xproto_randrproto.mk | 15 --
package/x11r7/xproto_recordproto/Config.in | 4 -
.../xproto_recordproto.hash | 2 -
.../xproto_recordproto/xproto_recordproto.mk | 15 --
package/x11r7/xproto_renderproto/Config.in | 4 -
.../xproto_renderproto.hash | 2 -
.../xproto_renderproto/xproto_renderproto.mk | 16 --
package/x11r7/xproto_resourceproto/Config.in | 4 -
.../xproto_resourceproto.hash | 3 -
.../xproto_resourceproto.mk | 15 --
package/x11r7/xproto_scrnsaverproto/Config.in | 4 -
.../xproto_scrnsaverproto.hash | 2 -
.../xproto_scrnsaverproto.mk | 15 --
package/x11r7/xproto_videoproto/Config.in | 4 -
.../xproto_videoproto/xproto_videoproto.hash | 2 -
.../xproto_videoproto/xproto_videoproto.mk | 15 --
package/x11r7/xproto_windowswmproto/Config.in | 4 -
.../xproto_windowswmproto.hash | 3 -
.../xproto_windowswmproto.mk | 15 --
package/x11r7/xproto_xcmiscproto/Config.in | 4 -
.../xproto_xcmiscproto.hash | 2 -
.../xproto_xcmiscproto/xproto_xcmiscproto.mk | 17 --
package/x11r7/xproto_xextproto/Config.in | 4 -
.../xproto_xextproto/xproto_xextproto.hash | 2 -
.../xproto_xextproto/xproto_xextproto.mk | 17 --
.../x11r7/xproto_xf86bigfontproto/Config.in | 4 -
.../xproto_xf86bigfontproto.hash | 3 -
.../xproto_xf86bigfontproto.mk | 16 --
package/x11r7/xproto_xf86dgaproto/Config.in | 4 -
.../xproto_xf86dgaproto.hash | 3 -
.../xproto_xf86dgaproto.mk | 15 --
package/x11r7/xproto_xf86driproto/Config.in | 4 -
.../xproto_xf86driproto.hash | 3 -
.../xproto_xf86driproto.mk | 15 --
.../x11r7/xproto_xf86vidmodeproto/Config.in | 4 -
.../xproto_xf86vidmodeproto.hash | 3 -
.../xproto_xf86vidmodeproto.mk | 15 --
package/x11r7/xproto_xineramaproto/Config.in | 4 -
.../xproto_xineramaproto.hash | 3 -
.../xproto_xineramaproto.mk | 15 --
package/x11r7/xproto_xproto/Config.in | 4 -
.../x11r7/xproto_xproto/xproto_xproto.hash | 2 -
package/x11r7/xproto_xproto/xproto_xproto.mk | 16 --
.../xproto_xproxymanagementprotocol/Config.in | 6 -
.../xproto_xproxymanagementprotocol.hash | 2 -
.../xproto_xproxymanagementprotocol.mk | 15 --
92 files changed, 240 insertions(+), 690 deletions(-)
delete mode 100644 package/x11r7/xproto_applewmproto/Config.in
delete mode 100644 package/x11r7/xproto_applewmproto/xproto_applewmproto.hash
delete mode 100644 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
delete mode 100644 package/x11r7/xproto_bigreqsproto/Config.in
delete mode 100644 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash
delete mode 100644 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
delete mode 100644 package/x11r7/xproto_compositeproto/Config.in
delete mode 100644 package/x11r7/xproto_compositeproto/xproto_compositeproto.hash
delete mode 100644 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
delete mode 100644 package/x11r7/xproto_damageproto/Config.in
delete mode 100644 package/x11r7/xproto_damageproto/xproto_damageproto.hash
delete mode 100644 package/x11r7/xproto_damageproto/xproto_damageproto.mk
delete mode 100644 package/x11r7/xproto_dmxproto/Config.in
delete mode 100644 package/x11r7/xproto_dmxproto/xproto_dmxproto.hash
delete mode 100644 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
delete mode 100644 package/x11r7/xproto_dri2proto/Config.in
delete mode 100644 package/x11r7/xproto_dri2proto/xproto_dri2proto.hash
delete mode 100644 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
delete mode 100644 package/x11r7/xproto_dri3proto/Config.in
delete mode 100644 package/x11r7/xproto_dri3proto/xproto_dri3proto.hash
delete mode 100644 package/x11r7/xproto_dri3proto/xproto_dri3proto.mk
delete mode 100644 package/x11r7/xproto_fixesproto/Config.in
delete mode 100644 package/x11r7/xproto_fixesproto/xproto_fixesproto.hash
delete mode 100644 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
delete mode 100644 package/x11r7/xproto_fontcacheproto/Config.in
delete mode 100644 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash
delete mode 100644 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
delete mode 100644 package/x11r7/xproto_fontsproto/Config.in
delete mode 100644 package/x11r7/xproto_fontsproto/xproto_fontsproto.hash
delete mode 100644 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
delete mode 100644 package/x11r7/xproto_glproto/Config.in
delete mode 100644 package/x11r7/xproto_glproto/xproto_glproto.hash
delete mode 100644 package/x11r7/xproto_glproto/xproto_glproto.mk
delete mode 100644 package/x11r7/xproto_inputproto/Config.in
delete mode 100644 package/x11r7/xproto_inputproto/xproto_inputproto.hash
delete mode 100644 package/x11r7/xproto_inputproto/xproto_inputproto.mk
delete mode 100644 package/x11r7/xproto_kbproto/Config.in
delete mode 100644 package/x11r7/xproto_kbproto/xproto_kbproto.hash
delete mode 100644 package/x11r7/xproto_kbproto/xproto_kbproto.mk
delete mode 100644 package/x11r7/xproto_presentproto/Config.in
delete mode 100644 package/x11r7/xproto_presentproto/xproto_presentproto.hash
delete mode 100644 package/x11r7/xproto_presentproto/xproto_presentproto.mk
delete mode 100644 package/x11r7/xproto_randrproto/Config.in
delete mode 100644 package/x11r7/xproto_randrproto/xproto_randrproto.hash
delete mode 100644 package/x11r7/xproto_randrproto/xproto_randrproto.mk
delete mode 100644 package/x11r7/xproto_recordproto/Config.in
delete mode 100644 package/x11r7/xproto_recordproto/xproto_recordproto.hash
delete mode 100644 package/x11r7/xproto_recordproto/xproto_recordproto.mk
delete mode 100644 package/x11r7/xproto_renderproto/Config.in
delete mode 100644 package/x11r7/xproto_renderproto/xproto_renderproto.hash
delete mode 100644 package/x11r7/xproto_renderproto/xproto_renderproto.mk
delete mode 100644 package/x11r7/xproto_resourceproto/Config.in
delete mode 100644 package/x11r7/xproto_resourceproto/xproto_resourceproto.hash
delete mode 100644 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
delete mode 100644 package/x11r7/xproto_scrnsaverproto/Config.in
delete mode 100644 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash
delete mode 100644 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
delete mode 100644 package/x11r7/xproto_videoproto/Config.in
delete mode 100644 package/x11r7/xproto_videoproto/xproto_videoproto.hash
delete mode 100644 package/x11r7/xproto_videoproto/xproto_videoproto.mk
delete mode 100644 package/x11r7/xproto_windowswmproto/Config.in
delete mode 100644 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash
delete mode 100644 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
delete mode 100644 package/x11r7/xproto_xcmiscproto/Config.in
delete mode 100644 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash
delete mode 100644 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
delete mode 100644 package/x11r7/xproto_xextproto/Config.in
delete mode 100644 package/x11r7/xproto_xextproto/xproto_xextproto.hash
delete mode 100644 package/x11r7/xproto_xextproto/xproto_xextproto.mk
delete mode 100644 package/x11r7/xproto_xf86bigfontproto/Config.in
delete mode 100644 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash
delete mode 100644 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
delete mode 100644 package/x11r7/xproto_xf86dgaproto/Config.in
delete mode 100644 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash
delete mode 100644 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
delete mode 100644 package/x11r7/xproto_xf86driproto/Config.in
delete mode 100644 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash
delete mode 100644 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/Config.in
delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash
delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
delete mode 100644 package/x11r7/xproto_xineramaproto/Config.in
delete mode 100644 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash
delete mode 100644 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
delete mode 100644 package/x11r7/xproto_xproto/Config.in
delete mode 100644 package/x11r7/xproto_xproto/xproto_xproto.hash
delete mode 100644 package/x11r7/xproto_xproto/xproto_xproto.mk
delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/Config.in
delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash
delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
diff --git a/Config.in.legacy b/Config.in.legacy
index 9743ebd08f..c8e2b02bba 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,246 @@ endif
###############################################################################
comment "Legacy options removed in 2018.08"
+config BR2_PACKAGE_XPROTO_APPLEWMPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_BIGREQSPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_COMPOSITEPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_DAMAGEPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_DMXPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_DRI2PROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_DRI3PROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_FIXESPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_FONTSPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_GLPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_INPUTPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_KBPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_PRESENTPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_RANDRPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_RECORDPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_RENDERPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_RESOURCEPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_VIDEOPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XCMISCPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XEXTPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XF86DGAPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XF86DRIPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XINERAMAPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XPROTO
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
+config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
+ bool "xproto packages were superseded by package xorgproto"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XORGPROTO
+ help
+ The new package xorgproto will combine and replace all xproto_*
+ packages
+
config BR2_PACKAGE_GST1_PLUGINS_BAD_LIB_OPENGL_OPENGL
bool "gst1-plugins-bad opengl option moved to gst1-plugins-base"
select BR2_LEGACY
diff --git a/package/x11r7/Config.in b/package/x11r7/Config.in
index 4648fcb5f6..f1396bbf0f 100644
--- a/package/x11r7/Config.in
+++ b/package/x11r7/Config.in
@@ -230,36 +230,6 @@ if BR2_PACKAGE_XORG7
menu "X11R7 X protocols"
source package/x11r7/xcb-proto/Config.in
source package/x11r7/xorgproto/Config.in
- source package/x11r7/xproto_applewmproto/Config.in
- source package/x11r7/xproto_bigreqsproto/Config.in
- source package/x11r7/xproto_compositeproto/Config.in
- source package/x11r7/xproto_damageproto/Config.in
- source package/x11r7/xproto_dmxproto/Config.in
- source package/x11r7/xproto_dri2proto/Config.in
- source package/x11r7/xproto_dri3proto/Config.in
- source package/x11r7/xproto_fixesproto/Config.in
- source package/x11r7/xproto_fontcacheproto/Config.in
- source package/x11r7/xproto_fontsproto/Config.in
- source package/x11r7/xproto_glproto/Config.in
- source package/x11r7/xproto_inputproto/Config.in
- source package/x11r7/xproto_kbproto/Config.in
- source package/x11r7/xproto_presentproto/Config.in
- source package/x11r7/xproto_randrproto/Config.in
- source package/x11r7/xproto_recordproto/Config.in
- source package/x11r7/xproto_renderproto/Config.in
- source package/x11r7/xproto_resourceproto/Config.in
- source package/x11r7/xproto_scrnsaverproto/Config.in
- source package/x11r7/xproto_videoproto/Config.in
- source package/x11r7/xproto_windowswmproto/Config.in
- source package/x11r7/xproto_xcmiscproto/Config.in
- source package/x11r7/xproto_xextproto/Config.in
- source package/x11r7/xproto_xf86bigfontproto/Config.in
- source package/x11r7/xproto_xf86dgaproto/Config.in
- source package/x11r7/xproto_xf86driproto/Config.in
- source package/x11r7/xproto_xf86vidmodeproto/Config.in
- source package/x11r7/xproto_xineramaproto/Config.in
- source package/x11r7/xproto_xproto/Config.in
- source package/x11r7/xproto_xproxymanagementprotocol/Config.in
endmenu
menu "X11R7 Utilities"
source package/x11r7/xutil_makedepend/Config.in
diff --git a/package/x11r7/xproto_applewmproto/Config.in b/package/x11r7/xproto_applewmproto/Config.in
deleted file mode 100644
index 51a5fd5ce6..0000000000
--- a/package/x11r7/xproto_applewmproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_APPLEWMPROTO
- bool "applewmproto"
- help
- No description available
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.hash b/package/x11r7/xproto_applewmproto/xproto_applewmproto.hash
deleted file mode 100644
index 695de3cd14..0000000000
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1371
-md5 c1d50749c3ac5215a1a9425818e856c1 applewmproto-1.4.2.tar.bz2
-sha1 71dd2374e745a7db7ae0e94410e55ba721683d10 applewmproto-1.4.2.tar.bz2
diff --git a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk b/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
deleted file mode 100644
index 998d0aa33b..0000000000
--- a/package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_applewmproto
-#
-################################################################################
-
-XPROTO_APPLEWMPROTO_VERSION = 1.4.2
-XPROTO_APPLEWMPROTO_SOURCE = applewmproto-$(XPROTO_APPLEWMPROTO_VERSION).tar.bz2
-XPROTO_APPLEWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_APPLEWMPROTO_LICENSE = MIT
-XPROTO_APPLEWMPROTO_LICENSE_FILES = COPYING
-XPROTO_APPLEWMPROTO_INSTALL_STAGING = YES
-XPROTO_APPLEWMPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_bigreqsproto/Config.in b/package/x11r7/xproto_bigreqsproto/Config.in
deleted file mode 100644
index c431ef2bbb..0000000000
--- a/package/x11r7/xproto_bigreqsproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_BIGREQSPROTO
- bool "bigreqsproto"
- help
- X.Org BigReqs protocol headers
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash
deleted file mode 100644
index 7d70dca8cc..0000000000
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 462116ab44e41d8121bfde947321950370b285a5316612b8fce8334d50751b1e bigreqsproto-1.1.2.tar.bz2
diff --git a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk b/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
deleted file mode 100644
index bca5a3cdfd..0000000000
--- a/package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_bigreqsproto
-#
-################################################################################
-
-XPROTO_BIGREQSPROTO_VERSION = 1.1.2
-XPROTO_BIGREQSPROTO_SOURCE = bigreqsproto-$(XPROTO_BIGREQSPROTO_VERSION).tar.bz2
-XPROTO_BIGREQSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_BIGREQSPROTO_LICENSE = MIT
-XPROTO_BIGREQSPROTO_LICENSE_FILES = COPYING
-XPROTO_BIGREQSPROTO_INSTALL_STAGING = YES
-XPROTO_BIGREQSPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_compositeproto/Config.in b/package/x11r7/xproto_compositeproto/Config.in
deleted file mode 100644
index 136900a07d..0000000000
--- a/package/x11r7/xproto_compositeproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_COMPOSITEPROTO
- bool "compositeproto"
- help
- X.Org Composite protocol headers
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.hash b/package/x11r7/xproto_compositeproto/xproto_compositeproto.hash
deleted file mode 100644
index c6ef73c213..0000000000
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1193
-md5 98482f65ba1e74a08bf5b056a4031ef0 compositeproto-0.4.2.tar.bz2
-sha1 aa7b5abcfd5bbfad7cb681ce89dc1d6e381e3044 compositeproto-0.4.2.tar.bz2
diff --git a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk b/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
deleted file mode 100644
index 21613582ec..0000000000
--- a/package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_compositeproto
-#
-################################################################################
-
-XPROTO_COMPOSITEPROTO_VERSION = 0.4.2
-XPROTO_COMPOSITEPROTO_SOURCE = compositeproto-$(XPROTO_COMPOSITEPROTO_VERSION).tar.bz2
-XPROTO_COMPOSITEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_COMPOSITEPROTO_LICENSE = MIT
-XPROTO_COMPOSITEPROTO_LICENSE_FILES = COPYING
-XPROTO_COMPOSITEPROTO_INSTALL_STAGING = YES
-XPROTO_COMPOSITEPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_damageproto/Config.in b/package/x11r7/xproto_damageproto/Config.in
deleted file mode 100644
index 068ed2b406..0000000000
--- a/package/x11r7/xproto_damageproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_DAMAGEPROTO
- bool "damageproto"
- help
- X.Org Damage protocol headers
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.hash b/package/x11r7/xproto_damageproto/xproto_damageproto.hash
deleted file mode 100644
index e5064b62a5..0000000000
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1194
-md5 998e5904764b82642cc63d97b4ba9e95 damageproto-1.2.1.tar.bz2
-sha1 bd0f0f4dc8f37eaabd9279d10fe2889710507358 damageproto-1.2.1.tar.bz2
diff --git a/package/x11r7/xproto_damageproto/xproto_damageproto.mk b/package/x11r7/xproto_damageproto/xproto_damageproto.mk
deleted file mode 100644
index 0311ea4901..0000000000
--- a/package/x11r7/xproto_damageproto/xproto_damageproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_damageproto
-#
-################################################################################
-
-XPROTO_DAMAGEPROTO_VERSION = 1.2.1
-XPROTO_DAMAGEPROTO_SOURCE = damageproto-$(XPROTO_DAMAGEPROTO_VERSION).tar.bz2
-XPROTO_DAMAGEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DAMAGEPROTO_LICENSE = MIT
-XPROTO_DAMAGEPROTO_LICENSE_FILES = COPYING
-XPROTO_DAMAGEPROTO_INSTALL_STAGING = YES
-XPROTO_DAMAGEPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_dmxproto/Config.in b/package/x11r7/xproto_dmxproto/Config.in
deleted file mode 100644
index dc048b1fd1..0000000000
--- a/package/x11r7/xproto_dmxproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_DMXPROTO
- bool "dmxproto"
- help
- X.Org DMX protocol headers
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.hash b/package/x11r7/xproto_dmxproto/xproto_dmxproto.hash
deleted file mode 100644
index 041f580e47..0000000000
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1306
-md5 4ee175bbd44d05c34d43bb129be5098a dmxproto-2.3.1.tar.bz2
-sha1 3b8b273b8ef3d8dbab998df9ec1dddf99edf4d91 dmxproto-2.3.1.tar.bz2
diff --git a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk b/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
deleted file mode 100644
index 4cc795c212..0000000000
--- a/package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_dmxproto
-#
-################################################################################
-
-XPROTO_DMXPROTO_VERSION = 2.3.1
-XPROTO_DMXPROTO_SOURCE = dmxproto-$(XPROTO_DMXPROTO_VERSION).tar.bz2
-XPROTO_DMXPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DMXPROTO_LICENSE = MIT
-XPROTO_DMXPROTO_LICENSE_FILES = COPYING
-XPROTO_DMXPROTO_INSTALL_STAGING = YES
-XPROTO_DMXPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_dri2proto/Config.in b/package/x11r7/xproto_dri2proto/Config.in
deleted file mode 100644
index 3fe5aa1ad1..0000000000
--- a/package/x11r7/xproto_dri2proto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_DRI2PROTO
- bool "dri2proto"
- help
- X.Org DRI2 protocol headers
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.hash b/package/x11r7/xproto_dri2proto/xproto_dri2proto.hash
deleted file mode 100644
index e3ea0bc1e9..0000000000
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1731
-sha256 f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04 dri2proto-2.8.tar.bz2
diff --git a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk b/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
deleted file mode 100644
index e4ed7d8bf8..0000000000
--- a/package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_dri2proto
-#
-################################################################################
-
-XPROTO_DRI2PROTO_VERSION = 2.8
-XPROTO_DRI2PROTO_SOURCE = dri2proto-$(XPROTO_DRI2PROTO_VERSION).tar.bz2
-XPROTO_DRI2PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DRI2PROTO_LICENSE = MIT
-XPROTO_DRI2PROTO_LICENSE_FILES = COPYING
-XPROTO_DRI2PROTO_INSTALL_STAGING = YES
-XPROTO_DRI2PROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_dri3proto/Config.in b/package/x11r7/xproto_dri3proto/Config.in
deleted file mode 100644
index eead7d4784..0000000000
--- a/package/x11r7/xproto_dri3proto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_DRI3PROTO
- bool "dri3proto"
- help
- X.Org DRI3 protocol headers
diff --git a/package/x11r7/xproto_dri3proto/xproto_dri3proto.hash b/package/x11r7/xproto_dri3proto/xproto_dri3proto.hash
deleted file mode 100644
index 6e1da4d3f2..0000000000
--- a/package/x11r7/xproto_dri3proto/xproto_dri3proto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/2079
-sha256 01be49d70200518b9a6b297131f6cc71f4ea2de17436896af153226a774fc074 dri3proto-1.0.tar.bz2
diff --git a/package/x11r7/xproto_dri3proto/xproto_dri3proto.mk b/package/x11r7/xproto_dri3proto/xproto_dri3proto.mk
deleted file mode 100644
index bdbff74ffc..0000000000
--- a/package/x11r7/xproto_dri3proto/xproto_dri3proto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_dri3proto
-#
-################################################################################
-
-XPROTO_DRI3PROTO_VERSION = 1.0
-XPROTO_DRI3PROTO_SOURCE = dri3proto-$(XPROTO_DRI3PROTO_VERSION).tar.bz2
-XPROTO_DRI3PROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_DRI3PROTO_LICENSE = MIT
-XPROTO_DRI3PROTO_INSTALL_STAGING = YES
-# this package does not contain any binary files
-XPROTO_DRI3PROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_fixesproto/Config.in b/package/x11r7/xproto_fixesproto/Config.in
deleted file mode 100644
index d419fa13d1..0000000000
--- a/package/x11r7/xproto_fixesproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_FIXESPROTO
- bool "fixesproto"
- help
- X.Org Fixes protocol headers
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.hash b/package/x11r7/xproto_fixesproto/xproto_fixesproto.hash
deleted file mode 100644
index d19f392442..0000000000
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1352
-md5 e7431ab84d37b2678af71e29355e101d fixesproto-5.0.tar.bz2
-sha1 ab605af5da8c98c0c2f8b2c578fed7c864ee996a fixesproto-5.0.tar.bz2
diff --git a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk b/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
deleted file mode 100644
index 55212b2678..0000000000
--- a/package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_fixesproto
-#
-################################################################################
-
-XPROTO_FIXESPROTO_VERSION = 5.0
-XPROTO_FIXESPROTO_SOURCE = fixesproto-$(XPROTO_FIXESPROTO_VERSION).tar.bz2
-XPROTO_FIXESPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FIXESPROTO_LICENSE = MIT
-XPROTO_FIXESPROTO_LICENSE_FILES = COPYING
-XPROTO_FIXESPROTO_INSTALL_STAGING = YES
-XPROTO_FIXESPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontcacheproto/Config.in b/package/x11r7/xproto_fontcacheproto/Config.in
deleted file mode 100644
index daa6c7f20b..0000000000
--- a/package/x11r7/xproto_fontcacheproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_FONTCACHEPROTO
- bool "fontcacheproto"
- help
- X.Org Fontcache protocol headers
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash
deleted file mode 100644
index 7363e224bb..0000000000
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/834
-md5 a8a50e5e995bfacb0359575faf7f6906 fontcacheproto-0.1.3.tar.bz2
-sha1 07f6ab3e1e1efe71c51f50e95851d93d2a1de773 fontcacheproto-0.1.3.tar.bz2
diff --git a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk b/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
deleted file mode 100644
index 0cb205ad59..0000000000
--- a/package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_fontcacheproto
-#
-################################################################################
-
-XPROTO_FONTCACHEPROTO_VERSION = 0.1.3
-XPROTO_FONTCACHEPROTO_SOURCE = fontcacheproto-$(XPROTO_FONTCACHEPROTO_VERSION).tar.bz2
-XPROTO_FONTCACHEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FONTCACHEPROTO_LICENSE = MIT
-XPROTO_FONTCACHEPROTO_LICENSE_FILES = COPYING
-XPROTO_FONTCACHEPROTO_INSTALL_STAGING = YES
-XPROTO_FONTCACHEPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_fontsproto/Config.in b/package/x11r7/xproto_fontsproto/Config.in
deleted file mode 100644
index b00220c277..0000000000
--- a/package/x11r7/xproto_fontsproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_FONTSPROTO
- bool "fontsproto"
- help
- X.Org Fonts protocol headers
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.hash b/package/x11r7/xproto_fontsproto/xproto_fontsproto.hash
deleted file mode 100644
index 6a21058b91..0000000000
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.freedesktop.org/archives/xorg/2014-April/056540.html
-sha256 259046b0dd9130825c4a4c479ba3591d6d0f17a33f54e294b56478729a6e5ab8 fontsproto-2.1.3.tar.bz2
diff --git a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk b/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
deleted file mode 100644
index b4e6d6a848..0000000000
--- a/package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_fontsproto
-#
-################################################################################
-
-XPROTO_FONTSPROTO_VERSION = 2.1.3
-XPROTO_FONTSPROTO_SOURCE = fontsproto-$(XPROTO_FONTSPROTO_VERSION).tar.bz2
-XPROTO_FONTSPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_FONTSPROTO_LICENSE = MIT
-XPROTO_FONTSPROTO_LICENSE_FILES = COPYING
-XPROTO_FONTSPROTO_INSTALL_STAGING = YES
-XPROTO_FONTSPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_glproto/Config.in b/package/x11r7/xproto_glproto/Config.in
deleted file mode 100644
index 28ceb9cc80..0000000000
--- a/package/x11r7/xproto_glproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_GLPROTO
- bool "glproto"
- help
- X.Org GL protocol headers
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.hash b/package/x11r7/xproto_glproto/xproto_glproto.hash
deleted file mode 100644
index fce6a22222..0000000000
--- a/package/x11r7/xproto_glproto/xproto_glproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# Locally computed
-sha256 adaa94bded310a2bfcbb9deb4d751d965fcfe6fb3a2f6d242e2df2d6589dbe40 glproto-1.4.17.tar.bz2
diff --git a/package/x11r7/xproto_glproto/xproto_glproto.mk b/package/x11r7/xproto_glproto/xproto_glproto.mk
deleted file mode 100644
index ccfc6de666..0000000000
--- a/package/x11r7/xproto_glproto/xproto_glproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_glproto
-#
-################################################################################
-
-XPROTO_GLPROTO_VERSION = 1.4.17
-XPROTO_GLPROTO_SOURCE = glproto-$(XPROTO_GLPROTO_VERSION).tar.bz2
-XPROTO_GLPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_GLPROTO_LICENSE = MIT
-XPROTO_GLPROTO_LICENSE_FILES = COPYING
-XPROTO_GLPROTO_INSTALL_STAGING = YES
-XPROTO_GLPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_inputproto/Config.in b/package/x11r7/xproto_inputproto/Config.in
deleted file mode 100644
index fcccb26cac..0000000000
--- a/package/x11r7/xproto_inputproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_INPUTPROTO
- bool "inputproto"
- help
- X.Org Input protocol headers
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.hash b/package/x11r7/xproto_inputproto/xproto_inputproto.hash
deleted file mode 100644
index 4ecdddc56d..0000000000
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://lists.freedesktop.org/archives/xorg-announce/2016-April/002682.html
-sha256 893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d inputproto-2.3.2.tar.bz2
diff --git a/package/x11r7/xproto_inputproto/xproto_inputproto.mk b/package/x11r7/xproto_inputproto/xproto_inputproto.mk
deleted file mode 100644
index 20169b5c46..0000000000
--- a/package/x11r7/xproto_inputproto/xproto_inputproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_inputproto
-#
-################################################################################
-
-XPROTO_INPUTPROTO_VERSION = 2.3.2
-XPROTO_INPUTPROTO_SOURCE = inputproto-$(XPROTO_INPUTPROTO_VERSION).tar.bz2
-XPROTO_INPUTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_INPUTPROTO_LICENSE = MIT
-XPROTO_INPUTPROTO_LICENSE_FILES = COPYING
-XPROTO_INPUTPROTO_INSTALL_STAGING = YES
-XPROTO_INPUTPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_kbproto/Config.in b/package/x11r7/xproto_kbproto/Config.in
deleted file mode 100644
index ce568d7ad8..0000000000
--- a/package/x11r7/xproto_kbproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_KBPROTO
- bool "kbproto"
- help
- X.Org KB protocol headers
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.hash b/package/x11r7/xproto_kbproto/xproto_kbproto.hash
deleted file mode 100644
index c98e595a16..0000000000
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2015-April/002595.html
-sha256 f882210b76376e3fa006b11dbd890e56ec0942bc56e65d1249ff4af86f90b857 kbproto-1.0.7.tar.bz2
diff --git a/package/x11r7/xproto_kbproto/xproto_kbproto.mk b/package/x11r7/xproto_kbproto/xproto_kbproto.mk
deleted file mode 100644
index b6c818f705..0000000000
--- a/package/x11r7/xproto_kbproto/xproto_kbproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_kbproto
-#
-################################################################################
-
-XPROTO_KBPROTO_VERSION = 1.0.7
-XPROTO_KBPROTO_SOURCE = kbproto-$(XPROTO_KBPROTO_VERSION).tar.bz2
-XPROTO_KBPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_KBPROTO_LICENSE = MIT
-XPROTO_KBPROTO_LICENSE_FILES = COPYING
-XPROTO_KBPROTO_INSTALL_STAGING = YES
-XPROTO_KBPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_presentproto/Config.in b/package/x11r7/xproto_presentproto/Config.in
deleted file mode 100644
index 586008df4a..0000000000
--- a/package/x11r7/xproto_presentproto/Config.in
+++ /dev/null
@@ -1,5 +0,0 @@
-config BR2_PACKAGE_XPROTO_PRESENTPROTO
- bool "presentproto"
- select BR2_PACKAGE_XUTIL_UTIL_MACROS
- help
- X.Org Present extension headers
diff --git a/package/x11r7/xproto_presentproto/xproto_presentproto.hash b/package/x11r7/xproto_presentproto/xproto_presentproto.hash
deleted file mode 100644
index aa45d9167e..0000000000
--- a/package/x11r7/xproto_presentproto/xproto_presentproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://lists.x.org/archives/xorg-announce/2017-January/002770.html
-sha256 f69b23a8869f78a5898aaf53938b829c8165e597cda34f06024d43ee1e6d26b9 presentproto-1.1.tar.bz2
diff --git a/package/x11r7/xproto_presentproto/xproto_presentproto.mk b/package/x11r7/xproto_presentproto/xproto_presentproto.mk
deleted file mode 100644
index 0097b9cddb..0000000000
--- a/package/x11r7/xproto_presentproto/xproto_presentproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_presentproto
-#
-################################################################################
-
-XPROTO_PRESENTPROTO_VERSION = 1.1
-XPROTO_PRESENTPROTO_SOURCE = presentproto-$(XPROTO_PRESENTPROTO_VERSION).tar.bz2
-XPROTO_PRESENTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_PRESENTPROTO_LICENSE = MIT
-XPROTO_PRESENTPROTO_LICENSE_FILES = presentproto.h
-XPROTO_PRESENTPROTO_DEPENDENCIES = host-pkgconf xutil_util-macros
-XPROTO_PRESENTPROTO_INSTALL_STAGING = YES
-XPROTO_PRESENTPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_randrproto/Config.in b/package/x11r7/xproto_randrproto/Config.in
deleted file mode 100644
index 097ec8f220..0000000000
--- a/package/x11r7/xproto_randrproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_RANDRPROTO
- bool "randrproto"
- help
- X.Org Randr protocol headers
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.hash b/package/x11r7/xproto_randrproto/xproto_randrproto.hash
deleted file mode 100644
index c71df7f8a0..0000000000
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2015-May/002605.html
-sha1 bc420745dc4af011988e9dcabdadf8829cbc2374 randrproto-1.5.0.tar.bz2
-sha256 4c675533e79cd730997d232c8894b6692174dce58d3e207021b8f860be498468 randrproto-1.5.0.tar.bz2
diff --git a/package/x11r7/xproto_randrproto/xproto_randrproto.mk b/package/x11r7/xproto_randrproto/xproto_randrproto.mk
deleted file mode 100644
index f6c4878104..0000000000
--- a/package/x11r7/xproto_randrproto/xproto_randrproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_randrproto
-#
-################################################################################
-
-XPROTO_RANDRPROTO_VERSION = 1.5.0
-XPROTO_RANDRPROTO_SOURCE = randrproto-$(XPROTO_RANDRPROTO_VERSION).tar.bz2
-XPROTO_RANDRPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RANDRPROTO_LICENSE = MIT
-XPROTO_RANDRPROTO_LICENSE_FILES = COPYING
-XPROTO_RANDRPROTO_INSTALL_STAGING = YES
-XPROTO_RANDRPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_recordproto/Config.in b/package/x11r7/xproto_recordproto/Config.in
deleted file mode 100644
index 9fd5b884f8..0000000000
--- a/package/x11r7/xproto_recordproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_RECORDPROTO
- bool "recordproto"
- help
- X.Org Record protocol headers
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.hash b/package/x11r7/xproto_recordproto/xproto_recordproto.hash
deleted file mode 100644
index bc03f8c4b5..0000000000
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 a777548d2e92aa259f1528de3c4a36d15e07a4650d0976573a8e2ff5437e7370 recordproto-1.14.2.tar.bz2
diff --git a/package/x11r7/xproto_recordproto/xproto_recordproto.mk b/package/x11r7/xproto_recordproto/xproto_recordproto.mk
deleted file mode 100644
index 2d2cceac22..0000000000
--- a/package/x11r7/xproto_recordproto/xproto_recordproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_recordproto
-#
-################################################################################
-
-XPROTO_RECORDPROTO_VERSION = 1.14.2
-XPROTO_RECORDPROTO_SOURCE = recordproto-$(XPROTO_RECORDPROTO_VERSION).tar.bz2
-XPROTO_RECORDPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RECORDPROTO_LICENSE = MIT
-XPROTO_RECORDPROTO_LICENSE_FILES = COPYING
-XPROTO_RECORDPROTO_INSTALL_STAGING = YES
-XPROTO_RECORDPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_renderproto/Config.in b/package/x11r7/xproto_renderproto/Config.in
deleted file mode 100644
index 5b5806fa47..0000000000
--- a/package/x11r7/xproto_renderproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_RENDERPROTO
- bool "renderproto"
- help
- X.Org Render protocol headers
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.hash b/package/x11r7/xproto_renderproto/xproto_renderproto.hash
deleted file mode 100644
index 92763da921..0000000000
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 06735a5b92b20759204e4751ecd6064a2ad8a6246bb65b3078b862a00def2537 renderproto-0.11.1.tar.bz2
diff --git a/package/x11r7/xproto_renderproto/xproto_renderproto.mk b/package/x11r7/xproto_renderproto/xproto_renderproto.mk
deleted file mode 100644
index 41a8445409..0000000000
--- a/package/x11r7/xproto_renderproto/xproto_renderproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_renderproto
-#
-################################################################################
-
-XPROTO_RENDERPROTO_VERSION = 0.11.1
-XPROTO_RENDERPROTO_SOURCE = renderproto-$(XPROTO_RENDERPROTO_VERSION).tar.bz2
-XPROTO_RENDERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RENDERPROTO_LICENSE = MIT
-XPROTO_RENDERPROTO_LICENSE_FILES = COPYING
-XPROTO_RENDERPROTO_INSTALL_STAGING = YES
-XPROTO_RENDERPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_resourceproto/Config.in b/package/x11r7/xproto_resourceproto/Config.in
deleted file mode 100644
index 4aec708c4a..0000000000
--- a/package/x11r7/xproto_resourceproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_RESOURCEPROTO
- bool "resourceproto"
- help
- X.Org Resource protocol headers
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.hash b/package/x11r7/xproto_resourceproto/xproto_resourceproto.hash
deleted file mode 100644
index 5ceb1c04ae..0000000000
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1404
-md5 cfdb57dae221b71b2703f8e2980eaaf4 resourceproto-1.2.0.tar.bz2
-sha1 9ff9bb9243b0474330959dc3853973523c9dd9ce resourceproto-1.2.0.tar.bz2
diff --git a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk b/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
deleted file mode 100644
index 960ca13372..0000000000
--- a/package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_resourceproto
-#
-################################################################################
-
-XPROTO_RESOURCEPROTO_VERSION = 1.2.0
-XPROTO_RESOURCEPROTO_SOURCE = resourceproto-$(XPROTO_RESOURCEPROTO_VERSION).tar.bz2
-XPROTO_RESOURCEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_RESOURCEPROTO_LICENSE = MIT
-XPROTO_RESOURCEPROTO_LICENSE_FILES = COPYING
-XPROTO_RESOURCEPROTO_INSTALL_STAGING = YES
-XPROTO_RESOURCEPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_scrnsaverproto/Config.in b/package/x11r7/xproto_scrnsaverproto/Config.in
deleted file mode 100644
index 83176a0d56..0000000000
--- a/package/x11r7/xproto_scrnsaverproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_SCRNSAVERPROTO
- bool "scrnsaverproto"
- help
- X.Org ScrnSaver protocol headers
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash
deleted file mode 100644
index 36c10362b2..0000000000
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 8bb70a8da164930cceaeb4c74180291660533ad3cc45377b30a795d1b85bcd65 scrnsaverproto-1.2.2.tar.bz2
diff --git a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk b/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
deleted file mode 100644
index 57047cf5a7..0000000000
--- a/package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_scrnsaverproto
-#
-################################################################################
-
-XPROTO_SCRNSAVERPROTO_VERSION = 1.2.2
-XPROTO_SCRNSAVERPROTO_SOURCE = scrnsaverproto-$(XPROTO_SCRNSAVERPROTO_VERSION).tar.bz2
-XPROTO_SCRNSAVERPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_SCRNSAVERPROTO_LICENSE = MIT
-XPROTO_SCRNSAVERPROTO_LICENSE_FILES = COPYING
-XPROTO_SCRNSAVERPROTO_INSTALL_STAGING = YES
-XPROTO_SCRNSAVERPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_videoproto/Config.in b/package/x11r7/xproto_videoproto/Config.in
deleted file mode 100644
index 271c78f39d..0000000000
--- a/package/x11r7/xproto_videoproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_VIDEOPROTO
- bool "videoproto"
- help
- X.Org Video protocol headers
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.hash b/package/x11r7/xproto_videoproto/xproto_videoproto.hash
deleted file mode 100644
index 471a0a394b..0000000000
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://lists.freedesktop.org/archives/xorg-announce/2016-March/002680.html
-sha256 c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702 videoproto-2.3.3.tar.bz2
diff --git a/package/x11r7/xproto_videoproto/xproto_videoproto.mk b/package/x11r7/xproto_videoproto/xproto_videoproto.mk
deleted file mode 100644
index 896398fc7b..0000000000
--- a/package/x11r7/xproto_videoproto/xproto_videoproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_videoproto
-#
-################################################################################
-
-XPROTO_VIDEOPROTO_VERSION = 2.3.3
-XPROTO_VIDEOPROTO_SOURCE = videoproto-$(XPROTO_VIDEOPROTO_VERSION).tar.bz2
-XPROTO_VIDEOPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_VIDEOPROTO_LICENSE = MIT
-XPROTO_VIDEOPROTO_LICENSE_FILES = COPYING
-XPROTO_VIDEOPROTO_INSTALL_STAGING = YES
-XPROTO_VIDEOPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_windowswmproto/Config.in b/package/x11r7/xproto_windowswmproto/Config.in
deleted file mode 100644
index d1a36acc51..0000000000
--- a/package/x11r7/xproto_windowswmproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_WINDOWSWMPROTO
- bool "windowswmproto"
- help
- No description available
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash
deleted file mode 100644
index eb96c5fa96..0000000000
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/835
-md5 e74b2ff3172a6117f2a62b655ef99064 windowswmproto-1.0.4.tar.bz2
-sha1 1c9b522c66325f08bb989700b4b31911b6ae60ae windowswmproto-1.0.4.tar.bz2
diff --git a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk b/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
deleted file mode 100644
index 067bccf01a..0000000000
--- a/package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_windowswmproto
-#
-################################################################################
-
-XPROTO_WINDOWSWMPROTO_VERSION = 1.0.4
-XPROTO_WINDOWSWMPROTO_SOURCE = windowswmproto-$(XPROTO_WINDOWSWMPROTO_VERSION).tar.bz2
-XPROTO_WINDOWSWMPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_WINDOWSWMPROTO_LICENSE = MIT
-XPROTO_WINDOWSWMPROTO_LICENSE_FILES = COPYING
-XPROTO_WINDOWSWMPROTO_INSTALL_STAGING = YES
-XPROTO_WINDOWSWMPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xcmiscproto/Config.in b/package/x11r7/xproto_xcmiscproto/Config.in
deleted file mode 100644
index f7ba153499..0000000000
--- a/package/x11r7/xproto_xcmiscproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XCMISCPROTO
- bool "xcmiscproto"
- help
- X.Org XCMisc protocol headers
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash
deleted file mode 100644
index 08eb58bd39..0000000000
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://www.x.org/archive/current/src/everything/CHECKSUMS
-sha256 b13236869372256c36db79ae39d54214172677fb79e9cdc555dceec80bd9d2df xcmiscproto-1.2.2.tar.bz2
diff --git a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk b/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
deleted file mode 100644
index 3bef2e9792..0000000000
--- a/package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# xproto_xcmiscproto
-#
-################################################################################
-
-XPROTO_XCMISCPROTO_VERSION = 1.2.2
-XPROTO_XCMISCPROTO_SOURCE = xcmiscproto-$(XPROTO_XCMISCPROTO_VERSION).tar.bz2
-XPROTO_XCMISCPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XCMISCPROTO_LICENSE = MIT
-XPROTO_XCMISCPROTO_LICENSE_FILES = COPYING
-XPROTO_XCMISCPROTO_INSTALL_STAGING = YES
-XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
-HOST_XPROTO_XCMISCPROTO_CONF_OPTS = --disable-specs
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xextproto/Config.in b/package/x11r7/xproto_xextproto/Config.in
deleted file mode 100644
index d80d76ceed..0000000000
--- a/package/x11r7/xproto_xextproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XEXTPROTO
- bool "xextproto"
- help
- X.Org XExt protocol headers
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.hash b/package/x11r7/xproto_xextproto/xproto_xextproto.hash
deleted file mode 100644
index 258c4ec7e5..0000000000
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.freedesktop.org/pipermail/xorg/2013-December/056256.html
-sha256 f3f4b23ac8db9c3a9e0d8edb591713f3d70ef9c3b175970dd8823dfc92aa5bb0 xextproto-7.3.0.tar.bz2
diff --git a/package/x11r7/xproto_xextproto/xproto_xextproto.mk b/package/x11r7/xproto_xextproto/xproto_xextproto.mk
deleted file mode 100644
index c17dd938b7..0000000000
--- a/package/x11r7/xproto_xextproto/xproto_xextproto.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-################################################################################
-#
-# xproto_xextproto
-#
-################################################################################
-
-XPROTO_XEXTPROTO_VERSION = 7.3.0
-XPROTO_XEXTPROTO_SOURCE = xextproto-$(XPROTO_XEXTPROTO_VERSION).tar.bz2
-XPROTO_XEXTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XEXTPROTO_LICENSE = MIT
-XPROTO_XEXTPROTO_LICENSE_FILES = COPYING
-XPROTO_XEXTPROTO_INSTALL_STAGING = YES
-XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
-HOST_XPROTO_XEXTPROTO_CONF_OPTS = --disable-specs
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xf86bigfontproto/Config.in b/package/x11r7/xproto_xf86bigfontproto/Config.in
deleted file mode 100644
index 7af30d03d7..0000000000
--- a/package/x11r7/xproto_xf86bigfontproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
- bool "xf86bigfontproto"
- help
- X.Org XF86BigFont protocol headers
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash
deleted file mode 100644
index b0ab8aeb20..0000000000
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/734
-md5 120e226ede5a4687b25dd357cc9b8efe xf86bigfontproto-1.2.0.tar.bz2
-sha1 312a2ea708b257520c1af4393b69d73a393a478f xf86bigfontproto-1.2.0.tar.bz2
diff --git a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk b/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
deleted file mode 100644
index f88f5ecace..0000000000
--- a/package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_xf86bigfontproto
-#
-################################################################################
-
-XPROTO_XF86BIGFONTPROTO_VERSION = 1.2.0
-XPROTO_XF86BIGFONTPROTO_SOURCE = xf86bigfontproto-$(XPROTO_XF86BIGFONTPROTO_VERSION).tar.bz2
-XPROTO_XF86BIGFONTPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86BIGFONTPROTO_LICENSE = MIT
-XPROTO_XF86BIGFONTPROTO_LICENSE_FILES = COPYING
-XPROTO_XF86BIGFONTPROTO_INSTALL_STAGING = YES
-XPROTO_XF86BIGFONTPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xf86dgaproto/Config.in b/package/x11r7/xproto_xf86dgaproto/Config.in
deleted file mode 100644
index 7561b8a6dc..0000000000
--- a/package/x11r7/xproto_xf86dgaproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86DGAPROTO
- bool "xf86dgaproto"
- help
- X.Org XF86DGA protocol headers
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash
deleted file mode 100644
index 36284fcd52..0000000000
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/817
-md5 a036dc2fcbf052ec10621fd48b68dbb1 xf86dgaproto-2.1.tar.bz2
-sha1 97a06120e7195c968875e8ba42e82c90ab54948b xf86dgaproto-2.1.tar.bz2
diff --git a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk b/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
deleted file mode 100644
index d671bf0094..0000000000
--- a/package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_xf86dgaproto
-#
-################################################################################
-
-XPROTO_XF86DGAPROTO_VERSION = 2.1
-XPROTO_XF86DGAPROTO_SOURCE = xf86dgaproto-$(XPROTO_XF86DGAPROTO_VERSION).tar.bz2
-XPROTO_XF86DGAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86DGAPROTO_LICENSE = MIT
-XPROTO_XF86DGAPROTO_LICENSE_FILES = COPYING
-XPROTO_XF86DGAPROTO_INSTALL_STAGING = YES
-XPROTO_XF86DGAPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xf86driproto/Config.in b/package/x11r7/xproto_xf86driproto/Config.in
deleted file mode 100644
index 8aeac87286..0000000000
--- a/package/x11r7/xproto_xf86driproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86DRIPROTO
- bool "xf86driproto"
- help
- X.Org XF86DRI protocol headers
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash
deleted file mode 100644
index 85d4bfcc9e..0000000000
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1310
-md5 1d716d0dac3b664e5ee20c69d34bc10e xf86driproto-2.1.1.tar.bz2
-sha1 23e861f40ba0f0cbbfd7db7ba2ef623762ffca17 xf86driproto-2.1.1.tar.bz2
diff --git a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk b/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
deleted file mode 100644
index e6bb0f12f1..0000000000
--- a/package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_xf86driproto
-#
-################################################################################
-
-XPROTO_XF86DRIPROTO_VERSION = 2.1.1
-XPROTO_XF86DRIPROTO_SOURCE = xf86driproto-$(XPROTO_XF86DRIPROTO_VERSION).tar.bz2
-XPROTO_XF86DRIPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86DRIPROTO_LICENSE = MIT
-XPROTO_XF86DRIPROTO_LICENSE_FILES = COPYING
-XPROTO_XF86DRIPROTO_INSTALL_STAGING = YES
-XPROTO_XF86DRIPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xf86vidmodeproto/Config.in b/package/x11r7/xproto_xf86vidmodeproto/Config.in
deleted file mode 100644
index 395c175861..0000000000
--- a/package/x11r7/xproto_xf86vidmodeproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
- bool "xf86vidmodeproto"
- help
- X.Org XF86VidMode protocol headers
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash
deleted file mode 100644
index d80749be60..0000000000
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1311
-md5 e793ecefeaecfeabd1aed6a01095174e xf86vidmodeproto-2.3.1.tar.bz2
-sha1 11d54c3210887631ea71e8f8030a77692e964fc4 xf86vidmodeproto-2.3.1.tar.bz2
diff --git a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk b/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
deleted file mode 100644
index 41637983a6..0000000000
--- a/package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_xf86vidmodeproto
-#
-################################################################################
-
-XPROTO_XF86VIDMODEPROTO_VERSION = 2.3.1
-XPROTO_XF86VIDMODEPROTO_SOURCE = xf86vidmodeproto-$(XPROTO_XF86VIDMODEPROTO_VERSION).tar.bz2
-XPROTO_XF86VIDMODEPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XF86VIDMODEPROTO_LICENSE = MIT
-XPROTO_XF86VIDMODEPROTO_LICENSE_FILES = COPYING
-XPROTO_XF86VIDMODEPROTO_INSTALL_STAGING = YES
-XPROTO_XF86VIDMODEPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xineramaproto/Config.in b/package/x11r7/xproto_xineramaproto/Config.in
deleted file mode 100644
index 12c8e05b16..0000000000
--- a/package/x11r7/xproto_xineramaproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XINERAMAPROTO
- bool "xineramaproto"
- help
- X.Org Xinerama protocol headers
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash
deleted file mode 100644
index 162c994898..0000000000
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash
+++ /dev/null
@@ -1,3 +0,0 @@
-# From http://article.gmane.org/gmane.comp.freedesktop.xorg.announce/1312
-md5 9959fe0bfb22a0e7260433b8d199590a xineramaproto-1.2.1.tar.bz2
-sha1 818bffc16139d6e3de4344c83f00c495d3536753 xineramaproto-1.2.1.tar.bz2
diff --git a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk b/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
deleted file mode 100644
index 4c9ae11d28..0000000000
--- a/package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_xineramaproto
-#
-################################################################################
-
-XPROTO_XINERAMAPROTO_VERSION = 1.2.1
-XPROTO_XINERAMAPROTO_SOURCE = xineramaproto-$(XPROTO_XINERAMAPROTO_VERSION).tar.bz2
-XPROTO_XINERAMAPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XINERAMAPROTO_LICENSE = MIT
-XPROTO_XINERAMAPROTO_LICENSE_FILES = COPYING
-XPROTO_XINERAMAPROTO_INSTALL_STAGING = YES
-XPROTO_XINERAMAPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
diff --git a/package/x11r7/xproto_xproto/Config.in b/package/x11r7/xproto_xproto/Config.in
deleted file mode 100644
index a5f88ef7c2..0000000000
--- a/package/x11r7/xproto_xproto/Config.in
+++ /dev/null
@@ -1,4 +0,0 @@
-config BR2_PACKAGE_XPROTO_XPROTO
- bool "xproto"
- help
- X.Org xproto protocol headers
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.hash b/package/x11r7/xproto_xproto/xproto_xproto.hash
deleted file mode 100644
index 4b77d256af..0000000000
--- a/package/x11r7/xproto_xproto/xproto_xproto.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From https://lists.x.org/archives/xorg-announce/2016-September/002713.html
-sha256 c6f9747da0bd3a95f86b17fb8dd5e717c8f3ab7f0ece3ba1b247899ec1ef7747 xproto-7.0.31.tar.bz2
diff --git a/package/x11r7/xproto_xproto/xproto_xproto.mk b/package/x11r7/xproto_xproto/xproto_xproto.mk
deleted file mode 100644
index 76f9d32b19..0000000000
--- a/package/x11r7/xproto_xproto/xproto_xproto.mk
+++ /dev/null
@@ -1,16 +0,0 @@
-################################################################################
-#
-# xproto_xproto
-#
-################################################################################
-
-XPROTO_XPROTO_VERSION = 7.0.31
-XPROTO_XPROTO_SOURCE = xproto-$(XPROTO_XPROTO_VERSION).tar.bz2
-XPROTO_XPROTO_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XPROTO_LICENSE = MIT
-XPROTO_XPROTO_LICENSE_FILES = COPYING
-XPROTO_XPROTO_INSTALL_STAGING = YES
-XPROTO_XPROTO_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
-$(eval $(host-autotools-package))
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/Config.in b/package/x11r7/xproto_xproxymanagementprotocol/Config.in
deleted file mode 100644
index bb31f03065..0000000000
--- a/package/x11r7/xproto_xproxymanagementprotocol/Config.in
+++ /dev/null
@@ -1,6 +0,0 @@
-config BR2_PACKAGE_XPROTO_XPROXYMANAGEMENTPROTOCOL
- bool "xproxymanagementprotocol"
- help
- The Proxy Management Protocol is an ICE based protocol that
- provides a way for application servers to easily locate
- proxy services available to them.
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash
deleted file mode 100644
index 27a9dfa8a4..0000000000
--- a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash
+++ /dev/null
@@ -1,2 +0,0 @@
-# From http://lists.x.org/archives/xorg-announce/2009-October/001150.html
-sha1 4abb036371670ecc25d32e48b3277fe203ae5203 xproxymanagementprotocol-1.0.3.tar.bz2
diff --git a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk b/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
deleted file mode 100644
index a48269aa13..0000000000
--- a/package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-################################################################################
-#
-# xproto_xproxymanagementprotocol
-#
-################################################################################
-
-XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION = 1.0.3
-XPROTO_XPROXYMANAGEMENTPROTOCOL_SOURCE = xproxymanagementprotocol-$(XPROTO_XPROXYMANAGEMENTPROTOCOL_VERSION).tar.bz2
-XPROTO_XPROXYMANAGEMENTPROTOCOL_SITE = http://xorg.freedesktop.org/releases/individual/proto
-XPROTO_XPROXYMANAGEMENTPROTOCOL_LICENSE = MIT
-XPROTO_XPROXYMANAGEMENTPROTOCOL_LICENSE_FILES = COPYING
-XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_STAGING = YES
-XPROTO_XPROXYMANAGEMENTPROTOCOL_INSTALL_TARGET = NO
-
-$(eval $(autotools-package))
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 15/22] package/x11r7/xdriver_xf86-video-intel: bump version
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (13 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 14/22] package/x11r7/xproto_*: mass removal Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-03 21:39 ` Yann E. MORIN
2018-06-30 11:08 ` [Buildroot] [PATCH v3 16/22] package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6 Bernd Kuhls
` (7 subsequent siblings)
22 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
This version bump includes
https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=359477215092ac1b602ad1e2f17a28963d9224c2
which is needed for compatibility with upcoming xserver_xorg-server
1.20.0.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash | 2 +-
.../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
index 1852540cb3..469649ec30 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 e3a107fadcdeef35830a12a305b09dfa793a33a54930a0ecd5e84a6156f546eb xdriver_xf86-video-intel-84eaaba2737b2765f3fe843a138002ad0056a52b.tar.gz
+sha256 8a008db80964700c57db407fe9fab78884d6919bd5343a269f681625132b4687 xdriver_xf86-video-intel-3d395062ce73f85e8340218df01c2ebf4bc25023.tar.gz
sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING
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 31cdf4b065..66b0f9defe 100644
--- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
+++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_INTEL_VERSION = 84eaaba2737b2765f3fe843a138002ad0056a52b
+XDRIVER_XF86_VIDEO_INTEL_VERSION = 3d395062ce73f85e8340218df01c2ebf4bc25023
XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 15/22] package/x11r7/xdriver_xf86-video-intel: bump version
2018-06-30 11:08 ` [Buildroot] [PATCH v3 15/22] package/x11r7/xdriver_xf86-video-intel: bump version Bernd Kuhls
@ 2018-07-03 21:39 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-03 21:39 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> This version bump includes
>
> https://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=359477215092ac1b602ad1e2f17a28963d9224c2
>
> which is needed for compatibility with upcoming xserver_xorg-server
> 1.20.0.
>
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Too bad the intel driver has not tagged any release in almost 4 years
now... :-/
Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Regards,
Yann E. MORIN.
> ---
> .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash | 2 +-
> .../x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
> index 1852540cb3..469649ec30 100644
> --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
> +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.hash
> @@ -1,3 +1,3 @@
> # Locally computed
> -sha256 e3a107fadcdeef35830a12a305b09dfa793a33a54930a0ecd5e84a6156f546eb xdriver_xf86-video-intel-84eaaba2737b2765f3fe843a138002ad0056a52b.tar.gz
> +sha256 8a008db80964700c57db407fe9fab78884d6919bd5343a269f681625132b4687 xdriver_xf86-video-intel-3d395062ce73f85e8340218df01c2ebf4bc25023.tar.gz
> sha256 5808e89f4b9a30afc59f335bfa8219ecf2dacb89a81d16b322bc6d92993a48fa COPYING
> 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 31cdf4b065..66b0f9defe 100644
> --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
> +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk
> @@ -4,7 +4,7 @@
> #
> ################################################################################
>
> -XDRIVER_XF86_VIDEO_INTEL_VERSION = 84eaaba2737b2765f3fe843a138002ad0056a52b
> +XDRIVER_XF86_VIDEO_INTEL_VERSION = 3d395062ce73f85e8340218df01c2ebf4bc25023
> XDRIVER_XF86_VIDEO_INTEL_SITE = git://anongit.freedesktop.org/xorg/driver/xf86-video-intel
> XDRIVER_XF86_VIDEO_INTEL_LICENSE = MIT
> XDRIVER_XF86_VIDEO_INTEL_LICENSE_FILES = COPYING
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 16/22] package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (14 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 15/22] package/x11r7/xdriver_xf86-video-intel: bump version Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 17/22] package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0 Bernd Kuhls
` (6 subsequent siblings)
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-video-mach64.hash | 9 +++++++--
.../xdriver_xf86-video-mach64.mk | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
index 43a7fa707e..55acd74652 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.hash
@@ -1,2 +1,7 @@
-# From http://lists.x.org/archives/xorg-announce/2015-May/002599.html
-sha256 3e98985b6e044189efd42342862208f472881c25debf22230a1d54a96d71b41f xf86-video-mach64-6.9.5.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-May/002896.html
+md5 0e12f9a3b5659e1e27e03adc42b04d99 xf86-video-mach64-6.9.6.tar.bz2
+sha1 1fdf0c3488ab88cb46b563efee166a5d54a01932 xf86-video-mach64-6.9.6.tar.bz2
+sha256 7a0707c71bb522430f83bb5e9d9ee697e661e35534a3a2d10834f86b327a3c9c xf86-video-mach64-6.9.6.tar.bz2
+sha512 687f6ac60491b704d5c4788463763d2f4bf725611e10bd2163156963fe0a8fdbffe0a1b7c737eff131f01759e43b5ec3544a7dabe66a67e85b286dcb969da2f1 xf86-video-mach64-6.9.6.tar.bz2
+# Locally computed
+sha256 a7d68021893bced0d709338a59a137c74b11e624880e110e4a2f14ccef475120 COPYING
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 7f77b4883f..e6f8d7471c 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
+++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.5
+XDRIVER_XF86_VIDEO_MACH64_VERSION = 6.9.6
XDRIVER_XF86_VIDEO_MACH64_SOURCE = xf86-video-mach64-$(XDRIVER_XF86_VIDEO_MACH64_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_MACH64_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_MACH64_LICENSE = MIT
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 17/22] package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (15 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 16/22] package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6 Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 18/22] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3 Bernd Kuhls
` (5 subsequent siblings)
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Added license hash and all hashes provided by upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-video-vmware.hash | 9 +++++++--
.../xdriver_xf86-video-vmware.mk | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
index 8d948a7d4c..f07e061478 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.hash
@@ -1,2 +1,7 @@
-# From https://lists.x.org/archives/xorg-announce/2016-November/002743.html
-sha256 e2f7f7101fba7f53b268e7a25908babbf155b3984fb5268b3d244eb6c11bf62b xf86-video-vmware-13.2.1.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-May/002895.html
+md5 08d66d062055080ff699ab4869726ea2 xf86-video-vmware-13.3.0.tar.bz2
+sha1 f01335fe6bdb507e749571bfcd69163aed97312a xf86-video-vmware-13.3.0.tar.bz2
+sha256 47971924659e51666a757269ad941a059ef5afe7a47b5101c174a6022ac4066c xf86-video-vmware-13.3.0.tar.bz2
+sha512 c318de893cae7b2b11e11c1b389ee47478b7c8d1f52c27099dbe453efec28f3e9da449217307a8c2251999eada66312f766996be1a6ead413b8b6dedc42c68ca xf86-video-vmware-13.3.0.tar.bz2
+# Locally computed
+sha256 7e59b8ca2a161855a60561f27ada8dfdbb678733eacdb23423fff6d21f9ad43b COPYING
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 3ba6b332a3..5f0cb77bf8 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
+++ b/package/x11r7/xdriver_xf86-video-vmware/xdriver_xf86-video-vmware.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.2.1
+XDRIVER_XF86_VIDEO_VMWARE_VERSION = 13.3.0
XDRIVER_XF86_VIDEO_VMWARE_SOURCE = xf86-video-vmware-$(XDRIVER_XF86_VIDEO_VMWARE_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_VMWARE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_VIDEO_VMWARE_LICENSE = MIT
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 18/22] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (16 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 17/22] package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0 Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 19/22] package/x11r7/xdriver_xf86-video-r128: add patch to fix support for xserver_xorg-server 1.20.0 Bernd Kuhls
` (4 subsequent siblings)
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Added license hash and all hashes provided by upstream.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../xdriver_xf86-input-mouse.hash | 9 +++++++--
.../xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk | 2 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
index caba427b22..551ff9d844 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.hash
@@ -1,2 +1,7 @@
-# From https://lists.x.org/archives/xorg-announce/2016-November/002740.html
-sha256 f425d5b05c6ab412a27e0a1106bb83f9e2662b307210abbe48270892387f4b2f xf86-input-mouse-1.9.2.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-June/002903.html
+md5 a2104693bbcfe1413397f7905eecd3dc xf86-input-mouse-1.9.3.tar.bz2
+sha1 b3982998808ba43117fc066c4ecc94ce67c5818e xf86-input-mouse-1.9.3.tar.bz2
+sha256 93ecb350604d05be98b7d4e5db3b8155a44890069a7d8d6b800c0bea79c85cc5 xf86-input-mouse-1.9.3.tar.bz2
+sha512 d99f5b4b1ef1aa4cbf1a92549e412f54f121bc804e4d6643248ad7ea18081b38b958bd289dc8476ebc0f6ef5f7424c2f2a8abcfaa30cae5378829549af6b148f xf86-input-mouse-1.9.3.tar.bz2
+# Locally computed
+sha256 472ff645ead9bf3ffb48d42c596376ffc595897e0c0993a071a7ada0da1f4f10 COPYING
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 88af9d2361..3886fa7aa1 100644
--- a/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
+++ b/package/x11r7/xdriver_xf86-input-mouse/xdriver_xf86-input-mouse.mk
@@ -4,7 +4,7 @@
#
################################################################################
-XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.2
+XDRIVER_XF86_INPUT_MOUSE_VERSION = 1.9.3
XDRIVER_XF86_INPUT_MOUSE_SOURCE = xf86-input-mouse-$(XDRIVER_XF86_INPUT_MOUSE_VERSION).tar.bz2
XDRIVER_XF86_INPUT_MOUSE_SITE = http://xorg.freedesktop.org/releases/individual/driver
XDRIVER_XF86_INPUT_MOUSE_LICENSE = MIT
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 19/22] package/x11r7/xdriver_xf86-video-r128: add patch to fix support for xserver_xorg-server 1.20.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (17 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 18/22] package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3 Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 20/22] package/x11r7/xdriver_xf86-video-savage: " Bernd Kuhls
` (3 subsequent siblings)
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0002-xorg-xserver120.patch | 21 +++++++++++++++++++
1 file changed, 21 insertions(+)
create mode 100644 package/x11r7/xdriver_xf86-video-r128/0002-xorg-xserver120.patch
diff --git a/package/x11r7/xdriver_xf86-video-r128/0002-xorg-xserver120.patch b/package/x11r7/xdriver_xf86-video-r128/0002-xorg-xserver120.patch
new file mode 100644
index 0000000000..d4d91daecd
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-r128/0002-xorg-xserver120.patch
@@ -0,0 +1,21 @@
+Fix build error with xserver_xorg-server 1.20.0
+
+atipcirename.h:52:15: error: unknown type name 'uint32_t'
+ static inline uint32_t
+
+Downloaded from
+https://gitweb.gentoo.org/repo/gentoo.git/tree/x11-drivers/xf86-video-r128/files/xf86-video-r128-6.10.2-fix-stdint_h.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/src/atipcirename.h
++++ b/src/atipcirename.h
+@@ -29,6 +29,8 @@
+ #ifndef ATIPCIRENAME_H
+ #define ATIPCIRENAME_H
+
++#include <stdint.h>
++
+ enum region_type {
+ REGION_MEM,
+ REGION_IO
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 20/22] package/x11r7/xdriver_xf86-video-savage: add patch to fix support for xserver_xorg-server 1.20.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (18 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 19/22] package/x11r7/xdriver_xf86-video-r128: add patch to fix support for xserver_xorg-server 1.20.0 Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 21/22] package/x11r7/xdriver_xf86-video-sis: add upstream " Bernd Kuhls
` (2 subsequent siblings)
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
.../0002-xorg-xserver120.patch | 23 +++++++++++++++++++
1 file changed, 23 insertions(+)
create mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
diff --git a/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch b/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
new file mode 100644
index 0000000000..4c695960d1
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
@@ -0,0 +1,23 @@
+Fix build with modular-xorg-server-1.20
+
+Downloaded from
+http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/x11/xf86-video-savage/patches/patch-src_savage__driver.c?rev=1.3&content-type=text/x-cvsweb-markup
+
+Patch was sent upstream by Thomas Klausner <wiz@netbsd.org>:
+https://lists.x.org/archives/xorg-devel/2018-May/056952.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+--- a/src/savage_driver.c.orig 2017-01-17 22:43:40.000000000 +0000
++++ b/src/savage_driver.c
+@@ -2034,8 +2034,10 @@ static Bool SavagePreInit(ScrnInfoPtr pS
+ xf86DrvMsg(pScrn->scrnIndex, X_PROBED, "Detected current MCLK value of %1.3f MHz\n",
+ mclk / 1000.0);
+
++#if 0
+ pScrn->maxHValue = 2048 << 3; /* 11 bits of h_total 8-pixel units */
+ pScrn->maxVValue = 2048; /* 11 bits of v_total */
++#endif
+ pScrn->virtualX = pScrn->display->virtualX;
+ pScrn->virtualY = pScrn->display->virtualY;
+
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 21/22] package/x11r7/xdriver_xf86-video-sis: add upstream patch to fix support for xserver_xorg-server 1.20.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (19 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 20/22] package/x11r7/xdriver_xf86-video-savage: " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-06-30 11:08 ` [Buildroot] [PATCH v3 22/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
2018-07-03 21:56 ` [Buildroot] [PATCH v3 00/22] " Yann E. MORIN
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
...0002-Remove-reference-to-virtualFrom.patch | 33 +++++++++++++++++++
1 file changed, 33 insertions(+)
create mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch
diff --git a/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch b/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch
new file mode 100644
index 0000000000..7de4ea9d3c
--- /dev/null
+++ b/package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch
@@ -0,0 +1,33 @@
+From 4b1356a2b7fd06e9a05d134caa4033681c939737 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Thu, 16 Feb 2017 11:21:27 -0500
+Subject: [PATCH 1/2] Remove reference to ->virtualFrom
+
+The core will print this information as well anyway.
+
+Signed-off-by: Adam Jackson <ajax@redhat.com>
+
+Downloaded from upstream commit
+https://cgit.freedesktop.org/xorg/driver/xf86-video-sis/commit/?id=4b1356a2b7fd06e9a05d134caa4033681c939737
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ src/sis_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/sis_driver.c b/src/sis_driver.c
+index 8f06164..513f68b 100644
+--- a/src/sis_driver.c
++++ b/src/sis_driver.c
+@@ -2738,7 +2738,7 @@ SiSPrintModes(ScrnInfoPtr pScrn)
+ float hsync, refresh = 0.0;
+ char *desc, *desc2, *prefix, *uprefix, *output;
+
+- xf86DrvMsg(pScrn->scrnIndex, pScrn->virtualFrom, "Virtual size is %dx%d "
++ xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Virtual size is %dx%d "
+ "(pitch %d)\n", pScrn->virtualX, pScrn->virtualY,
+ pScrn->displayWidth);
+
+--
+2.17.1
+
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 22/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (20 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 21/22] package/x11r7/xdriver_xf86-video-sis: add upstream " Bernd Kuhls
@ 2018-06-30 11:08 ` Bernd Kuhls
2018-07-03 21:56 ` [Buildroot] [PATCH v3 00/22] " Yann E. MORIN
22 siblings, 0 replies; 47+ messages in thread
From: Bernd Kuhls @ 2018-06-30 11:08 UTC (permalink / raw)
To: buildroot
Rebased patch 0001 after upstream commit:
https://cgit.freedesktop.org/xorg/xserver/commit/configure.ac?id=e0748b10a8621066b404d713a76826907da777b9
Removed patch 0004, applied upstream:
https://cgit.freedesktop.org/xorg/xserver/commit/glx/glxscreens.c?id=d16133e3e293fe16b291114d344fbd5a61d5ed65
Added legacy handling for internal version option.
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
Config.in.legacy | 7 +++++
...-compositeext.h-if-COMPOSITE-is-supp.patch | 31 -------------------
.../0001-modesettings-needs-dri2.patch | 5 +--
...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0
...003-Remove-check-for-useSIGIO-option.patch | 0
...0004-include-misc.h-fix-uClibc-build.patch | 31 +++++++++++++++++++
package/x11r7/xserver_xorg-server/Config.in | 12 +++----
.../xserver_xorg-server.hash | 10 +++---
8 files changed, 52 insertions(+), 44 deletions(-)
delete mode 100644 package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0001-modesettings-needs-dri2.patch (88%)
rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%)
rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0003-Remove-check-for-useSIGIO-option.patch (100%)
create mode 100644 package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch
diff --git a/Config.in.legacy b/Config.in.legacy
index c8e2b02bba..97c2c85ba3 100644
--- a/Config.in.legacy
+++ b/Config.in.legacy
@@ -145,6 +145,13 @@ endif
###############################################################################
comment "Legacy options removed in 2018.08"
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+ bool "Modular X.org server was updated to version 1.20.0"
+ select BR2_LEGACY
+ select BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
+ help
+ Modular X.org server was updated to version 1.20.0
+
config BR2_PACKAGE_XPROTO_APPLEWMPROTO
bool "xproto packages were superseded by package xorgproto"
select BR2_LEGACY
diff --git a/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch b/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
deleted file mode 100644
index 93be91ae7f..0000000000
--- a/package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From d16133e3e293fe16b291114d344fbd5a61d5ed65 Mon Sep 17 00:00:00 2001
-From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Date: Thu, 20 Jul 2017 19:48:26 -0700
-Subject: [PATCH] glx: Only include compositeext.h if COMPOSITE is
- supported
-
-Regressed-in: ea483af99a6351323afe00a0b630cd63310efdb1
-Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- glx/glxscreens.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/glx/glxscreens.c b/glx/glxscreens.c
-index 78e0aaff9..609661274 100644
---- a/glx/glxscreens.c
-+++ b/glx/glxscreens.c
-@@ -43,7 +43,10 @@
- #include "glxutil.h"
- #include "glxext.h"
- #include "protocol-versions.h"
-+
-+#ifdef COMPOSITE
- #include "compositeext.h"
-+#endif
-
- static DevPrivateKeyRec glxScreenPrivateKeyRec;
-
---
-2.11.0
-
diff --git a/package/x11r7/xserver_xorg-server/1.19.6/0001-modesettings-needs-dri2.patch b/package/x11r7/xserver_xorg-server/1.20.0/0001-modesettings-needs-dri2.patch
similarity index 88%
rename from package/x11r7/xserver_xorg-server/1.19.6/0001-modesettings-needs-dri2.patch
rename to package/x11r7/xserver_xorg-server/1.20.0/0001-modesettings-needs-dri2.patch
index 4ef95efc3e..790371c456 100644
--- a/package/x11r7/xserver_xorg-server/1.19.6/0001-modesettings-needs-dri2.patch
+++ b/package/x11r7/xserver_xorg-server/1.20.0/0001-modesettings-needs-dri2.patch
@@ -3,6 +3,7 @@ http://cgit.freedesktop.org/xorg/xserver/tree/hw/xfree86/drivers/modesetting/Mak
Patch sent upstream: https://bugs.freedesktop.org/show_bug.cgi?id=91584
+[rebased for version 1.20.0]
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
@@ -14,6 +15,6 @@ diff -uNr xorg-server-1.17.2.org/configure.ac xorg-server-1.17.2/configure.ac
- if test "x$DRM" = xyes; then
+ if test "x$DRM" = xyes -a "x$DRI2" = xyes; then
- dnl 2.4.46 is required for cursor hotspot support.
- PKG_CHECK_EXISTS(libdrm >= 2.4.46)
XORG_DRIVER_MODESETTING=yes
+ fi
+
diff --git a/package/x11r7/xserver_xorg-server/1.19.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch b/package/x11r7/xserver_xorg-server/1.20.0/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.19.6/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
rename to package/x11r7/xserver_xorg-server/1.20.0/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch
diff --git a/package/x11r7/xserver_xorg-server/1.19.6/0003-Remove-check-for-useSIGIO-option.patch b/package/x11r7/xserver_xorg-server/1.20.0/0003-Remove-check-for-useSIGIO-option.patch
similarity index 100%
rename from package/x11r7/xserver_xorg-server/1.19.6/0003-Remove-check-for-useSIGIO-option.patch
rename to package/x11r7/xserver_xorg-server/1.20.0/0003-Remove-check-for-useSIGIO-option.patch
diff --git a/package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch b/package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch
new file mode 100644
index 0000000000..e2d0ee84ed
--- /dev/null
+++ b/package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch
@@ -0,0 +1,31 @@
+From 2e8fca00f5bdb02f2f59aaa428d1e9d808ab0e86 Mon Sep 17 00:00:00 2001
+From: Bernd Kuhls <bernd.kuhls@t-online.de>
+Date: Sat, 16 Jun 2018 19:20:16 +0200
+Subject: [PATCH 1/1] include/misc.h: fix uClibc build
+
+A similar fix was used for Dovecot:
+https://www.dovecot.org/list/dovecot/2017-November/110019.html
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+---
+ include/misc.h | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/include/misc.h b/include/misc.h
+index 14920c3c3..390e52b60 100644
+--- a/include/misc.h
++++ b/include/misc.h
+@@ -185,6 +185,10 @@ typedef struct _xReq *xReqPtr;
+ #endif
+ #endif
+
++#undef bswap_16
++#undef bswap_32
++#undef bswap_64
++
+ /**
+ * Calculate the number of bytes needed to hold bits.
+ * @param bits The minimum number of bits needed.
+--
+2.17.1
+
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 16422316fc..5af4d09eed 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -48,21 +48,21 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
bool
-config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
bool
config BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI
int
default 14 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_14
default 19 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_19
- default 23 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+ default 24 if BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
choice
bool "X Window System server version"
-config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
- bool "1.19.6"
- select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_23
+config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
+ bool "1.20.0"
+ select BR2_PACKAGE_XSERVER_XORG_SERVER_VIDEODRV_ABI_24
select BR2_PACKAGE_XLIB_LIBXFONT2
config BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
@@ -79,7 +79,7 @@ endchoice
config BR2_PACKAGE_XSERVER_XORG_SERVER_VERSION
string
- default "1.19.6" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_19
+ default "1.20.0" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_20
default "1.17.4" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_17
default "1.14.7" if BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
index 10285abf12..691229a834 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash
@@ -3,8 +3,8 @@ sha1 7a95765e56b124758fcd7b609589e65b8870880b x
sha256 fcf66fa6ad86227613d2d3e8ae13ded297e2a1e947e9060a083eaf80d323451f xorg-server-1.14.7.tar.bz2
# From https://lists.x.org/archives/xorg-announce/2015-October/002650.html
sha256 0c4b45c116a812a996eb432d8508cf26c2ec8c3916ff2a50781796882f8d6457 xorg-server-1.17.4.tar.bz2
-# From https://lists.x.org/archives/xorg-announce/2017-December/002830.html
-md5 3e47777ff034a331aed2322b078694a8 xorg-server-1.19.6.tar.bz2
-sha1 2dd560ac49bdbda7f67166546af43541fabf517f xorg-server-1.19.6.tar.bz2
-sha256 a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197 xorg-server-1.19.6.tar.bz2
-sha512 38519a8d0af9dd034045fc346959496dd718fa59b6188307974797a1cd9c349deb54987f6232ea8396baf810dcc710c0ff191f76ed2186cae4d44921b3680412 xorg-server-1.19.6.tar.bz2
+# From https://lists.x.org/archives/xorg-announce/2018-May/002893.html
+md5 c1ca1ea0a905ea788da03c77cc38b06e xorg-server-1.20.0.tar.bz2
+sha1 a9e999c15a2322bc423d5d6e1978ba38f9635901 xorg-server-1.20.0.tar.bz2
+sha256 9d967d185f05709274ee0c4f861a4672463986e550ca05725ce27974f550d3e6 xorg-server-1.20.0.tar.bz2
+sha512 1489e8511c9da682ef0460182dfeeddd241c72d4ef4d206d9706f1e39572c09953df851fab18cefb65a1ee4c6710c6ba13c63c9c9fc0bc1b5f12c50780412cde xorg-server-1.20.0.tar.bz2
--
2.17.1
^ permalink raw reply related [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0
2018-06-30 11:08 [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
` (21 preceding siblings ...)
2018-06-30 11:08 ` [Buildroot] [PATCH v3 22/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0 Bernd Kuhls
@ 2018-07-03 21:56 ` Yann E. MORIN
2018-07-09 17:45 ` Bernd Kuhls
22 siblings, 1 reply; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-03 21:56 UTC (permalink / raw)
To: buildroot
Bernd, All,
On 2018-06-30 13:08 +0200, Bernd Kuhls spake thusly:
> upstream merged all xproto packages in a new package called xorgproto,
> for details read the announcement
> https://lists.x.org/archives/xorg-announce/2018-February/002835.html
[--SNIP--]
> Bernd Kuhls (22):
> package/x11r7/xorgproto: new package
> package/efl: switch to xorgproto
> package/gstreamer1/gst1-plugins-base: switch to xorgproto
> package/libdri2: switch to xorgproto
> package/libvdpau: switch to xorgproto
> package/mesa3d: switch to xorgproto
> package/x11r7/xapp_*: mass switch to xorgproto
> package/x11r7/xdriver_xf86-input-*: mass switch to xorgproto
> package/x11r7/xdriver_xf86-video-*: mass switch to xorgproto
> package/x11r7/xkeyboard-config: switch to xorgproto
> package/x11r7/xlib_*: mass switch to xorgproto
> package/x11r7/xutil_makedepend: switch to xorgproto
> package/x11r7/xserver_xorg-server: switch to xorgproto
> package/x11r7/xproto_*: mass removal
> package/x11r7/xdriver_xf86-video-intel: bump version
Reviewed up to there
> package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6
> package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0
> package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3
I skipped the review, they look simple, so I concentrated on the
following patches:
> package/x11r7/xdriver_xf86-video-r128: add patch to fix support for
> xserver_xorg-server 1.20.0
> package/x11r7/xdriver_xf86-video-savage: add patch to fix support for
> xserver_xorg-server 1.20.0
> package/x11r7/xdriver_xf86-video-sis: add upstream patch to fix
> support for xserver_xorg-server 1.20.0
r128, savage, and sis are all very, very old now. Like, 20 years or
more... I wonder if it makes sense to keep them, given that none of
those three natively cross-compile, and are starting to require patches
to build against a recent X stack. The latter meaning that upstream is
not even test-building those drivers anymore...
Regards,
Yann E. MORIN.
> package/x11r7/xserver_xorg-server: bump version to 1.20.0
>
> Config.in.legacy | 247 ++++++++++++++++++
> package/efl/Config.in | 2 +-
> .../gstreamer1/gst1-plugins-base/Config.in | 2 +-
> .../gst1-plugins-base/gst1-plugins-base.mk | 2 +-
> package/libdri2/Config.in | 2 +-
> package/libdri2/libdri2.mk | 2 +-
> package/libvdpau/libvdpau.mk | 4 +-
> package/mesa3d/Config.in | 18 +-
> package/mesa3d/mesa3d.mk | 8 +-
> package/x11r7/Config.in | 31 +--
> package/x11r7/xapp_mkfontscale/Config.in | 1 +
> .../xapp_mkfontscale/xapp_mkfontscale.mk | 4 +-
> package/x11r7/xapp_rgb/Config.in | 2 +-
> package/x11r7/xapp_rgb/xapp_rgb.mk | 2 +-
> package/x11r7/xapp_sessreg/Config.in | 2 +-
> package/x11r7/xapp_sessreg/xapp_sessreg.mk | 2 +-
> package/x11r7/xapp_xconsole/Config.in | 2 +-
> package/x11r7/xapp_xconsole/xapp_xconsole.mk | 2 +-
> package/x11r7/xapp_xdm/Config.in | 3 +-
> package/x11r7/xapp_xdm/xapp_xdm.mk | 10 +-
> package/x11r7/xapp_xdriinfo/Config.in | 2 +-
> package/x11r7/xapp_xdriinfo/xapp_xdriinfo.mk | 2 +-
> package/x11r7/xapp_xfindproxy/Config.in | 3 +-
> .../x11r7/xapp_xfindproxy/xapp_xfindproxy.mk | 3 +-
> package/x11r7/xapp_xfs/Config.in | 2 +-
> package/x11r7/xapp_xfs/xapp_xfs.mk | 2 +-
> package/x11r7/xapp_xsetpointer/Config.in | 2 +-
> .../xapp_xsetpointer/xapp_xsetpointer.mk | 2 +-
> .../x11r7/xdriver_xf86-input-evdev/Config.in | 4 +-
> .../xdriver_xf86-input-evdev.mk | 4 +-
> .../xdriver_xf86-input-joystick/Config.in | 4 +-
> .../xdriver_xf86-input-joystick.mk | 2 +-
> .../xdriver_xf86-input-keyboard/Config.in | 5 +-
> .../xdriver_xf86-input-keyboard.mk | 2 +-
> .../xdriver_xf86-input-libinput/Config.in | 3 +-
> .../xdriver_xf86-input-libinput.mk | 2 +-
> .../x11r7/xdriver_xf86-input-mouse/Config.in | 4 +-
> .../xdriver_xf86-input-mouse.hash | 9 +-
> .../xdriver_xf86-input-mouse.mk | 4 +-
> .../xdriver_xf86-input-synaptics/Config.in | 4 +-
> .../xdriver_xf86-input-synaptics.mk | 2 +-
> .../x11r7/xdriver_xf86-input-tslib/Config.in | 4 +-
> .../xdriver_xf86-input-tslib.mk | 4 +-
> .../xdriver_xf86-input-vmmouse/Config.in | 4 +-
> .../xdriver_xf86-input-vmmouse.mk | 2 +-
> .../x11r7/xdriver_xf86-video-amdgpu/Config.in | 9 +-
> .../xdriver_xf86-video-amdgpu.mk | 9 +-
> .../x11r7/xdriver_xf86-video-ark/Config.in | 6 +-
> .../xdriver_xf86-video-ark.mk | 2 +-
> .../x11r7/xdriver_xf86-video-ast/Config.in | 3 +-
> .../xdriver_xf86-video-ast.mk | 2 +-
> .../x11r7/xdriver_xf86-video-ati/Config.in | 9 +-
> .../xdriver_xf86-video-ati.mk | 11 +-
> .../x11r7/xdriver_xf86-video-cirrus/Config.in | 7 +-
> .../xdriver_xf86-video-cirrus.mk | 2 +-
> .../x11r7/xdriver_xf86-video-dummy/Config.in | 7 +-
> .../xdriver_xf86-video-dummy.mk | 2 +-
> .../x11r7/xdriver_xf86-video-fbdev/Config.in | 6 +-
> .../xdriver_xf86-video-fbdev.mk | 2 +-
> .../xdriver_xf86-video-fbturbo/Config.in | 8 +-
> .../xdriver_xf86-video-fbturbo.mk | 11 +-
> .../x11r7/xdriver_xf86-video-geode/Config.in | 6 +-
> .../xdriver_xf86-video-geode.mk | 2 +-
> .../x11r7/xdriver_xf86-video-glint/Config.in | 10 +-
> .../xdriver_xf86-video-glint.mk | 2 +-
> .../x11r7/xdriver_xf86-video-i128/Config.in | 7 +-
> .../xdriver_xf86-video-i128.mk | 2 +-
> .../xdriver_xf86-video-imx-viv/Config.in | 3 +-
> .../xdriver_xf86-video-imx-viv.mk | 2 +-
> .../x11r7/xdriver_xf86-video-imx/Config.in | 7 +-
> .../xdriver_xf86-video-imx.mk | 3 +-
> .../x11r7/xdriver_xf86-video-intel/Config.in | 3 +-
> .../xdriver_xf86-video-intel.hash | 2 +-
> .../xdriver_xf86-video-intel.mk | 23 +-
> .../x11r7/xdriver_xf86-video-mach64/Config.in | 6 +-
> .../xdriver_xf86-video-mach64.hash | 9 +-
> .../xdriver_xf86-video-mach64.mk | 4 +-
> .../x11r7/xdriver_xf86-video-mga/Config.in | 9 +-
> .../xdriver_xf86-video-mga.mk | 2 +-
> .../xdriver_xf86-video-neomagic/Config.in | 8 +-
> .../xdriver_xf86-video-neomagic.mk | 2 +-
> .../xdriver_xf86-video-nouveau/Config.in | 6 +-
> .../xdriver_xf86-video-nouveau.mk | 6 +-
> package/x11r7/xdriver_xf86-video-nv/Config.in | 7 +-
> .../xdriver_xf86-video-nv.mk | 2 +-
> .../xdriver_xf86-video-openchrome/Config.in | 7 +-
> .../xdriver_xf86-video-openchrome.mk | 8 +-
> .../x11r7/xdriver_xf86-video-qxl/Config.in | 3 +-
> .../xdriver_xf86-video-qxl.mk | 3 +-
> .../0002-xorg-xserver120.patch | 21 ++
> .../x11r7/xdriver_xf86-video-r128/Config.in | 6 +-
> .../xdriver_xf86-video-r128.mk | 2 +-
> .../0002-xorg-xserver120.patch | 23 ++
> .../x11r7/xdriver_xf86-video-savage/Config.in | 8 +-
> .../xdriver_xf86-video-savage.mk | 2 +-
> .../Config.in | 7 +-
> .../xdriver_xf86-video-siliconmotion.mk | 2 +-
> ...0002-Remove-reference-to-virtualFrom.patch | 33 +++
> .../x11r7/xdriver_xf86-video-sis/Config.in | 10 +-
> .../xdriver_xf86-video-sis.mk | 2 +-
> .../x11r7/xdriver_xf86-video-tdfx/Config.in | 8 +-
> .../xdriver_xf86-video-tdfx.mk | 8 +-
> .../x11r7/xdriver_xf86-video-tga/Config.in | 8 +-
> .../xdriver_xf86-video-tga.mk | 2 +-
> .../xdriver_xf86-video-trident/Config.in | 8 +-
> .../xdriver_xf86-video-trident.mk | 2 +-
> .../x11r7/xdriver_xf86-video-vesa/Config.in | 6 +-
> .../xdriver_xf86-video-vesa.mk | 2 +-
> .../x11r7/xdriver_xf86-video-vmware/Config.in | 7 +-
> .../xdriver_xf86-video-vmware.hash | 9 +-
> .../xdriver_xf86-video-vmware.mk | 4 +-
> .../x11r7/xdriver_xf86-video-voodoo/Config.in | 7 +-
> .../xdriver_xf86-video-voodoo.mk | 2 +-
> package/x11r7/xkeyboard-config/Config.in | 2 +-
> package/x11r7/xlib_libFS/Config.in | 3 +-
> package/x11r7/xlib_libFS/xlib_libFS.mk | 2 +-
> package/x11r7/xlib_libICE/Config.in | 2 +-
> package/x11r7/xlib_libICE/xlib_libICE.mk | 2 +-
> package/x11r7/xlib_libSM/Config.in | 2 +-
> package/x11r7/xlib_libSM/xlib_libSM.mk | 2 +-
> package/x11r7/xlib_libX11/Config.in | 6 +-
> package/x11r7/xlib_libX11/xlib_libX11.mk | 14 +-
> package/x11r7/xlib_libXScrnSaver/Config.in | 2 +-
> .../xlib_libXScrnSaver/xlib_libXScrnSaver.mk | 2 +-
> package/x11r7/xlib_libXau/Config.in | 2 +-
> package/x11r7/xlib_libXau/xlib_libXau.mk | 4 +-
> package/x11r7/xlib_libXaw/Config.in | 2 +-
> package/x11r7/xlib_libXaw/xlib_libXaw.mk | 2 +-
> package/x11r7/xlib_libXcomposite/Config.in | 3 +-
> .../xlib_libXcomposite/xlib_libXcomposite.mk | 2 +-
> package/x11r7/xlib_libXcursor/Config.in | 2 +-
> .../x11r7/xlib_libXcursor/xlib_libXcursor.mk | 4 +-
> package/x11r7/xlib_libXdamage/Config.in | 3 +-
> .../x11r7/xlib_libXdamage/xlib_libXdamage.mk | 2 +-
> package/x11r7/xlib_libXdmcp/Config.in | 2 +-
> package/x11r7/xlib_libXdmcp/xlib_libXdmcp.mk | 4 +-
> package/x11r7/xlib_libXext/Config.in | 3 +-
> package/x11r7/xlib_libXext/xlib_libXext.mk | 2 +-
> package/x11r7/xlib_libXfixes/Config.in | 4 +-
> .../x11r7/xlib_libXfixes/xlib_libXfixes.mk | 5 +-
> package/x11r7/xlib_libXfont/Config.in | 3 +-
> package/x11r7/xlib_libXfont/xlib_libXfont.mk | 4 +-
> package/x11r7/xlib_libXfont2/Config.in | 3 +-
> .../x11r7/xlib_libXfont2/xlib_libXfont2.mk | 6 +-
> package/x11r7/xlib_libXft/Config.in | 2 +-
> package/x11r7/xlib_libXft/xlib_libXft.mk | 2 +-
> package/x11r7/xlib_libXi/Config.in | 3 +-
> package/x11r7/xlib_libXi/xlib_libXi.mk | 5 +-
> package/x11r7/xlib_libXinerama/Config.in | 2 +-
> .../xlib_libXinerama/xlib_libXinerama.mk | 2 +-
> package/x11r7/xlib_libXmu/Config.in | 2 +-
> package/x11r7/xlib_libXmu/xlib_libXmu.mk | 2 +-
> package/x11r7/xlib_libXpm/Config.in | 2 +-
> package/x11r7/xlib_libXpm/xlib_libXpm.mk | 2 +-
> package/x11r7/xlib_libXrandr/Config.in | 4 +-
> .../x11r7/xlib_libXrandr/xlib_libXrandr.mk | 2 +-
> package/x11r7/xlib_libXrender/Config.in | 3 +-
> .../x11r7/xlib_libXrender/xlib_libXrender.mk | 4 +-
> package/x11r7/xlib_libXres/Config.in | 3 +-
> package/x11r7/xlib_libXres/xlib_libXres.mk | 2 +-
> package/x11r7/xlib_libXt/Config.in | 3 +-
> package/x11r7/xlib_libXt/xlib_libXt.mk | 2 +-
> package/x11r7/xlib_libXtst/Config.in | 2 +-
> package/x11r7/xlib_libXtst/xlib_libXtst.mk | 2 +-
> package/x11r7/xlib_libXv/Config.in | 3 +-
> package/x11r7/xlib_libXv/xlib_libXv.mk | 2 +-
> package/x11r7/xlib_libXvMC/Config.in | 3 +-
> package/x11r7/xlib_libXvMC/xlib_libXvMC.mk | 2 +-
> package/x11r7/xlib_libXxf86dga/Config.in | 3 +-
> .../xlib_libXxf86dga/xlib_libXxf86dga.mk | 2 +-
> package/x11r7/xlib_libXxf86vm/Config.in | 3 +-
> .../x11r7/xlib_libXxf86vm/xlib_libXxf86vm.mk | 2 +-
> package/x11r7/xlib_libdmx/Config.in | 2 +-
> package/x11r7/xlib_libdmx/xlib_libdmx.mk | 2 +-
> package/x11r7/xlib_libfontenc/Config.in | 2 +-
> .../x11r7/xlib_libfontenc/xlib_libfontenc.mk | 4 +-
> package/x11r7/xlib_libxkbfile/Config.in | 2 +-
> .../x11r7/xlib_libxkbfile/xlib_libxkbfile.mk | 4 +-
> package/x11r7/xlib_libxshmfence/Config.in | 2 +-
> .../xlib_libxshmfence/xlib_libxshmfence.mk | 2 +-
> package/x11r7/xorgproto/Config.in | 5 +
> package/x11r7/xorgproto/xorgproto.hash | 43 +++
> package/x11r7/xorgproto/xorgproto.mk | 53 ++++
> package/x11r7/xproto_applewmproto/Config.in | 4 -
> .../xproto_applewmproto.hash | 3 -
> .../xproto_applewmproto.mk | 15 --
> package/x11r7/xproto_bigreqsproto/Config.in | 4 -
> .../xproto_bigreqsproto.hash | 2 -
> .../xproto_bigreqsproto.mk | 15 --
> package/x11r7/xproto_compositeproto/Config.in | 4 -
> .../xproto_compositeproto.hash | 3 -
> .../xproto_compositeproto.mk | 15 --
> package/x11r7/xproto_damageproto/Config.in | 4 -
> .../xproto_damageproto.hash | 3 -
> .../xproto_damageproto/xproto_damageproto.mk | 15 --
> package/x11r7/xproto_dmxproto/Config.in | 4 -
> .../xproto_dmxproto/xproto_dmxproto.hash | 3 -
> .../x11r7/xproto_dmxproto/xproto_dmxproto.mk | 15 --
> package/x11r7/xproto_dri2proto/Config.in | 4 -
> .../xproto_dri2proto/xproto_dri2proto.hash | 2 -
> .../xproto_dri2proto/xproto_dri2proto.mk | 15 --
> package/x11r7/xproto_dri3proto/Config.in | 4 -
> .../xproto_dri3proto/xproto_dri3proto.hash | 2 -
> .../xproto_dri3proto/xproto_dri3proto.mk | 15 --
> package/x11r7/xproto_fixesproto/Config.in | 4 -
> .../xproto_fixesproto/xproto_fixesproto.hash | 3 -
> .../xproto_fixesproto/xproto_fixesproto.mk | 16 --
> package/x11r7/xproto_fontcacheproto/Config.in | 4 -
> .../xproto_fontcacheproto.hash | 3 -
> .../xproto_fontcacheproto.mk | 16 --
> package/x11r7/xproto_fontsproto/Config.in | 4 -
> .../xproto_fontsproto/xproto_fontsproto.hash | 2 -
> .../xproto_fontsproto/xproto_fontsproto.mk | 16 --
> package/x11r7/xproto_glproto/Config.in | 4 -
> .../x11r7/xproto_glproto/xproto_glproto.hash | 2 -
> .../x11r7/xproto_glproto/xproto_glproto.mk | 15 --
> package/x11r7/xproto_inputproto/Config.in | 4 -
> .../xproto_inputproto/xproto_inputproto.hash | 2 -
> .../xproto_inputproto/xproto_inputproto.mk | 16 --
> package/x11r7/xproto_kbproto/Config.in | 4 -
> .../x11r7/xproto_kbproto/xproto_kbproto.hash | 2 -
> .../x11r7/xproto_kbproto/xproto_kbproto.mk | 16 --
> package/x11r7/xproto_presentproto/Config.in | 5 -
> .../xproto_presentproto.hash | 2 -
> .../xproto_presentproto.mk | 16 --
> package/x11r7/xproto_randrproto/Config.in | 4 -
> .../xproto_randrproto/xproto_randrproto.hash | 3 -
> .../xproto_randrproto/xproto_randrproto.mk | 15 --
> package/x11r7/xproto_recordproto/Config.in | 4 -
> .../xproto_recordproto.hash | 2 -
> .../xproto_recordproto/xproto_recordproto.mk | 15 --
> package/x11r7/xproto_renderproto/Config.in | 4 -
> .../xproto_renderproto.hash | 2 -
> .../xproto_renderproto/xproto_renderproto.mk | 16 --
> package/x11r7/xproto_resourceproto/Config.in | 4 -
> .../xproto_resourceproto.hash | 3 -
> .../xproto_resourceproto.mk | 15 --
> package/x11r7/xproto_scrnsaverproto/Config.in | 4 -
> .../xproto_scrnsaverproto.hash | 2 -
> .../xproto_scrnsaverproto.mk | 15 --
> package/x11r7/xproto_videoproto/Config.in | 4 -
> .../xproto_videoproto/xproto_videoproto.hash | 2 -
> .../xproto_videoproto/xproto_videoproto.mk | 15 --
> package/x11r7/xproto_windowswmproto/Config.in | 4 -
> .../xproto_windowswmproto.hash | 3 -
> .../xproto_windowswmproto.mk | 15 --
> package/x11r7/xproto_xcmiscproto/Config.in | 4 -
> .../xproto_xcmiscproto.hash | 2 -
> .../xproto_xcmiscproto/xproto_xcmiscproto.mk | 17 --
> package/x11r7/xproto_xextproto/Config.in | 4 -
> .../xproto_xextproto/xproto_xextproto.hash | 2 -
> .../xproto_xextproto/xproto_xextproto.mk | 17 --
> .../x11r7/xproto_xf86bigfontproto/Config.in | 4 -
> .../xproto_xf86bigfontproto.hash | 3 -
> .../xproto_xf86bigfontproto.mk | 16 --
> package/x11r7/xproto_xf86dgaproto/Config.in | 4 -
> .../xproto_xf86dgaproto.hash | 3 -
> .../xproto_xf86dgaproto.mk | 15 --
> package/x11r7/xproto_xf86driproto/Config.in | 4 -
> .../xproto_xf86driproto.hash | 3 -
> .../xproto_xf86driproto.mk | 15 --
> .../x11r7/xproto_xf86vidmodeproto/Config.in | 4 -
> .../xproto_xf86vidmodeproto.hash | 3 -
> .../xproto_xf86vidmodeproto.mk | 15 --
> package/x11r7/xproto_xineramaproto/Config.in | 4 -
> .../xproto_xineramaproto.hash | 3 -
> .../xproto_xineramaproto.mk | 15 --
> package/x11r7/xproto_xproto/Config.in | 4 -
> .../x11r7/xproto_xproto/xproto_xproto.hash | 2 -
> package/x11r7/xproto_xproto/xproto_xproto.mk | 16 --
> .../xproto_xproxymanagementprotocol/Config.in | 6 -
> .../xproto_xproxymanagementprotocol.hash | 2 -
> .../xproto_xproxymanagementprotocol.mk | 15 --
> ...-compositeext.h-if-COMPOSITE-is-supp.patch | 31 ---
> .../0001-modesettings-needs-dri2.patch | 5 +-
> ...ure.ac-Fix-check-for-CLOCK_MONOTONIC.patch | 0
> ...003-Remove-check-for-useSIGIO-option.patch | 0
> ...0004-include-misc.h-fix-uClibc-build.patch | 31 +++
> package/x11r7/xserver_xorg-server/Config.in | 40 +--
> .../xserver_xorg-server.hash | 10 +-
> .../xserver_xorg-server.mk | 48 +---
> package/x11r7/xutil_makedepend/Config.in | 1 +
> .../xutil_makedepend/xutil_makedepend.mk | 4 +-
> 283 files changed, 712 insertions(+), 1279 deletions(-)
> create mode 100644 package/x11r7/xdriver_xf86-video-r128/0002-xorg-xserver120.patch
> create mode 100644 package/x11r7/xdriver_xf86-video-savage/0002-xorg-xserver120.patch
> create mode 100644 package/x11r7/xdriver_xf86-video-sis/0002-Remove-reference-to-virtualFrom.patch
> create mode 100644 package/x11r7/xorgproto/Config.in
> create mode 100644 package/x11r7/xorgproto/xorgproto.hash
> create mode 100644 package/x11r7/xorgproto/xorgproto.mk
> delete mode 100644 package/x11r7/xproto_applewmproto/Config.in
> delete mode 100644 package/x11r7/xproto_applewmproto/xproto_applewmproto.hash
> delete mode 100644 package/x11r7/xproto_applewmproto/xproto_applewmproto.mk
> delete mode 100644 package/x11r7/xproto_bigreqsproto/Config.in
> delete mode 100644 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.hash
> delete mode 100644 package/x11r7/xproto_bigreqsproto/xproto_bigreqsproto.mk
> delete mode 100644 package/x11r7/xproto_compositeproto/Config.in
> delete mode 100644 package/x11r7/xproto_compositeproto/xproto_compositeproto.hash
> delete mode 100644 package/x11r7/xproto_compositeproto/xproto_compositeproto.mk
> delete mode 100644 package/x11r7/xproto_damageproto/Config.in
> delete mode 100644 package/x11r7/xproto_damageproto/xproto_damageproto.hash
> delete mode 100644 package/x11r7/xproto_damageproto/xproto_damageproto.mk
> delete mode 100644 package/x11r7/xproto_dmxproto/Config.in
> delete mode 100644 package/x11r7/xproto_dmxproto/xproto_dmxproto.hash
> delete mode 100644 package/x11r7/xproto_dmxproto/xproto_dmxproto.mk
> delete mode 100644 package/x11r7/xproto_dri2proto/Config.in
> delete mode 100644 package/x11r7/xproto_dri2proto/xproto_dri2proto.hash
> delete mode 100644 package/x11r7/xproto_dri2proto/xproto_dri2proto.mk
> delete mode 100644 package/x11r7/xproto_dri3proto/Config.in
> delete mode 100644 package/x11r7/xproto_dri3proto/xproto_dri3proto.hash
> delete mode 100644 package/x11r7/xproto_dri3proto/xproto_dri3proto.mk
> delete mode 100644 package/x11r7/xproto_fixesproto/Config.in
> delete mode 100644 package/x11r7/xproto_fixesproto/xproto_fixesproto.hash
> delete mode 100644 package/x11r7/xproto_fixesproto/xproto_fixesproto.mk
> delete mode 100644 package/x11r7/xproto_fontcacheproto/Config.in
> delete mode 100644 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.hash
> delete mode 100644 package/x11r7/xproto_fontcacheproto/xproto_fontcacheproto.mk
> delete mode 100644 package/x11r7/xproto_fontsproto/Config.in
> delete mode 100644 package/x11r7/xproto_fontsproto/xproto_fontsproto.hash
> delete mode 100644 package/x11r7/xproto_fontsproto/xproto_fontsproto.mk
> delete mode 100644 package/x11r7/xproto_glproto/Config.in
> delete mode 100644 package/x11r7/xproto_glproto/xproto_glproto.hash
> delete mode 100644 package/x11r7/xproto_glproto/xproto_glproto.mk
> delete mode 100644 package/x11r7/xproto_inputproto/Config.in
> delete mode 100644 package/x11r7/xproto_inputproto/xproto_inputproto.hash
> delete mode 100644 package/x11r7/xproto_inputproto/xproto_inputproto.mk
> delete mode 100644 package/x11r7/xproto_kbproto/Config.in
> delete mode 100644 package/x11r7/xproto_kbproto/xproto_kbproto.hash
> delete mode 100644 package/x11r7/xproto_kbproto/xproto_kbproto.mk
> delete mode 100644 package/x11r7/xproto_presentproto/Config.in
> delete mode 100644 package/x11r7/xproto_presentproto/xproto_presentproto.hash
> delete mode 100644 package/x11r7/xproto_presentproto/xproto_presentproto.mk
> delete mode 100644 package/x11r7/xproto_randrproto/Config.in
> delete mode 100644 package/x11r7/xproto_randrproto/xproto_randrproto.hash
> delete mode 100644 package/x11r7/xproto_randrproto/xproto_randrproto.mk
> delete mode 100644 package/x11r7/xproto_recordproto/Config.in
> delete mode 100644 package/x11r7/xproto_recordproto/xproto_recordproto.hash
> delete mode 100644 package/x11r7/xproto_recordproto/xproto_recordproto.mk
> delete mode 100644 package/x11r7/xproto_renderproto/Config.in
> delete mode 100644 package/x11r7/xproto_renderproto/xproto_renderproto.hash
> delete mode 100644 package/x11r7/xproto_renderproto/xproto_renderproto.mk
> delete mode 100644 package/x11r7/xproto_resourceproto/Config.in
> delete mode 100644 package/x11r7/xproto_resourceproto/xproto_resourceproto.hash
> delete mode 100644 package/x11r7/xproto_resourceproto/xproto_resourceproto.mk
> delete mode 100644 package/x11r7/xproto_scrnsaverproto/Config.in
> delete mode 100644 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.hash
> delete mode 100644 package/x11r7/xproto_scrnsaverproto/xproto_scrnsaverproto.mk
> delete mode 100644 package/x11r7/xproto_videoproto/Config.in
> delete mode 100644 package/x11r7/xproto_videoproto/xproto_videoproto.hash
> delete mode 100644 package/x11r7/xproto_videoproto/xproto_videoproto.mk
> delete mode 100644 package/x11r7/xproto_windowswmproto/Config.in
> delete mode 100644 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.hash
> delete mode 100644 package/x11r7/xproto_windowswmproto/xproto_windowswmproto.mk
> delete mode 100644 package/x11r7/xproto_xcmiscproto/Config.in
> delete mode 100644 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.hash
> delete mode 100644 package/x11r7/xproto_xcmiscproto/xproto_xcmiscproto.mk
> delete mode 100644 package/x11r7/xproto_xextproto/Config.in
> delete mode 100644 package/x11r7/xproto_xextproto/xproto_xextproto.hash
> delete mode 100644 package/x11r7/xproto_xextproto/xproto_xextproto.mk
> delete mode 100644 package/x11r7/xproto_xf86bigfontproto/Config.in
> delete mode 100644 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.hash
> delete mode 100644 package/x11r7/xproto_xf86bigfontproto/xproto_xf86bigfontproto.mk
> delete mode 100644 package/x11r7/xproto_xf86dgaproto/Config.in
> delete mode 100644 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.hash
> delete mode 100644 package/x11r7/xproto_xf86dgaproto/xproto_xf86dgaproto.mk
> delete mode 100644 package/x11r7/xproto_xf86driproto/Config.in
> delete mode 100644 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.hash
> delete mode 100644 package/x11r7/xproto_xf86driproto/xproto_xf86driproto.mk
> delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/Config.in
> delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.hash
> delete mode 100644 package/x11r7/xproto_xf86vidmodeproto/xproto_xf86vidmodeproto.mk
> delete mode 100644 package/x11r7/xproto_xineramaproto/Config.in
> delete mode 100644 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.hash
> delete mode 100644 package/x11r7/xproto_xineramaproto/xproto_xineramaproto.mk
> delete mode 100644 package/x11r7/xproto_xproto/Config.in
> delete mode 100644 package/x11r7/xproto_xproto/xproto_xproto.hash
> delete mode 100644 package/x11r7/xproto_xproto/xproto_xproto.mk
> delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/Config.in
> delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.hash
> delete mode 100644 package/x11r7/xproto_xproxymanagementprotocol/xproto_xproxymanagementprotocol.mk
> delete mode 100644 package/x11r7/xserver_xorg-server/1.19.6/0004-glx-Only-include-compositeext.h-if-COMPOSITE-is-supp.patch
> rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0001-modesettings-needs-dri2.patch (88%)
> rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0002-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch (100%)
> rename package/x11r7/xserver_xorg-server/{1.19.6 => 1.20.0}/0003-Remove-check-for-useSIGIO-option.patch (100%)
> create mode 100644 package/x11r7/xserver_xorg-server/1.20.0/0004-include-misc.h-fix-uClibc-build.patch
>
> --
> 2.17.1
>
> _______________________________________________
> 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 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread* [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0
2018-07-03 21:56 ` [Buildroot] [PATCH v3 00/22] " Yann E. MORIN
@ 2018-07-09 17:45 ` Bernd Kuhls
2018-07-13 7:19 ` Peter Korsgaard
0 siblings, 1 reply; 47+ messages in thread
From: Bernd Kuhls @ 2018-07-09 17:45 UTC (permalink / raw)
To: buildroot
Hi Yann,
thank you for your review!
Am Tue, 03 Jul 2018 23:56:02 +0200 schrieb Yann E. MORIN:
>> package/x11r7/xdriver_xf86-video-mach64: bump version to 6.9.6
>> package/x11r7/xdriver_xf86-video-vmware: bump version to 13.3.0
>> package/x11r7/xdriver_xf86-input-mouse: bump version to 1.9.3
>
> I skipped the review, they look simple, so I concentrated on the
> following patches:
>
>> package/x11r7/xdriver_xf86-video-r128: add patch to fix support for
>> xserver_xorg-server 1.20.0
>> package/x11r7/xdriver_xf86-video-savage: add patch to fix support for
>> xserver_xorg-server 1.20.0
>> package/x11r7/xdriver_xf86-video-sis: add upstream patch to fix
>> support for xserver_xorg-server 1.20.0
>
> r128, savage, and sis are all very, very old now. Like, 20 years or
> more... I wonder if it makes sense to keep them, given that none of
> those three natively cross-compile, and are starting to require patches
> to build against a recent X stack. The latter meaning that upstream is
> not even test-building those drivers anymore...
Up until now and even including the current bump to xserver_xorg-server
1.20.0 I am still willing to support even the oldest drivers if I can
find the necessary patches somewhere so from my POV it is ok to keep
them. If Thomas or Peter think otherwise I can remove them since I have
no personal interest in them ;)
Right now I am preparing a smaller patch series bumping some x11r7
packages, splitting four xdriver_xf86* packages from this series along
with three recent bumps by upstream. After that in the coming days I will
send v4 of the xserver bump series.
Regards, Bernd
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0
2018-07-09 17:45 ` Bernd Kuhls
@ 2018-07-13 7:19 ` Peter Korsgaard
2018-07-15 15:46 ` Yann E. MORIN
0 siblings, 1 reply; 47+ messages in thread
From: Peter Korsgaard @ 2018-07-13 7:19 UTC (permalink / raw)
To: buildroot
>>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
Hi,
>> r128, savage, and sis are all very, very old now. Like, 20 years or
>> more... I wonder if it makes sense to keep them, given that none of
>> those three natively cross-compile, and are starting to require patches
>> to build against a recent X stack. The latter meaning that upstream is
>> not even test-building those drivers anymore...
> Up until now and even including the current bump to xserver_xorg-server
> 1.20.0 I am still willing to support even the oldest drivers if I can
> find the necessary patches somewhere so from my POV it is ok to keep
> them. If Thomas or Peter think otherwise I can remove them since I have
> no personal interest in them ;)
As long as you care enough about them to keep them working (and the
patches aren't super big/ugly), then I am fine with keeping them.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 47+ messages in thread
* [Buildroot] [PATCH v3 00/22] package/x11r7/xserver_xorg-server: bump version to 1.20.0
2018-07-13 7:19 ` Peter Korsgaard
@ 2018-07-15 15:46 ` Yann E. MORIN
0 siblings, 0 replies; 47+ messages in thread
From: Yann E. MORIN @ 2018-07-15 15:46 UTC (permalink / raw)
To: buildroot
On 2018-07-13 09:19 +0200, Peter Korsgaard spake thusly:
> >>>>> "Bernd" == Bernd Kuhls <bernd.kuhls@t-online.de> writes:
> >> r128, savage, and sis are all very, very old now. Like, 20 years or
> >> more... I wonder if it makes sense to keep them, given that none of
> >> those three natively cross-compile, and are starting to require patches
> >> to build against a recent X stack. The latter meaning that upstream is
> >> not even test-building those drivers anymore...
> > Up until now and even including the current bump to xserver_xorg-server
> > 1.20.0 I am still willing to support even the oldest drivers if I can
> > find the necessary patches somewhere so from my POV it is ok to keep
> > them. If Thomas or Peter think otherwise I can remove them since I have
> > no personal interest in them ;)
>
> As long as you care enough about them to keep them working (and the
> patches aren't super big/ugly), then I am fine with keeping them.
I'm also fine with keeping them if someone is actually caring for them.
But as I sais, maintaining them just for the sake of maintenance,
without actual use, is probably going too far.
But OK, if that is an exercise in style. ;-)
Regards,
Yann E. MORIN.
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 223 225 172 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 47+ messages in thread