From 1dfd225c6097a97bad2b779d663cbfd5b2ac581f Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Mon, 7 May 2018 19:03:44 -0700 Subject: 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 Signed-off-by: Armin Kuster --- meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_7.8.0.bb | 4 ++-- meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb | 2 +- meta-xfce/recipes-panel-plugins/clipman/xfce4-clipman-plugin_1.4.2.bb | 2 +- 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" DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" -DEPENDS += "virtual/libx11 libxvmc drm xf86driproto glproto \ - virtual/libgl xineramaproto libpciaccess" +DEPENDS += "virtual/libx11 libxvmc drm \ + virtual/libgl xorgproto libpciaccess" inherit distro_features_check REQUIRED_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" SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri" +PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" RDEPENDS_${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" inherit xfce-panel-plugin -DEPENDS += "xfconf xproto libxtst" +DEPENDS += "xfconf xorgproto libxtst" SRC_URI[md5sum] = "9169140af7c9d3fddd8a5c9e0efb5a61" SRC_URI[sha256sum] = "cf2b45e327e67cc187dcb99a6ef6d95570463045accd24540e17172f005189b3" -- cgit v1.2.3-54-g00ecf