Commit Graph

76 Commits

Author SHA1 Message Date
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
Richard Purdie f3ba3cb6af gdk-pixbuf: Fix lsb builds where dependency may be missing
We turn on the xlib depdendency for linuxstdbase builds but
were missing the dependency on libx11. This adds the missing
dependency.

(From OE-Core rev: 89c3eb5247d9d15f0beaf397d2aa5332007f229a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-15 19:44:37 +01:00
Richard Purdie cf0db01c55 gdk-pixbuf: Allow empty -xlib package
There are things that depend on the -xlib package. There are two
possible ways to fix this, either recommend them instead of depending
on them, or allow the package to be empty. I'm doing the latter
since its a bit cleaner and less invasive.

This library is a bit pointless which is why there is little point
in adding the x dependency in the non-lsb case. If it becomes widly
used we can rethink this.

(From OE-Core rev: 7d49da7389b5bb0e74d9000b002ebf0bc554e85b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-15 18:51:13 +01:00
Richard Purdie d93e43a126 gdk-pixbuf: Drop unneeded RPROVIDES
(From OE-Core rev: cab85fd0b481cdbf36477348de75352be3f38ca2)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-12 11:23:35 +01:00
Xiaofeng Yan 31122b03bf gdk-pixbuf: Add --with-x11 when building lsb image
LSB Test Suite complains "No library libgdk_pixbuf_xlib-2.0.so.0" \
because of having "--without-x11" for gdk-pixbuf_2.24.1.bb.
Use the linuxstdbase override and also make it conditional on x11 \
being in DISTRO_FEATURES for passing lsb test.
Split libgdk_pixbuf_xlib to a single package.

(From OE-Core rev: 4cb21630cf87e6cc9a062f1c2be9fea25d3e218a)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-05-11 18:00:27 +01:00
Richard Purdie 9cb1f86301 gdk-pixbuf: Fix checksum warning issue
(From OE-Core rev: 6a7ea3cf81f3600fec01bdd4af96ed149398a1a1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:23 +01:00
Shane Wang 6e5446cda6 gdk-pixbuf: upgrade to 2.24.1
(From OE-Core rev: a9c128897e7fa496cf8f297819b64bdc7b8c319c)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-21 13:03:39 +00:00
Richard Purdie 5bc142ac6c gdk-pixbuf: Disable xlib library since we don't have anything needing this as yet and no libx11 DEPENDS
This is currently causing builds not to be deterministic.

(From OE-Core rev: 2569711868dac01a0bf4bdfb3484b239862143dc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-19 20:28:46 +00:00
James Limbouris 7172b4b012 gdk-pixbuf: Pick up ${NM} from the environment.
(From OE-Core rev: e48eb65494a234ac82ec04fcbcc04f5e881347c3)

Signed-off-by: James Limbouris <james@digitalmatter.com.au>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-08 11:55:39 -08: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
Martin Jansa 0761649736 recipes: bump PR to rebuild .la files without libz.la
(From OE-Core rev: 1da6a2dbd5e7aeea6cd45ca05590bdd50b67bf89)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-21 17:00:47 +00: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
Richard Purdie 9d136b2db8 gdk-pixbuf: Ensure the binaries can be relocated
There are paths hardcoded into the binaries provided by this recipe. This
patch adds the neccessary environment options to ensure they can be relocated
successfully avoding build failures.

(From OE-Core rev: b9dfccc018f32a47fc045f35d5f53d7269d791ed)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-12-13 18:00:25 +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 4050aa4252 gdk-pixbuf: upgrade to 2.24.6
* older version doesn't build with glib-2.30.0

(From OE-Core rev: 169a524d86ee0647b9ecf8b9a70c750df6582a1a)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-10 10:00:09 +01: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
Andreas Mueller 160d0055e8 gdk-pixbuf(-native): Fix build by disabling introspection
Error message was:
| /home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/bin/g-ir-compiler  --includedir=. GdkPixbuf-2.0.gir -o GdkPixbuf-2.0.typelib
| /usr/share/gir-1.0/GLib-2.0.gir:9:1: error: Unsupported version '1.1'
| /usr/share/gir-1.0/GLib-2.0.gir:9:39: error: Unsupported version '1.1'
| error parsing file GdkPixbuf-2.0.gir: Failed to parse included gir GLib-2.0
| make[4]: *** [GdkPixbuf-2.0.typelib] Error 1

(From OE-Core rev: ed40a1c776ba3d59f03250b2eb9cfae9b8afadd5)

Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:33 +01:00
Andreas Mueller 96329f3ae0 gdk-pixbuf: Fix QA issues and clean minor formatting
QA warnings fixed:
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-png.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-wbmp.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xbm.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ras.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-tga.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-bmp.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ani.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pnm.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-icns.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-pcx.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-ico.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-gif.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-qtif.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-xpm.la
WARNING:   /usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/libpixbufloader-jpeg.la

(From OE-Core rev: 9d39ee7a8560005efd35dd7df7710ac30dd6d50c)

Signed-off-by: Andreas Mueller <schnitzeltony@gmx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-19 17:34:19 +01:00
Richard Purdie 8511d1ec1b Drop PRIORITY variable
As discussed on the mailing list, this variable isn't useful and if wanted
would be better implemented by distros using pn-X overrides.

This patch executes:

find . -regex ".*\.\(bb\|inc\)$" | xargs sed -i '/^PRIORITY = ".*"$/d'

against the tree removing the referenced. Thanks to Phil Blundell for
the command.

(From OE-Core rev: d122343362669c683acc4af295971a62cbc823fc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-01 23:27:29 +01:00
Zhai Edwin 79031b082b recipes: Add Upstream-Status to multiple recipes
gtk+: Add Upstream-Status
ed: Add Upstream-Status
gnome-common: Add Upstream-Status
libmatchbox: Add Upstream-Status
matchbox-wm: Add Upstream-Status
x11vnc: Add Upstream-Status
xtscal: Add Upstream-Status
eds-dbus: Add Upstream-Status
matchbox-desktop: Add Upstream-Status
matchbox-keyboard: Add Upstream-Status
matchbox-stroke: Add Upstream-Status
matchbox-theme-sato: Add Upstream-Status
owl-video-widget: Add Upstream-Status
beecrypt: Add Upstream-Status
gnome-icon-theme: Add Upstream-Status
tslib: Add Upstream-Status
libowl-av: Add Upstream-Status
sato-icon-theme: Add Upstream-Status
web-webkit: Add Upstream-Status
metacity: Add Upstream-Status
apr: Add Upstream-Status
gdk-pixbuf: Add Upstream-Status
pcmanfm: Add Upstream-Status
gpgme: Add Upstream-Status
eee-acpi-scripts: Add Upstream-Status
libgalago: Add Upstream-Status
python-pygtk: Add Upstream-Status
gnome-mime-data: Add Upstream-Status
clutter: Add Upstream-Status
clutter-gtk: Add Upstream-Status
tidy: Add Upstream-Status
mutter: Add Upstream-Status
xcursor-transparent-theme: Add Upstream-Status
leafpad: Add Upstream-Status
matchbox-config-gtk: Add Upstream-Status
contacts: Add Upstream-Status
dates: Add Upstream-Status
web: Add Upstream-Status
webkit: Add Upstream-Status
 - Also removed empty fix_im.patch
apr-util: Add Upstream-Status
libcroco: Add Upstream-Status
liboil: Add Upstream-Status
libxslt: Add Upstream-Status
libglade: Add Upstream-Status
gnome-terminal: Add Upstream-Status
xev: Add Upstream-Status
claws-mail: Add Upstream-Status
clipboard-manager: Add Upstream-Status
epdfview: Add Upstream-Status
kf: Add Upstream-Status
qemu: Add Upstream-Status
clutter-gst: Add Upstream-Status
table: Add Upstream-Status
matchbox-panel-2: Add Upstream-Status

(From OE-Core rev: 10bdb737c2c4c6996fd035849109a1e07580a6b9)

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-13 10:29:01 +01:00
Khem Raj d73500fdd9 gdk-pixbuf_2.22.1.bb: inherit gettext class instead of adding gettext to DEPENDS directly
(From OE-Core rev: 9081339cf588d29e31599ba05d1aad1c8c81af30)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 14:09:49 +01:00
Zhai Edwin fd03e8a682 gdk-pixbuf: Fix the native png load error and remove duplicated recipe
Native gdk-pixbuf-csource failed to load png file as the "loaders.cache" was
not properly set by gdk-pxibuf-query-loaders when install. This patch use the
wrapper script rather than query-loaders binary as required libtool library was
not installed when do_install_append.

Also remove dedicated recipe for gdk-pixbuf-native.

[sgw: Added PACKAGES_DYMAMIC_virtclass-native]
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-02-01 23:59:39 +00:00
Dexuan Cui cc0b8f491f gdk-pixbuf: add jpeg into DEPENDS
This fixes the following error:
| checking for jpeg_destroy_decompress in -ljpeg... no
| configure: WARNING: *** JPEG loader will not be built (JPEG library not found) ***
| configure: error:
| *** Checks for JPEG loader failed. You can build without it by passing
| *** --without-libjpeg to configure but some programs using GTK+ may
| *** not work properly
| FATAL: oe_runconf failed

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2011-02-01 23:59:37 +00:00
Saul Wold b46ce7cacd gdk-pixbuf-native: add jpeg-native as a dependency
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-01-20 21:37:02 +00:00
Zhai Edwin 552169e89a gdk-pixbuf: Add 2.22.1 as new recipe
Updating gtk+ to 2.23.2 requires gdk-pixbuf, which is originaly a module in gtk+.
Borrow hardcoded_libtool.patch from original gtk+, and add configure_fix.patch
to fix build failure in cross-compile environment.

As gdk-pixbuf is a stand-alone package now, gdk-pixbuf-csource-native can be
safely removed. So extend gdk-pixbuf with native support, and make related
packages depend on it.

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
2011-01-20 21:36:56 +00:00