package/x11r7/xlib_*: mass switch to xorgproto

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

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

diff --git a/package/x11r7/xlib_libFS/Config.in b/package/x11r7/xlib_libFS/Config.in
index 0c8a7290c10448c45ac537eeebb80dfd5a3f34b0..6ff0bcc36e699aa0cecab7d38d550254a6bfd354 100644 (file)
--- 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 a3c58b90d9a16f10a0038b6927fc9c36b5f8ca40..56f2dc3cbad5194fc52e9649afe4cec981f69c87 100644 (file)
--- 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 d63f935602ab2488fc46f495421a707c452a51c8..ccdd400396ddc015c754f74d263c3bb1b71d47a9 100644 (file)
--- 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 e2a4e7d3870602594cc84d0a4687d11a3dc5e239..982e8fdef13528305ac31357cbf5a6b08460d6da 100644 (file)
--- 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 ef83b531f844353442cac616e0396d623ac7518d..02ee2bd2320a19cd16a4098b319029350ab9fce1 100644 (file)
--- 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 30640bd10103815d1fc045fb365a9a3139ac2ef7..9049cea234081d93fbfd33a2c429330010f59a8a 100644 (file)
--- 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 3ad8d00ae50c4d9a297b2a8cfb2b776ac027b931..d69c51b91e2921ed90e0389c6caa5740e5058a99 100644 (file)
--- 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 64344da737e10f910d8c5cc363b52df32ba0227d..e2266cdfaddec10ccea7e78fe202cc275c013635 100644 (file)
--- 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 5df9a00c72335dfc576dd1c6f3c390180d12a353..05c96d74cd399a2553061e393269395da6753897 100644 (file)
--- 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 4c3d36d007206eb534580208bb09ab2ca2b526dd..92abb902ebe2010349fc8f38f76a96303ba3f179 100644 (file)
--- 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 a220f01970e793044a038c067b199116b75f1775..0323faa3ead8c639f3acee51e14f834b916e5337 100644 (file)
--- 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 1c50cb2e4e56dfa4d40862a600ca0d7696867842..0fc78e7068277d855d76248114a6f76ba536da14 100644 (file)
--- 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 host-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 3695bb679f210758678bba56786395c577edd7b3..bda4ded26d105d67fc2bcdcf9385ecab2916c57c 100644 (file)
--- 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 d78adffedae49baacc318694231b0c214f5065eb..17d51a95701d332dcb4c9f4b1825311ce13a8870 100644 (file)
--- 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 14da977af0eeefc43e8a20b7f8b0682fd2b8f424..b417140aeae89fad347f522049f4ee6e5ae03122 100644 (file)
--- 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 f0e59cba1d7add8a1fa642dd631616319d11ea1b..e84b52e3fde2f0e4c4ff9f4182d0aa24b7fa113d 100644 (file)
--- 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 6519cc76679d595f920cba50abda743b9fd82a4d..0c70f95918f8d4f437cfba40f00d06ae368a5dc8 100644 (file)
--- 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 b27aa653e92b794f75a79a9c6c9752a82afc4b6c..6ee76039e095523bf0446ae3c823090de4e2ead6 100644 (file)
--- 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 242748663c39489c395df843f46877ee5cad243e..d1a07dea9e72898f7b4e2dbef4cdf77d57de807d 100644 (file)
--- 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 9f982eef10250cf86d08db8bf170e00cbe53aaba..d52b4e0e2497d69d47e55a5525473e52abfa3d63 100644 (file)
--- 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 218ff1598b176927f99afc68e0042094bdda94e9..832822e912a5ec3b19df26a6609a24cd165203fd 100644 (file)
--- 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 ec1b861b92507a905a2980b600277ae88e9d2048..179234e73f059b064a950baa88860941a57569a1 100644 (file)
--- 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 823a165bf2cbdf6d217510651a6b14e0e39ac60f..58c9ce55eac9f61e56dc2b99244ceb09b5a4ab14 100644 (file)
--- 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 211c85360ae37ffecda4b94f56aa921e306cc974..02fee222b606bb4d4baa6887916b07c8d8fb3e53 100644 (file)
--- 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 9bbabb255897b2abca703d9a3cbce20b8f6913ba..2c3b6684f882438c34d685d5203bcbc8e6fbf5bd 100644 (file)
--- 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 b7d835bb30f44f412d0748fde27ddf8216d12b52..f563ba34ecb070d403bd7e0aa7faf5af245c0b1e 100644 (file)
--- 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 cc1da0ea39346aa5e0b63164d774fc237d26ea8a..4658027da8386ffd2f1c94d14883eb9227f2fc8a 100644 (file)
--- 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 30163eec6f3803d8b2a416e750d1d845a1a0db18..61b6f99785fb3dd6d5f6a35ae9490098161d01ec 100644 (file)
--- 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 6cba46586bbcd4ce5570aa05e307e99c724a36fd..fc2ebfe22c0db1b82f754723055784281fbfbc57 100644 (file)
--- 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 3f1bdee4359bb282a4746fb374bf8ec0d54a0235..ba2c7540cb0cd5cb3211986811212a41d42c7737 100644 (file)
--- 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 6eef170177b8853552f89a97cc2b09a0c40e7cf9..84967a55e3674dd1d0764c514e7545840482b428 100644 (file)
--- 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 de9b47093bab54b41d1307bdb235f75785aff9de..64415cfd3028629dc54b114190bcdade18c7f857 100644 (file)
--- 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 3ae22d630583544b738f1cf4f6aadde16b997d3b..3131306902241214cc90b69f8af8245549590f08 100644 (file)
--- 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 d593c1e95a1c5b7634f72b3c0d2750a63184e020..283373891129ac5952e157921b011f5d9c5279ca 100644 (file)
--- 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 5a79b4eb76e1880f72a1fdd02a97d892b0a7afa9..f8ea959537ad65a200be61d1d10b1625d3efa2d3 100644 (file)
--- 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 3c2a505bc83a088247dd49e683a407325461a144..405faefa46986cb342db1c61ebf9d5c52fb6548a 100644 (file)
--- 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 ed239dc11cf94fad8069bca292ff85b8275359f6..b588920835688557f9dbe31b5b789d1b6c9ff62e 100644 (file)
--- 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 261f8713875c8322deb030ddaf77672085cdc49b..b3f3db3e5dfb08fb257b371b3f14d404383e749e 100644 (file)
--- 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 528498cb43baa5326537c3b3174c822f6d44221f..9a15d77d8c70f99fd71b2a046e77a846e54f82c5 100644 (file)
--- 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 09f897ea092d5c9935d19c3d4027bd0f9537a6a6..7e11c4b5aabdfa21a9f60a66dbf726ee67cd2ee9 100644 (file)
--- 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 3b3ebd579010ac20f76e0673780316f6fea3ec0d..e019ca5ef8e4bbb647d03bd4ea1b63e6db2d6884 100644 (file)
--- 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 0fd298c50d217ff6025ebf4f1b858e5c440bd1b6..1bfd78f73dfd125b309702d16e03eac0ad55b03a 100644 (file)
--- 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 c723e4df460b3446ed45e10671b7c27c4c1590e6..4487ef1faa6185cc47fea331e7ab387c6758bc62 100644 (file)
--- 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 6134c4538683dda3814d6845204a591bfdd4d7c1..870f94386eaacc7d52b986d054a683058a9bd6e9 100644 (file)
--- 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 39abbbfd3319dbfaf88400d2251dba0768146884..4e135ed3aa0a3a889079cd8d3dd7c717bcd2d6d8 100644 (file)
--- 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 0075e8f60b1aac82b999a42d9f65424ba13032c0..72f2ec4424e87de0c14dac8ac7da4c847ea99942 100644 (file)
--- 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 6557e20bcd479cb0e529ca98a510225292da7010..0f55780886a99673cb4d6619d366e53e3f90c544 100644 (file)
--- 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 4715ac642f1a23a6aebe413fba14f0e54e66640f..946fd517a717b3fa7162a8119136ea55b70481ee 100644 (file)
--- 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 8853bde8d4485b1156b39e60ee73654b34ef47bd..2c7db22468c58b64638c6e5f894801142b826dcd 100644 (file)
--- 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 d71290ae40cf815991aeac0ae6c63b2452b9df1a..e0d7e8217ca72bc0d67d98bfa7f9e3e5c440cf9b 100644 (file)
--- 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 90f07f34be29d5727884c63242b65c281f4ddddd..d3e57445a3d3905e10a921aead6b98fab2361bfb 100644 (file)
--- 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 0e02439fa8c2a2e31b747a608a4c9dcffcd746e5..0ff99b9380e20df224dbc7edcb679455cdba99af 100644 (file)
--- 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 90c0e74e45380b8d11d6b46b80745603205c3163..5cc6ec766a9302d9d9d8b2d6acad1225877ae032 100644 (file)
--- 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 cb39c29f21276869527847c9c4da2c968f40b4e4..c970182fe5581d7539a3f9bc91a8e3869b448edb 100644 (file)
--- 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 8276b7178f2de8f7fe3439f4491f08d6e0e11a92..918ea0f150af4bbb78d2c7a130fad89534f567e9 100644 (file)
--- 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 eea756bdb2cbaa560d1e234bb5625e7b0bee4e0f..59ebd2b41321233ef3dfbfaf6b0bdf059cd94030 100644 (file)
--- 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 9e32188ec81688f0afb438d01123df890d7cdeaa..c3b11f42184473b36ce3206f4a0a6e0fbbb6ebc8 100644 (file)
--- 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 f650fe4e2a764b45f6d6172666200adb3252d216..2106451c74be0855a307d0f7d824744ec2fc4453 100644 (file)
--- 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 879f6895c3d023a077a45e39b95d16f0a78dca07..99cddb638aeff30aa73447f33fafe799d27c9c21 100644 (file)
--- 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 01ff493201a35095f94c43b101f04f346cf58acd..c67593e9a4df17a53550e7af2a15fc8064568e02 100644 (file)
--- 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 d25e96a5a51db13cc09dfa75a357abaca8ab5f48..38cb8333c07776158af135faea2bfa9d443afe71 100644 (file)
--- 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 e2c4c6e8d901db85cd4fa57aa0ed3721f19cf5f8..526aea9fe5fe2d3cd463afa5b6ee5a3f5efe1639 100644 (file)
--- 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 ccd35fa10ff6f4c94322a58b5c66443cb47226e3..0d7e466005fad0425fc4ac878b44b1a441de40ee 100644 (file)
--- 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 c69d73118fe459a80bc7f785ef6baf7626fadd93..97755fae84e768f5af27b90092a489a4756d6aee 100644 (file)
--- 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 d4e87b3e817ff1db6a207f4ad45895d1bfb72bac..710476b357f6283793afce21e30684167110ddb4 100644 (file)
--- 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 f51cf0d5cb494a6e55cd12f38c7064376f67f706..f395ebe17291f7e0c6ac8dfb4e481aa721ab3cf8 100644 (file)
--- 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