From: Robert Foss <robert.foss@xxxxxxxxxxxxx> Changes since v1: - Replaced the automake flags HAVE_VC4/NOUVEAU/INTEL with HAVE_LIBDRM_XXX. - Move conditionals from Makefile.sources to Arduino.mk/Makefile.am. - Removed duplicated i915_drm.h symbols from intel_drm_stubs.h. - Replaced igt_require with igt_require_f to communicate stubs being the cause of failure. - Rename intel_drm_stubs to intel_bufmgr. - Moved intel_bufmgr to lib/stubs/drm. - Remove header inclusion changes in favor for inclusion of stubs in lib/stubs/drm using build scripts. - Rebased on trunk. Changes since v2: - Removed conditional compilation from intel_bufmgr.h. - Enable HAVE_LIBDRM_INTEL on android platforms. - Remove unnecessary whitespace. - Remove unnecessary inclusion of C files. - De-duplicated intel_bufmgr.c error string. - Changed Makefile.sources variable names to be non-automake specific Changes since v3: - Added signoff to two commits. - Changed automake if not statement. - Removed accidental space character. - Copied in new copy of intel_bufmgr.h - Improved wording of lib/stubs/drm/README. Changes since v4: - Fixed whitespace issue. - Rebased onto upstream/master. - Fixed issue where DRM_INTEL_LIBS wasn't being used. - Added "Reviewed-by: Emil Velikov <emil.l.velikov@xxxxxxxxx>" Robert Foss (13): configure.ac: Test for libdrm_intel and build for it if present configure.ac: Harmonize HAVE_XXX flag for all drm platforms to HAVE_LIBDRM_XXX Enable HAVE_LIBDRM_INTEL unconditionally for Android benchmarks/Makefile: Don't build benchmarks that depend on libdrm_intel tools/Makefile: Don't build tools that depend on libdrm_intel tools/Makefile: Format whitespace demos/Makefile: Don't build tools that depend on libdrm_intel lib/stubs: Add stubs for intel_bufmgr demos/Makefile: Replace automake specific name of listing in Makfile.sources benchmarks/Makefile: Replace automake specific name of listing in Makfile.sources tools/Makefile: Replace automake specific name of listings in Makfile.sources lib/tests/Makefile: Replace automake specific names of listings in Makefile.sources lib/Makefile: Replace automake specific names of listings in Makefile.sources Android.mk | 2 + benchmarks/Android.mk | 6 +- benchmarks/Makefile.am | 7 +- benchmarks/Makefile.sources | 15 +- configure.ac | 27 +++- demos/Android.mk | 5 +- demos/Makefile.am | 10 +- demos/Makefile.sources | 7 + lib/Android.mk | 2 +- lib/Makefile.am | 10 +- lib/Makefile.sources | 2 +- lib/stubs/drm/README | 4 + lib/stubs/drm/intel_bufmgr.c | 269 ++++++++++++++++++++++++++++++++++++ lib/stubs/drm/intel_bufmgr.h | 321 +++++++++++++++++++++++++++++++++++++++++++ lib/tests/Android.mk | 2 +- lib/tests/Makefile.am | 3 + lib/tests/Makefile.sources | 8 +- tests/Makefile.am | 4 +- tools/Android.mk | 6 + tools/Makefile.am | 7 + tools/Makefile.sources | 73 +++++----- 21 files changed, 725 insertions(+), 65 deletions(-) create mode 100644 demos/Makefile.sources create mode 100644 lib/stubs/drm/README create mode 100644 lib/stubs/drm/intel_bufmgr.c create mode 100644 lib/stubs/drm/intel_bufmgr.h -- 2.7.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx