Signed-off-by: Ross Burton <ross.bur...@intel.com>
---
meta-oe/recipes-graphics/waffle/files/cflags.patch | 30 ++++++++++++++++++++
meta-oe/recipes-graphics/waffle/waffle_1.2.2.bb | 21 ++++++++++++++
2 files changed, 51 insertions(+)
create mode 100644 meta-oe/recipes-graphics/waffle/files/cflags.patch
create mode 100644 meta-oe/recipes-graphics/waffle/waffle_1.2.2.bb
diff --git a/meta-oe/recipes-graphics/waffle/files/cflags.patch
b/meta-oe/recipes-graphics/waffle/files/cflags.patch
new file mode 100644
index 0000000..34b9b7f
--- /dev/null
+++ b/meta-oe/recipes-graphics/waffle/files/cflags.patch
@@ -0,0 +1,30 @@
+Upstream-Status: Backport
+Signed-off-by: Ross Burton <ross.bur...@intel.com>
+
+From 2abec1cb3c17fa5ec8d945d79acd74a39c38293a Mon Sep 17 00:00:00 2001
+From: Ross Burton <ross.bur...@intel.com>
+Date: Wed, 12 Dec 2012 12:57:18 +0000
+Subject: cmake: respect existing CMAKE_C_FLAGS
+
+When cross-compiling it's not unusual to need specific arguments passed to gcc
+such as --sysroot. Ensure that these are passed on from the toolchain file by
+appending to CMAKE_C_FLAGS instead of overwriting it.
+
+Signed-off-by: Ross Burton <ross.bur...@intel.com>
+Signed-off-by: Chad Versace <chad.vers...@linux.intel.com>
+---
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3c9bb5d..5fc4467 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -211,7 +211,7 @@ endif()
+ # Compiler Flags
+ #
------------------------------------------------------------------------------
+
+-set(CMAKE_C_FLAGS "--std=c99 -Wall -Werror=implicit-function-declaration")
++set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} --std=c99 -Wall
-Werror=implicit-function-declaration")
+ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
+ # On MacOS, the SSE2 headers trigger this error.
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror=missing-prototypes")
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/meta-oe/recipes-graphics/waffle/waffle_1.2.2.bb
b/meta-oe/recipes-graphics/waffle/waffle_1.2.2.bb
new file mode 100644
index 0000000..6bdeb1e
--- /dev/null
+++ b/meta-oe/recipes-graphics/waffle/waffle_1.2.2.bb
@@ -0,0 +1,21 @@
+SUMMARY = "cross-platform C library to defer selection of GL API and of window
system"
+LICENSE = "BSD-2-Clause"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \
+
file://include/waffle/waffle.h;endline=24;md5=61dbf8697f61c78645e75a93c585b1bf"
+
+PR = "r0"
+
+SRC_URI =
"http://people.freedesktop.org/~chadversary/waffle/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz
\
+ file://cflags.patch"
+
+SRC_URI[md5sum] = "fdd07cea7709422fbf72418ee63a285d"
+SRC_URI[sha256sum] =
"7e342c859b58d4e051b347ef3d7740ed2f3b6c506b93daec272724afe7dd1311"
+
+inherit cmake
+
+DEPENDS = "virtual/libgl libxcb libx11"
+
+# TODO: add waffle_has_wayland, waffle_has_x11_egl, waffle_has_gbm depending
on environment.
+EXTRA_OECMAKE = "-Dwaffle_has_glx=1"
+
+FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake"
--
1.7.10
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
