Commit Graph

378 Commits

Author SHA1 Message Date
Richard Purdie aa203e4605 Revert "pango: use qemu to generate pango.modules during rootfs construction"
This reverts commit 62381fd3a135318794f14dc3740b04facd32446e.

This commit has issues with the rpm rootfs generation which need
resolving before it can be accepted.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-13 17:06:17 +01:00
Zhai Edwin 44fd68da7c xserver-nodm-init: Change hidraw mode to allow normal user access
USB HID like touch screen could be presented as hidraw* device, this change
make user under rootless X can access them.

(From OE-Core rev: ddb54d4a467b51f5f8f305f532bd5ea64df92876)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-07 22:54:14 +01:00
Phil Blundell b8b4a92625 pango: use qemu to generate pango.modules during rootfs construction
This allows pango to be installed in an image with read-only-rootfs.

(From OE-Core rev: 62381fd3a135318794f14dc3740b04facd32446e)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-07 22:54:13 +01:00
Saul Wold 99666e772d o-hand recipes: convert from svn.o-hand.org to git.yoctoproject.org
(From OE-Core rev: 4e7218c19775ef81caed27742e9d203af10b7416)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-02 18:15:29 +01:00
Richard Purdie 8294f427d0 xserver-nodm: Disable dbus-wait as it causes users too much confusion
In the event the xserver fails to start the dbus-wait has to time out and
this causes many users a lot of confusion. If we wish to reinstate this,
we need to find a safer mechanism to do it where X failing to start cancels
the timeout (sends a dbus event at that point?) The comments are left in the
file as an example in case some user does wish to enable is.

(From OE-Core rev: 0471b17b061e57231387ef90c95fc0c34fc0e66b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-31 19:38:31 +01:00
Phil Blundell 7d8d3e6784 pango: make x11 support conditional on DISTRO_FEATURES
This allows pango to build on DISTROs which don't enable x11.
Also adjust the SECTION since pango isn't really an X library.

(From OE-Core rev: ac92a573dd38270a28967c76472435cfd7f9bdfe)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-29 13:48:06 +01:00
Jiajun Xu 9a75040320 libsdl: do not inherit nativesdk
We already enable target version for libsdl and use BBCLASSEXTEND
to enable nativesdk. No need to inherit nativesdk then.

(From OE-Core rev: f3945cf1a9d33438afbcb28ee35edc10b9d047d9)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:34 -07:00
Khem Raj a0dc330b4a recipes: Delete patch=1, its default and replace pnum with striplevel
Some place pnum=1 is used which is removed as well since
striplevel=1 is default

(From OE-Core rev: 4e108857e0d40105f7ecbc55e99bd6c367bb7386)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:30 -07:00
Richard Purdie 36396b6ecb xcb/libpthreads: Add BBCLASSEXTEND to resolve missing providers in world builds
(From OE-Core rev: 9134800548a03bfe3a7e351a15f2129bcb3cc680)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 16:28:17 -07:00
Dexuan Cui 99fbca7271 dri2proto: upgrade from 2.4 to 2.6
The patch has been integrated into 1.4.14 so let's remove it.

(From OE-Core rev: 8e0e309966576d705c75eb0e82cbf46e57fc0e46)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:57 +01:00
Dexuan Cui 4580761533 glproto: upgrade from 1.4.13 to 1.4.14
The patch has been integrated into 1.4.14 so let's remove it.

(From OE-Core rev: 6f66bab6bf9fa202bfbbaed5d86c0d585e23571e)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:57 +01:00
Dexuan Cui f08d7da6f4 xproto: upgrade from 7.0.21 to 7.0.22
(From OE-Core rev: 8f80adf492226af775487e9224d4892a5f9c72a3)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:57 +01:00
Dexuan Cui 8c9add68f4 freetype: upgrade from 2.4.4 to 2.4.6
freetype-2.4.6/docs/LICENSE.TXT changed a little to describe more clearly
the compatibility about FreeTypeLicense and GPLv2+, but the actual license
remains unchanged: it's still  LICENSE = "FreeTypeLicense | GPLv2+".

(From OE-Core rev: 06e0d50a936c01d4f02e7208b7e3784947436462)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:57 +01:00
Dexuan Cui ce6a08ce95 util-macros: upgrade from 1.14.0 to the latest version 0.15.0
(From OE-Core rev: c8289590ac4b60d1bec5397585c9ceb3d2982ae1)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:56 +01:00
Dmitry Eremin-Solenikov 2df547206a libxcb: enable native/nativesdk builds as was done previously in meta-oe
(From OE-Core rev: 552fc421b54303fbaad57b4596350e1bc4ed6674)

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-17 15:14:54 +01:00
Xiaofeng Yan b10a2ba200 libx11-diet: Fix bug 1050
[YOCTO #1050]
I got do_compile failure during building qemux86 image
| ../../../doltlibtool: line 17:
/distro/dcui/0704/pc1/build/tmp/work/i586-poky-linux/libx11-diet-1.3-r2/libX11-1.3/modules/im/ximcp/../../../libtool:
No such file or directory

This is due to not found libtool, but i586-poky-linux-libtool in libX11-1.3
So I disable dolt for solving this problem.

(From OE-Core rev: 710ad20f005cb96a6aabf3f0eb184a254ada1610)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:21 +01:00
Jiajun Xu 92b2e942e1 libsdl: enable opengl for libsdl
To enable opengl for libsdl, we need DEPENDS on virtual/libgl. Add a check for
"opengl" in DISTRO_FEATURES and when it's set, "--enable-video-opengl"
and "virtual/libgl" will be added into EXTRA_CONF and DEPENDS.

(From OE-Core rev: c28e62125209aa2e9606f094a4100ac1107fdd28)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:20 +01:00
Jiajun Xu 9939c3664e libsdl: add target version
Rename libsdl-nativesdk to libsdl to enable target version. libsdl
is needed in some graphics testing.

(From OE-Core rev: 2d719f69676e9a64f7baf34f058441b887dfa14a)

Signed-off-by: Jiajun Xu <jiajun.xu@intel.com>
Acked-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:20 +01:00
Phil Blundell 3c1701b7c9 cairo: only use x11 if selected in DISTRO_FEATURES
This makes it possible to build cairo-using apps without X11.

(From OE-Core rev: ba22cfac56120d001a53d33aee3b8eb3feda2786)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:19 +01:00
Phil Blundell 0a5fe1cdd1 libx11: skip self if x11 not in DISTRO_FEATURES
This stops (most) x11 packages leaking into a non-x11 distro by mistake.

(From OE-Core rev: 2f94ff4fdb66755ba2448794baea19315ff96273)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:19 +01:00
Phil Blundell 254b09ede7 pixman: remove spurious dependency on libx11
Nothing in pixman actually uses libx11, so no need to DEPEND on it.

(From OE-Core rev: e3432253da5af35345a978c7435e31fee6938217)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-15 15:26:19 +01:00
Kumar Gala 86504a12ad xcb-proto: update based on changes to python.m4 in automake
1. We dont need the aclocal patch as this will be handled by automake
2. We need to update xcb-proto.pc.in to know about ${libdir} since
   we'll end up with something like:

   pythondir=${libdir}/python2.6/site-packages

(From OE-Core rev: 4de2ba0eeaefbd6813443c6906108b815af9e109)

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-12 17:21:55 +01:00
Lianhao Lu 773c555648 Misc: Corrected the dependency on non-native for -native package.
[YOCTO #1336] Corrected the wrong dependency on non-native for -native
packages for the following recipes:

- util-macros
- intltool

(From OE-Core rev: e33bd6024c5f4cdd5c16d51e9b5c75ec4e1f1fb8)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-05 17:43:35 +01:00
Saul Wold d76a2ee76a libxt: Add depends for util-linux and libxcb
(From OE-Core rev: 972d805ae3d67c5d762fd18f76f2e0465d98f7d9)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 15:04:35 +01:00
Zhai Edwin cb3de7d9ca xserver-nodm-init: Fix X start failure on some platform
sudo is used to run rootless X in xserver-nodm, and start to fail with
"xf86OpenConsole: Cannot open /dev/tty0" error after upgrade to 1.8.1. sudo
seems wait for some resource that is unavailable in early phase of booting.
This patch swith to "su" for rootless X starting as a fix.

[YOCTO #1211] got fixed

(From OE-Core rev: cb935833a128d67e6c1fbe745cf68a58df6470d1)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 15:04:34 +01:00
Yu Ke a242da91a2 SRC_URI, S: use BPN instead of PN for multilib case
in multilibcase, PN has multilib prefix, so it is not
correct to use PN in SRC_URI and S. instead,  we've
dedicately pruned multilib prefix in BPN, so BPN is
the right alternative for PN.

(From OE-Core rev: d6dca85028640034b1a5356920aad3268bd4f1c2)

Signed-off-by: Yu Ke <ke.y@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 15:04:30 +01:00
Richard Purdie c5c9c53c4e font-util: The recipe produces binaries so don't mark as 'all' architecture
Since font-util produces binaries it shouldn't be marked as "all"
package architecture. To achieve this we need to move the settings
out the common include file.

This fixes errors like:

ERROR: runstrip: ''mips-poky-linux-strip' --remove-section=.comment --remove-section=.note '/srv/home/pokybuild/poky-slave/nightly-external/build/build/tmp/work/all-poky-linux/font-util-1.2.0-r2.1/package/usr/bin/bdftruncate'' strip command failed
ERROR: runstrip: ''mips-poky-linux-strip' --remove-section=.comment --remove-section=.note '/srv/home/pokybuild/poky-slave/nightly-external/build/build/tmp/work/all-poky-linux/font-util-1.2.0-r2.1/package/usr/bin/ucs2any'' strip command failed

(From OE-Core rev: 7aefddc57e9da02298af1aa98abedbe99435e15a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-04 14:03:58 +01:00
Khem Raj 9321db3fc6 libxcb: Add missing DEPENDS on libxdmcp
Observed this to fail when populating new tmpdir
from shared state

(From OE-Core rev: 7bdc14b0537afa004830f1f23253b2778bb0e098)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-27 12:02:39 +01:00
Yu Ke 7b441c2f3f upstream status: add for libsdl and xserver patches
(From OE-Core rev: 8afcc3551be8d608a2082ab7da7a6bfdba490f15)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-26 15:48:59 +01:00
Richard Purdie 5aa96bd0ef bitbake.conf/classes: Variable cleanup
This patch removes the variables BASE_PACKAGE_ARCH, BASEPKG_HOST_SYS,
BASEPKG_TARGET_SYS and also removes the immediate assignments in
several core classes as these are no longer required.

This should make it clearer what some of the core variables do and
simplfy some overly complex and confusing class code.

(From OE-Core rev: d5521be2dcbaf213c140b0d12a4176380874426b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-25 14:36:30 +01:00
Khem Raj a9aa45ce9e mesa-xlib, mesa-dri: Probe for newlocale() before using it.
(From OE-Core rev: 1a55faf994b30101026b6c8980023f213ee1db2c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-22 11:51:04 +01:00
Richard Purdie c9c14a198d Sync patches with DOS line endings that became corrupted
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-22 10:04:04 +01:00
Saul Wold 51ff9bae5b clutter-box2d: fix isfinite.patch
The original patch lost ^M and was not appliable.

(From OE-Core rev: 980f57f2d21818957165a73a0f1bc8cc19e10113)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-21 10:59:19 +01:00
Khem Raj 07fb4265c9 clutter-box2d: Replace use of finite macro with C99 compliant isfinite()
(From OE-Core rev: 46a335577506f36714f66135931b7b9669dc1416)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:39 +01:00
Khem Raj 33467f8455 libxdamage,libxft,libxrandr: Add missing dependency on virtual/libx11
(From OE-Core rev: 65095cf2fa9f890a1faf29a8a743497d88e5cfa7)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:37 +01:00
Dongxiao Xu 16e29ba77d xcb-proto: add multilib support.
There is hardcode of /usr/lib dir for some python files.
Fix it to support multilib.

(From OE-Core rev: ec7ea43749d40e4164dc35493a796b9546e60e4e)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:32 +01:00
Saul Wold 4a6109fc36 Patches: Fix Upstream-Status info
(From OE-Core rev: f2a5b2d143fff8337d2f0d024bc593c55f56a3a3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13 12:29:20 +01:00
Yu Ke 6aa76f9f27 xserver-kdrive: add patch upstream status info
- add patch upstream status
- also remove the obsolete xserver-kdrive-1.3.0.0 patches

(From OE-Core rev: 1ec48876d36a415fcd5816c1e4de17f8794b367b)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-13 12:13:13 +01:00
Saul Wold f974868cad libx11: ensure nativesdk uses correct DEPENDS and XCB flags
The inital patch was for native, but nativesdk also needs the
same change.

(From OE-Core rev: e66c2999afa2b3efbce8bb46c89f9db5e15f35c7)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-10 09:49:17 +01:00
Saul Wold 9f4eaeef33 libx11: enable xcb support
[YOCTO #1196]

XCB support is needed in libx1l, it has been enabled in libx11-trim for
sometime and was not in full version. The usage here is for LSB testing,
which uses full libx11.

(From OE-Core rev: 4f36a7f698de5056cb38641a7bf12921dba7d962)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-08 23:02:08 +01:00
Richard Purdie dc9751dd2f x11perf: Packaged unpackaged files
(From OE-Core rev: ab9242965628a301b702d6c8426e59182655fabf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:49 +01:00
Richard Purdie 3944ed8036 xcb-proto: Package unshipped files, create python-xcbgen package for python xcbgen code
(From OE-Core rev: 9a22f0d62eaac8716a547f7102155483c9b0187e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:47 +01:00
Richard Purdie c47c0e0eb3 tslib: Package unpackaged .la file
(From OE-Core rev: 85a64f77d2100e29980efa1e28295627a5401453)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-07 10:57:46 +01:00
Yu Ke c6dac094ac xauth: upgrade from 1.05 to 1.06
(From OE-Core rev: 2b3bf5350861f62435e2fdf1c56c8a02f4b1b4ac)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-04 12:45:33 +01:00
Yu Ke e2830aa23e libdrm: upgrade to 2.4.26
(From OE-Core rev: 4855794c2c329bcd1b1642caf43cb48616d5e95d)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-04 12:45:32 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Richard Purdie a272d989a9 cairo: Clean up packaging and fix warnings
There were a number of QA errors being reported when packaging cairo. This patch
ensures the debug files go in the -dbg package, the .so development links go into
the -dev package, .a files into -staticdev.

It also switches back to relying on debian package naming for the library name.
Since this is working correctly now the files are in the correct packages, we
can simplify the recipe and there is no change in the resulting package names
from a package feed perspective.

(From OE-Core rev: 9e8bc7b5834578f325c5777bf196dc834ca406c3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:25 +01:00
Phil Blundell ff997f4582 fontconfig: specify font directory in EXTRA_OECONF
since, otherwise, fontconfig's builtin default may not match ${datadir}.

(From OE-Core rev: 99d8d574f15d6bd2294b340da20bd9a47af79f9f)

Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-29 14:46:52 +01:00
Zhai Edwin 120b40952e clutter: Use new git repo
clutter move its git server from clutter-project.org to gnome.org

[YOCTO #1040] got fixed

(From OE-Core rev: 752ab344a6456619901fb8d33137b0329d5b039e)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-23 13:45:56 +01:00
Dexuan Cui d96a8c9f25 dri2proto: Revert "dri2proto: make DRI2 swap event match GLX spec"
(From OE-Core rev: 55575a64af87471bd0cf08cc3f31809bfb4e6107)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-15 11:13:13 +01:00