[mupen64plus-core] 281/310: Revert "Try to fallback to Desktop size window for fullscreen"

[Sven Eckelmann]

This is an automated email from the git hooks/post-receive script.

ecsv-guest pushed a commit to branch armhf_test
in repository mupen64plus-core.

commit ebf1ccca0ece3ee50b2ca76e4d9f0cd8185af538
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Aug 13 20:15:58 2014 +0200

    Revert "Try to fallback to Desktop size window for fullscreen"
    
    This reverts commit 57075c090fdb3aaf4fbb23e531e947b941abe0ea.
---
 debian/changelog                              |  3 ---
 debian/patches/sdl2_fullscreen_fallback.patch | 25 -------------------------
 debian/patches/series                         |  1 -
 3 files changed, 29 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e78763..360cc61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,9 +2,6 @@ mupen64plus-core (2.0-7) UNRELEASED; urgency=medium
 
   * debian/rules:
     - Use Largefile Support enabled C API
-  * debian/patches:
-    - Add sdl2_fullscreen_fallback.patch, Try to fallback to Desktop size
-      window for fullscreen (LP Closes: #1355747)
 
  -- Sven Eckelmann <sven at narfation.org>  Sun, 13 Jul 2014 10:22:55 +0200
 
diff --git a/debian/patches/sdl2_fullscreen_fallback.patch b/debian/patches/sdl2_fullscreen_fallback.patch
deleted file mode 100644
index 9a11a35..0000000
--- a/debian/patches/sdl2_fullscreen_fallback.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Try to fallback to Desktop size window for fullscreen
- The creation of a fullscreen window seems to fail on linux quite often and a
- normal window still work fine. SDL2 allows to resize the window to the
- complete screen in this situations as workaround.
-Author: Sven Eckelmann <sven at narfation.org>
-
----
-diff --git a/src/api/vidext_sdl2_compat.h b/src/api/vidext_sdl2_compat.h
-index 85075e8337f80db881315fd0b5d43489f09f8b46..e832218d923336b00c91e7431da263cb896c164f 100644
---- a/src/api/vidext_sdl2_compat.h
-+++ b/src/api/vidext_sdl2_compat.h
-@@ -417,6 +417,13 @@ SDL_SetVideoMode(int width, int height, int bpp, Uint32 flags)
-     SDL_VideoWindow =
-         SDL_CreateWindow(wm_title, window_x, window_y, width, height,
-                          window_flags);
-+    if (!SDL_VideoWindow && (flags & SDL_FULLSCREEN)) {
-+        window_flags &= ~SDL_WINDOW_FULLSCREEN;
-+        window_flags |= SDL_WINDOW_FULLSCREEN_DESKTOP;
-+        SDL_VideoWindow =
-+            SDL_CreateWindow(wm_title, window_x, window_y, width, height,
-+                             window_flags);
-+    }
-     if (!SDL_VideoWindow) {
-         return NULL;
-     }
diff --git a/debian/patches/series b/debian/patches/series
index 66be2a5..00f923a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -36,4 +36,3 @@ duplicates_cheatdb.patch
 whitelist_cheatdb.patch
 nfl_duplicates_cheatdb.patch
 turok2_duplicates_cheatdb.patch
-sdl2_fullscreen_fallback.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/mupen64plus-core.git