Merge lp:~brandontschaefer/libsdl/forward-declare-1306629-fix into lp:ubuntu/trusty/libsdl2

[Brandon Schaefer]

Need to forward declare MirSurface/MirConnection so we don't need to expose the mir header. This fixes the issue in finding mir_toolkit h

Need to forward declare MirSurface/MirConnection so we don't need to expose the mir header. This fixes the issue in finding mir_toolkit headers.

The fix has landed upstream:
https://hg.libsdl.org/SDL/rev/ede9d13dad21

[lp:~brandontschaefer/libsdl/forward-declare-1306629-fix]

15. By Brandon Schaefer on 2014-04-21

* Apply the patch

[Scott Howard (showard314)]

from a user (DD maintainer of a depending package): Looks good, tested on trusty chroot to build an SDL2 package that was unable to be built without this patch. Thanks!

review: Approve

[Martin Pitt (pitti)]

Merged with taking the changelog from the utopic fix, with version number 2.0.2+dfsg1-3ubuntu1.1.

review: Approve

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-03-19 20:22:29 +0000
+++ .pc/applied-patches	2014-04-21 21:52:25 +0000
@@ -1,2 +1,3 @@
 SDL2_dont_propagate_lpthread.diff
 fix_joystick_misc_axes.diff
+mir_forward_declaration_syswm.diff

=== added file 'debian/patches/mir_forward_declaration_syswm.diff'
--- debian/patches/mir_forward_declaration_syswm.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/mir_forward_declaration_syswm.diff	2014-04-21 21:52:25 +0000
@@ -0,0 +1,29 @@
+Description: Forward Declare MirConnection/MirSurface so we don't have to expose mir headers.
+Author: Brandon Schaefer <[e-mail]>
+Last-Update: 2014-4-17
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libsdl2/+bug/1306629
+
+--- a/include/SDL_syswm.h
++++ b/include/SDL_syswm.h
+@@ -93,11 +93,6 @@
+ #endif
+ #endif
+ 
+-#if defined(SDL_VIDEO_DRIVER_MIR)
+-#include <mir_toolkit/mir_client_library.h>
+-#endif
+-
+-
+ /**
+  *  These are the various supported windowing subsystems
+  */
+@@ -213,8 +208,8 @@
+ #if defined(SDL_VIDEO_DRIVER_MIR)
+         struct
+         {
+-            MirConnection *connection;  /**< Mir display server connection */
+-            MirSurface *surface;  /**< Mir surface */
++            struct MirConnection *connection;  /**< Mir display server connection */
++            struct MirSurface *surface;  /**< Mir surface */
+         } mir;
+ #endif

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-03-19 20:22:29 +0000
+++ debian/patches/series	2014-04-21 21:52:25 +0000
@@ -1,2 +1,3 @@
 SDL2_dont_propagate_lpthread.diff
 fix_joystick_misc_axes.diff
+mir_forward_declaration_syswm.diff

=== modified file 'include/SDL_syswm.h'
--- include/SDL_syswm.h	2014-03-15 00:22:48 +0000
+++ include/SDL_syswm.h	2014-04-21 21:52:25 +0000
@@ -93,11 +93,6 @@
 #endif
 #endif
 
-#if defined(SDL_VIDEO_DRIVER_MIR)
-#include <mir_toolkit/mir_client_library.h>
-#endif
-
-
 /**
  *  These are the various supported windowing subsystems
  */
@@ -213,8 +208,8 @@
 #if defined(SDL_VIDEO_DRIVER_MIR)
         struct
         {
-            MirConnection *connection;  /**< Mir display server connection */
-            MirSurface *surface;  /**< Mir surface */
+            struct MirConnection *connection;  /**< Mir display server connection */
+            struct MirSurface *surface;  /**< Mir surface */
         } mir;
 #endif