[mupen64plus-video-z64] 135/161: Imported Upstream version 2.0.0

[Sven Eckelmann]

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

ecsv-guest pushed a commit to branch master
in repository mupen64plus-video-z64.

commit 9504d83ce9df89aeb0ed558baed9e9c98b8dfbc4
Author: Sven Eckelmann <sven at narfation.org>
Date:   Fri Jul 5 21:56:42 2013 +0200

    Imported Upstream version 2.0.0
---
 .hg_archival.txt | 5 +++++
 .hgignore        | 4 ++++
 .hgtags          | 3 +++
 src/maingl.cpp   | 6 +++++-
 4 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/.hg_archival.txt b/.hg_archival.txt
new file mode 100644
index 0000000..e3428af
--- /dev/null
+++ b/.hg_archival.txt
@@ -0,0 +1,5 @@
+repo: 29d6a3861712003358cf3187f7a9736a9f243756
+node: bc9712b27e1ba9a6ba13af33ef04bcfce4ec5066
+branch: default
+latesttag: 2.0.0
+latesttagdistance: 1
diff --git a/.hgignore b/.hgignore
new file mode 100644
index 0000000..495a970
--- /dev/null
+++ b/.hgignore
@@ -0,0 +1,4 @@
+syntax: regexp
+
+^projects/unix/_obj/
+^projects/unix/mupen64plus-video-z64.so$
diff --git a/.hgtags b/.hgtags
new file mode 100644
index 0000000..78f00da
--- /dev/null
+++ b/.hgtags
@@ -0,0 +1,3 @@
+ce1efa043f54c7421e2ee8b95f5c53ea702746c5 1.99.4
+3d6f55e4531cb4f883bca555fea1a1e066d91f82 1.99.5
+1393910be940d3a0a1555a8e846c1b4e1aa0c85b 2.0.0
diff --git a/src/maingl.cpp b/src/maingl.cpp
index 9a0142e..51f0e74 100644
--- a/src/maingl.cpp
+++ b/src/maingl.cpp
@@ -26,7 +26,7 @@
 
 #define THREADED
 
-#define PLUGIN_VERSION           0x016305
+#define PLUGIN_VERSION           0x020000
 #define VIDEO_PLUGIN_API_VERSION 0x020200
 #define CONFIG_API_VERSION       0x020000
 #define VIDEXT_API_VERSION       0x030000
@@ -123,7 +123,11 @@ void rdpCreateThread()
     }
     if (!rdpThread) {
         LOG("Creating rdp thread\n");
+#if SDL_VERSION_ATLEAST(2,0,0)
+        rdpThread = SDL_CreateThread(rdpThreadFunc, "z64rdp", 0);
+#else
         rdpThread = SDL_CreateThread(rdpThreadFunc, 0);
+#endif
     }
 }
 #endif

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