summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Orling <TicoTimo@gmail.com>2014-06-02 20:33:13 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-06-06 09:18:33 +0100
commit0e3b38baddf6341465288323dfdc0440c47579d7 (patch)
tree7bee88ae495ff20f1f5c4285c49ed3b437a0483d
parenta6a6cd089352157d35a8730e37153ce9df62ec01 (diff)
downloadopenembedded-core-contrib-0e3b38baddf6341465288323dfdc0440c47579d7.tar.gz
openembedded-core-contrib-0e3b38baddf6341465288323dfdc0440c47579d7.tar.bz2
openembedded-core-contrib-0e3b38baddf6341465288323dfdc0440c47579d7.zip
cogl: update to 1.18.0
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> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0.inc2
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0/kms-include-stddef.h-before-drm.h.patch33
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.16.2.bb8
-rw-r--r--meta/recipes-graphics/cogl/cogl-1.0_1.18.0.bb6
4 files changed, 7 insertions, 42 deletions
diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc
index a4a85506ff..e25968e468 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 7cce279a19..0000000000
--- 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 521158e7e4..0000000000
--- 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 0000000000..375b079b4f
--- /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"