Merge branch 'maint-1.4'

* maint-1.4:
  doc: Add release notes for Waffle 1.4.3
  waffle: Bump version to 1.4.3
  glx: Fix requirements for creation of ES2 context
  cmake: Fix building with CMake 2.8.11
  examples: Remove bitrotted XCode project files
  debian: Release 1.4.2-1

Conflicts:
  Android.mk
  cmake/Modules/WaffleDefineVersion.cmake
    Trivial version conflicts.
  debian/changelog
    Resolve conflicts by ignoring incoming changes.

2 files changed, 24 insertions, 2 deletions

diff --git a/src/waffle/CMakeLists.txt b/src/waffle/CMakeLists.txt
index 8231c7a..d76e029 100644
--- a/src/waffle/CMakeLists.txt
+++ b/src/waffle/CMakeLists.txt
@@ -203,7 +203,27 @@ include_directories(
     )
 
 add_library(${waffle_libname} SHARED ${waffle_sources})
-target_link_libraries(${waffle_libname} PRIVATE ${waffle_libdeps})
+
+# Debian's packaging system emits warnings if wflinfo directly links to any
+# library that it doesn't directly use. Silence the warnings by annotating
+# libwaffle's library dependencies as private, which prevents wflinfo from
+# linking to them.
+if(CMAKE_VERSION VERSION_LESS "2.8.12")
+    # On older CMake, we must rely on hacking the LINK_INTERFACE_LIBRARIES
+    # property.
+    if(NOT waffle_on_mac)
+        set_target_properties(${waffle_libname}
+            PROPERTIES
+            LINK_INTERFACE_LIBRARIES ""
+            )
+    endif()
+else()
+    # CMake 2.8.12 introduced the PRIVATE keyword to target_link_libraries().
+    # All libraries listed after PRIVATE get annotated as such.
+    list(INSERT waffle_libdeps 0 PRIVATE)
+endif()
+
+target_link_libraries(${waffle_libname} ${waffle_libdeps})
 
 set_target_properties(${waffle_libname}
     PROPERTIES
diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c
index f47e705..7792aa0 100644
--- a/src/waffle/glx/glx_config.c
+++ b/src/waffle/glx/glx_config.c
@@ -121,8 +121,10 @@ glx_config_check_context_attrs(struct glx_display *dpy,
             assert(attrs->context_major_version == 2);
             assert(!attrs->context_forward_compatible);
 
-            if (!dpy->EXT_create_context_es2_profile) {
+            if (!dpy->EXT_create_context_es_profile
+                && !dpy->EXT_create_context_es2_profile) {
                 wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
+                             "GLX_EXT_create_context_es_profile or "
                              "GLX_EXT_create_context_es2_profile is required "
                              "to create an OpenGL ES2 context");
                 return false;