- added cflags patch (fixes SDL_syswm.h inclusion when DirectFB or Mir support is...

diff --git a/SDL2-cflags.patch b/SDL2-cflags.patch
new file mode 100644 (file)
index 0000000..2a2abd8
--- /dev/null
+++ b/SDL2-cflags.patch
@@ -0,0 +1,23 @@
+--- SDL2-2.0.3/configure.in.orig       2014-03-16 03:31:42.000000000 +0100
++++ SDL2-2.0.3/configure.in    2014-05-18 08:29:43.394208085 +0200
+@@ -1265,6 +1265,10 @@
+             AC_DEFINE(SDL_VIDEO_DRIVER_MIR, 1, [ ])
+             SOURCES="$SOURCES $srcdir/src/video/mir/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $MIR_CFLAGS"
++
++            # Needed so SDL applications can include SDL_syswm.h
++            SDL_CFLAGS="$SDL_CFLAGS $MIR_CFLAGS"
++
+             AC_ARG_ENABLE(mir-shared,
+ AC_HELP_STRING([--enable-mir-shared], [dynamically load Mir support [[default=maybe]]]),
+                           , enable_mir_shared=maybe)
+@@ -1762,6 +1766,9 @@
+             SOURCES="$SOURCES $srcdir/src/video/directfb/*.c"
+             EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS"
+ 
++            # Needed so SDL applications can include SDL_syswm.h
++            SDL_CFLAGS="$SDL_CFLAGS $DIRECTFB_CFLAGS"
++
+             AC_MSG_CHECKING(for directfb dynamic loading support)
+             directfb_shared=no
+             directfb_lib=[`find_lib "libdirectfb.so.*" "$DIRECTFB_LIBS"`]

diff --git a/SDL2.spec b/SDL2.spec
index 17cc95f20c996d2c695c12165955ca4b1b83fd48..010410611953a7e217c140518a3ea16549daa165 100644 (file)
--- a/SDL2.spec
+++ b/SDL2.spec
@@ -61,6 +61,7 @@ Group:                Libraries
 Source0:       http://www.libsdl.org/release/%{name}-%{version}.tar.gz
 # Source0-md5: fe6c61d2e9df9ef570e7e80c6e822537
 Patch0:                %{name}-config.patch
+Patch1:                %{name}-cflags.patch
 URL:           http://www.libsdl.org/
 %{?with_wayland:BuildRequires: Mesa-libwayland-egl-devel}
 %{?with_directfb:BuildRequires:        DirectFB-devel >= 1.0.0}
@@ -200,6 +201,7 @@ SDL - przykładowe programy.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}