From f084bc5079d04ebed05874211695e4f3a2ae0c45 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Fri, 28 Jan 2011 09:40:26 +0000 Subject: [PATCH] Remove unused patches --- vlc-1.1.0-pending-taglib-not-tread_safe.patch | 40 ----- vlc-handlers.schemas | 161 ------------------ 2 files changed, 201 deletions(-) delete mode 100644 vlc-1.1.0-pending-taglib-not-tread_safe.patch delete mode 100644 vlc-handlers.schemas diff --git a/vlc-1.1.0-pending-taglib-not-tread_safe.patch b/vlc-1.1.0-pending-taglib-not-tread_safe.patch deleted file mode 100644 index cf6ece6..0000000 --- a/vlc-1.1.0-pending-taglib-not-tread_safe.patch +++ /dev/null @@ -1,40 +0,0 @@ -From: Rafaël Carré -Date: Sun, 24 Oct 2010 16:14:33 +0000 (+0200) -Subject: taglib is not thread-safe -X-Git-Url: http://git.videolan.org/?p=vlc.git;a=commitdiff_plain;h=8675d26cea713ca9ebae3b91bd7c3e9bb320dcb1;hp=2ad5d811df1fcb2c0229d9e21fdd93d43344d19c - -taglib is not thread-safe - -Fix ticket #3958 ---- - -diff --git a/modules/meta_engine/taglib.cpp b/modules/meta_engine/taglib.cpp -index 33866d0..f67dbda 100644 ---- a/modules/meta_engine/taglib.cpp -+++ b/modules/meta_engine/taglib.cpp -@@ -77,6 +77,8 @@ - #include - #include - -+// taglib is not thread safe -+static vlc_mutex_t taglib_lock = VLC_STATIC_MUTEX; - - // Local functions - static int ReadMeta ( vlc_object_t * ); -@@ -363,6 +365,7 @@ static void ReadMetaFromMP4( MP4::Tag* tag, demux_t *p_demux, demux_meta_t *p_de - */ - static int ReadMeta( vlc_object_t* p_this) - { -+ vlc_mutex_locker locker (&taglib_lock); - demux_meta_t* p_demux_meta = (demux_meta_t *)p_this; - demux_t* p_demux = p_demux_meta->p_demux; - vlc_meta_t* p_meta; -@@ -585,6 +588,7 @@ static void WriteMetaToXiph( Ogg::XiphComment* tag, input_item_t* p_item ) - - static int WriteMeta( vlc_object_t *p_this ) - { -+ vlc_mutex_locker locker (&taglib_lock); - meta_export_t *p_export = (meta_export_t *)p_this; - input_item_t *p_item = p_export->p_item; - FileRef f; - diff --git a/vlc-handlers.schemas b/vlc-handlers.schemas deleted file mode 100644 index b243c23..0000000 --- a/vlc-handlers.schemas +++ /dev/null @@ -1,161 +0,0 @@ - - - - - /schemas/desktop/gnome/url-handlers/mms/command - /desktop/gnome/url-handlers/mms/command - vlc - string - vlc "%s" - - - - - - - - - /schemas/desktop/gnome/url-handlers/mms/needs_terminal - /desktop/gnome/url-handlers/mms/needs_terminal - vlc - bool - false - - - - - - - - - /schemas/desktop/gnome/url-handlers/mms/enabled - /desktop/gnome/url-handlers/mms/enabled - vlc - bool - true - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtp/command - /desktop/gnome/url-handlers/rtp/command - vlc - string - vlc "%s" - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtp/needs_terminal - /desktop/gnome/url-handlers/rtp/needs_terminal - vlc - bool - false - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtp/enabled - /desktop/gnome/url-handlers/rtp/enabled - vlc - bool - true - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtsp/command - /desktop/gnome/url-handlers/rtsp/command - vlc - string - vlc "%s" - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtsp/needs_terminal - /desktop/gnome/url-handlers/rtsp/needs_terminal - vlc - bool - false - - - - - - - - - /schemas/desktop/gnome/url-handlers/rtsp/enabled - /desktop/gnome/url-handlers/rtsp/enabled - vlc - bool - true - - - - - - - - - /schemas/desktop/gnome/url-handlers/mmsh/command - /desktop/gnome/url-handlers/mmsh/command - vlc - string - vlc "%s" - - - - - - - - - /schemas/desktop/gnome/url-handlers/mmsh/needs_terminal - /desktop/gnome/url-handlers/mmsh/needs_terminal - vlc - bool - false - - - - - - - - - /schemas/desktop/gnome/url-handlers/mmsh/enabled - /desktop/gnome/url-handlers/mmsh/enabled - vlc - bool - true - - - - - - - - -