Merge lp:~brandontschaefer/libsdl/sdl2-needs-rebuild-mir into lp:ubuntu/vivid/libsdl2

[Brandon Schaefer]

* New fixes included:
  - symbol fixes
  - software renderering fixes
  - touch events now supported
  - set_type changed to set_state

* New fixes included:
  - symbol fixes
  - software renderering fixes
  - touch events now supported
  - set_type changed to set_state

[Brandon Schaefer (brandontschaefer)]

I need to make some changes to the code now :(

[Didier Roche (didrocks)]

Hey Brandon,

You are doing inline changes in your current MP, this isn't allowed in debian format 3.0, which is what this package used. Did you try to build the package? It should have prevented you to build it.

Please use quilt as it's what the package is using follow DEP5 format: http://dep.debian.net/deps/dep5/ and then resuscribe the sponsor team.

review: Needs Fixing

[Brandon Schaefer (brandontschaefer)]

Duh... thanks sorry!

[Brandon Schaefer (brandontschaefer)]

And yeah ... dpkg-buildpackage -us -uc -b worked... though it could have ignored some warnings.

[Brandon Schaefer (brandontschaefer)]

https://code.launchpad.net/~brandontschaefer/libsdl/sdl2-upstream-merges/+merge/247666

New Branch.

review: Disapprove

Unmerged revisions

19. By Brandon Schaefer on 2015-01-21

* Fix a few errors that are no in SDL yet

18. By Brandon Schaefer on 2015-01-21

* New fixes included:
  - symbol fixes
  - software renderering fixes
  - touch events now supported
  - set_type changed to set_state

17. By Brandon Schaefer on 2015-01-20

* Rebuild against libmirclient.so.8. (Closes: #1402753)

16. By Brandon Schaefer on 2015-01-20

* Rebuild against libmirclient.so.8

=== modified file 'debian/changelog'
--- debian/changelog	2015-01-06 23:39:58 +0000
+++ debian/changelog	2015-01-21 18:20:25 +0000
@@ -1,3 +1,14 @@
+libsdl2 (2.0.2+dfsg1-6ubuntu2) vivid; urgency=medium
+
+  * Rebuild against libmirclient.so.8. (Closes: #1402753)
+  * New fixes included:
+    - symbol fixes
+    - software renderering fixes
+    - touch events now supported
+    - set_type changed to set_state
+
+ -- Brandon Schaefer <[e-mail]>  Tue, 20 Jan 2015 12:55:44 -0800
+
 libsdl2 (2.0.2+dfsg1-6ubuntu1) vivid; urgency=low
 
   * Merge from Debian unstable.  Remaining changes:

=== modified file 'src/video/mir/SDL_mirevents.c'
--- src/video/mir/SDL_mirevents.c	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirevents.c	2015-01-21 18:20:25 +0000
@@ -117,6 +117,12 @@
 }
 
 static void
+HandleMouseMotion(SDL_Window* sdl_window, int x, int y)
+{
+    SDL_SendMouseMotion(sdl_window, 0, 0, x, y);
+}
+
+static void
 HandleTouchPress(int device_id, int source_id, SDL_bool down, float x, float y, float pressure)
 {
     SDL_SendTouch(device_id, source_id, down, x, y, pressure);
@@ -129,12 +135,6 @@
 }
 
 static void
-HandleMouseMotion(SDL_Window* sdl_window, int x, int y)
-{
-    SDL_SendMouseMotion(sdl_window, 0, 0, x, y);
-}
-
-static void
 HandleMouseScroll(SDL_Window* sdl_window, int hscroll, int vscroll)
 {
     SDL_SendMouseWheel(sdl_window, 0, hscroll, vscroll);
@@ -205,13 +205,11 @@
         case mir_motion_action_outside:
             SDL_SetMouseFocus(NULL);
             break;
-#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
         case mir_motion_action_scroll:
             HandleMouseScroll(sdl_window,
                               motion.pointer_coordinates[cord_index].hscroll,
                               motion.pointer_coordinates[cord_index].vscroll);
             break;
-#endif
         case mir_motion_action_cancel:
         case mir_motion_action_hover_enter:
         case mir_motion_action_hover_exit:
@@ -226,16 +224,12 @@
 {
     int cord_index;
     for (cord_index = 0; cord_index < motion.pointer_count; cord_index++) {
-#if 0  /* !!! FIXME: needs a newer set of dev headers than Ubuntu 13.10 is shipping atm. */
-        if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_mouse) {
+        if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
+            HandleTouchEvent(motion, cord_index, sdl_window);
+        }
+        else {
             HandleMouseEvent(motion, cord_index, sdl_window);
         }
-        else if (motion.pointer_coordinates[cord_index].tool_type == mir_motion_tool_type_finger) {
-            HandleTouchEvent(motion, cord_index, sdl_window);
-        }
-#else
-        HandleMouseEvent(motion, cord_index, sdl_window);
-#endif
     }
 }
 

=== modified file 'src/video/mir/SDL_mirframebuffer.c'
--- src/video/mir/SDL_mirframebuffer.c	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirframebuffer.c	2015-01-21 18:20:25 +0000
@@ -56,6 +56,8 @@
     MIR_Window* mir_window;
     MirSurfaceParameters surfaceparm;
 
+    mir_data->software = SDL_TRUE;
+
     if (MIR_CreateWindow(_this, window) < 0)
         return SDL_SetError("Failed to created a mir window.");
 
@@ -91,11 +93,13 @@
     MirGraphicsRegion region;
     int i, j, x, y, w, h, start;
     int bytes_per_pixel, bytes_per_row, s_stride, d_stride;
+    char* s_dest;
+    char* pixels;
 
     MIR_mir_surface_get_graphics_region(mir_window->surface, &region);
 
-    char* s_dest = region.vaddr;
-    char* pixels = (char*)window->surface->pixels;
+    s_dest = region.vaddr;
+    pixels = (char*)window->surface->pixels;
 
     s_stride = window->surface->pitch;
     d_stride = region.stride;

=== modified file 'src/video/mir/SDL_mirsym.h'
--- src/video/mir/SDL_mirsym.h	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirsym.h	2015-01-21 18:20:25 +0000
@@ -26,7 +26,7 @@
 SDL_MIR_SYM(MirSurface *,mir_connection_create_surface_sync,(MirConnection *connection, MirSurfaceParameters const *params))
 SDL_MIR_SYM(void,mir_connection_get_available_surface_formats,(MirConnection* connection, MirPixelFormat* formats, unsigned const int format_size, unsigned int *num_valid_formats))
 SDL_MIR_SYM(MirEGLNativeDisplayType,mir_connection_get_egl_native_display,(MirConnection *connection))
-SDL_MIR_SYM(int,mir_connection_is_valid,(MirConnection *connection))
+SDL_MIR_SYM(MirBool,mir_connection_is_valid,(MirConnection *connection))
 SDL_MIR_SYM(void,mir_connection_release,(MirConnection *connection))
 SDL_MIR_SYM(MirConnection *,mir_connect_sync,(char const *server, char const *app_name))
 SDL_MIR_SYM(void,mir_display_config_destroy,(MirDisplayConfiguration* display_configuration))
@@ -34,10 +34,11 @@
 SDL_MIR_SYM(char const *,mir_surface_get_error_message,(MirSurface *surface))
 SDL_MIR_SYM(void,mir_surface_get_graphics_region,(MirSurface *surface, MirGraphicsRegion *graphics_region))
 SDL_MIR_SYM(void,mir_surface_get_parameters,(MirSurface *surface, MirSurfaceParameters *parameters))
-SDL_MIR_SYM(int,mir_surface_is_valid,(MirSurface *surface))
+SDL_MIR_SYM(MirBool,mir_surface_is_valid,(MirSurface *surface))
 SDL_MIR_SYM(void,mir_surface_release_sync,(MirSurface *surface))
 SDL_MIR_SYM(void,mir_surface_set_event_handler,(MirSurface *surface, MirEventDelegate const *event_handler))
 SDL_MIR_SYM(MirWaitHandle*,mir_surface_set_type,(MirSurface *surface, MirSurfaceType type))
+SDL_MIR_SYM(MirWaitHandle*,mir_surface_set_state,(MirSurface *surface, MirSurfaceState state))
 SDL_MIR_SYM(void,mir_surface_swap_buffers_sync,(MirSurface *surface))
 
 SDL_MIR_MODULE(XKBCOMMON)

=== modified file 'src/video/mir/SDL_mirvideo.c'
--- src/video/mir/SDL_mirvideo.c	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirvideo.c	2015-01-21 18:20:25 +0000
@@ -82,7 +82,6 @@
         /* !!! FIXME: try to make a MirConnection here. */
         available = 1;
         SDL_MIR_UnloadSymbols();
-
     }
 
     return available;
@@ -274,6 +273,7 @@
     MIR_Data* mir_data = _this->driverdata;
 
     mir_data->connection = MIR_mir_connect_sync(NULL, __PRETTY_FUNCTION__);
+    mir_data->software = SDL_FALSE;
 
     if (!MIR_mir_connection_is_valid(mir_data->connection))
         return SDL_SetError("Failed to connect to the Mir Server");

=== modified file 'src/video/mir/SDL_mirvideo.h'
--- src/video/mir/SDL_mirvideo.h	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirvideo.h	2015-01-21 18:20:25 +0000
@@ -32,6 +32,8 @@
 typedef struct
 {
     MirConnection* connection;
+    SDL_bool software;
+    
 } MIR_Data;
 
 #endif /* _SDL_mirvideo_h_ */

=== modified file 'src/video/mir/SDL_mirwindow.c'
--- src/video/mir/SDL_mirwindow.c	2014-03-15 00:22:48 +0000
+++ src/video/mir/SDL_mirwindow.c	2015-01-21 18:20:25 +0000
@@ -84,7 +84,8 @@
         .width = window->w,
         .height = window->h,
         .pixel_format = mir_pixel_format_invalid,
-        .buffer_usage = mir_buffer_usage_hardware
+        .buffer_usage = mir_buffer_usage_hardware,
+        .output_id = mir_display_output_id_invalid
     };
 
     MirEventDelegate delegate = {
@@ -99,6 +100,9 @@
     mir_data = _this->driverdata;
     window->driverdata = mir_window;
 
+    if (mir_data->software)
+        surfaceparm.buffer_usage = mir_buffer_usage_software;
+
     if (window->x == SDL_WINDOWPOS_UNDEFINED)
         window->x = 0;
 
@@ -145,14 +149,13 @@
     MIR_Data* mir_data = _this->driverdata;
     MIR_Window* mir_window = window->driverdata;
 
-    window->driverdata = NULL;
-
     if (mir_data) {
         SDL_EGL_DestroySurface(_this, mir_window->egl_surface);
         MIR_mir_surface_release_sync(mir_window->surface);
 
         SDL_free(mir_window);
     }
+    window->driverdata = NULL;
 }
 
 SDL_bool
@@ -183,9 +186,9 @@
         return;
 
     if (fullscreen) {
-        MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_fullscreen);
+        MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_fullscreen);
     } else {
-        MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
+        MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_restored);
     }
 }
 
@@ -197,7 +200,7 @@
     if (IsSurfaceValid(mir_window) < 0)
         return;
 
-    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_maximized);
+    MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_maximized);
 }
 
 void
@@ -208,7 +211,7 @@
     if (IsSurfaceValid(mir_window) < 0)
         return;
 
-    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_minimized);
+    MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_minimized);
 }
 
 void
@@ -219,7 +222,7 @@
     if (IsSurfaceValid(mir_window) < 0)
         return;
 
-    MIR_mir_surface_set_type(mir_window->surface, mir_surface_state_restored);
+    MIR_mir_surface_set_state(mir_window->surface, mir_surface_state_restored);
 }
 
 #endif /* SDL_VIDEO_DRIVER_MIR */