tetromino    15/03/08 19:53:59

  Modified:             wine-1.7.38-gstreamer-v5-staging-post.patch
  Log:
  Fix gst post-patch, thanks to Sebastian Lackner and NP-Hardass. No revbump 
(affects only USE="gstreamer staging").
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 
0x18E5B6F2D8D5EC8D)

Revision  Changes    Path
1.2                  
app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch?rev=1.2&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch?rev=1.2&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch?r1=1.1&r2=1.2

Index: wine-1.7.38-gstreamer-v5-staging-post.patch
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wine-1.7.38-gstreamer-v5-staging-post.patch 8 Mar 2015 07:00:24 -0000       
1.1
+++ wine-1.7.38-gstreamer-v5-staging-post.patch 8 Mar 2015 19:53:58 -0000       
1.2
@@ -25,26 +25,28 @@
 index 936cabe..98e679e 100755
 --- a/dlls/ntdll/thread.c
 +++ b/dlls/ntdll/thread.c
-@@ -459,6 +459,7 @@ static void exit_thread_common( int status )
- {
- #ifndef __linux__
+@@ -459,6 +459,8 @@ static void exit_thread_common( int status )
      static void *prev_teb;
-+    sigset_t sigset;
      TEB *teb;
  #endif
- 
-@@ -495,6 +496,11 @@ static void exit_thread_common( int status )
-             signal_free_thread( teb );
-         }
-     }
++
++    sigset_t sigset;
+
+    if (status)  /* send the exit code to the server (0 is already the 
default) */
+    {
+--
+@@ -498,6 +499,11 @@ static void exit_thread_common( int status )
+ #else
+     reap_thread(NtCurrentTeb());
+ #endif
 +
 +    sigemptyset( &sigset );
 +    sigaddset( &sigset, SIGQUIT );
 +    pthread_sigmask( SIG_BLOCK, &sigset, NULL );
 +    if (interlocked_xchg_add( &nb_threads, -1 ) <= 1) _exit( status );
- #else
-     reap_thread(NtCurrentTeb());
- #endif
+
+    close( ntdll_get_thread_data()->wait_fd[0] );
+    close( ntdll_get_thread_data()->wait_fd[1] );
 -- 
 2.3.1
 




Reply via email to