Commit Graph

43 Commits

Author SHA1 Message Date
Ross Burton 042fec8fc3 pango: fix x11 DISTRO_FEATURE check
--without-x was removed in 1.32.0, so the correct option is now --without-xft.

Also remove --disable-glibtest, as configure.ac doesn't invoke that test.

(From OE-Core master rev: e806f4ff404515f38318b6fed7d2b614c2138da6)

(From OE-Core rev: 147eac9794bd815f7f10002beacbe47302352ca4)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-12-12 16:59:54 +00:00
Roy.Li db9775f57a pango: remove pango-module-basic-x RRECOMMENDS
pango-module-basic-x has been removed from pango-1.31.0 and we're using
pango-1.32.5, so we should not refer pango-module-basic-x.
    Commit 194b6ee552318ec6c494f34ed9f0979d0460fe4f
    Author: Behdad Esfahbod <behdad@behdad.org>
    Date:   Thu Aug 16 21:48:50 2012 -0400

        Remove PangoX

        Been overdue...

(From OE-Core rev: a609771a7dc8a102f080d31526e795705154e514)

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-13 18:23:31 +01:00
Ross Burton c44cb07de0 pango: drop unexplainable elfutils dependency
In dafefa7bd4de518adb63ec19390b77a56cb65d8e elfutils was added as a
build-dependency of Pango.  However there is no such linkage inside Pango, and
it builds fine without elfutils.

(From OE-Core rev: 48051f19a1df55ffdf72f90e331e31d9ccc76b3e)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-07-10 09:42:02 +01:00
Laurentiu Palcu 8f32a0fa03 pango: fix postinstall when using multilib
The pango-query-modules binary gets a multilib prefix and the
postinstall has to call the appropriate binary.

(From OE-Core rev: 21ae18ca5e3be0b3e5cb0fdcf19b1476dbd38b0c)

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-04-29 14:45:09 +01:00
Constantin Musca 26bddbd41b pango: use qemu_run_binary instead of pango-native
- use qemu_run_binary from qemu.bbclass to run pango-querymodules
- remove pango-native from DEPENDS in order to do not create
unbuildable dependency chains (e.g. ['gtk+', 'pango', 'pango-native',
'cairo-native', 'directfb-native'])

[YOCTO #3642]

(From OE-Core rev: c34bb3554112cbaeb4e125ff5ed190c0d3bbcf36)

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-01-18 13:28:06 +00:00
Marko Lindqvist 4eccc6416f pango: replace obsolete automake macros with working ones
Add obsolete_automake_macros.patch that replaces automake macros
no longer supported by automake-1.13 with modern constructs.

(From OE-Core rev: 16df16408719b93f595412a4c10df793d847dd19)

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>
2013-01-16 11:57:34 +00:00
Marko Lindqvist 60de86fc55 pango: update to upstream version 1.32.5
multilib-fix-clean.patch adjusted to apply cleanly, and to handle
new modules.cache file.

(From OE-Core rev: bcc5773199b46811f913d06e960d34ed9833f714)

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>
2013-01-10 23:43:17 +00:00
Laurentiu Palcu 5d8a2e82e8 pango: have postinstalls run at do_rootfs time
Since pango-native is built anyway and all the modules are in the native
sysroot, create the cache file by scanning those files instead of the
target files. The latter will fail because the shared objects wouldn't
be from the same ELF class.

[YOCTO #3600]

(From OE-Core rev: 75334cbee1f064b38f167269917e333989802e7d)

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-01-07 11:09:35 +00:00
Marko Lindqvist 13180a97d6 pango: update to upstream version 1.30.1
(From OE-Core rev: 82720dd1aa2594cc308130da4db4ff600263ac74)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-12-03 13:52:07 +00:00
Robert Yang cc1f50fca8 recipes-graphics: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.

[YOCTO #3297]

(From OE-Core rev: db1a03da3a6a6e7adb68e28883204adfaa8b3f47)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:29 +00:00
Martin Jansa fadb407901 PACKAGES_DYNAMIC: use += instead of = in most cases
* to keep ${PN}-locale from
  bitbake.conf:PACKAGES_DYNAMIC = "^${PN}-locale-.*"

(From OE-Core rev: 73252b16b501c0986b0ca0895e4534895a9ba3db)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa 33b31640bf PACKAGES_DYNAMIC: use regexp not glob
* bitbake uses PACKAGES_DYNAMIC as regexp
  ^ could make matching faster (and it will be more clear that we're expecting regexp not glob)
  * made all those last '-' optional, use .* (or nothing)

(From OE-Core rev: 2f3ebdfa5f42dae51063b043cc4b0fbe20b40064)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-19 18:02:26 +01:00
Martin Jansa 2c5079be86 recipes: bump PR to rebuild after libffi5 -> libffi6
(From OE-Core rev: 211200fb98a72ba815e7c411fbebfd781879064c)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-19 17:56:26 +01:00
Radu Moisan cc1179e1bd pango: Add missing sign-off-by and upstream-status
(From OE-Core rev: 7cc3976dd558b2e4cb07adf2d8875eaed5b8d7ba)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-09-04 14:08:34 +01:00
Radu Moisan 1834db1ddd pango: upgrade to upstream stable 1.30.0
(From OE-Core rev: dec33ee2c8badb64b90ce8230f218c6898f3703c)

Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-08-15 14:26:39 +01:00
Ross Burton 4a5f8d84ee pango: cleanup thanks to new gtk-doc.bbclass
(From OE-Core rev: 1c5fbfe7f284c8e8f6d850593192b8350c3ce7d5)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-22 11:42:19 +01:00
Richard Purdie bfd279de32 Convert tab indentation in python functions into four-space
(From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 10:24:50 +01:00
Nitin A Kamble 95c561f277 pango: fix dependencies to avoid build issue
this commit avoids this build issue:

| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.7.1/ld: cannot find -lelf
| collect2: error: ld returned 1 exit status
...
| make: *** [all] Error 2
| ERROR: oe_runmake failed
NOTE: package pango-1.28.4-r7: task do_compile: Failed

(From OE-Core rev: dafefa7bd4de518adb63ec19390b77a56cb65d8e)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 10:54:04 +01:00
Lianhao Lu 55a6587ec5 pango: added upstream-status status.
Added missing upstream status.

(From OE-Core rev: 5938eb43b3d7de65e58610f9d5044fadd42cc225)

Signed-off-by: Edwin Zhai <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-06-15 15:44:38 +01:00
Zhai Edwin 38467c458f pango: Fix modules load failure in multilib environment
Multi-libs of Pango need different modules, thus different config files and
utils. This patch separate config file and utils with different MLPREFIX to
avoid conflict.

[YOCTO #2356] got fixed.

(From OE-Core rev: 80c431989eef64d2c34a9cddb7fb95b7b9768706)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-08 16:06:42 +01:00
Martin Jansa e910451889 pango: import native support and --disable-introspection from meta-oe
* see http://git.openembedded.org/meta-openembedded/commit/?id=3f4c8edc60b3426dd96f76504169d742a04c1ce1
  for details about --disable-introspection

(From OE-Core rev: f3ff6f0d0ae3cef6f30a80fc64c251aec9dd1a01)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-26 10:05:05 +01:00
Richard Purdie b1aeaa8b0d meta: Replace bb.data.expand(xxx, d) -> d.expand(xxx)
sed \
 -e 's:bb.data.\(expand([^,()]*\), *\([^) ]*\) *):\2.\1):g' \
 -i `grep -ril bb.data.expand *`

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:23:53 -08: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
Khem Raj a142cbd47e zlib: Upgrade 1.2.5 -> 1.2.6
Dont use autotools, it really not so autoconf like.
the configure script gets updated with every release of zlib
and we overwrite that. Instead use the upstream provided
configure

copyright year was changed in zlib.h which caused change in
LIC_FILE_CHECKSUM

fix.inverted.LFS.logic.patch is already applied upstream so drop it

Drop the configure.ac and Makefile.am scripts since we do not
autoreconf anymore and do not inherit autotools anymore

Bump PR for depending recipes so a rebuild it ensues so that
they dont depend on .la anymore
and add missing dependencies discovered during incremental
build

(From OE-Core rev: 50ad5230ea9e0982cdfda23fb9fcfccf89d28f29)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-10 14:38:44 +00:00
Saul Wold 703e1f06fd pango.inc: fix /etc/pango -> /${sysconfdir}/pango/*
(From OE-Core rev: ea660263d20066f35a47e60a9d48832ff3959ac3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-19 11:34:08 +00:00
Koen Kooi 925433d6e6 pango: create /etc/pango in module postinsts if it's missing
(From OE-Core rev: 1b24f76bae9612bc69fb0afeaccb06c5e5746ce6)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-17 15:10:15 +00:00
Koen Kooi 1ca0401f33 Revert "pango.inc: add directory "/etc/pango""
This reverts commit 65186bd86170d8c375931a18487c2fdf3bd1b3b0.

(From OE-Core rev: 25c2d1a825a5d028b99f956be2918ceed4a93ac3)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-17 15:10:15 +00:00
Richard Purdie 7c8ebf6f0d pango: Use gnomebase class, not gnome
There was a circular dependency introduced by the recent gconf changes
to depend on gtk+. The issue is that gtk+ depends on pango and pango
depends on gconf.

This patch changes to use the gnonebase class since pango has no need
of gconf/mime/gtk-icon-cache and hence removes the circular dependency.

(From OE-Core rev: 91e17c0c0ac2330f826b95e762542cd0d0c82385)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-16 18:01:43 +00:00
Xiaofeng Yan 094118031c pango.inc: add directory "/etc/pango"
Command "pango-querymodules > /etc/pango/pango.modules" can't work when \
starting up yocto because of no directory "/etc/pango". It will cause \
messy code when gtk-demo running.

[YOCTO #1900]

[RP: PR bump]
(From OE-Core rev: 65186bd86170d8c375931a18487c2fdf3bd1b3b0)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-16 12:24:56 +00:00
Joshua Lock 3980c48b7f pango: clarify LICENSE is LGPLv2.0+
(From OE-Core rev: c801891878afcb75091315f4455db35009eaa246)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-21 17:16:28 +00:00
Xiaofeng Yan 627b230f56 pango: Disable x11 when pango doesn't run over x11
pango run over x11 at current OE-core. If pango want to run over non-x11, then \
the configuration related to x11 should be disabled.

[YOCTO #1674]

(From OE-Core rev: e20bb10573dd67fd60b5b7f944eb0cbec2332a04)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13 12:28:10 +00: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 bc5dcd3364 recipes: bump PR after python upgrade
(From OE-Core rev: 669b20b5af9c663f8f8bc4017511d60638f86088)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-31 22:03:21 +00:00
Richard Purdie 2912f89b25 pango: Update to work with glib-2.0
(From OE-Core rev: e1d888cd20aafafdab60ec2a857f4ee19d1f9342)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-14 13:18:06 +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
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
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
Yu Ke b0ac556f72 pango: upgrade from 1.28.3 to 1.28.4
(From OE-Core rev: 76b86764b0346d8cac6aa915f4907f4b0ffe9a8d)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-18 05:49:42 +01:00
Saul Wold bcb56958f8 pango: reenable PARALLEL_MAKE
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-02-16 07:34:52 -08: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
Saul Wold 3d08b9f2c6 SRC_URI Checksums Additionals
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2010-12-09 08:18:17 -08:00
Yu Ke 8de3400317 pango: upgrade from 1.28.0 to 1.28.3
Signed-off-by: Yu Ke <ke.yu@intel.com>
2010-11-22 10:33:08 -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