Merge lp:~showard314/ubuntu/utopic/libsdl2/forward-declare-1306629-fix into lp:ubuntu/utopic/libsdl2

Proposed by Scott Howard on 2014-05-01
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~showard314/ubuntu/utopic/libsdl2/forward-declare-1306629-fix
Merge into: lp:ubuntu/utopic/libsdl2
Diff against target: 91 lines (+41/-7)
5 files modified
.pc/applied-patches (+1/-0)
debian/changelog (+8/-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:~showard314/ubuntu/utopic/libsdl2/forward-declare-1306629-fix
Reviewer Review Type Date Requested Status
Martin Pitt 2014-05-01 Approve on 2014-05-07
Review via email: mp+217952@code.launchpad.net

Description of the change

To post a comment you must log in.
Martin Pitt (pitti) wrote :

Thanks!

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-05-01 17:21:54 +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=== modified file 'debian/changelog'
10--- debian/changelog 2014-04-10 00:17:31 +0000
11+++ debian/changelog 2014-05-01 17:21:54 +0000
12@@ -1,3 +1,11 @@
13+libsdl2 (2.0.2+dfsg1-3ubuntu2) utopic; urgency=medium
14+
15+ * New patch: mir_forward_declaration_syswm.diff
16+ - Forward declare structs so you don't need mir headers
17+ (LP: #1306629)
18+
19+ -- Brandon Schaefer <brandon.schaefer@canonical.com> Thu, 01 May 2014 13:03:23 -0400
20+
21 libsdl2 (2.0.2+dfsg1-3ubuntu1) trusty; urgency=medium
22
23 * Enable Mir video support (LP: #1295389).
24
25=== added file 'debian/patches/mir_forward_declaration_syswm.diff'
26--- debian/patches/mir_forward_declaration_syswm.diff 1970-01-01 00:00:00 +0000
27+++ debian/patches/mir_forward_declaration_syswm.diff 2014-05-01 17:21:54 +0000
28@@ -0,0 +1,29 @@
29+Description: Forward Declare MirConnection/MirSurface so we don't have to expose mir headers.
30+Author: Brandon Schaefer <brandon.schaefer@canonical.com>
31+Last-Update: 2014-4-17
32+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libsdl2/+bug/1306629
33+
34+--- a/include/SDL_syswm.h
35++++ b/include/SDL_syswm.h
36+@@ -93,11 +93,6 @@
37+ #endif
38+ #endif
39+
40+-#if defined(SDL_VIDEO_DRIVER_MIR)
41+-#include <mir_toolkit/mir_client_library.h>
42+-#endif
43+-
44+-
45+ /**
46+ * These are the various supported windowing subsystems
47+ */
48+@@ -213,8 +208,8 @@
49+ #if defined(SDL_VIDEO_DRIVER_MIR)
50+ struct
51+ {
52+- MirConnection *connection; /**< Mir display server connection */
53+- MirSurface *surface; /**< Mir surface */
54++ struct MirConnection *connection; /**< Mir display server connection */
55++ struct MirSurface *surface; /**< Mir surface */
56+ } mir;
57+ #endif
58
59=== modified file 'debian/patches/series'
60--- debian/patches/series 2014-03-19 20:22:29 +0000
61+++ debian/patches/series 2014-05-01 17:21:54 +0000
62@@ -1,2 +1,3 @@
63 SDL2_dont_propagate_lpthread.diff
64 fix_joystick_misc_axes.diff
65+mir_forward_declaration_syswm.diff
66
67=== modified file 'include/SDL_syswm.h'
68--- include/SDL_syswm.h 2014-03-15 00:22:48 +0000
69+++ include/SDL_syswm.h 2014-05-01 17:21:54 +0000
70@@ -93,11 +93,6 @@
71 #endif
72 #endif
73
74-#if defined(SDL_VIDEO_DRIVER_MIR)
75-#include <mir_toolkit/mir_client_library.h>
76-#endif
77-
78-
79 /**
80 * These are the various supported windowing subsystems
81 */
82@@ -213,8 +208,8 @@
83 #if defined(SDL_VIDEO_DRIVER_MIR)
84 struct
85 {
86- MirConnection *connection; /**< Mir display server connection */
87- MirSurface *surface; /**< Mir surface */
88+ struct MirConnection *connection; /**< Mir display server connection */
89+ struct MirSurface *surface; /**< Mir surface */
90 } mir;
91 #endif
92

Subscribers

People subscribed via source and target branches

to all changes: