* [PATCH 0/2] cogl/clutter update to 1.18
@ 2014-06-03 3:33 Tim Orling
2014-06-03 3:33 ` [PATCH 1/2] cogl: update to 1.18.0 Tim Orling
2014-06-03 3:33 ` [PATCH 2/2] clutter: update to 1.18.2 Tim Orling
0 siblings, 2 replies; 3+ messages in thread
From: Tim Orling @ 2014-06-03 3:33 UTC (permalink / raw)
To: openembedded-core
From: Tim Orling <TicoTimo@gmail.com>
The following changes since commit 6433f5d68eba1ce7306fbfb19265ea6786715d7c:
diffstat: patches have now been submitted upstream
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib timo/cogl-clutter-1.18
http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-1.18
Tim Orling (2):
cogl: update to 1.18.0
clutter: update to 1.18.2
.../clutter/clutter-1.0/install-examples.patch | 14 ++-------
.../recipes-graphics/clutter/clutter-1.0_1.16.2.bb | 8 ------
.../recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 ++++++
meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
.../kms-include-stddef.h-before-drm.h.patch | 33 ----------------------
meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb | 8 ------
meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb | 6 ++++
7 files changed, 17 insertions(+), 62 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
--
1.8.3.2
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] cogl: update to 1.18.0
2014-06-03 3:33 [PATCH 0/2] cogl/clutter update to 1.18 Tim Orling
@ 2014-06-03 3:33 ` Tim Orling
2014-06-03 3:33 ` [PATCH 2/2] clutter: update to 1.18.2 Tim Orling
1 sibling, 0 replies; 3+ messages in thread
From: Tim Orling @ 2014-06-03 3:33 UTC (permalink / raw)
To: openembedded-core
From: Tim Orling <TicoTimo@gmail.com>
Announcement:
http://lists.freedesktop.org/archives/cogl/2014-March/001636.html
* License changed from LGPL to MIT
* kms-include-stddef.h-before-drm.h.patch fixed upstream
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
meta/recipes-graphics/cogl/cogl-1.0.inc | 2 +-
.../kms-include-stddef.h-before-drm.h.patch | 33 ----------------------
meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb | 8 ------
meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb | 6 ++++
4 files changed, 7 insertions(+), 42 deletions(-)
delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
delete mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
create mode 100644 meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index a4a8550..e25968e 100644
--- a/meta/recipes-graphics/cogl/cogl-1.0.inc
+++ b/meta/recipes-graphics/cogl/cogl-1.0.inc
@@ -1,6 +1,6 @@
SUMMARY = "Modern 3D graphics API with associated utility APIs"
HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl"
-LICENSE = "LGPLv2.1+"
+LICENSE = "MIT"
inherit clutter
diff --git a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch b/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
deleted file mode 100644
index 7cce279..0000000
--- a/meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Submitted [cogl@lists.freedesktop.org]
-
-From 5e4f4689308732a0570a1631169247157c59f064 Mon Sep 17 00:00:00 2001
-From: Andreas Oberritter <obi@saftware.de>
-Date: Tue, 28 Jan 2014 18:36:04 +0100
-Subject: [PATCH] kms: include stddef.h before drm.h
-
-Not doing so leads to the following error, if stddef.h is not included
-indirectly through EGL headers:
-
-| libdrm/drm.h:132:2: error: unknown type name 'size_t'
-| size_t name_len; /**< Length of name buffer */
-
-Signed-off-by: Andreas Oberritter <obi@saftware.de>
----
- cogl/winsys/cogl-winsys-egl-kms.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/cogl/winsys/cogl-winsys-egl-kms.c b/cogl/winsys/cogl-winsys-egl-kms.c
-index f7c9cfb..144ad9b 100644
---- a/cogl/winsys/cogl-winsys-egl-kms.c
-+++ b/cogl/winsys/cogl-winsys-egl-kms.c
-@@ -40,6 +40,7 @@
-
- #include <EGL/egl.h>
- #include <EGL/eglext.h>
-+#include <stddef.h>
- #include <drm.h>
- #include <xf86drm.h>
- #include <xf86drmMode.h>
---
-1.8.3.2
-
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
deleted file mode 100644
index 521158e..0000000
--- a/meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require cogl-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI += "file://kms-include-stddef.h-before-drm.h.patch"
-
-SRC_URI[archive.md5sum] = "aaf32bde135cf3815aa3221726bad71e"
-SRC_URI[archive.sha256sum] = "65be91591546ef6fdfec93a71979b2b108eee25edbc20c53190caafc9a92d4e7"
diff --git a/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
new file mode 100644
index 0000000..375b079
--- /dev/null
+++ b/meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb
@@ -0,0 +1,6 @@
+require cogl-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84"
+
+SRC_URI[archive.md5sum] = "994a29f5c02768367b6f035bfe456ba6"
+SRC_URI[archive.sha256sum] = "a4d91ebf7e7aba362eb5c6e4ffebbf1167ff4ac87fabae104912d879a5390f5e"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] clutter: update to 1.18.2
2014-06-03 3:33 [PATCH 0/2] cogl/clutter update to 1.18 Tim Orling
2014-06-03 3:33 ` [PATCH 1/2] cogl: update to 1.18.0 Tim Orling
@ 2014-06-03 3:33 ` Tim Orling
1 sibling, 0 replies; 3+ messages in thread
From: Tim Orling @ 2014-06-03 3:33 UTC (permalink / raw)
To: openembedded-core
From: Tim Orling <TicoTimo@gmail.com>
* Updated Ross's install-examples.patch to current
** AM_CPPFLAGS changes no longer needed
** example_DATA = ... redhand.png no longer needed
** minor line # changes
Signed-off-by: Tim Orling <TicoTimo@gmail.com>
---
.../clutter/clutter-1.0/install-examples.patch | 14 ++------------
meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb | 8 --------
meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb | 8 ++++++++
3 files changed, 10 insertions(+), 20 deletions(-)
delete mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
create mode 100644 meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
diff --git a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
index d96b038..3b6a70e 100644
--- a/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
+++ b/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch
@@ -7,22 +7,12 @@ diff --git a/examples/Makefile.am b/examples/Makefile.am
index 4b9b449..232cd19 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
-@@ -31,7 +31,7 @@ LDADD = \
- AM_CFLAGS = $(CLUTTER_CFLAGS) $(GDK_PIXBUF_CFLAGS) $(MAINTAINER_CFLAGS)
-
- AM_CPPFLAGS = \
-- -DTESTS_DATADIR=\""$(abs_top_srcdir)/tests/data"\" \
-+ -DTESTS_DATADIR=\""$(exampledir)"\" \
- -DG_DISABLE_SINGLE_INCLUDES \
- -DGLIB_DISABLE_DEPRECATION_WARNINGS \
- -I$(top_srcdir) \
-@@ -39,6 +39,8 @@ AM_CPPFLAGS = \
+@@ -38,6 +38,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/clutter \
-I$(top_builddir)/clutter
-noinst_PROGRAMS = $(all_examples)
+exampledir = $(pkglibdir)/examples
+example_PROGRAMS = $(all_examples)
-+example_DATA = $(top_srcdir)/tests/data/redhand.png
- -include $(top_srcdir)/build/autotools/Makefile.am.gitignore
+ EXTRA_DIST = redhand.png
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
deleted file mode 100644
index 584f9d0..0000000
--- a/meta/recipes-graphics/clutter/clutter-1.0_1.16.2.bb
+++ /dev/null
@@ -1,8 +0,0 @@
-require clutter-1.0.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
-
-SRC_URI[archive.md5sum] = "976614a2f7e60af088a0a460fe9d267e"
-SRC_URI[archive.sha256sum] = "0cb7e88c80f43fc7fb869fc6d34c42e98aa1a0ef7aa02e6aeef1b099ad33df42"
-
-SRC_URI += "file://install-examples.patch"
diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
new file mode 100644
index 0000000..452e7ee
--- /dev/null
+++ b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb
@@ -0,0 +1,8 @@
+require clutter-1.0.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29"
+SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"
+
+SRC_URI += "file://install-examples.patch"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-06-03 3:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-03 3:33 [PATCH 0/2] cogl/clutter update to 1.18 Tim Orling
2014-06-03 3:33 ` [PATCH 1/2] cogl: update to 1.18.0 Tim Orling
2014-06-03 3:33 ` [PATCH 2/2] clutter: update to 1.18.2 Tim Orling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox