Both these clutter recipes provide 1.8. With different PN namespace, a world
build cna build both causing the clutter libraries to "disappear" at certain
points of the build. In particular, this causes issues for mx.
This patch puts then into the same PN namespace so only one can be built.
[YOCTO #2158]
(From OE-Core rev: d5a7a9090b57793be1de63dca86fe40437628e9d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix a couple common typoes, all contained within comments so there
should be no effect on functionality.
(From OE-Core rev: dc52c3cbf3a7b7242d53019f7643495eb40c0566)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
WARNING: For recipe xserver-kdrive, the following files/directories were installed but not shipped in any package:
WARNING: /usr/lib
WARNING: /usr/lib/xorg
WARNING: /usr/lib/xorg/protocol.txt
WARNING: /usr/share/X11
WARNING: /usr/share/X11/xkb
WARNING: /usr/share/X11/xkb/compiled
WARNING: /usr/share/X11/xkb/compiled/README.compiled
(From OE-Core rev: d036265de1d9931bedb660e01a763d3d1d9e4097)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The license change is:
--- libXmu-1.1.0/COPYING 2009-10-17 05:26:51.000000000 +0800
+++ libXmu-1.1.1/COPYING 2012-03-06 15:00:13.000000000 +0800
@@ -28,13 +28,13 @@
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
(From OE-Core rev: a75b4604d79a8d8f9a38ffe347546da856cb4cc1)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is:
--- libXv-1.0.6/COPYING 2009-10-17 05:27:22.000000000 +0800
+++ libXv-1.0.7/COPYING 2012-03-08 13:25:45.000000000 +0800
@@ -3,13 +3,13 @@
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the names of Digital or MIT not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
(From OE-Core rev: eb51eebe14e961e63ceb1673cb7e349c8281849b)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is:
--- libXext-1.3.0/COPYING 2010-11-22 03:24:13.000000000 +0800
+++ libXext-1.3.1/COPYING 2012-03-08 11:54:58.000000000 +0800
@@ -34,14 +34,14 @@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
+BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Digital Equipment Corporation
+Except as contained in this notice, the name of Digital Equipment Corporation
shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
+dealings in this Software without prior written authorization from Digital
Equipment Corporation.
Copyright (c) 1997 by Silicon Graphics Computer Systems, Inc.
@@ -81,7 +81,7 @@
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL NCD.
BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
Copyright 1991,1993 by Digital Equipment Corporation, Maynard, Massachusetts,
@@ -116,8 +116,8 @@
advertising or publicity pertaining to distribution of the
software without specific, written prior permission.
-Hewlett-Packard makes no representations about the
-suitability of this software for any purpose. It is provided
+Hewlett-Packard makes no representations about the
+suitability of this software for any purpose. It is provided
"as is" without express or implied warranty.
This software is not subject to any license of the American
(From OE-Core rev: 8e7750c68251fe1525ef01687e64b9c45161ccdd)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is:
--- libXrender-0.9.6/COPYING 2010-01-30 15:39:43.000000000 +0800
+++ libXrender-0.9.7/COPYING 2012-03-08 12:47:00.000000000 +0800
@@ -35,5 +35,5 @@
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
-OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
(From OE-Core rev: fd02e4a4c6774121d67559b09e4b03be42de983e)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is:
--- libXxf86vm-1.1.1/COPYING 2010-01-30 15:40:42.000000000 +0800
+++ libXxf86vm-1.1.2/COPYING 2012-03-08 13:39:59.000000000 +0800
@@ -14,12 +14,12 @@
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
+IN NO EVENT SHALL Kaleb S. KEITHLEY BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS IN THE SOFTWARE.
-Except as contained in this notice, the name of Kaleb S. KEITHLEY
-shall not be used in advertising or otherwise to promote the sale, use
+Except as contained in this notice, the name of Kaleb S. KEITHLEY
+shall not be used in advertising or otherwise to promote the sale, use
or other dealings in this Software without prior written authorization
from Kaleb S. KEITHLEY.
(From OE-Core rev: b5f1c7ddf30214a649d43dd0fa23160dc37792a6)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is below (only removing a space in the end of each line):
--- libxkbfile-1.0.7/COPYING 2009-10-17 05:27:13.000000000 +0800
+++ libxkbfile-1.0.8/COPYING 2012-03-08 12:37:23.000000000 +0800
@@ -5,19 +5,19 @@
fee is hereby granted, provided that the above copyright
notice appear in all copies and that both that copyright
notice and this permission notice appear in supporting
-documentation, and that the name of Silicon Graphics not be
-used in advertising or publicity pertaining to distribution
+documentation, and that the name of Silicon Graphics not be
+used in advertising or publicity pertaining to distribution
of the software without specific prior written permission.
-Silicon Graphics makes no representation about the suitability
+Silicon Graphics makes no representation about the suitability
of this software for any purpose. It is provided "as is"
without any express or implied warranty.
-SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
-SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+SILICON GRAPHICS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
+SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON
-GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
-DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+GRAPHICS BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL
+DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
@@ -48,13 +48,13 @@
Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
All Rights Reserved
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
+both that copyright notice and this permission notice appear in
supporting documentation, and that the name of Digital not be
used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.
+software without specific, written prior permission.
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
(From OE-Core rev: 5165e1b6fcbfcaabf0d22f8be4e08ee838b198ab)
Signed-off-by: Shane Wang <shane.wang@intel.com>
The license change is because:
--- libsm-1_1.2.0-r1/libSM-1.2.0/COPYING 2010-01-15 12:59:55.000000000 +0800
+++ libsm-1_1.2.1-r0/libSM-1.2.1/COPYING 2012-03-03 12:53:55.000000000 +0800
@@ -1,4 +1,4 @@
-Copyright 2002 Sun Microsystems, Inc. All rights reserved.
+Copyright (c) 2002, Oracle and/or its affiliates. All rights reserved.
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"),
@@ -19,6 +19,7 @@
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
+
Copyright 1993, 1998 The Open Group
Permission to use, copy, modify, distribute, and sell this software and its
(From OE-Core rev: 27fbb481e1b39ce5cfdecf19bb434be096392e72)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Cross compiling of xserver-kdrive fails if dtrace is enabled. Configure
script enables dtrace automatically if dtrace binary exists. xserver-kdrive
compiling was failed if systemtap package was builded beforehand because
systemtap provides dtrace binary.
(From OE-Core rev: 5d404fdb36b0535ce758d98408b02134cdbce4ee)
Signed-off-by: Lauri Hintsala <lauri.hintsala@bluegiga.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Exporting these extensions make guest call some missing GLX API then crash.
It's hacky to implement these APIs, so hide these extensions as fix.
[YOCTO #1927] got fixed
(From OE-Core rev: a9e4b94f799e41a2b06f833a8b411ebee3939430)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove the .pc file work around since it leads to incorrect paths being encoded and
places the files in the incorrect directory.
WARNING: For recipe xf86-input-synaptics, the following files/directories were installed but not shipped in any package:
WARNING: /media
WARNING: /media/build1
WARNING: /media/build1/poky
WARNING: /media/build1/poky/build
WARNING: /media/build1/poky/build/tmp
WARNING: /media/build1/poky/build/tmp/sysroots
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86/usr
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86/usr/include
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86/usr/include/xorg
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86/usr/include/xorg/synaptics-properties.h
WARNING: /media/build1/poky/build/tmp/sysroots/qemux86/usr/include/xorg/synaptics.h
WARNING: /usr/share/X11
WARNING: /usr/share/X11/xorg.conf.d
WARNING: /usr/share/X11/xorg.conf.d/50-synaptics.conf
(From OE-Core rev: 5fa6f6246ab21007aa39c2936382e8cff3fe9148)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update libsdl to 1.2.15.
Patch add.XGetRequest.symbol.patch is merged by upstream, so remove it.
(From OE-Core rev: 94e18a1c574b97ba87724c0fea79d2af77ba4186)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add dependency on startup-notification, which is optional but without
it mx applications will not send startup notifications.
* Add dependencies on gdk-pixbuf and libxrandr which are usually taken
care of, but are required and thus should be stated explicitly.
(From OE-Core rev: 42a278ff7dc641b1700e56fbaf5a63947ff1161c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixes the warning:
WARNING: For recipe xf86-video-vmware, the following files/directories were installed but not shipped in any package:
WARNING: /usr/bin
(From OE-Core rev: 58b2b72852389b9454dd9082ad2b22b2efbb2c19)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This addresses the QA warnings:
WARNING: For recipe xf86-input-vmmouse, the following files/directories were installed but not shipped in any package:
WARNING: /lib
WARNING: /lib/udev
WARNING: /lib/udev/rules.d
WARNING: /lib/udev/rules.d/69-xorg-vmmouse.rules
WARNING: /usr/share/X11
WARNING: /usr/share/hal
WARNING: /usr/share/X11/xorg.conf.d
WARNING: /usr/share/X11/xorg.conf.d/50-vmmouse.conf
WARNING: /usr/share/hal/fdi
WARNING: /usr/share/hal/fdi/policy
WARNING: /usr/share/hal/fdi/policy/20thirdparty
WARNING: /usr/share/hal/fdi/policy/20thirdparty/11-x11-vmmouse.fdi
WARNING: /usr/lib/hal
WARNING: /usr/lib/hal/hal-probe-vmmouse
The hal files are simply deleted, we don't care about hal.
(From OE-Core rev: fb1e1ca346c617598726609425406b5afc79270d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoids the error:
ln: creating symbolic link `/media/data1/build1/poky/build/tmp/work/x86_64-linux/mesa-dri-glsl-native-7.11-r0/Mesa-7.11/src/glsl//../../configs/current': File exists
(From OE-Core rev: 7871772c74e65ef472c5bf3776e4b3b30308bd5d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
