summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-08-02 21:37:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-03 23:56:01 +0100
commit85c295bef624ec569c6187bb44c84b75789fac8e (patch)
treeaf569942b5c3ff8384345abc0e223c2d4c8f50bc /meta
parente5b0ad5dfa1bfec1d7f591554ab846252d8aaddb (diff)
downloadpoky-85c295bef624ec569c6187bb44c84b75789fac8e.tar.gz
libxx86misc: remove this now redundant library
The extension this client library is for was removed from the X server over a decade ago: commit 22e64108ec63ba77779891f8df237913ef9ca731 Author: Daniel Stone <daniel@fooishbar.org> Date: Wed Jul 16 06:25:26 2008 +0300 XFree86: Remove XFree86-Misc extension Its last remaining purpose in life has been destroyed by input properties. Au revoir: it's been fun, by which I mean awful. Remove the obsolete dependencies from xset and xdpyinfo, and delete libxx86misc entirely. (From OE-Core rev: 4d7677b2f511b2d07fabb1f06213a569c53f839f) Signed-off-by: Ross Burton <ross.burton@intel.com> enter the commit message for your changes. Lines starting Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/include/distro_alias.inc1
-rw-r--r--meta/conf/distro/include/maintainers.inc1
-rw-r--r--meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb2
-rw-r--r--meta/recipes-graphics/xorg-app/xset_1.2.4.bb2
-rw-r--r--meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb19
5 files changed, 2 insertions, 23 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc
index b0656953eb..ab6ebdb899 100644
--- a/meta/conf/distro/include/distro_alias.inc
+++ b/meta/conf/distro/include/distro_alias.inc
@@ -195,7 +195,6 @@ DISTRO_PN_ALIAS_pn-libxft = "Mandriva=libxft Debian=libxft2 Ubuntu=libxft2"
195DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi" 195DISTRO_PN_ALIAS_pn-libxi = "Ubuntu=libxi Fedora=libXi"
196DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon" 196DISTRO_PN_ALIAS_pn-libxkbcommon = "Fedora=libxkbcommon Debian=libxkbcommon"
197DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver" 197DISTRO_PN_ALIAS_pn-libxscrnsaver = "Fedora=libXScrnSaver Ubuntu=libxss1 Mandriva=libxscrnsaver"
198DISTRO_PN_ALIAS_pn-libxxf86misc = "Mandriva=libxxf86misc Fedora=libXxf86misc"
199DISTRO_PN_ALIAS_pn-linux-dummy = "Intel" 198DISTRO_PN_ALIAS_pn-linux-dummy = "Intel"
200DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware" 199DISTRO_PN_ALIAS_pn-linux-firmware = "Fedora=linux-firmware Ubuntu=linux-firmware"
201DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers" 200DISTRO_PN_ALIAS_pn-linux-libc-headers = "Debian=linux-kernel-headers Ubuntu=linux-kernel-headers"
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc
index 201130e771..7057111bc1 100644
--- a/meta/conf/distro/include/maintainers.inc
+++ b/meta/conf/distro/include/maintainers.inc
@@ -444,7 +444,6 @@ RECIPE_MAINTAINER_pn-libxtst = "Armin Kuster <akuster808@gmail.com>"
444RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <akuster808@gmail.com>" 444RECIPE_MAINTAINER_pn-libxv = "Armin Kuster <akuster808@gmail.com>"
445RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <akuster808@gmail.com>" 445RECIPE_MAINTAINER_pn-libxvmc = "Armin Kuster <akuster808@gmail.com>"
446RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster <akuster808@gmail.com>" 446RECIPE_MAINTAINER_pn-libxxf86dga = "Armin Kuster <akuster808@gmail.com>"
447RECIPE_MAINTAINER_pn-libxxf86misc = "Armin Kuster <akuster808@gmail.com>"
448RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <akuster808@gmail.com>" 447RECIPE_MAINTAINER_pn-libxxf86vm = "Armin Kuster <akuster808@gmail.com>"
449RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin <alex.kanavin@gmail.com>" 448RECIPE_MAINTAINER_pn-libyaml = "Alexander Kanavin <alex.kanavin@gmail.com>"
450RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin <alex.kanavin@gmail.com>" 449RECIPE_MAINTAINER_pn-lighttpd = "Alexander Kanavin <alex.kanavin@gmail.com>"
diff --git a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
index af04bb6e3a..a09e220f9d 100644
--- a/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
+++ b/meta/recipes-graphics/xorg-app/xdpyinfo_1.3.2.bb
@@ -9,7 +9,7 @@ clients and the server, and the different types of screens and visuals \
9that are available." 9that are available."
10 10
11LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3" 11LIC_FILES_CHKSUM = "file://COPYING;md5=f3d09e6b9e203a1af489e16c708f4fb3"
12DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxxf86misc libxi libxrender libxinerama libdmx libxau libxcomposite" 12DEPENDS += "libxtst libxext libxxf86vm libxxf86dga libxi libxrender libxinerama libdmx libxau libxcomposite"
13PE = "1" 13PE = "1"
14 14
15SRC_URI += "file://disable-xkb.patch" 15SRC_URI += "file://disable-xkb.patch"
diff --git a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb
index 5748837fd5..e21120e788 100644
--- a/meta/recipes-graphics/xorg-app/xset_1.2.4.bb
+++ b/meta/recipes-graphics/xorg-app/xset_1.2.4.bb
@@ -7,7 +7,7 @@ preference options of the display."
7 7
8LICENSE = "MIT" 8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d" 9LIC_FILES_CHKSUM = "file://COPYING;md5=bea81cc9827cdf1af0e12c2b8228cf8d"
10DEPENDS += "libxext libxxf86misc libxmu libxau" 10DEPENDS += "libxext libxmu libxau"
11PE = "1" 11PE = "1"
12 12
13SRC_URI += "file://disable-xkb.patch" 13SRC_URI += "file://disable-xkb.patch"
diff --git a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb b/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb
deleted file mode 100644
index 45b0673e73..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxxf86misc_1.0.4.bb
+++ /dev/null
@@ -1,19 +0,0 @@
1SUMMARY = "XFree86-Misc: XFree86 miscellaneous extension library"
2
3DESCRIPTION = "The XFree86-Misc extension, provides a means to access \
4input device configuration settings specific to the XFree86/Xorg DDX."
5
6require xorg-lib-common.inc
7
8LICENSE = "MIT"
9LIC_FILES_CHKSUM = "file://COPYING;md5=27c91ecc435bd3d2bfad868914c94b45"
10
11DEPENDS += "libxext"
12PROVIDES = "xxf86misc"
13
14PE = "1"
15
16XORG_PN = "libXxf86misc"
17
18SRC_URI[md5sum] = "37ad70f8b53b94b550f9290be97fbe2d"
19SRC_URI[sha256sum] = "a89c03e2b0f16239d67a2031b9003f31b5a686106bbdb3c797fb88ae472af380"