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>
* Use conditional dependencies for DirectFB, like
it's already done for OpenGL and X11.
(From OE-Core rev: 29ba15af6b4a85687bd487779ec2ea2be80644dc)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "1" with getVar is bad coding style and "True" is preferred.
This patch is a sed over the meta directory of the form:
sed \
-e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \
-e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \
-i `grep -ril getVar *`
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Append error information from LSB Test Suite to this patch for an illustrative purpose \
why this patches should be needed.
(From OE-Core rev: 0e6dfa5dcf324a1d32b634bbcd9487106a6f5413)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
LSB 4.1 complain a host contamination error from libx11 because of absent
patch "makekeys_crosscompile.patch" from libx11-trim-1.4.4.
The error from LSB Test Suite is as follow:
VSW5TESTSUITE PURPOSE 7
Assertion XStringToKeysym-7.(A)
When the string argument is the name of a KeySym in the
table with the prefix XK_ removed, then a call to
XStringToKeysym returns that KeySym.
METH: For each KeySym name in table with code G:
METH: Call XStringToKeysym to obtain the KeySym defined for that string.
METH: Verify that XStringToKeysym did not return NoSymbol.
METH: Verify that the returned string is correct.
CHECK: XStringToKeysym-7 1, line 130
CHECK: XStringToKeysym-7 2, line 140
CHECK: XStringToKeysym-7 3, line 150
CHECK: XStringToKeysym-7 4, line 160
CHECK: XStringToKeysym-7 5, line 170
CHECK: XStringToKeysym-7 6, line 180
CHECK: XStringToKeysym-7 7, line 190
CHECK: XStringToKeysym-7 8, line 200
CHECK: XStringToKeysym-7 9, line 210
CHECK: XStringToKeysym-7 10, line 220
CHECK: XStringToKeysym-7 11, line 230
CHECK: XStringToKeysym-7 12, line 240
CHECK: XStringToKeysym-7 13, line 250
CHECK: XStringToKeysym-7 14, line 260
CHECK: XStringToKeysym-7 15, line 270
CHECK: XStringToKeysym-7 16, line 280
CHECK: XStringToKeysym-7 17, line 290
CHECK: XStringToKeysym-7 18, line 300
CHECK: XStringToKeysym-7 19, line 310
CHECK: XStringToKeysym-7 20, line 320
[YOCTO #1970]
(From OE-Core rev: c9824083d4ab5bfd37fa1efdfbc3e93288cb47b6)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have things that depend on libx11-dev, this patch ensures the -trim
and -diet versions provide it. This resolves some multiple providers
warnings.
(From OE-Core rev: c051d6c59c71a5f90c2d545491facd2d131592fd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* We have various variables which are either not quoted at all or are half
quoted. This patch fixes the bad exmaples so everything is consistent.
(From OE-Core rev: 960ee8076e860353a05eb2eb7f825a455c54698d)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Improve error message as suggested by Koen.
(This got lost when v1 was committed instead of v2)
(From OE-Core rev: 384912b4719a77b2e5f6673066e75258df130f5d)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Disable X11 output support for target and nativesdk if x11 is not in
DISTRO_FEATURES.
Fixes [YOCTO #2020]
(From OE-Core rev: 506e4c9b05d61f126fff112d7c111902d5c9fac5)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* If 'x11' is not set in DISTRO_FEATURES, then skip all
recipes using xorg-lib-common.inc instead of only those
using libx11.inc.
* One exception: pixman, which is not only used by xorg,
but also by cairo.
(From OE-Core rev: a101bc85adcc915f151348107e850b8998a395b0)
Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The patch was tested on VMware Player 4.0.1.
(From OE-Core rev: d33cc3be420fb509d8dddb1f1a752db6d41f50f9)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Dont use autotools, it really not so autoconf like.
the configure script gets updated with every release of zlib
and we overwrite that. Instead use the upstream provided
configure
copyright year was changed in zlib.h which caused change in
LIC_FILE_CHECKSUM
fix.inverted.LFS.logic.patch is already applied upstream so drop it
Drop the configure.ac and Makefile.am scripts since we do not
autoreconf anymore and do not inherit autotools anymore
Bump PR for depending recipes so a rebuild it ensues so that
they dont depend on .la anymore
and add missing dependencies discovered during incremental
build
(From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upstream informs me that D-bus isn't really optional as it's required
to make some of the API work such as the single instance MxApplication.
Therefore ensure we're building with it enabled.
Gettext macros are used in the configure.ac so inherit gettext to
ensure the required dependencies are present.
(From OE-Core rev: fe2c13684e2a0b652007e92a6f11942c6366483e)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
