Merge tag 'debian/1.4.0-1' into debian-unstable

Merge in debian/changelog from debian/1.4.0-1
debian: Release 1.4.1-1

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
droid_surfaceflingerlink.cpp: fix compiling error for android5.0

update the version check for android 5.0 in file droid_surfaceflingerlink.cpp

Change-Id: Iee3f294dfd4951d4b2fff9cc2afeebc0d2d24802
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
Android.mk: fix problem when compile with 64bit version

TARGET_CC should not be specified in the Android.mk file
directly since it would be different file for 64bit and 32 bit.
change to use the default gcc target file

and mv the -std=c99 to LOCAL_CFLAGS variable.

Change-Id: I9ca3d714963493841ff7eaaae69a33b881fd1727
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
waffle: Bump version to 1.4.2
doc: Add waffle-1.4.2 release notes

Signed-off-by: Chad Versace <chad@kiwitree.net>
cmake: Find and set include path for wglext.h

GL/*glext.h is not provided by the system (be it MinGW or MSVC), so its
path must be specified separately.

I used GLEXT_INCLUDE_DIR, which is the name also used for Piglit, so
that existing CMake initial caches might already provide it.

Reviewed-by: Emil Velikov <emil.l.velikov@gmail.com>
.mailmap: Add chad@kiwitree.net

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
doc/html/man: Remove duplicate link to manpage waffle_init(3)

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Merge branch 'maint-1.4' into master

* maint-1.4:
  doc/html/man: Remove duplicate link to manpage waffle_init(3)
  doc: Add waffle-1.4.2 release notes
  waffle: Bump version to 1.4.2

Conflicts:
  Android.mk
  cmake/Modules/WaffleDefineVersion.cmake
    Version bump conflicts.
waffle: Bump version to 1.5.0

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
doc: Add draft release notes for Waffle 1.5.0

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
Merge tag 'debian/1.4.1-1' for debian changelog

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
debian: Release 1.5.0~rc1-1

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Merge tag 'debian/1.4.1-1' for debian changelog

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
debian: Release 1.4.2-1

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Merge tag 'debian/1.4.2-1' for debian changelog

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Merge branch 'liuyq/fix-android-5.0-build'

* cooking/liuyq/fix-android-5.0-build:
  Android.mk: fix problem when compile with 64bit version
  droid_surfaceflingerlink.cpp: fix compiling error for android5.0
examples: Remove bitrotted XCode project files

Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
cmake: Fix building with CMake 2.8.11

Regressed by commit 92116dae.

Waffle's CMakeLists declares that 2.8.11 is required, but commit
92116dae begin using a 2.8.12 feature: the PRIVATE keyword to
target_link_libraries().  We should not bump Waffle's CMake requirement
to 2.8.12, though, because RHEL-7 and Chrome OS still have only 2.8.11.

This patch fixes Waffle to use the PRIVATE keyword only if cmake >= 2.8.12.
Otherwise, it falls back to the LINK_INTERFACE_LIBRARIES hack removed by
92116dae.

Reported-by: Matej Cepl <mcepl@cepl.eu>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Signed-off-by: Chad Versace <chad.versace@linux.intel.com>