package/x11r7/xapp_*: 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/xapp_mkfontscale/Config.in b/package/x11r7/xapp_mkfontscale/Config.in
index 0cfee6ad050f3f60fc837d1607ed46cbede9ab8c..d0a9d89658d162172ebfa14ec2f143d6853842b6 100644 (file)
--- a/package/x11r7/xapp_mkfontscale/Config.in
+++ b/package/x11r7/xapp_mkfontscale/Config.in
@@ -3,7 +3,7 @@ config BR2_PACKAGE_XAPP_MKFONTSCALE
        select BR2_PACKAGE_FREETYPE
        select BR2_PACKAGE_XLIB_LIBX11
        select BR2_PACKAGE_XLIB_LIBFONTENC
-       select BR2_PACKAGE_XPROTO_XPROTO
+       select BR2_PACKAGE_XORGPROTO
        select BR2_PACKAGE_ZLIB
        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 12416b4d6b12bda281a57e67bed588da700f5897..a07d2f4fbd7c6c14c880b86846db1c92cc5e510e 100644 (file)
--- 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 038b849d4bc9a404fd4828d871e36a87b6c1c653..7198b5f1a422df1a07328c86d407acb0edf0000a 100644 (file)
--- 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 82878abad0e44bc29125b227abbef8700c4c793c..d63576f44db522c6537b1c0cfdc130f448dab607 100644 (file)
--- 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 0796bc1bca953b6bab3614c03fcfe0e06f08634e..c9048b3b7e3956730828ad3ee429be315b76df2c 100644 (file)
--- 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 c6e9463d3b15274b46282006e4e35bc235c49f3b..46935aed9ab0e3edf3d0f21c4d8294791c64d6fe 100644 (file)
--- 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 7baf4ff6af25ee47cb4099a2727e29a712c1f3d0..3d796bd3c1f4152a947fc8e7c38ae22adb8fdaad 100644 (file)
--- 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 52656de83c0ee448cc9a6b0ad76ee07270160a86..a91b98dc60a468bf3bb208ab0d7e38a5c9875075 100644 (file)
--- 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 69829701caba38b905bb41cbba547a88d4a4feda..af816a13498c0cc9a27f2da23ec06ceca3f9c950 100644 (file)
--- 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 8f846a82aa55c5fed605ec4b652d1f8faffc030b..2c213a6bf06b2aec4a4a21ff0f55830d9b72fe75 100644 (file)
--- 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 2b204d91714dd63c586694f809b3d6b092c5ab17..df65b491ab90724e7e0fd4472a665e94dc36b7ea 100644 (file)
--- 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 00dea8c7ad390b2978b8b475bb36ebbf2449d8ae..7f7aac9e154c1bcfb5f0b31bcd984b3f1559b78a 100644 (file)
--- 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 b186ab65bc542656563a922ae157d657813351ef..e452dc9658d178bc9388f55517728c07754923bf 100644 (file)
--- 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 7662a902a2bc8735a184d5f177371e17e551186a..7832e0ca961ee19dff38fb0bdfa2820105df6bb5 100644 (file)
--- 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 b708af8c0cddb101bca2da662474dcbaaa252a76..19e675b265a8cec76120dca4776dc6c5b3da9893 100644 (file)
--- 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 f4fe35dfb73fc03738f344824dccd1f23227e417..9177a65b9c78d8c8aefe2a690d1eafb3231d26eb 100644 (file)
--- 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 2b0b4624e8213c3927d6ae7dc6807a7c0d684c62..0deb6d81127cf31d9f4625c7958b2c7928ac01d1 100644 (file)
--- 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 f56cdd58a1c376e2f8475ae5a02c5d343497f98a..a34b7e637dc77f268adcf6e8620c47b297c277d8 100644 (file)
--- 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))