* [PATCH] Avoid include of cairo.h on Android build
@ 2014-03-31 10:55 tim.gore
2014-03-31 10:55 ` [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds tim.gore
2014-03-31 11:15 ` [PATCH] Avoid include of cairo.h on Android build Jani Nikula
0 siblings, 2 replies; 3+ messages in thread
From: tim.gore @ 2014-03-31 10:55 UTC (permalink / raw)
To: intel-gfx
From: tgore <tim.gore@intel.com>
This is a rework of the third patch in a previous series of 3,
to accomodate a simplification suggested by Daniel Vetter.
tgore (1):
intel-gpu-tools: avoid include of cairo.h on Android builds
lib/Android.mk | 3 ++-
lib/igt_fb.h | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
--
1.9.0
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds
2014-03-31 10:55 [PATCH] Avoid include of cairo.h on Android build tim.gore
@ 2014-03-31 10:55 ` tim.gore
2014-03-31 11:15 ` [PATCH] Avoid include of cairo.h on Android build Jani Nikula
1 sibling, 0 replies; 3+ messages in thread
From: tim.gore @ 2014-03-31 10:55 UTC (permalink / raw)
To: intel-gfx
From: tgore <tim.gore@intel.com>
A recent commit means igt_debugfs.c now needs to include igt_kms.h,
which in turn includes igt_fb.h and hence cairo.h.
We need to avoid this inclusion of cairo.h when building for Android,
(until we have a cairo port) so I have added a #ifndef around it.
Signed-off-by: Tim Gore <tim.gore@intel.com>
---
lib/Android.mk | 3 ++-
lib/igt_fb.h | 5 +++++
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/Android.mk b/lib/Android.mk
index 6735255..d4ebef4 100644
--- a/lib/Android.mk
+++ b/lib/Android.mk
@@ -33,7 +33,8 @@ include $(LOCAL_PATH)/Makefile.sources
skip_lib_list := \
igt_kms.c \
- igt_kms.h
+ igt_kms.h \
+ igt_fb.c
lib_list := $(filter-out $(skip_lib_list),$(libintel_tools_la_SOURCES))
diff --git a/lib/igt_fb.h b/lib/igt_fb.h
index 5f0ff51..7242f9b 100644
--- a/lib/igt_fb.h
+++ b/lib/igt_fb.h
@@ -28,7 +28,12 @@
#ifndef __IGT_FB_H__
#define __IGT_FB_H__
+#ifndef ANDROID
#include <cairo.h>
+#else
+typedef struct _cairo_surface cairo_surface_t;
+typedef struct _cairo cairo_t;
+#endif
#include <drm_fourcc.h>
#include <xf86drmMode.h>
--
1.9.0
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] Avoid include of cairo.h on Android build
2014-03-31 10:55 [PATCH] Avoid include of cairo.h on Android build tim.gore
2014-03-31 10:55 ` [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds tim.gore
@ 2014-03-31 11:15 ` Jani Nikula
1 sibling, 0 replies; 3+ messages in thread
From: Jani Nikula @ 2014-03-31 11:15 UTC (permalink / raw)
To: tim.gore, intel-gfx
On Mon, 31 Mar 2014, tim.gore@intel.com wrote:
> From: tgore <tim.gore@intel.com>
Please configure git to use your real name instead of login.
Thanks,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-03-31 11:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-31 10:55 [PATCH] Avoid include of cairo.h on Android build tim.gore
2014-03-31 10:55 ` [PATCH] intel-gpu-tools: avoid include of cairo.h on Android builds tim.gore
2014-03-31 11:15 ` [PATCH] Avoid include of cairo.h on Android build Jani Nikula
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox