diff options
| author | Lucas Stach <l.stach@pengutronix.de> | 2017-06-15 11:30:37 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2017-06-21 10:14:52 +0200 |
| commit | 16289d0e176484e2fb3e1eb441eca3e301bc7a4f (patch) | |
| tree | 32be3520c4474dd5e9bc5c80c61eae6415b4d8be /patches | |
| parent | 963fc205d336ebf65c4a42fbcdbc40df74da7d05 (diff) | |
| download | ptxdist-16289d0e176484e2fb3e1eb441eca3e301bc7a4f.tar.gz ptxdist-16289d0e176484e2fb3e1eb441eca3e301bc7a4f.tar.xz | |
waffle: new package
Waffle is a cross-platform C library that allows one to defer
selection of an OpenGL API and window system until runtime.
Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
[p.zabel@pengutronix.de: added a patch to use EGL CFLAGS from pkgconfig]
Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch | 47 | ||||
| -rw-r--r-- | patches/waffle-1.5.2/series | 1 |
2 files changed, 48 insertions, 0 deletions
diff --git a/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch b/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch new file mode 100644 index 000000000..30759ce4e --- /dev/null +++ b/patches/waffle-1.5.2/0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch @@ -0,0 +1,47 @@ +From 359902f8f043e7a7d782d1df3d5d74c3b2a3bd04 Mon Sep 17 00:00:00 2001 +From: Philipp Zabel <p.zabel@pengutronix.de> +Date: Thu, 8 Jun 2017 13:52:02 +0200 +Subject: [PATCH] egl: use EGL CFLAGS reported by pkg-config + +Some platforms need -DMESA_EGL_NO_X11_HEADERS set, as indicated by the +Cflags: field in egl.pc. pkg-config provides this information, pass it +to the compiler. + +Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> +--- + src/waffle/CMakeLists.txt | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt +index d76e029..954774c 100644 +--- a/src/waffle/CMakeLists.txt ++++ b/src/waffle/CMakeLists.txt +@@ -94,6 +94,9 @@ if(waffle_on_mac) + endif() + + if(waffle_has_egl) ++ list(APPEND waffle_cflags ++ ${egl_CFLAGS} ++ ) + list(APPEND waffle_sources + egl/wegl_config.c + egl/wegl_context.c +@@ -227,6 +230,7 @@ target_link_libraries(${waffle_libname} ${waffle_libdeps}) + + set_target_properties(${waffle_libname} + PROPERTIES ++ COMPILE_FLAGS ${waffle_cflags} + SOVERSION ${waffle_soversion} + VERSION ${waffle_soversion}.${waffle_minor_version}.${waffle_patch_version} + ) +@@ -266,6 +270,7 @@ target_link_libraries(waffle_static ${waffle_libdeps}) + + set_target_properties(waffle_static + PROPERTIES ++ COMPILE_FLAGS ${waffle_cflags} + OUTPUT_NAME "waffle-static-${waffle_major_version}" + ) + +-- +2.11.0 + diff --git a/patches/waffle-1.5.2/series b/patches/waffle-1.5.2/series new file mode 100644 index 000000000..6b680e422 --- /dev/null +++ b/patches/waffle-1.5.2/series @@ -0,0 +1 @@ +0001-egl-use-EGL-CFLAGS-reported-by-pkg-config.patch |