Commit Graph

11 Commits

Author SHA1 Message Date
Ross Burton ad02e381e1 libx11: makekeys can be cross-compiled now, so don't hack around
(From OE-Core rev: 04c776956b98cc96c2c1a139bec0422feae1497d)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:49 +01:00
Ross Burton cc5557eb2f libx11-diet: remove statements that are redundant
(From OE-Core rev: 4bba0537473f28961d6e128f8bc18c9a4abd01cd)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:48 +01:00
Ross Burton 84279136fe libx11: refresh dependencies, and centralise into libx11.inc
(From OE-Core rev: a66e6a7765525d3e18cd81b68c422b3dab81d498)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:48 +01:00
Ross Burton 8e6a6ecd0e libx11: remove redundant license data
(From OE-Core rev: 0f2643cfa385e9637a2d34268e60cdce9fa44e69)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:47 +01:00
Ross Burton 13ca58f538 libx11: move keysymdefdir option to .inc
(From OE-Core rev: 375cdaf2cc03a4784991999e6a302fe37678809b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:47 +01:00
Ross Burton c0fff56ef0 libx11: move xcms disabling to PACKAGECONFIG in libx11.inc
(From OE-Core rev: ea17d1365b0425b0f6ddd4daf8d166116ac26f26)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:47 +01:00
Ross Burton 8071888705 libx11-diet: you can't disable UDC, because it's always disabled
(From OE-Core rev: bb2c59d3efdd94d7cc0cd47daa3429a1521ca8ac)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:46 +01:00
Ross Burton 71ba823419 libx11-diet: you can't disable XCB anymore, so don't try
(From OE-Core rev: 315d187fcf1e6ff430b5c2986aa307e182ae09cb)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:46 +01:00
Ross Burton aa1744d63b libx11: use INC_PR
(From OE-Core rev: d709a0a457ec05291ae56a54af923ca9f43d15aa)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-12 15:13:45 +01:00
Martin Jansa 0e53886ced libx11: fix makekeys build
* on hosts without libx11 installed it fails with
  | makekeys.c:33:27: fatal error: X11/Xresource.h: No such file or directory
  since oe-core rev 52d4ff7b35602faa52360a3e7a800891ef60c739
* upstream added -I$(top_srcdir)/include in 24283d40b1e4314c6647dda49d2a159833341a8b
  to ensure that right Xresource.h version is used, but we're building
  makekeys outside source tree (x11_disable_makekeys.patch), so we need
  to pass -I${S}/include in our makekeys build too
* building makekeys outside source tree isn't probably needed anymore
  and recipes should be updated to reflect that, upstream fixes:
  https://bugs.freedesktop.org/show_bug.cgi?id=22584
  http://cgit.freedesktop.org/xorg/lib/libX11/commit/src/util/Makefile.am?id=b2487d07f7b355f230a56e32c763acd08862735c
  http://cgit.freedesktop.org/xorg/lib/libX11/commit/src/util/Makefile.am?id=24283d40b1e4314c6647dda49d2a159833341a8b

(From OE-Core rev: abdc37d181019b9dd21ad08ad998ea4ff2a3e264)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:53:59 +01:00
Laurentiu Palcu a5180e43ba libx11-diet: upgrade to 1.5.0
The X18NCMSstubs.diff was modified to please the -Werror=return-type
compiler option. Otherwise, it will throw an error.

(From OE-Core rev: 708785266d1d671f5d2a8e8af81a77e34c70662f)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-09 16:58:55 +01:00