diff options
| author |   Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-03-08 19:53:58 +0000 |
|---|---|---|
| committer | Alexandre Rostovtsev <tetromino@gentoo.org> | 2015-03-08 19:53:58 +0000 |
| commit | ea874cb7471bb898fbdc38a6ec6be1ecd53d6862 (patch) | |
| tree | 5292f1201001dfb37cd1e0ae7400fd2610d0e8d7 /app-emulation/wine | |
| parent | EAPI 5 (diff) | |
| download | gentoo-2-ea874cb7471bb898fbdc38a6ec6be1ecd53d6862.tar.gz gentoo-2-ea874cb7471bb898fbdc38a6ec6be1ecd53d6862.tar.bz2 gentoo-2-ea874cb7471bb898fbdc38a6ec6be1ecd53d6862.zip | |
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)
Diffstat (limited to 'app-emulation/wine')
| -rw-r--r-- | app-emulation/wine/ChangeLog | 7 | ||||
| -rw-r--r-- | app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch | 26 |
2 files changed, 20 insertions, 13 deletions
diff --git a/app-emulation/wine/ChangeLog b/app-emulation/wine/ChangeLog index bbfae8463922..03f9ed3e3fbb 100644 --- a/app-emulation/wine/ChangeLog +++ b/app-emulation/wine/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emulation/wine # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.527 2015/03/08 07:00:24 tetromino Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/wine/ChangeLog,v 1.528 2015/03/08 19:53:58 tetromino Exp $ + + 08 Mar 2015; Alexandre Rostovtsev <tetromino@gentoo.org> + files/wine-1.7.38-gstreamer-v5-staging-post.patch: + Fix gst post-patch, thanks to Sebastian Lackner and NP-Hardass. No revbump + (affects only USE="gstreamer staging"). *wine-1.7.38 (08 Mar 2015) diff --git a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch index 3e597baba24c..cd52f1b62bb6 100644 --- a/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch +++ b/app-emulation/wine/files/wine-1.7.38-gstreamer-v5-staging-post.patch @@ -25,26 +25,28 @@ diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c 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 |