Commit Graph

22 Commits

Author SHA1 Message Date
Kai Kang f0a690dd9d libx11: upgrade to 1.6.1
Upgrade libx11 to version 1.6.1.

Update:
* Remove PR and INC_PR.
* File Xcms.txt position changes.
* Drop backport patch keysymdef_include.patch.
* Update disable_tests.patch.

[YOCTO #4973]

(From OE-Core rev: 9e2d9608464c189ec460930570557c48d78108bb)

Signed-off-by: Kai Kang <kai.kang@windriver.com>

[sgw - Removed PR and INC_PR]

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-08-22 18:30:05 +01:00
Jonathan Liu 9106cfb2f4 libx11: enable Xcms by default
The following do not work if Xcms is not enabled in libx11:
- starting xterm and doing ls --color / fails to color code the
  directories:
  xterm: Cannot allocate color "rgb:5c/5c/ff"
- xsetroot -solid rgb:5c/5c/ff fails with the following error:
  xsetroot:  unknown color "rgb:5c/5c/ff"
- xsetroot -solid rgbi:1.0/1.0/1.0 fails with the following error:
  xsetroot:  unknown color "rgbi:1.0/1.0/1.0"

More specifically, applications that pass Xcms color names to
XParseColor do not work properly.

[YOCTO #4576]

(From OE-Core rev: d860ee68208b84efb8049669ca18acc69f2f2d1b)

Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-06-28 09:14:05 +01:00
Ross Burton 7ea8496ce0 meta: remove redundant _FOR_BUILD variables
(From OE-Core rev: acabd2158d9004dedfdfad8c170b77d32684f3fc)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-12 13:36:37 +00:00
Ross Burton 8ce23f5695 xorg: remove XF86 BigFont extension
This has been disabled by default upstream since 2007, nothing uses it.

(From OE-Core rev: 06d27cf0fbcc4004e6f456880eca49893c9290bf)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-22 14:59:30 +01:00
Matthew McClintock 6e8d68de7f libx11.inc: fix build issues for older CentOS distros
Fixes these sorts of issues present on older gcc (CentOS 5.x in this case)

| cc1: error: unrecognized command line option "-Werror=implicit"
| cc1: error: unrecognized command line option "-Werror=nonnull"
| cc1: error: unrecognized command line option "-Werror=init-self"
| cc1: error: unrecognized command line option "-Werror=main"
| cc1: error: unrecognized command line option "-Werror=missing-braces"
| cc1: error: unrecognized command line option "-Werror=sequence-point"
| cc1: error: unrecognized command line option "-Werror=return-type"
| cc1: error: unrecognized command line option "-Werror=trigraphs"
| cc1: error: unrecognized command line option "-Werror=array-bounds"
| cc1: error: unrecognized command line option "-Werror=write-strings"
| cc1: error: unrecognized command line option "-Werror=address"
| cc1: error: unrecognized command line option "-Werror=int-to-pointer-cast"
| cc1: error: unrecognized command line option "-Werror=pointer-to-int-cast"

Also fixes:

makekeys-makekeys.o: In function `main':
makekeys.c:(.text+0x85): undefined reference to `__isoc99_sscanf'
makekeys.c:(.text+0xa7): undefined reference to `__isoc99_sscanf'
collect2: ld returned 1 exit status
make: *** [makekeys] Error 1

Older libc do not have this defined, we can use the -D_GNU_SOURCE
to the compiler to prevent generating calls to this function and
make linking work

(From OE-Core rev: 83c560ae282c1a28fd2c311c66debd02a69f1678)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-02 17:10:35 +01:00
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 5842947c3d libx11: make bigfont an optional (disabled by default) packageconfig option
(From OE-Core rev: eb4e584de23ebaf2d8f54404dcf12a5aed1a37a1)

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 d7a03d5bd0 libx11: merge patches into a single directory
(From OE-Core rev: 34b337e52551717106b377c53ea5dc617ac4c92c)

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 85816c84eb xorg-lib: move options to disable documentation to xorg-lib-common
(From OE-Core rev: aee98f2ccab4bfff2aca031c2374274f945982f5)

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
Koen Kooi 082cc604f5 libx11: reinstate PE=1 that got lost in the big meta-oe Xorg merge
This prevents package managers 'upgrading' 1.4.4 to 1:1.4.3

(From OE-Core rev: 906641853e8ac6fd296dfb91f8bb647c7da8e23e)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:34:37 -08:00
Andreas Oberritter 831e0b5cd7 xorg-lib: don't build libs unless requested by DISTRO_FEATURES
* 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>
2012-02-23 23:59:34 +00:00
Martin Jansa af0a957760 libx11: package xcb, merge few changes from meta-oe
* move --with-keysymdef/--with-keysymdefdir setting to recipes (newer
  versions are using keysymdefdir instead keysymdef
* fix MIN_REHASH in makekeys by sed call

(From OE-Core rev: 70abb59e71a2aed5ef7faf5ba9b56f695d562382)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-11 18:08:36 +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
Jingdong Lu 06a03d7211 libx11: fix libX11 keysyms to pass xts5 of lsb
Fixes bug: [YOCTO #1095]
Because of cross-compiling libx11 keysyms will cause Xts5 test of LSB fail.
libx11 use a tool named "makekey" which compiled as a native tool to generate
ks_tables.h. Because the size of "unsigned long" is different between 32-bit
and 64-bit, we should judge whether our target is 32-bit or 64-bit and tell
"makekey".
I add a patch to "makekeys_crosscompile.patch" to "src/utils/makekeys.c" in
order to deal with the different targets. If our target is 32-bit, we force
the variable its type is "unsigned long" to "uint32_t". So we can generate a
correct keysyms.

(From OE-Core rev: 0eea9ab2e9d6e9457f24aa63b3126666611c1c7b)

Signed-off-by: Jingdong Lu <jingdong.lu@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-02 14:55:56 +01:00
Joshua Lock 9a453893ad libx11: disable building of specs
Generating Postscript specs fails on Fedora 15, I don't *think* we need them
so disable them.

(From OE-Core rev: da778e48c4daa2a67adc2b0d7115ab4135d37f67)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 14:09:58 +01:00
Mark Hatle 9ee3c77f4e recipes-graphics: Add more detailed SUMMARY and DESCRIPTIONS
Add more detailed SUMMARY and DESCRIPTIONS to various graphics and
graphics related components.  I've recently gotten question from users
what something is, or why it was needed.. this should go a long way toward
answering those questions.

Many of the descriptions were taken directly from the upstream location,
where one was not available the Debian packages were consulted for
information.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 08:49:22 -08:00
Richard Purdie 29d6678fd5 Major layout change to the packages directory
Having one monolithic packages directory makes it hard to find things
and is generally overwhelming. This commit splits it into several
logical sections roughly based on function, recipes.txt gives more
information about the classifications used.

The opportunity is also used to switch from "packages" to "recipes"
as used in OpenEmbedded as the term "packages" can be confusing to
people and has many different meanings.

Not all recipes have been classified yet, this is just a first pass
at separating things out. Some packages are moved to meta-extras as
they're no longer actively used or maintained.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-08-27 15:29:45 +01:00