Additions from oe-core
cover Additions from oe-core
Hi,
Recently libgdata, clutter-box2d and gthumb were removed from oe-core. These are all still useful, so this series adds them to meta-oe.
gthumb and libgdata are in meta-gnome, clutter-box2d is in meta-oe.
Ross
The following changes since commit 84ea5433739ddc2551216902f6053d5c2368e755:
macchanger: added 1.5.0 recipe (2013-02-25 09:59:56 -0500)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contrib ross/from-core
for you to fetch changes up to ff4c100c5e51ac6227325ea1ea319c902bf554bf:
libgdata: add, from oe-core (2013-02-28 11:56:21 +0000)
----------------------------------------------------------------
Ross Burton (3):
gthumb: add, taken from oe-core
clutter-box2d: add, from oe-core
libgdata: add, from oe-core
.../recipes-gnome/gthumb/files/parallel.patch | 158 ++++++++++++++++++++ meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ++++ .../recipes-gnome/libgdata/libgdata_0.7.1.bb | 15 ++ meta-oe/recipes-graphics/clutter/clutter-box2d.inc | 15 ++ .../recipes-graphics/clutter/clutter-box2d_git.bb | 14 ++ 5 files changed, 229 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/files/parallel.patch create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb create mode 100644 meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d.inc create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
Ross Burton (3):
gthumb: add, taken from oe-core
clutter-box2d: add, from oe-core
libgdata: add, from oe-core
.../recipes-gnome/gthumb/files/parallel.patch | 158 ++++++++++++++++++++ meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ++++ .../recipes-gnome/libgdata/libgdata_0.7.1.bb | 15 ++ meta-oe/recipes-graphics/clutter/clutter-box2d.inc | 15 ++ .../recipes-graphics/clutter/clutter-box2d_git.bb | 14 ++ 5 files changed, 229 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/files/parallel.patch create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb create mode 100644 meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d.inc create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
Signature · 1 line
1.7.10.4
PATCH 1/3 gthumb: add, taken from oe-core
This was removed in oe-core, so add it to meta-gnome.
--- .../recipes-gnome/gthumb/files/parallel.patch | 158 ++++++++++++++++++++ meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ++++ 2 files changed, 185 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/files/parallel.patch create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb
meta-gnome/recipes-gnome/gthumb/files/parallel.patch new file +158 -0
@@ -0,0 +1,158 @@ +From 34969cde1dcb7740b4a7c3b6e3d04d481e5980b5 Mon Sep 17 00:00:00 2001 +From: Ross Burton <[email protected]> +Date: Tue, 31 Jul 2012 17:26:27 +0100 +Subject: [PATCH] build: Fix parallel build problems with enum generation + +This is a backport from a patch against master. + +Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=680925] +--- + extensions/file_tools/Makefile.am | 10 ++++------ + extensions/importer/Makefile.am | 10 ++++------ + extensions/pixbuf_savers/Makefile.am | 10 ++++------ + gthumb/Makefile.am | 10 ++++------ + 4 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/extensions/file_tools/Makefile.am b/extensions/file_tools/Makefile.am +index 7785eff..d70a8a5 100644 +--- a/extensions/file_tools/Makefile.am ++++ b/extensions/file_tools/Makefile.am +@@ -24,17 +24,16 @@ HEADER_FILES = \ + gth-file-tool-undo.h \ + preferences.h + +-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) ++enum-types.h: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) enum-types.h ) + +-enum-types.c: $(HEADER_FILES) enum-types.h ++enum-types.c: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include <glib-object.h>\n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ +@@ -42,8 +41,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) enum-types.c ) + + libfile_tools_la_SOURCES = \ + $(ENUM_TYPES) \ +diff --git a/extensions/importer/Makefile.am b/extensions/importer/Makefile.am +index 29e7f2c..07c1eba 100644 +--- a/extensions/importer/Makefile.am ++++ b/extensions/importer/Makefile.am +@@ -14,17 +14,16 @@ HEADER_FILES = \ + preferences.h \ + utils.h + +-gth-import-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) ++gth-import-enum-types.h: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) gth-import-enum-types.h || cp xgen-$(@F) gth-import-enum-types.h ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) gth-import-enum-types.h ) + +-gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h ++gth-import-enum-types.c: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include <glib-object.h>\n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ +@@ -32,8 +31,7 @@ gth-import-enum-types.c: $(HEADER_FILES) gth-import-enum-types.h + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) gth-import-enum-types.c || cp xgen-$(@F) gth-import-enum-types.c ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) gth-import-enum-types.c ) + + libimporter_la_SOURCES = \ + $(ENUM_TYPES) \ +diff --git a/extensions/pixbuf_savers/Makefile.am b/extensions/pixbuf_savers/Makefile.am +index bfe9f34..4764c32 100644 +--- a/extensions/pixbuf_savers/Makefile.am ++++ b/extensions/pixbuf_savers/Makefile.am +@@ -10,17 +10,16 @@ ENUM_TYPES = \ + HEADER_FILES = \ + preferences.h + +-enum-types.h: $(HEADER_FILES) $(GLIB_MKENUMS) ++enum-types.h: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef ENUM_TYPES_H\n#define ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) enum-types.h || cp xgen-$(@F) enum-types.h ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) enum-types.h ) + +-enum-types.c: $(HEADER_FILES) enum-types.h ++enum-types.c: $(HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include <glib-object.h>\n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ +@@ -28,8 +27,7 @@ enum-types.c: $(HEADER_FILES) enum-types.h + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) enum-types.c || cp xgen-$(@F) enum-types.c ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) enum-types.c ) + + libpixbuf_savers_la_SOURCES = \ + $(ENUM_TYPES) \ +diff --git a/gthumb/Makefile.am b/gthumb/Makefile.am +index e9e385e..2f14e03 100644 +--- a/gthumb/Makefile.am ++++ b/gthumb/Makefile.am +@@ -296,17 +296,16 @@ gthumb_CFLAGS = \ + -DGTHUMB_EXTENSIONS_DIR=\"$(extensions_dir)\" \ + $(NULL) + +-gth-enum-types.h: $(PUBLIC_HEADER_FILES) $(GLIB_MKENUMS) ++gth-enum-types.h: $(PUBLIC_HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#ifndef GTH_ENUM_TYPES_H\n#define GTH_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \ + --fprod "/* enumerations from \"@filename@\" */\n" \ + --vhead "GType @enum_name@_get_type (void);\n#define GTH_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \ + --ftail "G_END_DECLS\n\n#endif /* GTH_ENUM_TYPES_H */" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) gth-enum-types.h || cp xgen-$(@F) gth-enum-types.h ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) gth-enum-types.h ) + +-gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h ++gth-enum-types.c: $(PUBLIC_HEADER_FILES) + $(AM_V_GEN)( $(GLIB_MKENUMS) \ + --fhead "#include <glib-object.h>\n" \ + --fprod "\n/* enumerations from \"@filename@\" */\n#include \"@filename@\"" \ +@@ -314,8 +313,7 @@ gth-enum-types.c: $(PUBLIC_HEADER_FILES) gth-enum-types.h + --vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \ + --vtail " { 0, NULL, NULL }\n };\n etype = g_@type@_register_static (\"@EnumName@\", values);\n }\n return etype;\n}\n" \ + $^> xgen-$(@F) \ +- && (cmp -s xgen-$(@F) gth-enum-types.c || cp xgen-$(@F) gth-enum-types.c ) \ +- && rm -f xgen-$(@F) ) ++ && mv -f xgen-$(@F) gth-enum-types.c ) + + gth-marshal.h: gth-marshal.list $(GLIB_GENMARSHAL) + $(AM_V_GEN)( $(GLIB_GENMARSHAL) $(srcdir)/gth-marshal.list --header --prefix=gth_marshal > $@ ) +-- +1.7.10.4 +
meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb new file +27 -0
@@ -0,0 +1,27 @@ +DESCRIPTION = "gThumb is an image viewer and browser for the GNOME Desktop" +SECTION = "x11/gnome" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" +DEPENDS = "glib-2.0 gtk+ libxml2 gnome-doc-utils libunique gconf libpng gstreamer jpeg tiff gst-plugins-base" + +PR = "r4" + +EXTRA_OECONF = "--disable-gnome-keyring --disable-libsoup --disable-exiv2 --disable-clutter" + +inherit gnome pkgconfig + +SRC_URI[archive.md5sum] = "97fc13221b0c5d80c27a2e25a3a3ac6f" +SRC_URI[archive.sha256sum] = "cf809695230ab8892a078be454a42ade865754c72ec1da7c3d74d4310de54f1d" + +SRC_URI += "file://parallel.patch" + +do_install_append () { + rm ${D}${libdir}/${BPN}/extensions/*.a +} + +FILES_${PN} += "${datadir}/icons" +FILES_${PN} += "${libdir}/${BPN}/extensions/*.so \ + ${libdir}/${BPN}/extensions/*.extension" +FILES_${PN}-dev += "${libdir}/${BPN}/extensions/*.la" +FILES_${PN}-dbg += "${libdir}/${BPN}/extensions/.debug/" +
Signature · 1 line
1.7.10.4
PATCH 2/3 clutter-box2d: add, from oe-core
In reply to Ross BurtonThis was removed from oe-core but it's still useful, so add it to meta-oe.
--- meta-oe/recipes-graphics/clutter/clutter-box2d.inc | 15 +++++++++++++++ meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb | 14 ++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d.inc create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb
meta-oe/recipes-graphics/clutter/clutter-box2d.inc new file +15 -0
@@ -0,0 +1,15 @@ +DESCRIPTION = "Clutter Box2D" +HOMEPAGE = "http://www.clutter-project.org/" +LICENSE = "LGPLv2.1+" + +# The main clutter lib is machine specific so we need to be too +PACKAGE_ARCH = "${MACHINE_ARCH}" + +inherit autotools pkgconfig gtk-doc + +do_install_append () { + install -d ${D}${bindir} + install ${S}/examples/.libs/blockbox ${D}${bindir} +} + +FILESPATH = "${FILE_DIRNAME}/clutter-box2d"
meta-oe/recipes-graphics/clutter/clutter-box2d_git.bb new file +14 -0
@@ -0,0 +1,14 @@ +require clutter-box2d.inc + +LIC_FILES_CHKSUM = "file://box2d/License.txt;md5=e5d39ad91f7dc4692dcdb1d85139ec6b" + +SRCREV = "de5452e56b537a11fd7f9453d048ff4b4793b5a2" +PV = "0.12.1+git${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.gnome.org/clutter-box2d.git" + +S = "${WORKDIR}/git" + +DEPENDS += "clutter-1.8" +PROVIDES = "clutter-box2d-1.6"
Signature · 1 line
1.7.10.4
PATCH 3/3 libgdata: add, from oe-core
In reply to Ross Burtonlibgdata was removed from oe-core, but it's still useful so add it to meta-gnome.
--- meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb
meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb new file +15 -0
@@ -0,0 +1,15 @@ +DESCRIPTION = "GLib-based library for accessing online service APIs using the GData protocol" +HOMEPAGE = "http://live.gnome.org/libgdata" +BUGTRACKER = "https://bugzilla.gnome.org/" + +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24 \ + file://gdata/gdata.h;endline=20;md5=079a554efcf65d46f96a515806e7e99a \ + file://gdata/gdata-types.h;endline=20;md5=7399b111aac8718da13888fc634be6ef" + +DEPENDS = "libxml2 glib-2.0 libsoup-2.4" + +inherit gnome pkgconfig autotools gettext + +SRC_URI[archive.md5sum] = "ec5262cbcb07b63b58d45aa3ac636096" +SRC_URI[archive.sha256sum] = "fb244138276a5ce98510b0e2408bbf6f9ce0fd8cdcf86f07cd4be38afbb7c2bc"
Signature · 1 line
1.7.10.4
Martin Jansa
AppliedQuoted 4 lines · Ross Burton
Hi,
Recently libgdata, clutter-box2d and gthumb were removed from oe-core. These are all still useful, so this series adds them to meta-oe.
Applied, thanks!
Quoted 60 lines
gthumb and libgdata are in meta-gnome, clutter-box2d is in meta-oe.
Ross
The following changes since commit
84ea5433739ddc2551216902f6053d5c2368e755:macchanger: added 1.5.0 recipe (2013-02-25 09:59:56 -0500)
are available in the git repository at:
git://git.openembedded.org/meta-openembedded-contribross/from-corefor you to fetch changes up to
ff4c100c5e51ac6227325ea1ea319c902bf554bf:libgdata: add, from oe-core (2013-02-28 11:56:21 +0000)
----------------------------------------------------------------
Ross Burton (3):
gthumb: add, taken from oe-core
clutter-box2d: add, from oe-core
libgdata: add, from oe-core.../recipes-gnome/gthumb/files/parallel.patch | 158 ++++++++++++++++++++ meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ++++ .../recipes-gnome/libgdata/libgdata_0.7.1.bb | 15 ++ meta-oe/recipes-graphics/clutter/clutter-box2d.inc | 15 ++ .../recipes-graphics/clutter/clutter-box2d_git.bb | 14 ++ 5 files changed, 229 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/files/parallel.patch create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb create mode 100644 meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d.inc create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bbRoss Burton (3):
gthumb: add, taken from oe-core
clutter-box2d: add, from oe-core
libgdata: add, from oe-core.../recipes-gnome/gthumb/files/parallel.patch | 158 ++++++++++++++++++++ meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb | 27 ++++ .../recipes-gnome/libgdata/libgdata_0.7.1.bb | 15 ++ meta-oe/recipes-graphics/clutter/clutter-box2d.inc | 15 ++ .../recipes-graphics/clutter/clutter-box2d_git.bb | 14 ++ 5 files changed, 229 insertions(+) create mode 100644 meta-gnome/recipes-gnome/gthumb/files/parallel.patch create mode 100644 meta-gnome/recipes-gnome/gthumb/gthumb_2.12.4.bb create mode 100644 meta-gnome/recipes-gnome/libgdata/libgdata_0.7.1.bb create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d.inc create mode 100644 meta-oe/recipes-graphics/clutter/clutter-box2d_git.bbSignature · 7 lines
1.7.10.4 _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]