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>

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

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))

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

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))

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

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))

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

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))

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

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

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
 

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))

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

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))

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

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))

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

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))