[mupen64plus-video-glide64mk2] 21/60: Call VidExt_Quit when video output stopped

[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-video-glide64mk2.

commit bd2797aa77045a268c9a95c055468ba20e1d5348
Author: Sven Eckelmann <sven at narfation.org>
Date:   Wed Jul 10 10:20:33 2013 +0200

    Call VidExt_Quit when video output stopped
---
 debian/changelog               |  1 +
 debian/patches/init_quit.patch | 40 ++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7440cc..9561e21 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ mupen64plus-video-glide64mk2 (2.0-2) UNRELEASED; urgency=low
     - Add quantization_channel_order.patch, Enable ARGB and YUV input to fix
       channel order in compressed textures
     - Add mesa_fxt1.patch, Fix colors in compressed FXT1 textures
+    - Add init_quit.patch, Call VidExt_Quit when video output stopped
 
  -- Sven Eckelmann <sven at narfation.org>  Mon, 08 Jul 2013 22:55:53 +0200
 
diff --git a/debian/patches/init_quit.patch b/debian/patches/init_quit.patch
new file mode 100644
index 0000000..7d854f7
--- /dev/null
+++ b/debian/patches/init_quit.patch
@@ -0,0 +1,40 @@
+Description: Video plugin should call VidExt_Quit when it is done
+Origin: upstream, https://bitbucket.org/richard42/mupen64plus-video-glide64mk2/commits/753991c466983154780fa4239f046397d44dbaf9/
+Author: Richard Goedeken <Richard at fascinationsoftware.com>
+
+---
+diff --git a/src/Glide64/Main.cpp b/src/Glide64/Main.cpp
+index 3a5e47a462bdeed9c8995c38cb097eef1edaa9c4..fabaa3091d74ee0fb41816bd650d2908d14b371d 100644
+--- a/src/Glide64/Main.cpp
++++ b/src/Glide64/Main.cpp
+@@ -1407,7 +1407,6 @@ EXPORT m64p_error CALL PluginStartup(m64p_dynlib_handle CoreLibHandle, void *Con
+     if (configDir)
+     {
+         SetConfigDir(configDir);
+-        CoreVideo_Init();
+         ReadSettings();
+ 		return M64ERR_SUCCESS;
+     }
+diff --git a/src/Glitch64/glitchmain.cpp b/src/Glitch64/glitchmain.cpp
+index da75486c894f0149d2b38ec5d74857a790d4c0d3..773a4db4d2396a44821361ba64ba676eafa6e9ea 100644
+--- a/src/Glitch64/glitchmain.cpp
++++ b/src/Glitch64/glitchmain.cpp
+@@ -497,7 +497,7 @@ grSstWinOpen(
+   // ZIGGY viewport_offset is WIN32 specific, with SDL just set it to zero
+   viewport_offset = 0; //-10 //-20;
+ 
+-  // ZIGGY not sure, but it might be better to let the system choose
++  CoreVideo_Init();
+   CoreVideo_GL_SetAttribute(M64P_GL_DOUBLEBUFFER, 1);
+   CoreVideo_GL_SetAttribute(M64P_GL_SWAP_CONTROL, vsync);
+   CoreVideo_GL_SetAttribute(M64P_GL_BUFFER_SIZE, 16);
+@@ -798,6 +798,9 @@ grSstWinClose( GrContext_t context )
+   //SDL_QuitSubSystem(SDL_INIT_VIDEO);
+   //sleep(2);
+ #endif
++
++  CoreVideo_Quit();
++
+   return FXTRUE;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 23ec59d..75097f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 quantization_channel_order.patch
 mesa_fxt1.patch
+init_quit.patch

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