From: Tim Orling <ticotimo@gmail.com>
To: openembedded-core@lists.openembedded.org
Subject: [PATCH 1/2] cogl: update to 1.18.0
Date: Mon, 2 Jun 2014 20:33:13 -0700 [thread overview]
Message-ID: <1401766394-8680-2-git-send-email-ticotimo@gmail.com> (raw)
In-Reply-To: <1401766394-8680-1-git-send-email-ticotimo@gmail.com>
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
next prev parent reply other threads:[~2014-06-03 3:29 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 3:33 [PATCH 0/2] cogl/clutter update to 1.18 Tim Orling
2014-06-03 3:33 ` Tim Orling [this message]
2014-06-03 3:33 ` [PATCH 2/2] clutter: update to 1.18.2 Tim Orling
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401766394-8680-2-git-send-email-ticotimo@gmail.com \
--to=ticotimo@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox