summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArmin Kuster <akuster@mvista.com>2018-04-03 18:49:19 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:03 +0100
commit4ba923dbac2845aca5b4312a5f278ad886a7acc7 (patch)
tree8939dc2f46d4af1f65de0da84c9ef4b42a89b26e
parente2b37c86613b94afa9e5b42f6d00373b362be168 (diff)
downloadpoky-4ba923dbac2845aca5b4312a5f278ad886a7acc7.tar.gz
xorg: Replace depreciated *proto depends with xorgproto
This completes the transition to xorgproto. (From OE-Core rev: 9d236bd40ef8598c78c1ea807d658467700505e2) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Armin Kuster <akuster808@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/mesa/mesa.inc6
-rw-r--r--meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-app/rgb_1.0.6.bb2
-rw-r--r--meta/recipes-graphics/xorg-app/xev_1.2.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb6
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-common.inc2
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-input.inc2
-rw-r--r--meta/recipes-graphics/xorg-driver/xorg-driver-video.inc2
-rw-r--r--meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libice_1.0.9.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libx11.inc4
-rw-r--r--meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb_1.13.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb2
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg.inc12
42 files changed, 52 insertions, 52 deletions
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index b501b7e726..5660f44a3b 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -47,7 +47,7 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
47# "gbm" requires "dri", "opengl" 47# "gbm" requires "dri", "opengl"
48PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" 48PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"
49 49
50X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" 50X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes"
51# "x11" requires "opengl" 51# "x11" requires "opengl"
52PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" 52PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
53PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" 53PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc"
@@ -57,8 +57,8 @@ DRIDRIVERS = "swrast"
57DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" 57DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915"
58DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" 58DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915"
59# "dri" requires "opengl" 59# "dri" requires "opengl"
60PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" 60PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm"
61PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" 61PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence"
62 62
63# Vulkan drivers need dri3 enabled 63# Vulkan drivers need dri3 enabled
64# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 64# radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9
diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
index 88c88f135e..2a6bec1649 100644
--- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.3.bb
@@ -8,7 +8,7 @@ font name (XLFD) is generated, and is written together with the file \
8name to a file fonts.scale in the directory. The resulting fonts.scale \ 8name to a file fonts.scale in the directory. The resulting fonts.scale \
9is used by the mkfontdir program." 9is used by the mkfontdir program."
10 10
11DEPENDS = "util-macros-native zlib libfontenc freetype xproto" 11DEPENDS = "util-macros-native zlib libfontenc freetype xorgproto"
12 12
13BBCLASSEXTEND = "native" 13BBCLASSEXTEND = "native"
14 14
diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
index 87268046e6..c3e853631b 100644
--- a/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
+++ b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb
@@ -6,7 +6,7 @@ to RGB values (rgb.txt) and, if configured to use a database for color \
6lookup, the rgb program to convert the text file into the binary database \ 6lookup, the rgb program to convert the text file into the binary database \
7format." 7format."
8 8
9DEPENDS += " xproto util-macros" 9DEPENDS += " xorgproto util-macros"
10LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" 10LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a"
11PE = "1" 11PE = "1"
12 12
diff --git a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
index f151b579e3..0705b7f7f1 100644
--- a/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-app/xev_1.2.2.bb
@@ -10,7 +10,7 @@ LICENSE = "MIT"
10 10
11PE = "1" 11PE = "1"
12 12
13DEPENDS += "libxrandr xproto" 13DEPENDS += "libxrandr xorgproto"
14 14
15SRC_URI += "file://diet-x11.patch" 15SRC_URI += "file://diet-x11.patch"
16 16
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
index 2623cb2f31..893f5ce3f6 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb
@@ -28,9 +28,9 @@ DEPENDS += "virtual/libx11 drm libpciaccess pixman"
28PACKAGECONFIG ??= "xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}" 28PACKAGECONFIG ??= "xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri1 dri2', '', d)}"
29 29
30PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" 30PACKAGECONFIG[dri] = "--enable-dri,--disable-dri"
31PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xf86driproto" 31PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1,xorgproto"
32PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" 32PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto"
33PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" 33PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto"
34PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" 34PACKAGECONFIG[sna] = "--enable-sna,--disable-sna"
35PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" 35PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa"
36PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" 36PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
index bef3636092..0430f67b40 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb
@@ -22,7 +22,7 @@ omapdrm kernel driver w/ GEM support. \
22 22
23LICENSE = "GPLv2+" 23LICENSE = "GPLv2+"
24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" 24LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602"
25DEPENDS += "virtual/libx11 libdrm xf86driproto" 25DEPENDS += "virtual/libx11 libdrm xorgproto"
26 26
27SRC_URI[md5sum] = "3b8ea5e8fba63355c0dc6681c49d5fe5" 27SRC_URI[md5sum] = "3b8ea5e8fba63355c0dc6681c49d5fe5"
28SRC_URI[sha256sum] = "93e7d42107521e61f61980eaea64fb452e87b7b94272e48938ac8d904ccfab5a" 28SRC_URI[sha256sum] = "93e7d42107521e61f61980eaea64fb452e87b7b94272e48938ac8d904ccfab5a"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
index 5c1356de55..9a110148d8 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vesa_2.4.0.bb
@@ -9,7 +9,7 @@ can drive most VESA-compatible video cards, but only makes use of the \
9basic standard VESA core that is common to these cards. The driver \ 9basic standard VESA core that is common to these cards. The driver \
10supports depths 8, 15 16 and 24." 10supports depths 8, 15 16 and 24."
11 11
12DEPENDS += "virtual/libx11 randrproto libpciaccess" 12DEPENDS += "virtual/libx11 xorgproto libpciaccess"
13 13
14COMPATIBLE_HOST = '(i.86|x86_64).*-linux' 14COMPATIBLE_HOST = '(i.86|x86_64).*-linux'
15 15
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
index 706d35d2fc..0b63bbc67c 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.2.1.bb
@@ -6,7 +6,7 @@ DESCRIPTION = "vmware is an Xorg driver for VMware virtual video cards."
6 6
7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53" 7LIC_FILES_CHKSUM = "file://COPYING;md5=5fcd7d437a959a15fbee8707747c6b53"
8 8
9DEPENDS += "virtual/libx11 xineramaproto videoproto libpciaccess" 9DEPENDS += "virtual/libx11 xorgproto libpciaccess"
10 10
11SRC_URI += "file://0002-add-option-for-vmwgfx.patch" 11SRC_URI += "file://0002-add-option-for-vmwgfx.patch"
12 12
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
index bca0aade6c..e657c65b4c 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc
@@ -7,7 +7,7 @@ LICENSE = "MIT-X"
7PE = "2" 7PE = "2"
8INC_PR = "r21" 8INC_PR = "r21"
9 9
10DEPENDS = "virtual/xserver xproto randrproto util-macros" 10DEPENDS = "virtual/xserver xorgproto util-macros"
11 11
12SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" 12SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2"
13 13
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
index 342067d6c1..57912e70db 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc
@@ -1,6 +1,6 @@
1require xorg-driver-common.inc 1require xorg-driver-common.inc
2 2
3DEPENDS += "inputproto kbproto " 3DEPENDS += "xorgproto"
4 4
5python add_xorg_abi_depends() { 5python add_xorg_abi_depends() {
6 _add_xorg_abi_depends(d, "input") 6 _add_xorg_abi_depends(d, "input")
diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
index b5862dae10..2938ef1161 100644
--- a/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
+++ b/meta/recipes-graphics/xorg-driver/xorg-driver-video.inc
@@ -1,6 +1,6 @@
1require xorg-driver-common.inc 1require xorg-driver-common.inc
2 2
3DEPENDS =+ "renderproto videoproto xextproto fontsproto" 3DEPENDS =+ "xorgproto"
4 4
5python add_xorg_abi_depends() { 5python add_xorg_abi_depends() {
6 _add_xorg_abi_depends(d, "video") 6 _add_xorg_abi_depends(d, "video")
diff --git a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
index e623cee421..c74b706953 100644
--- a/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libdmx_1.1.3.bb
@@ -11,7 +11,7 @@ LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=a3c3499231a8035efd0e004cfbd3b72a \
12 file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1" 12 file://src/dmx.c;endline=33;md5=c43f19af03c7c8619cadc9724ed9afe1"
13 13
14DEPENDS += "libxext dmxproto" 14DEPENDS += "libxext xorgproto"
15 15
16PE = "1" 16PE = "1"
17 17
diff --git a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
index a181f05c29..34d5fc4487 100644
--- a/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" 9LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1"
10 10
11DEPENDS += "zlib xproto font-util" 11DEPENDS += "zlib xorgproto font-util"
12PE = "1" 12PE = "1"
13 13
14BBCLASSEXTEND = "native" 14BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
index f069749ce0..0337d21189 100644
--- a/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93" 12LIC_FILES_CHKSUM = "file://COPYING;md5=d162b1b3c6fa812da9d804dcf8584a93"
13 13
14DEPENDS += "xproto xtrans" 14DEPENDS += "xorgproto xtrans"
15PROVIDES = "ice" 15PROVIDES = "ice"
16 16
17PE = "1" 17PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
index 48922cb992..fdc693be14 100644
--- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" 12LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d"
13 13
14DEPENDS += "libice xproto xtrans" 14DEPENDS += "libice xorgproto xtrans"
15 15
16# libSM can work without libuuid, we explicitly disable it to break the following circular dependency 16# libSM can work without libuuid, we explicitly disable it to break the following circular dependency
17# when DISTRO_FEATURES contains 'systemd' and 'x11'. 17# when DISTRO_FEATURES contains 'systemd' and 'x11'.
diff --git a/meta/recipes-graphics/xorg-lib/libx11.inc b/meta/recipes-graphics/xorg-lib/libx11.inc
index 4af40ab8a1..d9a2b52ad6 100644
--- a/meta/recipes-graphics/xorg-lib/libx11.inc
+++ b/meta/recipes-graphics/xorg-lib/libx11.inc
@@ -18,8 +18,8 @@ XORG_PN = "libX11"
18LICENSE = "MIT & MIT-style & BSD" 18LICENSE = "MIT & MIT-style & BSD"
19LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7" 19LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
20 20
21DEPENDS += "xproto xextproto xtrans libxcb kbproto inputproto" 21DEPENDS += "xorgproto xtrans libxcb"
22DEPENDS += "xproto-native" 22DEPENDS += "xorgproto-native"
23 23
24EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont" 24EXTRA_OECONF += "--with-keysymdefdir=${STAGING_INCDIR}/X11/ --disable-xf86bigfont"
25EXTRA_OEMAKE += 'CWARNFLAGS=""' 25EXTRA_OEMAKE += 'CWARNFLAGS=""'
diff --git a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
index 2ef8bfa8b6..8c52475b85 100644
--- a/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
+++ b/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb
@@ -11,7 +11,7 @@ inherit gettext
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec" 12LIC_FILES_CHKSUM = "file://COPYING;md5=7908e342491198401321cec1956807ec"
13 13
14DEPENDS += " xproto" 14DEPENDS += " xorgproto"
15PROVIDES = "xau" 15PROVIDES = "xau"
16 16
17PE = "1" 17PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
index 0fe65318be..0ed8fda169 100644
--- a/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT-style"
9LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \ 9LIC_FILES_CHKSUM = "file://xcalibrate.h;endline=21;md5=fa572df6439f0f235f2612f370f153d7 \
10 file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7" 10 file://xcalibrate.c;endline=21;md5=fa572df6439f0f235f2612f370f153d7"
11 11
12DEPENDS = "virtual/libx11 calibrateproto libxext" 12DEPENDS = "virtual/libx11 xorgproto libxext"
13 13
14SRCREV = "209d83af61ed38a002c8096377deac292b3e396c" 14SRCREV = "209d83af61ed38a002c8096377deac292b3e396c"
15PV = "0.0+git${SRCPV}" 15PV = "0.0+git${SRCPV}"
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
index 04b58ea49f..a8e0307e1a 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b
20 20
21BBCLASSEXTEND = "native nativesdk" 21BBCLASSEXTEND = "native nativesdk"
22 22
23DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" 23DEPENDS = "xcb-proto xorgproto libxau libpthread-stubs libxdmcp"
24 24
25PACKAGES_DYNAMIC = "^libxcb-.*" 25PACKAGES_DYNAMIC = "^libxcb-.*"
26 26
diff --git a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
index 70257194a9..73e2948404 100644
--- a/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb
@@ -14,7 +14,7 @@ require xorg-lib-common.inc
14LICENSE = "MIT-style" 14LICENSE = "MIT-style"
15LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" 15LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1"
16 16
17DEPENDS += " compositeproto virtual/libx11 libxfixes libxext" 17DEPENDS += " xorgproto virtual/libx11 libxfixes libxext"
18PROVIDES = "xcomposite" 18PROVIDES = "xcomposite"
19BBCLASSEXTEND = "native" 19BBCLASSEXTEND = "native"
20 20
diff --git a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
index c3d70043ca..6d6ffadf20 100644
--- a/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb
@@ -16,7 +16,7 @@ require xorg-lib-common.inc
16LICENSE = "MIT" 16LICENSE = "MIT"
17LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" 17LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868"
18 18
19DEPENDS += "virtual/libx11 damageproto libxfixes" 19DEPENDS += "virtual/libx11 xorgproto libxfixes"
20PROVIDES = "xdamage" 20PROVIDES = "xdamage"
21BBCLASSEXTEND = "native" 21BBCLASSEXTEND = "native"
22 22
diff --git a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
index f4e30d93d4..466f3491fd 100644
--- a/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxdmcp_1.1.2.bb
@@ -13,7 +13,7 @@ inherit gettext
13LICENSE = "MIT-style" 13LICENSE = "MIT-style"
14LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123" 14LIC_FILES_CHKSUM = "file://COPYING;md5=d559fb26e129626022e052a5e6e0e123"
15 15
16DEPENDS += "xproto" 16DEPENDS += "xorgproto"
17PROVIDES = "xdmcp" 17PROVIDES = "xdmcp"
18 18
19PE = "1" 19PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
index 063e531c02..aae8f2af6d 100644
--- a/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb
@@ -13,7 +13,7 @@ require xorg-lib-common.inc
13LICENSE = "MIT-style" 13LICENSE = "MIT-style"
14LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" 14LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8"
15 15
16DEPENDS += "xproto virtual/libx11 xextproto" 16DEPENDS += "xorgproto virtual/libx11"
17PROVIDES = "xext" 17PROVIDES = "xext"
18 18
19PE = "1" 19PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
index c80042d349..f0e2f606ce 100644
--- a/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfixes_5.0.3.bb
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
10LICENSE = "MIT-style" 10LICENSE = "MIT-style"
11LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" 11LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0"
12 12
13DEPENDS += "virtual/libx11 xproto fixesproto xextproto" 13DEPENDS += "virtual/libx11 xorgproto"
14 14
15PE = "1" 15PE = "1"
16 16
diff --git a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
index 5f27a55827..2b72d6750c 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
9LICENSE = "MIT & MIT-style & BSD" 9LICENSE = "MIT & MIT-style & BSD"
10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" 10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
11 11
12DEPENDS += "freetype xtrans fontsproto libfontenc zlib" 12DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
13 13
14XORG_PN = "libXfont2" 14XORG_PN = "libXfont2"
15 15
diff --git a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
index 79f77fceac..94c6c66e87 100644
--- a/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb
@@ -9,7 +9,7 @@ require xorg-lib-common.inc
9LICENSE = "MIT & MIT-style & BSD" 9LICENSE = "MIT & MIT-style & BSD"
10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c" 10LIC_FILES_CHKSUM = "file://COPYING;md5=a46c8040f2f737bcd0c435feb2ab1c2c"
11 11
12DEPENDS += "freetype xtrans fontsproto libfontenc zlib" 12DEPENDS += "freetype xtrans xorgproto libfontenc zlib"
13PROVIDES = "xfont" 13PROVIDES = "xfont"
14 14
15PE = "1" 15PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
index 74f0527b78..08381d9c4d 100644
--- a/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb
@@ -11,7 +11,7 @@ LICENSE = "MIT & MIT-style"
11LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \ 11LIC_FILES_CHKSUM = "file://COPYING;md5=17b064789fab936a1c58c4e13d965b0f \
12 file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f" 12 file://src/XIGetDevFocus.c;endline=23;md5=cdfb0d435a33ec57ea0d1e8e395b729f"
13 13
14DEPENDS += "libxext inputproto libxfixes" 14DEPENDS += "libxext xorgproto libxfixes"
15 15
16PE = "1" 16PE = "1"
17 17
diff --git a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
index bb03f44e25..367ad262be 100644
--- a/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb
@@ -10,7 +10,7 @@ LICENSE = "MIT"
10LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=6f4f634d1643a2e638bba3fcd19c2536 \
11 file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02" 11 file://src/Xinerama.c;beginline=2;endline=25;md5=fcef273bfb66339256411dd06ea79c02"
12 12
13DEPENDS += "libxext xineramaproto" 13DEPENDS += "libxext xorgproto"
14PROVIDES = "xinerama" 14PROVIDES = "xinerama"
15PE = "1" 15PE = "1"
16 16
diff --git a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
index 39a344ccad..f5c18607ac 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbfile_1.0.9.bb
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
8LICENSE = "MIT-style" 8LICENSE = "MIT-style"
9LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f" 9LIC_FILES_CHKSUM = "file://COPYING;md5=8be7367f7e5d605a426f76bb37d4d61f"
10 10
11DEPENDS += "virtual/libx11 kbproto" 11DEPENDS += "virtual/libx11 xorgproto"
12 12
13PE = "1" 13PE = "1"
14 14
diff --git a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
index 48e88d20a7..b90ebc6232 100644
--- a/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrandr_1.5.1.bb
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69" 12LIC_FILES_CHKSUM = "file://COPYING;md5=c9d1a2118a6cd5727521db8e7a2fee69"
13 13
14DEPENDS += "virtual/libx11 randrproto libxrender libxext" 14DEPENDS += "virtual/libx11 xorgproto libxrender libxext"
15 15
16PE = "1" 16PE = "1"
17 17
diff --git a/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb b/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
index 92b3102704..9b18366138 100644
--- a/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
+++ b/meta/recipes-graphics/xorg-lib/libxrender_0.9.10.bb
@@ -11,7 +11,7 @@ require xorg-lib-common.inc
11LICENSE = "MIT-style" 11LICENSE = "MIT-style"
12LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" 12LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196"
13 13
14DEPENDS += "virtual/libx11 renderproto xproto" 14DEPENDS += "virtual/libx11 xorgproto"
15 15
16PE = "1" 16PE = "1"
17 17
diff --git a/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb b/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
index 8c34e47b43..af6bb19a25 100644
--- a/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
10LICENSE = "MIT" 10LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa" 11LIC_FILES_CHKSUM = "file://COPYING;md5=8c89441a8df261bdc56587465e13c7fa"
12 12
13DEPENDS += "libxext resourceproto" 13DEPENDS += "libxext xorgproto"
14 14
15PE = "1" 15PE = "1"
16 16
diff --git a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
index 354e5de7fd..ddf09af05f 100644
--- a/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
+++ b/meta/recipes-graphics/xorg-lib/libxscrnsaver_1.2.2.bb
@@ -12,7 +12,7 @@ image is to be displayed and to provide the graphics."
12LICENSE = "MIT" 12LICENSE = "MIT"
13LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb" 13LIC_FILES_CHKSUM = "file://COPYING;md5=21fd154ee757813632ada871a34113fb"
14 14
15DEPENDS += "libxext scrnsaverproto" 15DEPENDS += "libxext xorgproto"
16PROVIDES = "libxss" 16PROVIDES = "libxss"
17RREPLACES_${PN} = "libxss" 17RREPLACES_${PN} = "libxss"
18PE = "1" 18PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
index 180d00d9b0..f8d94a2f54 100644
--- a/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
+++ b/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb
@@ -16,7 +16,7 @@ LICENSE = "MIT & MIT-style"
16LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343" 16LIC_FILES_CHKSUM = "file://COPYING;md5=6565b1e0094ea1caae0971cc4035f343"
17 17
18 18
19DEPENDS += "util-linux libxcb libsm virtual/libx11 kbproto libxdmcp" 19DEPENDS += "util-linux libxcb libsm virtual/libx11 xorgproto libxdmcp"
20PROVIDES = "xt" 20PROVIDES = "xt"
21 21
22PE = "1" 22PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
index 5717fa5b79..266bd1ca59 100644
--- a/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb
@@ -10,7 +10,7 @@ LICENSE = "MIT-style"
10LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \ 10LIC_FILES_CHKSUM = "file://COPYING;md5=bb4f89972c3869f617f61c1a79ad1952 \
11 file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99" 11 file://src/XTest.c;beginline=2;endline=32;md5=b1c8c9dff842b4d5b89ca5fa32c40e99"
12 12
13DEPENDS += "libxext recordproto inputproto libxi" 13DEPENDS += "libxext xorgproto libxi"
14PROVIDES = "xtst" 14PROVIDES = "xtst"
15PE = "1" 15PE = "1"
16 16
diff --git a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb b/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
index a226c2753a..c6027233ef 100644
--- a/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
+++ b/meta/recipes-graphics/xorg-lib/libxv_1.0.11.bb
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
10LICENSE = "MIT-style" 10LICENSE = "MIT-style"
11LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c" 11LIC_FILES_CHKSUM = "file://COPYING;md5=827da9afab1f727f2a66574629e0f39c"
12 12
13DEPENDS += "libxext videoproto" 13DEPENDS += "libxext xorgproto"
14 14
15XORG_PN = "libXv" 15XORG_PN = "libXv"
16 16
diff --git a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
index 6ed49b1f37..7e49a98ddb 100644
--- a/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
+++ b/meta/recipes-graphics/xorg-lib/libxvmc_1.0.10.bb
@@ -9,7 +9,7 @@ LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \ 9LIC_FILES_CHKSUM = "file://COPYING;md5=0a207f08d4961489c55046c9a5e500da \
10 file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de" 10 file://wrapper/XvMCWrapper.c;endline=26;md5=5151daa8172a3f1bb0cb0e0ff157d9de"
11 11
12DEPENDS += "libxext libxv videoproto" 12DEPENDS += "libxext libxv xorgproto"
13 13
14PE = "1" 14PE = "1"
15 15
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
index 695a39637c..626199e09c 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86dga_1.1.4.bb
@@ -9,7 +9,7 @@ emulators for games."
9 9
10LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f" 10LIC_FILES_CHKSUM = "file://COPYING;md5=abb99ac125f84f424a4278153988e32f"
11 11
12DEPENDS += "libxext xf86dgaproto" 12DEPENDS += "libxext"
13 13
14PE = "1" 14PE = "1"
15 15
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
index af6f1f76a2..04fe962628 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.3.bb
@@ -8,7 +8,7 @@ require xorg-lib-common.inc
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45" 9LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45"
10 10
11DEPENDS += "libxext xf86miscproto" 11DEPENDS += "libxext"
12PROVIDES = "xxf86misc" 12PROVIDES = "xxf86misc"
13 13
14PE = "1" 14PE = "1"
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
index 35f87d2719..95fc0b642c 100644
--- a/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
+++ b/meta/recipes-graphics/xorg-lib/libxxf86vm_1.1.4.bb
@@ -10,7 +10,7 @@ require xorg-lib-common.inc
10LICENSE = "MIT" 10LICENSE = "MIT"
11LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d" 11LIC_FILES_CHKSUM = "file://COPYING;md5=fa0b9c462d8f2f13eba26492d42ea63d"
12 12
13DEPENDS += "libxext xf86vidmodeproto" 13DEPENDS += "libxext xorgproto"
14 14
15PE = "1" 15PE = "1"
16 16
diff --git a/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
index 84a967a81e..727ab54965 100644
--- a/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
+++ b/meta/recipes-graphics/xorg-util/makedepend_1.0.5.bb
@@ -10,7 +10,7 @@ directives would be used in a compilation. Any #include, directives \
10can reference files having other #include directives, and parsing will \ 10can reference files having other #include directives, and parsing will \
11occur in these files as well." 11occur in these files as well."
12 12
13DEPENDS = "xproto util-macros" 13DEPENDS = "xorgproto util-macros"
14PE = "1" 14PE = "1"
15 15
16BBCLASSEXTEND = "native" 16BBCLASSEXTEND = "native"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index cf2286c653..882897bd25 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -26,7 +26,7 @@ inherit autotools pkgconfig
26inherit distro_features_check 26inherit distro_features_check
27REQUIRED_DISTRO_FEATURES = "x11" 27REQUIRED_DISTRO_FEATURES = "x11"
28 28
29PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" 29PROTO_DEPS = "xorgproto"
30LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" 30LIB_DEPS = "pixman libxfont2 xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess"
31DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" 31DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util"
32 32
@@ -127,18 +127,18 @@ PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \
127" 127"
128 128
129PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" 129PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
130PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" 130PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xorgproto virtual/mesa"
131PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" 131PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,xorgproto"
132# DRI3 requires xshmfence to also be enabled 132# DRI3 requires xshmfence to also be enabled
133PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" 133PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,xorgproto"
134PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" 134PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,xorgproto virtual/libgl virtual/libx11"
135PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" 135PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl"
136PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" 136PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind"
137PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" 137PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence"
138PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" 138PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native"
139PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," 139PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus,"
140PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" 140PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd"
141PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" 141PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xorgproto"
142PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy" 142PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland wayland-native wayland-protocols libepoxy"
143 143
144# Xorg requires a SHA1 implementation, pick one 144# Xorg requires a SHA1 implementation, pick one