| 1 |
commit: eff19da8e22050be19180b57c3df1984db7bd23f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Aug 29 19:37:03 2017 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Aug 29 19:40:17 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eff19da8 |
| 7 |
|
| 8 |
media-video/vlc: Fix segfault |
| 9 |
|
| 10 |
Reported-by: dekbertu <sparks71 <AT> gmx.de> |
| 11 |
Thanks-to: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com> |
| 12 |
Gentoo-bug: 629294 |
| 13 |
Package-Manager: Portage-2.3.8, Repoman-2.3.3 |
| 14 |
|
| 15 |
.../vlc/files/vlc-2.2.6-decoder-lock-scope.patch | 34 ++++++++++++++++++++++ |
| 16 |
.../{vlc-2.2.9999.ebuild => vlc-2.2.6-r2.ebuild} | 8 ++--- |
| 17 |
media-video/vlc/vlc-2.2.9999.ebuild | 4 +-- |
| 18 |
3 files changed, 40 insertions(+), 6 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch |
| 21 |
new file mode 100644 |
| 22 |
index 00000000000..2e8064446d0 |
| 23 |
--- /dev/null |
| 24 |
+++ b/media-video/vlc/files/vlc-2.2.6-decoder-lock-scope.patch |
| 25 |
@@ -0,0 +1,34 @@ |
| 26 |
+X-Git-Url: https://git.videolan.org/?p=vlc.git;a=blobdiff_plain;f=src%2Finput%2Fdecoder.c;h=fe3cd428c65c18bfbdadb55baf11521afdc2bfc7;hp=83aa5bf54e2c29ad93fae803117558e4fcd0f658;hb=6ae2905ef7fbc7de3a3a4a1bdf8ad6df46ce570a;hpb=5b2de76965ee8b1ab5e3257f8b6d71bbb4e9e3f9 |
| 27 |
+ |
| 28 |
+--- a/src/input/decoder.c |
| 29 |
++++ b/src/input/decoder.c |
| 30 |
+@@ -1162,7 +1162,10 @@ |
| 31 |
+ b_paused = p_owner->b_paused; |
| 32 |
+ |
| 33 |
+ if (!p_audio) |
| 34 |
++ { |
| 35 |
++ vlc_mutex_unlock( &p_owner->lock ); |
| 36 |
+ break; |
| 37 |
++ } |
| 38 |
+ |
| 39 |
+ /* */ |
| 40 |
+ int i_rate = INPUT_RATE_DEFAULT; |
| 41 |
+@@ -1180,6 +1183,9 @@ |
| 42 |
+ |
| 43 |
+ if( unlikely(p_owner->b_paused != b_paused) ) |
| 44 |
+ continue; /* race with input thread? retry... */ |
| 45 |
++ |
| 46 |
++ vlc_mutex_unlock( &p_owner->lock ); |
| 47 |
++ |
| 48 |
+ if( p_aout == NULL ) |
| 49 |
+ b_reject = true; |
| 50 |
+ |
| 51 |
+@@ -1199,7 +1205,6 @@ |
| 52 |
+ |
| 53 |
+ break; |
| 54 |
+ } |
| 55 |
+- vlc_mutex_unlock( &p_owner->lock ); |
| 56 |
+ } |
| 57 |
+ |
| 58 |
+ static void DecoderDecodeAudio( decoder_t *p_dec, block_t *p_block ) |
| 59 |
+ |
| 60 |
|
| 61 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.6-r2.ebuild |
| 62 |
similarity index 98% |
| 63 |
copy from media-video/vlc/vlc-2.2.9999.ebuild |
| 64 |
copy to media-video/vlc/vlc-2.2.6-r2.ebuild |
| 65 |
index ea1b3f17fea..62e7d7e9ef2 100644 |
| 66 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
| 67 |
+++ b/media-video/vlc/vlc-2.2.6-r2.ebuild |
| 68 |
@@ -196,10 +196,10 @@ PATCHES=( |
| 69 |
"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch |
| 70 |
|
| 71 |
# Patch up incompatibilities and reconfigure autotools. |
| 72 |
- "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
| 73 |
+# "${FILESDIR}"/${PN}-9999-libva-1.2.1-compat.patch |
| 74 |
|
| 75 |
# Fix up broken audio when skipping using a fixed reversed bisected commit. |
| 76 |
- "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
| 77 |
+# "${FILESDIR}"/${PN}-2.1.0-TomWij-bisected-PA-broken-underflow.patch |
| 78 |
|
| 79 |
# Bug #541678 |
| 80 |
"${FILESDIR}"/qt4-select.patch |
| 81 |
@@ -214,8 +214,8 @@ PATCHES=( |
| 82 |
# Bug #589396 |
| 83 |
"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch |
| 84 |
|
| 85 |
- # Bug #594126 |
| 86 |
- "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch |
| 87 |
+ # Bug #594126, #629294 |
| 88 |
+ "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch |
| 89 |
"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch |
| 90 |
|
| 91 |
# Bug #593460 |
| 92 |
|
| 93 |
diff --git a/media-video/vlc/vlc-2.2.9999.ebuild b/media-video/vlc/vlc-2.2.9999.ebuild |
| 94 |
index ea1b3f17fea..069a19e151f 100644 |
| 95 |
--- a/media-video/vlc/vlc-2.2.9999.ebuild |
| 96 |
+++ b/media-video/vlc/vlc-2.2.9999.ebuild |
| 97 |
@@ -214,8 +214,8 @@ PATCHES=( |
| 98 |
# Bug #589396 |
| 99 |
"${FILESDIR}"/${PN}-2.2.4-cxx0x.patch |
| 100 |
|
| 101 |
- # Bug #594126 |
| 102 |
- "${FILESDIR}"/${PN}-2.2.4-decoder-lock-scope.patch |
| 103 |
+ # Bug #594126, #629294 |
| 104 |
+ "${FILESDIR}"/${PN}-2.2.6-decoder-lock-scope.patch |
| 105 |
"${FILESDIR}"/${PN}-2.2.4-alsa-large-buffers.patch |
| 106 |
|
| 107 |
# Bug #593460 |
Archives