Commit Graph

29 Commits

Author SHA1 Message Date
Li Zhou 3f5725c845 fontconfig: Revert changes made to FcConfigAppFontAddDir() recently
Backport <commit 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e> from
fontconfig upstream <http://cgit.freedesktop.org/fontconfig/> to solve
issue: fontconfig changes break pybootchartgui tool generating bootchart
png file.

(From OE-Core rev: 563922edefee882a04622ab0d78c25c61dfd851c)

Signed-off-by: Li Zhou <li.zhou@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-03-09 16:58:12 +00:00
Martin Jansa bb151b888c fontconfig: Don't add font directories from host
* when enabled, configure check for "fonts" directory existence in following directories:
  /usr/X11R6/lib/X11 /usr/X11/lib/X11 /usr/lib/X11
  on _host_ system and if it exists it adds <dir> element to
  /etc/fonts/fonts.conf
* update_font_cache postinst will then fail if host system has e.g.
  /usr/lib/X11/fonts while the rootfs doesn't have it
* if you're installing fonts to other directories, you'll need to adapt
  this EXTRA_OECONF to find them that's why it's in separate variable

[YOCTO #9155] - update_font_cache postinst failing with read-only filesystem

(From OE-Core rev: 8cc47e6bfb7f623711d9cd9e71a7f72ab2838f57)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-02-28 11:33:01 +00:00
Ross Burton 1c914a844b meta: Fix Upstream-Status statements
Fix a variety of problems such as typos, bad punctuations, or incorrect
Upstream-Status values.

(From OE-Core rev: bd220fe6ce8c3a0805f13a14706d3130ea872604)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-09-12 23:01:53 +01:00
Jussi Kukkonen acc0af6ac5 fontconfig: Upgrade 2.11.93 -> 2.11.94
(From OE-Core rev: e9e8d56ab53e17f62c9496932a108d7255a33148)

Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-10 12:40:25 -07:00
Khem Raj 09fab50b9b fontconfig: Fix pkgconfig file generation to not have absolute paths
Fixes cross building dependent packages with gcc-5
e.g. matchbox-panel-2

Change-Id: I6290cfa4aac5d03a7200472d0c713b7ea84b99ac
(From OE-Core rev: 5b3831fa52a38640ec529d2ffb366c8fffce3a51)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-27 14:59:50 +01:00
Khem Raj 7caffd2559 fontconfig: Upgrade to 2.11.93
LIC_FILES_CHKSUM change is due to shifting of
the hunk to different line numbers, checksum remains same still

Change-Id: I0ce0cc96d39c801e57394f7a839a01d11a6f3979
(From OE-Core rev: 87749a627d0d34f7338ecc55a377a273c66562f3)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-27 14:59:50 +01:00
Martin Jansa 29361a0e07 fontcache: allow to pass different fontconfig cache dir
(From OE-Core rev: 40f7986313277ef815b19331388bca124187bfeb)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-21 07:20:25 +01:00
Ross Burton e0a3495d44 Revert "fontconfig: enable 64 bit file support"
Fontconfig doesn't need to be passed large file flags through CPPFLAGS because
it's configure script uses AC_SYS_LARGEFILE.

This reverts commit 5a49a24d35.

(From OE-Core rev: 84a4326473ce448c9bdd9a8b79383c319f04d339)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-10 17:35:33 +01:00
Saul Wold 5a49a24d35 fontconfig: enable 64 bit file support
When running 32bit code on a large filessytem with 64bit inodes, the
fontcache was not being created correctly because an EOVERFLOW was being
returned from the fstat when reading the 64 inode on a 32bit system.

The fontcache is created at rootfs time on the host system via qemu.

[YOCTO #6338]

(From OE-Core rev: 9f363f9e2a56d847efc37dfba38764ae393fbfd6)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-06-06 09:32:39 +01:00
Laurentiu Palcu c4207f0b5f fontconfig: upgrade to 2.11.1
Removed the following patch(es):
 * sysroot-arg.patch (changes included in release)

Correct the fccache.c license checksum and the line numbers because the
license snippet has moved and, also, at the previous upgrade the lines
were wrong (shifted a couple of lines).

(From OE-Core rev: cc337329309a6ad94a68b2813211a15040638c00)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-04-30 16:39:09 +01:00
Ross Burton 4a4b36f913 fontconfig: upgrade to 2.11.0
Drop sysroot patch as a rewritten form has been accepted upstream.

Update license checksums - Google added to COPYING, and the fccache license has
moved.

(From OE-Core rev: e24659fc039c9f54b841ed01c3d5ff407921398b)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-11-29 09:52:55 +00:00
Ross Burton ce3d50899d fontconfig: rename the patches directory
Rename the patches directory to files as we only have one version of fontconfig,
so the hassle of moving these files every upgrade can be avoided.

(From OE-Core rev: 67a279f517fc43e418482cc104458875264141f6)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-11 22:48:50 +00:00
Ross Burton e767a2f74d fontconfig: drop explicit -native recipe
Instead, use BBCLASSEXTEND=native in fontconfig.

We can drop the installation of fc-lang/fc-glyphname, they are not used by
fontconfig's build anymore as it ships the generated files in the tarball.

(From OE-Core rev: d5ccc6cbbbdc7502d35ddcbbc2bfc2d4657cbe78)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-11 22:48:50 +00:00
Ross Burton 556217d482 fontconfig: remove unexplainable and broken build tweaking
The build flag twiddling in do_configure_append was unexplainable and clearly
wrong (native flags for a cross build), remove it all.

Parallel make appears to be working now, so enable it.

The tarball doesn't contain read only sources, remove the unpack hacking.

The pkgconfig doesn't need patching as the freetype link lines are the same.

Don't need to specify where freetype is, it's found automatically.

Merge fontconfig-util-dbg into fontconfig-dbg.

Don't export HASDOCBOOK, --disable-docs is sufficient to turn off documentation
building.

(From OE-Core rev: ba3db5f5e7055d597b21d8b5f8e60bc3c4f12bd2)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-11 22:48:50 +00:00
Laurentiu Palcu e46f33688c fontconfig: add sysroot option to fc-cache and fc-cat
This is needed in order to be able to generate the cache on host.

Additionally, remove the volatile config file, as /var/cache was moved
out of tmpfs.

[YOCTO #2599]

(From OE-Core rev: b675e9917b0a1e774c95ee7a946f515c5a996b59)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-06 09:37:24 +00:00
Marko Lindqvist 7202ab662c fontconfig: update to upstream version 2.10.2
(From OE-Core rev: c494865437ed9136fb8841235f1d9341997cadb7)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-19 17:54:52 +00:00
Laurentiu Palcu 657ed11b29 fontconfig: upgrade to 2.10.1
A couple of changes:
 * licence snippet in fccache.c moved down the file;
 * new files appeared in this version, added them to fontconfig package

(From OE-Core rev: f6ca099d9cbd2ed1c181e8e91cc16d0550701f26)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-18 16:42:04 +00:00
Laurentiu Palcu 7bf02ebc52 fontconfig: upgrade to 2.9.0
Other changes:
	- licence checksums because the licence headers changed slightly:
	  several other authors were added and Keith Packard's name has been
	  replaced with "author(s)". That's it.
	- rebased the fix-pkgconfig.patch to apply on 2.9.0
	- removed all sed instructions in do_configure_append() that were
	  changing fc-arch/Makefile. In the new version the fc-arch/ directory
	  has been removed in order to make the package cross-compiling safe

(From OE-Core rev: 8e219dea0373dc3a37d51f63c41f1a8449029dd5)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-30 12:04:46 +01:00
Richard Purdie ed14592700 fontconfig-native: Be clear about FILE search path
This avoids warnings from the new file checksum code.

(From OE-Core rev: 75abd412cd4294ec0bcd544630988dd2ed042ff8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-25 11:17:54 +01:00
Richard Purdie 06f2f8ce0a meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)
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>
2012-03-05 10:22:56 -08:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
This is the result of running the following over the metadata:

sed \
-e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \
-e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \
-e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \
-e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
-i `grep -ril bb.data *`

(From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-10 11:51:19 +00:00
Martin Jansa b4757833c3 fontconfig: fix fix-pkgconfig.patch
* missing $ is causing problems ie when building webkit-efl
* see http://lists.linuxtogo.org/pipermail/openembedded-core/2011-June/003798.html
  for details

(From OE-Core rev: e31dd9b65f3b03f79cabab25eca157532de3bd9c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-18 18:18:36 +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
Beth Flanagan 62e3f0ff7b License Field Cleanup: Non-standard field names
I've cleaned up some odd license fields, fixed some license
names and corrected some incorrect licenses. LICENSE really needs
a pass through by the maintainers as some of the licensing is
incorrect.

Also, every license with Artistic should be gone through and noted as
which version of Artistic.

(From OE-Core rev: 4786ecdf7cd427089464dcb62579110d494e7cd7)

Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-27 18:27:22 +01:00
Dexuan Cui fc1859ea66 recpies: add Upstream-Status for multiple recipes' patches
tcf-agent: update its patch's Upstream-Status
screen: update its patch's Upstream-Status
which (GPLv2): update its patch's Upstream-Status
gnome-vfs: update its patch's Upstream-Status
libart-lgpl: update its patch's Upstream-Status
librsvg: update its patch's Upstream-Status
fontconfig: update its patch's Upstream-Status
freetype: update its patch's Upstream-Status
libxsettings-client: update its patch's Upstream-Status
libxcb: update its patch's Upstream-Status
libx11: update its patch's Upstream-Status
 - remove 2 unused xim.patch.
libx11-trim: update its patch's Upstream-Status
libxcalibrate: update its patch's Upstream-Status
libxcomposite: update its patch's Upstream-Status
libxfont: update its patch's Upstream-Status
xtrans: update its patch's Upstream-Status
  - remove abstract_socket_fix.patch as it's not used at all for long.
calibrateproto: update its patch's Upstream-Status
latencytop: update its patch's Upstream-Status
powertop: update its patch's Upstream-Status
settings-daemon: update its patch's Upstream-Status
gnome-settings-daemon: update its patch's Upstream-Status
libxklavier: update its patch's Upstream-Status
liblbxutil: update its patch's Upstream-Status
oprofile: update its patch's Upstream-Status and remove an unused patch
  - delete xml_callgraph_details.patch as it's not used at all.

(From OE-Core rev: 94991fb73586887bfc740eacf190032dfb206a65)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:28:59 +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
Mark Hatle cda749d2b8 recipes-graphics: Add SUMMARY and update DESCRIPTION
Add the missing SUMMARY fields and update DESCRIPTION fields if necessary

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2010-12-16 15:53:08 +00:00
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -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