Commit Graph

419 Commits

Author SHA1 Message Date
Martin Jansa
4d0fbb1ff0 xserver-xorg: move shared EXTRA_OECONF entries to shared .inc
* after this xserver-xorg-lite.inc is disabling only dri/glx
  and xserver-xorg.inc is forcing dri/dri2 enabled
  the rest is defined in xserver-xorg-common.inc

(From OE-Core rev: eb381e05ff24ee2fed0b4e9675bd01dce662da07)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:34 +01:00
Martin Jansa
8c4b9ae0bd xserver-xorg: replace hardcoded --enable-glx-tls with glx-use-tls.inc, which doesn't enable it for uClibc
(From OE-Core rev: 9e5c8cb78fcc5d26e1b91172aa6e98890d9ea75c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:33 +01:00
Martin Jansa
3476f1548e xserver-xorg: remove FILES_${PN} += "${bindir}/Xorg ", now we have whole ${bindir} in FILES_ defined in shared .inc
(From OE-Core rev: 623f4feb86c2587c9a5bdac833671a91fbfbbf72)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:33 +01:00
Martin Jansa
73cfa3e166 xserver-xorg-common: move RDEPENDS_${PN} += xorg-minimal-fonts to shared .inc
(From OE-Core rev: 7c380db374381ae71cf6b1398a77654b3eebf512)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:33 +01:00
Martin Jansa
7350b5bad7 xserver-xorg-common: lower xserver-xf86-config and xkeyboard-config dependency to RRECOMMENDS and add few more recipes to RRECOMMENDS
* when someone is using hal or udev explicitly, then he doesn't need xserver-xf86-config
* add xkeyboard-config to RDEPENDS_${PN}-xvfb

(From OE-Core rev: aa0ee22d8504560e5aa0a5ddf67082b0744cd180)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:33 +01:00
Martin Jansa
fbf9e2fd49 xserver-xorg-common: move shared PROTO_DEPS and LIB_DEPS from xserver-xorg.inc and xserver-xorg-lite.inc to xserver-xorg-common.inc
* xserver-xorg.inc is appending extra xf86driproto dri2proto to PROTO_DEPS and virtual/libgl to LIB_DEPS
* both lite and dri variants now depend on font-util (from DEPENDS in xserver-xorg-common.inc)

(From OE-Core rev: f7fb209cd447418e72c421ab473c35430ee46893)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:32 +01:00
Martin Jansa
9e34241ec1 xserver-xorg-common: improve packaging
* add ${bindir} and protocol.txt to ${PN}
* SecurityPolicy is now in ${PN}-security-policy
* package .la files to ${PN}-dev
* README.compiled is lately in ${localstatedir}/lib/xkb so add it too to ${PN}-doc

(From OE-Core rev: 4499728e5ec94783ab44d302a871d44ae0a2e2d3)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:32 +01:00
Martin Jansa
73b9f8f78c xserver-xorg-common: Split out some bigger modules and extensions from the main package
(From OE-Core rev: 8197c20e63acd5e7a5521d5e2ee391e03b4d50d3)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:32 +01:00
Martin Jansa
4fa7554c07 xserver-xorg-common: move SRC_URI closer together
(From OE-Core rev: b1025d11659af648c5414af165ed9623dd13f419)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:32 +01:00
Martin Jansa
b0ea4f0104 xserver-xorg-common: fix LIC_FILES_CHKSUM
* old value was actually from xserver-kdrive, use the same as
  xserver-xorg-1.10.1 and newer has
  ./xserver-kdrive.inc:LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
  ./xserver-xorg-lite_1.10.1.bb:LIC_FILES_CHKSUM = "file://COPYING;md5=74df27b6254cc88d2799b5f4f5949c00"

(From OE-Core rev: 5c32d388d788e0d35a384e84765c2b66ccd593e4)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:31 +01:00
Martin Jansa
a87ee718f9 glx-use-tls.inc: add include file to enable glx-tls only when TARGET_OS isn't uclibc
* will be used in mesa-common.inc and xserver-xorg.inc
* based on mesa-tls.inc (glx-use-tls.bbclass) from
  http://git.openembedded.org/cgit.cgi/openembedded/commit/packages/mesa/mesa-tls.inc?id=b527d8f723c98c77f2f5c5358062e5348493d767

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:31 +01:00
Martin Jansa
a4cbf47114 xserver-xorg: remove old git recipe
(From OE-Core rev: f1fb94ee3a91091d678752e9e7c4db0787ea32ff)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:31 +01:00
Martin Jansa
c09f0eb561 xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and
  that's how it's named in OE-classic and meta-oe? It would make meta-oe
  transition easier and better to do it now then convert meta-oe to
  xserver-xf86 and then rename it back later.

(From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:31 +01:00
Richard Purdie
639f138c3d font-alias: Convert to use allarch including a patch to disable compiler checks
(From OE-Core rev: b0c111fd15be671be77ce886e28c05835f159ce6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-10 10:00:07 +01:00
Joshua Lock
0d8c8cf462 mutter: update to 2.29.1 and fix SRC_URI
mutter has been hosted by the gnome community for some time now, update the
recipe to use the new SRC_URI and a more recernt version - this is the last
version to support Gtk+ 2.

(From OE-Core rev: 0d7d464bc66318684f85d9b725a0a5ab62a09224)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:50 +01:00
Saul Wold
97bbce289a mutter: Add SRC_URI Checksum
(From OE-Core rev: b051eca254e8e097f58590a33e027403df3db647)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:46 +01:00
Saul Wold
7f469f06f8 xserver-kdrive: Add SRC_URI Checksum
(From OE-Core rev: 46aa62e7f27c3419cfbf20eab4c6d3bb7d7ecd7a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:45 +01:00
Saul Wold
d3798b658a clutter-gst-1.6: Add SRC_URI Checksum
(From OE-Core rev: 61490712e37a1d3300eb0da9424ff94e270edb02)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:45 +01:00
Saul Wold
2c89e283e5 libx11-diet: Add SRC_URI Checksum
(From OE-Core rev: 0ab7f6d84d036e5721f7c7585f13c00df16075bf)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:45 +01:00
Saul Wold
eed0114234 libx11-trim: Add SRC_URI Checksum
(From OE-Core rev: be8843ebfcc84a27111c1d020917e72233176651)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:44 +01:00
Richard Purdie
173c35a452 xserver-xf86: Use PACKAGECONFIG for udev/hal choice and default to udev
(From OE-Core rev: 55fe7a29e059a3e09e04896b18bb751da3cd8530)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:43 +01:00
Richard Purdie
9bf0d8898b Improve handling of 'all' architecture recipes and their interaction with sstate
* Jansa: rebased on current master, added nocompiler patch also to
  font-alias, dropped allarch from linux-firmware, gnome-icon-theme, hal-info as
  those are checking compiler (ie in intltool check) and better to build
  them as default arch instead of rebuilding after every machine
  change.
* this is also part of [BUGID# 1075]

(From OE-Core rev: 85d8362e0c443f11fe8d3fd0fba55d1bd4983613)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:26 +01:00
Martin Jansa
55dcda0656 rgb: import from meta-oe layer
(From OE-Core rev: 805219204f81b80c6614aa23645e6960d33a25cc)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:23 +01:00
Richard Purdie
c1a74b0cac xserver/mesa: Bump PR after libdrm packaging changes
(From OE-Core rev: f61a7339bdff5d2fde9b6d477f1cdbe5b84b92e3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:23 +01:00
Martin Jansa
1c2753f917 libdrm: improve packaging
(From OE-Core rev: 9a36f54bfc32a86cb6ee540353a00141aeef2c5d)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:23 +01:00
Martin Jansa
66978869af xf86-video-omapfb: bump SRCREV and add patch from meta-oe
(From OE-Core rev: 37312b2367cd1db3b6682261fa370ff95ec07eef)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:23 +01:00
Martin Jansa
7047b873e4 xorg-driver: rename .inc files and merge some changes from meta-oe
* use INC_PR
* use BPN directly instead of XORG_PN

(From OE-Core rev: 7920cc4b43f139d023b52a71c2407f5295347618)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:22 +01:00
Martin Jansa
b887e7fd3f xorg-app-common: merge some changes from meta-oe
* use BPN directly instead of XORG_PN
* fix depends
* fix packaging
* add INC_PR (used by recipes in meta-oe now, but should be used here
  too)

(From OE-Core rev: fbf6dcefb719f992c8b7900aea9c719ce143d0b1)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:22 +01:00
Martin Jansa
c079b76ec8 libxft, libxrender, renderproto: add native BBCLASSEXTEND
(From OE-Core rev: 6b3a4846cf3e5b21d392c1f5e9aa05b4da10c2e9)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-04 13:46:22 +01:00
Saul Wold
54e6a441ba glew: update to 1.7.0
(From OE-Core rev: 8ea44ac0678b2a44e22dec5a4c2eea96df638cdc)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-29 16:46:47 +01:00
Zhai Edwin
d39c6738df matchbox: Upgrade SRCREV to reflect recent accpeted patches by upstream
(From OE-Core rev: 33a1a05ef988c69f8ff8e38c6723922082e5d1aa)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-26 17:56:42 +01:00
Richard Purdie
eb509c6c3d cairo: Disable bfd symbol loopup since we don't list it in DEPENDS
(From OE-Core rev: ac8b7e275a8789b6605ef84a3b128aea2518b596)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-25 17:53:31 +01:00
Zhai Edwin
0289683798 qemugl: Use local variable rather than "push" to save register
New gcc uses "%esp" rather than "%ebp" to index local variable in stack, and
push between save-to/restore-from stack decrease "%esp", which leads wrong
index. Saving registers via local variables to make gcc aware of this and avoid
stack disorder.

[YOCTO #1442] got fixed

(From OE-Core rev: afc9edc27e77e80fdd24b4c8c538f91672940e75)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-22 08:49:10 +01:00
Otavio Salvador
d9d2c9c75f xserver-xf86-lite.inc: use ${datadir} instead of /usr/share
(From OE-Core rev: d86acde7c6c57bd848feb1875c10df9b1de1201d)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-22 04:50:08 +01:00
Otavio Salvador
4d3bac9a6d xserver-xf86-dri-lite.inc: use ${datadir} instead of /usr/share
(From OE-Core rev: e83f142e1510cf686d9626b873ce9acf7baced0a)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-22 04:50:08 +01:00
Otavio Salvador
ad0c9a13ea xserver-xf86-common.inc: use ${datadir} instead of /usr/share
(From OE-Core rev: 9e283b637fcfc704156675eef4bc53966a03e3dc)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-22 04:50:08 +01:00
Paul Eggleton
1fba7bec25 freetype: disable bzip2 compressed font support
If we do not disable this then it is enabled sometimes and disabled at
others depending on whether bzip2 has been built at the time, and worst
case it will cause a race condition if bzip2 is building at the same
time.

(From OE-Core rev: 81274f4488fbc4d68d150870735ec0181b60b451)

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-20 22:23:21 +01:00
Lianhao Lu
aab71071d7 Misc: Added MLPREFIX to final pkg names in case of DEBIAN_NAMES.
[YOCTO #1486]
Added MLPREFIX to the final package names of library packages in case of
DEBIAN_NAMES.

(From OE-Core rev: 1162b78d6f99da52cd7d122e4295c618184e41cd)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 18:07:25 +01:00
Tom Zanussi
000068e1ce ttf-bitstream-vera_1.10: add PN to RDEPENDS
RDEPENDS is package-specific, so add ${PN} to it.

(From OE-Core rev: cfccedf0f9c2aa051de3ecdd4c3f6d42729c982d)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 13:30:25 +01:00
Tom Zanussi
66f4ceb7ff liberation-fonts_1.06: add PN to RDEPENDS
RDEPENDS is package-specific, so add ${PN} to it.

(From OE-Core rev: c259bc5a16d85527ad22c22e996195eebe3519c1)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 13:30:25 +01:00
Tom Zanussi
bf51268786 liberation-fonts_1.04: add PN to RDEPENDS
RDEPENDS is package-specific, so add ${PN} to it.

(From OE-Core rev: d29f252486f80f2d59f5cd63042336f317a59e43)

Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-16 13:30:25 +01:00
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