wine-1.7.34-gstreamer-v5.patch.out

file_565970.txt (text/plain), 18.75 KB, created by Scott Alfter on 2015-11-16 18:35:12 UTC

***** wine-1.7.34-gstreamer-v5.patch *****
PWD: /var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.55
PATCH TOOL: patch -> /usr/bin/patch
VERSION INFO:
GNU patch 2.7.5
Copyright (C) 2003, 2009-2012 Free Software Foundation, Inc.
Copyright (C) 1988 Larry Wall

License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>.
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.

Written by Larry Wall and Paul Eggert

==========================================

PATCH COMMAND:  patch -p0 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.34-gstreamer-v5.patch'

==========================================
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 41dd203aff02350efe76ba2ca39e8bc2dac426bc Mon Sep 17 00:00:00 2001
|From: Maarten Lankhorst <[e-mail]>
|Date: Mon, 5 Jan 2015 11:31:55 +0100
|Subject: [PATCH] TESTING -- override pthreads to fix gstreamer v5
|
|I believe the code is ready and will work properly now in all cases.
|but please test before cherry picking this patch, and report
|success or failure to me please.
|
|Changes since v1:
|  - Call pthread_yield to make sure that we link against libpthread.
|    This fixes the build on saucy.
|Changes since v2:
|  - Set thread_data->detached before creating the thread to prevent
|    a race condition.
|Changes since v3:
|  - Set thread_data->detached CORRECTLY. Fix a small race between
|    thread creation and pthread_detach.
|Changes since v4:
|  - Set native thread stack defaults in a similar way to eglibc,
|    and respect the defaults for win32 again. This fixes the regression
|    where you can only create 194 threads in java.
|---
| dlls/ntdll/ntdll_misc.h         |    3 +
| dlls/ntdll/thread.c             |  331 +++++++++++++++++++++++++++++++++++++--
| dlls/winegstreamer/glibthread.c |   13 ++
| libs/wine/loader.c              |    7 +
| libs/wine/wine.map              |    6 +
| loader/Makefile.in              |    2 +-
| loader/main.c                   |   41 +++++
| 7 files changed, 386 insertions(+), 17 deletions(-)
|
|diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|index b7ea6dc..60c530f 100644
|--- a/dlls/ntdll/ntdll_misc.h
|+++ b/dlls/ntdll/ntdll_misc.h
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 58
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|index c8461b0..d9b8142 100644
|--- a/dlls/ntdll/thread.c
|+++ b/dlls/ntdll/thread.c
--------------------------
No file to patch.  Skipping patch.
11 out of 11 hunks ignored
can't find file to patch at input line 527
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c
|index 0d829a0..46e22f4 100644
|--- a/dlls/winegstreamer/glibthread.c
|+++ b/dlls/winegstreamer/glibthread.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 555
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|index 7261522..a8c31b9 100644
|--- a/libs/wine/loader.c
|+++ b/libs/wine/loader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 573
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/wine.map b/libs/wine/wine.map
|index 2159fac..fb3b951 100644
|--- a/libs/wine/wine.map
|+++ b/libs/wine/wine.map
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 590
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/Makefile.in b/loader/Makefile.in
|index 95e4798..a18dd02 100644
|--- a/loader/Makefile.in
|+++ b/loader/Makefile.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 600
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/main.c b/loader/main.c
|index ce21173..0e13862 100644
|--- a/loader/main.c
|+++ b/loader/main.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
==========================================

PATCH COMMAND:  patch -p1 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.34-gstreamer-v5.patch'

==========================================
checking file dlls/ntdll/ntdll_misc.h
Hunk #2 succeeded at 241 (offset 1 line).
checking file dlls/ntdll/thread.c
Hunk #4 succeeded at 299 with fuzz 2 (offset 3 lines).
Hunk #5 succeeded at 446 (offset 20 lines).
Hunk #6 succeeded at 475 (offset 20 lines).
Hunk #7 succeeded at 696 (offset 20 lines).
Hunk #8 succeeded at 720 (offset 20 lines).
Hunk #9 succeeded at 751 (offset 20 lines).
Hunk #10 succeeded at 779 (offset 20 lines).
Hunk #11 succeeded at 811 (offset 20 lines).
checking file dlls/winegstreamer/glibthread.c
checking file libs/wine/loader.c
Hunk #1 succeeded at 69 (offset -4 lines).
checking file libs/wine/wine.map
checking file loader/Makefile.in
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
checking file loader/main.c
Hunk #1 succeeded at 212 (offset 10 lines).
Hunk #2 succeeded at 260 (offset 10 lines).

patch program exited with status 1
==========================================

PATCH COMMAND:  patch -p2 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.34-gstreamer-v5.patch'

==========================================
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 41dd203aff02350efe76ba2ca39e8bc2dac426bc Mon Sep 17 00:00:00 2001
|From: Maarten Lankhorst <[e-mail]>
|Date: Mon, 5 Jan 2015 11:31:55 +0100
|Subject: [PATCH] TESTING -- override pthreads to fix gstreamer v5
|
|I believe the code is ready and will work properly now in all cases.
|but please test before cherry picking this patch, and report
|success or failure to me please.
|
|Changes since v1:
|  - Call pthread_yield to make sure that we link against libpthread.
|    This fixes the build on saucy.
|Changes since v2:
|  - Set thread_data->detached before creating the thread to prevent
|    a race condition.
|Changes since v3:
|  - Set thread_data->detached CORRECTLY. Fix a small race between
|    thread creation and pthread_detach.
|Changes since v4:
|  - Set native thread stack defaults in a similar way to eglibc,
|    and respect the defaults for win32 again. This fixes the regression
|    where you can only create 194 threads in java.
|---
| dlls/ntdll/ntdll_misc.h         |    3 +
| dlls/ntdll/thread.c             |  331 +++++++++++++++++++++++++++++++++++++--
| dlls/winegstreamer/glibthread.c |   13 ++
| libs/wine/loader.c              |    7 +
| libs/wine/wine.map              |    6 +
| loader/Makefile.in              |    2 +-
| loader/main.c                   |   41 +++++
| 7 files changed, 386 insertions(+), 17 deletions(-)
|
|diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|index b7ea6dc..60c530f 100644
|--- a/dlls/ntdll/ntdll_misc.h
|+++ b/dlls/ntdll/ntdll_misc.h
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 58
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|index c8461b0..d9b8142 100644
|--- a/dlls/ntdll/thread.c
|+++ b/dlls/ntdll/thread.c
--------------------------
No file to patch.  Skipping patch.
11 out of 11 hunks ignored
can't find file to patch at input line 527
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c
|index 0d829a0..46e22f4 100644
|--- a/dlls/winegstreamer/glibthread.c
|+++ b/dlls/winegstreamer/glibthread.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 555
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|index 7261522..a8c31b9 100644
|--- a/libs/wine/loader.c
|+++ b/libs/wine/loader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 573
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/wine.map b/libs/wine/wine.map
|index 2159fac..fb3b951 100644
|--- a/libs/wine/wine.map
|+++ b/libs/wine/wine.map
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
checking file Makefile.in
Hunk #1 FAILED at 1.
1 out of 1 hunk FAILED
can't find file to patch at input line 600
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/main.c b/loader/main.c
|index ce21173..0e13862 100644
|--- a/loader/main.c
|+++ b/loader/main.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
==========================================

PATCH COMMAND:  patch -p3 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.34-gstreamer-v5.patch'

==========================================
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 41dd203aff02350efe76ba2ca39e8bc2dac426bc Mon Sep 17 00:00:00 2001
|From: Maarten Lankhorst <[e-mail]>
|Date: Mon, 5 Jan 2015 11:31:55 +0100
|Subject: [PATCH] TESTING -- override pthreads to fix gstreamer v5
|
|I believe the code is ready and will work properly now in all cases.
|but please test before cherry picking this patch, and report
|success or failure to me please.
|
|Changes since v1:
|  - Call pthread_yield to make sure that we link against libpthread.
|    This fixes the build on saucy.
|Changes since v2:
|  - Set thread_data->detached before creating the thread to prevent
|    a race condition.
|Changes since v3:
|  - Set thread_data->detached CORRECTLY. Fix a small race between
|    thread creation and pthread_detach.
|Changes since v4:
|  - Set native thread stack defaults in a similar way to eglibc,
|    and respect the defaults for win32 again. This fixes the regression
|    where you can only create 194 threads in java.
|---
| dlls/ntdll/ntdll_misc.h         |    3 +
| dlls/ntdll/thread.c             |  331 +++++++++++++++++++++++++++++++++++++--
| dlls/winegstreamer/glibthread.c |   13 ++
| libs/wine/loader.c              |    7 +
| libs/wine/wine.map              |    6 +
| loader/Makefile.in              |    2 +-
| loader/main.c                   |   41 +++++
| 7 files changed, 386 insertions(+), 17 deletions(-)
|
|diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|index b7ea6dc..60c530f 100644
|--- a/dlls/ntdll/ntdll_misc.h
|+++ b/dlls/ntdll/ntdll_misc.h
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 58
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|index c8461b0..d9b8142 100644
|--- a/dlls/ntdll/thread.c
|+++ b/dlls/ntdll/thread.c
--------------------------
No file to patch.  Skipping patch.
11 out of 11 hunks ignored
can't find file to patch at input line 527
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c
|index 0d829a0..46e22f4 100644
|--- a/dlls/winegstreamer/glibthread.c
|+++ b/dlls/winegstreamer/glibthread.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 555
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|index 7261522..a8c31b9 100644
|--- a/libs/wine/loader.c
|+++ b/libs/wine/loader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 573
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/wine.map b/libs/wine/wine.map
|index 2159fac..fb3b951 100644
|--- a/libs/wine/wine.map
|+++ b/libs/wine/wine.map
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 590
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/Makefile.in b/loader/Makefile.in
|index 95e4798..a18dd02 100644
|--- a/loader/Makefile.in
|+++ b/loader/Makefile.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 600
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/main.c b/loader/main.c
|index ce21173..0e13862 100644
|--- a/loader/main.c
|+++ b/loader/main.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1
==========================================

PATCH COMMAND:  patch -p4 -g0 -E --no-backup-if-mismatch  --dry-run -f < '/var/tmp/portage/app-emulation/wine-1.7.55/work/wine-1.7.34-gstreamer-v5.patch'

==========================================
can't find file to patch at input line 37
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|From 41dd203aff02350efe76ba2ca39e8bc2dac426bc Mon Sep 17 00:00:00 2001
|From: Maarten Lankhorst <[e-mail]>
|Date: Mon, 5 Jan 2015 11:31:55 +0100
|Subject: [PATCH] TESTING -- override pthreads to fix gstreamer v5
|
|I believe the code is ready and will work properly now in all cases.
|but please test before cherry picking this patch, and report
|success or failure to me please.
|
|Changes since v1:
|  - Call pthread_yield to make sure that we link against libpthread.
|    This fixes the build on saucy.
|Changes since v2:
|  - Set thread_data->detached before creating the thread to prevent
|    a race condition.
|Changes since v3:
|  - Set thread_data->detached CORRECTLY. Fix a small race between
|    thread creation and pthread_detach.
|Changes since v4:
|  - Set native thread stack defaults in a similar way to eglibc,
|    and respect the defaults for win32 again. This fixes the regression
|    where you can only create 194 threads in java.
|---
| dlls/ntdll/ntdll_misc.h         |    3 +
| dlls/ntdll/thread.c             |  331 +++++++++++++++++++++++++++++++++++++--
| dlls/winegstreamer/glibthread.c |   13 ++
| libs/wine/loader.c              |    7 +
| libs/wine/wine.map              |    6 +
| loader/Makefile.in              |    2 +-
| loader/main.c                   |   41 +++++
| 7 files changed, 386 insertions(+), 17 deletions(-)
|
|diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
|index b7ea6dc..60c530f 100644
|--- a/dlls/ntdll/ntdll_misc.h
|+++ b/dlls/ntdll/ntdll_misc.h
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 58
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|index c8461b0..d9b8142 100644
|--- a/dlls/ntdll/thread.c
|+++ b/dlls/ntdll/thread.c
--------------------------
No file to patch.  Skipping patch.
11 out of 11 hunks ignored
can't find file to patch at input line 527
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/dlls/winegstreamer/glibthread.c b/dlls/winegstreamer/glibthread.c
|index 0d829a0..46e22f4 100644
|--- a/dlls/winegstreamer/glibthread.c
|+++ b/dlls/winegstreamer/glibthread.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 555
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|index 7261522..a8c31b9 100644
|--- a/libs/wine/loader.c
|+++ b/libs/wine/loader.c
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 573
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/libs/wine/wine.map b/libs/wine/wine.map
|index 2159fac..fb3b951 100644
|--- a/libs/wine/wine.map
|+++ b/libs/wine/wine.map
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 590
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/Makefile.in b/loader/Makefile.in
|index 95e4798..a18dd02 100644
|--- a/loader/Makefile.in
|+++ b/loader/Makefile.in
--------------------------
No file to patch.  Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 600
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff --git a/loader/main.c b/loader/main.c
|index ce21173..0e13862 100644
|--- a/loader/main.c
|+++ b/loader/main.c
--------------------------
No file to patch.  Skipping patch.
2 out of 2 hunks ignored

patch program exited with status 1