[SCM] vlc/master: Drop backported bp-fix-hang-caused-by-notify.patch.

bdrung at users.alioth.debian.org bdrung at users.alioth.debian.org
Mon Oct 15 21:16:14 UTC 2012


The following commit has been merged in the master branch:
commit 59b81c38a68d84b65de357eb57fe79b451c0cd83
Author: Benjamin Drung <bdrung at debian.org>
Date:   Mon Oct 15 22:27:44 2012 +0200

    Drop backported bp-fix-hang-caused-by-notify.patch.

diff --git a/debian/patches/bp-fix-hang-caused-by-notify.patch b/debian/patches/bp-fix-hang-caused-by-notify.patch
deleted file mode 100644
index a7c938a..0000000
--- a/debian/patches/bp-fix-hang-caused-by-notify.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Rémi Denis-Courmont <remi at remlab.net>
-Subject: [PATCH] Revert "Notify: add a callback to match telepathy, msn"
- .
- The "item-change" callback is called with the playlist lock held in
- at least one case: when the now playing meta is cleared while a new
- input is created by the playlist.
- .
- playlist_CurrentInput() acquires the playlist lock. So the
- "item-change" callback cannot call it. This bug is present in the
- Growl, MSN and Telepathy modules since version 1.0.0. It got copied
- into Notify in version 2.0.0.
- .
- This reverts commit fc56b92af1636c53a0545109a74476fe74c054a5.
- This should fix #6641.
- (cherry picked from commit 1e5f4b465a82745e8e7e5a5de491deac39554ed3)
-Origin: http://git.videolan.org/?p=vlc/vlc-2.0.git;a=commitdiff;h=e89f4296
-Applied-Upstream: 2.0.4
-Bug: http://trac.videolan.org/vlc/ticket/6641
-Bug-Debian: http://bugs.debian.org/662628
-Bug-Ubuntu: https://launchpad.net/bugs/970447
-
---- a/modules/notify/notify.c
-+++ b/modules/notify/notify.c
-@@ -122,7 +122,6 @@
- 
-     /* */
-     var_AddCallback( pl_Get( p_intf ), "item-current", ItemChange, p_intf );
--    var_AddCallback( pl_Get( p_intf ), "item-change", ItemChange, p_intf );
- 
-     return VLC_SUCCESS;
- }
-@@ -136,7 +135,6 @@
-     intf_sys_t      *p_sys  = p_intf->p_sys;
- 
-     var_DelCallback( pl_Get( p_this ), "item-current", ItemChange, p_this );
--    var_DelCallback( pl_Get( p_this ), "item-change", ItemChange, p_this );
- 
-     if( p_sys->notification )
-     {
diff --git a/debian/patches/series b/debian/patches/series
index 39952d1..5703d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 v4l-kfreebsd.patch
 link-vlc-cache-gen-with-c++.patch
 link-vlc-with-c++.patch
-bp-fix-hang-caused-by-notify.patch

-- 
VLC media player packaging



More information about the pkg-multimedia-commits mailing list