summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2018-05-07 19:03:44 -0700
committerArmin Kuster <akuster808@gmail.com>2018-05-17 08:20:47 -0700
commit1dfd225c6097a97bad2b779d663cbfd5b2ac581f (patch)
treeef454406c8646b97b07a76598bc6ced4d557b738
parent7f12897639b1416991ea2764be6894c864636bfb (diff)
downloadmeta-openembedded-1dfd225c6097a97bad2b779d663cbfd5b2ac581f.tar.gz
xorg: Replace depreciated *proto depends with xorgproto
The oe-core commit 9d236bd40ef8598c78c1ea807d658467700505e2 has removed *proto, we also need to do so in meta-openembedded. Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb4
-rw-r--r--meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb2
-rw-r--r--meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb2
3 files changed, 4 insertions, 4 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
index d409a1863..fb81e5396 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb
@@ -6,8 +6,8 @@ SUMMARY = "X.Org X server -- ATI Radeon video driver"
6 6
7DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" 7DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics"
8 8
9DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ 9DEPENDS += "virtual/libx11 libxvmc drm \
10 virtual/libgl xineramaproto libpciaccess" 10 virtual/libgl xorgproto libpciaccess"
11 11
12inherit distro_features_check 12inherit distro_features_check
13REQUIRED_DISTRO_FEATURES += "opengl" 13REQUIRED_DISTRO_FEATURES += "opengl"
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
index cd680597c..182e18fd9 100644
--- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
+++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb
@@ -16,6 +16,6 @@ SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118"
16SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" 16SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422"
17 17
18PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" 18PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}"
19PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" 19PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri"
20 20
21RDEPENDS_${PN} = "xserver-xorg-module-exa" 21RDEPENDS_${PN} = "xserver-xorg-module-exa"
diff --git a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
index 96bdf0e53..f683f5359 100644
--- a/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
+++ b/meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
6 6
7inherit xfce-panel-plugin 7inherit xfce-panel-plugin
8 8
9DEPENDS += "xfconf xproto libxtst" 9DEPENDS += "xfconf xorgproto libxtst"
10 10
11SRC_URI[md5sum] = "9169140af7c9d3fddd8a5c9e0efb5a61" 11SRC_URI[md5sum] = "9169140af7c9d3fddd8a5c9e0efb5a61"
12SRC_URI[sha256sum] = "cf2b45e327e67cc187dcb99a6ef6d95570463045accd24540e17172f005189b3" 12SRC_URI[sha256sum] = "cf2b45e327e67cc187dcb99a6ef6d95570463045accd24540e17172f005189b3"