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>
Patch in a copy of introspection.m4 so that we can continue to easily and
cleanly disable introspection.
(From OE-Core rev: 84d62181f80402fa461675e03b20ba08da1991e8)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added a note about why we're setting S, so I don't have to figure it out again
next time I try and update clutter.
(From OE-Core rev: b752e2d6ae286db5588547fc49f1aa64e112fa32)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This API is relatively new and will be in next release of libX11
this is needed for OE qemu-native which links to libx11-native
but uses libGL from build system and herein lies the problem
if you have bleeding edge distro e.g. ubuntu 12.04(development)
libGL.so expects this API to be present. Backported to 1.4.4
thusly
(From OE-Core rev: e08604800fe1cb8f240f53c147ceb4ee08a29b91)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
uclibc wants to know value of __USE_GNU for certain
header prototypes to be enabled. So we move the config.h
header up in search list.
(From OE-Core rev: 086679cfbc30dba4af2f650984084195e5171b8f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
rgb in meta-oe has been removed in favour of
oe-core which requires a PR bump so feeds
keep working
(From OE-Core rev: 00c2e80e8cae2db6e2c34b1291c615f7f146b070)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This has patch has been merged into upstreams git repository and will be
available in the next stable release.
(From OE-Core rev: 77f5e99a821ad30b859a402bdc55c495741b24cc)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade xcb-proto from 1.6 to 1.7
Since xcb-proto-libdir.patch is there, the file is removed.
(From OE-Core rev: 15780c7d7bb5d242aa688c1c1d9842a1004222d9)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add DESCRIPTION to each image bb file according to poky reference manual for Hob2 use later.
(From OE-Core rev: 05a7c022e613f35de8ce47bb667140a7ce47fcea)
Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* from meta-openembedded with minor editings
* (fields reordering like other recipes in xorg-app)
(From OE-Core rev: 618da7f65d3f9e3a1a5ee0b35371ae036a219a9a)
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This enables wacom tablet/touchscreen support on qemuppc.
(From OE-Core rev: 127b15cb0e9644fb732b707b9d4ddaf00d24973e)
Signed-off-by: Liming Wang <liming.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There was a circular dependency introduced by the recent gconf changes
to depend on gtk+. The issue is that gtk+ depends on pango and pango
depends on gconf.
This patch changes to use the gnonebase class since pango has no need
of gconf/mime/gtk-icon-cache and hence removes the circular dependency.
(From OE-Core rev: 91e17c0c0ac2330f826b95e762542cd0d0c82385)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is needed for firefox:
| checking CAIRO_LIBS... -lcairo -lpixman-1 -lfreetype -lfontconfig
| checking for cairo-tee >= 1.10... Package cairo-tee was not found in the pkg-config search path. Perhaps you should add the directory containing `cairo-tee.pc' to the PKG_CONFIG_PATH environment variable No package 'cairo-tee' found
| configure: error: Library requirements (cairo-tee >= 1.10) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.
(From OE-Core rev: 935ae84757ca623f93b1465088e27107bc226dee)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Command "pango-querymodules > /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.
[YOCTO #1900]
[RP: PR bump]
(From OE-Core rev: 65186bd86170d8c375931a18487c2fdf3bd1b3b0)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"direcdtfb" is a wrong configuration in PACKAGECONFIG. It should be "gtk-directfb".
PACKAGECONFIG can't select directfb as backend rightly, or else.
[YOCTO #1900]
(From OE-Core rev: 458ffd3f47b99ee89e6cb8015d68f9820f86e3e7)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix type conversion for x32. For x32 the off_t is 64bit and pointers are
32bit.
so the conversion of pointer to off_t was resulting into this error:
| XF86DGA2.c:931:24: error: cast from pointer to integer of different
size [-Werror=pointer-to-int-cast]
| cc1: some warnings being treated as errors
|
| make[2]: *** [XF86DGA2.lo] Error 1
Fixed it by typecasting pointer into unsigned long 1st and then again
typecasting unsigned long to off_t.
(From OE-Core rev: 644aaa87a0e161f8a37267f13d4a18f6dfcd9a4f)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Windows manager should be independent on session manager, especially when we
have multiple session manager like mini-x and matchbox session.
This commit remove session-manager stuff in matchbox-wm, as matchbox-session
already has duplicated code. Also adjust alternative priority for mini-X to
make it higher priority over matchbox-session.
(From OE-Core rev: c3400040fdce8c049b51a8acb06eb2e92f9426d1)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This file can make an image to run gtk over directfb.
[YOCTO #1674]
(From OE-Core rev: 0c97fd9d721cea9786e89a557418649ef4576cfd)
Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A number of calls to REGION_INIT() use a static box which is flagged
as an error with -Werror=address. This patch works around the problem,
but should not be considered a final solution.
Upstream-Status: Inappropriate
(From OE-Core rev: 605f6b89b9948351601af1ef37510f7dee77895b)
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Without this patch cogl will not build for armv4 as it uses an
unsupported instruction. This changeset adds a patch from Wolfgang
Denk to add an extra guard around armv5 or above code.
(From OE-Core rev: e19586765af518892ed55d9bfd45d0857566ae98)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
According to http://cgit.freedesktop.org/xorg/lib/libpciaccess/log/, 0.12.902
does fix some bugs, so let's upgrade to it.
Moreover, I pulled a patch from upstream git repo.
I also updated the COPYING's chksum since there is a minor change to the
Copyright header.
(From OE-Core rev: 72c6f939c9130328045bda1c8896e078b75f07f0)
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
These patches were marked by "UpstreamStatus:" line, fix it to use
"Upstream-Status:" instead.
(From OE-Core rev: b33b373c9a33fe0ff51104c96d1e5b105efc63ed)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"builder" can start some auto stuff by mini X session.
(From OE-Core rev: fdb12302674101feb85f4e83936652474ffd231d)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mini-x-session runs session files on behalf of file owner, so that no rootless X
required.
(From OE-Core rev: 43c2d366622ea52cba8a5b727d723c8ec30bd44b)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
projects.o-hand.com downloads have moved to downloads.yoctoproject.org
(From OE-Core rev: 7799fb896e6a8eed27496a49b676056bb63c5ca3)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
projects.o-hand.com downloads have moved to downloads.yoctoproject.org
(From OE-Core rev: de8d8c97885de7ae25206ede6a4d8a016e0a6938)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* projects.o-hand.com downloads have moved to downloads.yoctoproject.org
* LICENSE syntax was invalid (should use & instead of + to signify mixed
license). I have set it to GPLv2+ since there is only one source file
and that's the license it states. (Note - even if it was a mix of
GPLv2+ and GPLv2 code the result would be GPLv2 only.)
(From OE-Core rev: 9734aaecf6bc347fac59b307df63597e501b4d72)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the HOMEPAGE and DESCRIPTION which were using the same values as Clutter.
(From OE-Core rev: 67c91c83774d485b54357b81eb105ab291d4e383)
Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For some reason the -config script was shipped in ${PN} leading to shlibs renaming issues:
What we want, and how meta-oe used to do it:
libsdl-1.2-0_1.2.14-r0.0_armv7a.ipk
Current OE-core status:
libsdl_1.2.14-r2_armv7a.ipk
With this commit we get both proper shlib renaming and the -dev package now has all the dev files
(From OE-Core rev: ae4118a1f78f113c3d687c3aa6a86007cf977cae)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
