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

Proposed by Brandon Schaefer on 2014-04-21
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~brandontschaefer/libsdl/forward-declare-1306629-fix
Merge into: lp:ubuntu/trusty/libsdl2
Diff against target: 75 lines (+33/-7)
4 files modified
.pc/applied-patches (+1/-0)
debian/patches/mir_forward_declaration_syswm.diff (+29/-0)
debian/patches/series (+1/-0)
include/SDL_syswm.h (+2/-7)
To merge this branch: bzr merge lp:~brandontschaefer/libsdl/forward-declare-1306629-fix
Reviewer Review Type Date Requested Status
Martin Pitt 2014-04-21 Approve on 2014-05-07
Scott Howard (community) Approve on 2014-04-22
Review via email: mp+216641@code.launchpad.net

Commit message

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

Description of the change

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

To post a comment you must log in.
15. By Brandon Schaefer on 2014-04-21

* Apply the patch

Scott Howard (showard314) wrote :

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) wrote :

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

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '.pc/applied-patches'
2--- .pc/applied-patches 2014-03-19 20:22:29 +0000
3+++ .pc/applied-patches 2014-04-21 21:52:25 +0000
4@@ -1,2 +1,3 @@
5 SDL2_dont_propagate_lpthread.diff
6 fix_joystick_misc_axes.diff
7+mir_forward_declaration_syswm.diff
8
9=== added file 'debian/patches/mir_forward_declaration_syswm.diff'
10--- debian/patches/mir_forward_declaration_syswm.diff 1970-01-01 00:00:00 +0000
11+++ debian/patches/mir_forward_declaration_syswm.diff 2014-04-21 21:52:25 +0000
12@@ -0,0 +1,29 @@
13+Description: Forward Declare MirConnection/MirSurface so we don't have to expose mir headers.
14+Author: Brandon Schaefer <brandon.schaefer@canonical.com>
15+Last-Update: 2014-4-17
16+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libsdl2/+bug/1306629
17+
18+--- a/include/SDL_syswm.h
19++++ b/include/SDL_syswm.h
20+@@ -93,11 +93,6 @@
21+ #endif
22+ #endif
23+
24+-#if defined(SDL_VIDEO_DRIVER_MIR)
25+-#include <mir_toolkit/mir_client_library.h>
26+-#endif
27+-
28+-
29+ /**
30+ * These are the various supported windowing subsystems
31+ */
32+@@ -213,8 +208,8 @@
33+ #if defined(SDL_VIDEO_DRIVER_MIR)
34+ struct
35+ {
36+- MirConnection *connection; /**< Mir display server connection */
37+- MirSurface *surface; /**< Mir surface */
38++ struct MirConnection *connection; /**< Mir display server connection */
39++ struct MirSurface *surface; /**< Mir surface */
40+ } mir;
41+ #endif
42
43=== modified file 'debian/patches/series'
44--- debian/patches/series 2014-03-19 20:22:29 +0000
45+++ debian/patches/series 2014-04-21 21:52:25 +0000
46@@ -1,2 +1,3 @@
47 SDL2_dont_propagate_lpthread.diff
48 fix_joystick_misc_axes.diff
49+mir_forward_declaration_syswm.diff
50
51=== modified file 'include/SDL_syswm.h'
52--- include/SDL_syswm.h 2014-03-15 00:22:48 +0000
53+++ include/SDL_syswm.h 2014-04-21 21:52:25 +0000
54@@ -93,11 +93,6 @@
55 #endif
56 #endif
57
58-#if defined(SDL_VIDEO_DRIVER_MIR)
59-#include <mir_toolkit/mir_client_library.h>
60-#endif
61-
62-
63 /**
64 * These are the various supported windowing subsystems
65 */
66@@ -213,8 +208,8 @@
67 #if defined(SDL_VIDEO_DRIVER_MIR)
68 struct
69 {
70- MirConnection *connection; /**< Mir display server connection */
71- MirSurface *surface; /**< Mir surface */
72+ struct MirConnection *connection; /**< Mir display server connection */
73+ struct MirSurface *surface; /**< Mir surface */
74 } mir;
75 #endif
76

Subscribers

People subscribed via source and target branches