Merge lp:~brandontschaefer/libsdl/mir-include-sdl2-pc-fix into lp:ubuntu/trusty/libsdl2

[Brandon Schaefer]

The fix, we need to include the MIR_CFLAGS to the sdl2.pc file, so other programs know where to look to include mir_toolkit/mir_client_library.h

Cherry pick fix from upstream:
https://hg.libsdl.org/SDL/rev/274017846e73

The fix, we need to include the MIR_CFLAGS to the sdl2.pc file, so other programs know where to look to include mir_toolkit/mir_client_library.h

[Brandon Schaefer (brandontschaefer)]

While this did fix the compiling issue, it didn't fix the issue where the mir header was being exposed. I've a new branch that fixes exposing the mir headers, which fixes this issue as well.

https://code.launchpad.net/~brandontschaefer/libsdl/forward-declare-1306629-fix/+merge/216641

review: Disapprove

[Brandon Schaefer (brandontschaefer)]

(im not able to reject the branch, but if anyone else can go for it!)

[Sebastien Bacher (seb128)]

setting as rejected

Unmerged revisions

16. By Brandon Schaefer on 2014-04-17

* Apply the patch (seems like the other patches are done this way)

15. By Brandon Schaefer on 2014-04-17

* Fix up patch

14. By Brandon Schaefer on 2014-04-17

* Add patch that adds MIR_CFLAGS to SDL_CFLAGS so the sdl2.pc
  file includes the correct location of its headers.

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

=== modified file 'configure.in'
--- configure.in	2014-03-15 00:22:48 +0000
+++ configure.in	2014-04-17 21:36:25 +0000
@@ -1299,6 +1299,7 @@
                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
                 SUMMARY_video="${SUMMARY_video} mir"
             fi
+            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
             have_video=yes
         fi
     fi

=== added file 'debian/patches/mir_include_cflags_to_sdl2pc.diff'
--- debian/patches/mir_include_cflags_to_sdl2pc.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/mir_include_cflags_to_sdl2pc.diff	2014-04-17 21:36:25 +0000
@@ -0,0 +1,15 @@
+Description: Inlucde MIR_CFLAGS to SDL_CFLAGS, so sdl2.pc include the location of the mir headers
+Author: Brandon Schaefer <[e-mail]>
+Last-Update: 2014-4-17
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libsdl2/+bug/1306629
+
+--- a/configure.in
++++ b/configure.in
+@@ -1299,6 +1299,7 @@
+                 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MIR_LIBS"
+                 SUMMARY_video="${SUMMARY_video} mir"
+             fi
++            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
+             have_video=yes
+         fi
+     fi

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