rpms/vlc/devel 0001-Fix-typo-in-vlc.desktop.patch, NONE, 1.1 0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch, NONE, 1.1 vlc.spec, 1.130, 1.131

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31116

Modified Files:
	vlc.spec 
Added Files:
	0001-Fix-typo-in-vlc.desktop.patch 
	0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch 
Log Message:
Add 2 already merged patches


0001-Fix-typo-in-vlc.desktop.patch:
 vlc.desktop |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE 0001-Fix-typo-in-vlc.desktop.patch ---
>From 5694c98039d550984e3e8d3a13341cc9543d3950 Mon Sep 17 00:00:00 2001
From: Nicolas Chauvet <kwizart at gmail.com>
Date: Fri, 7 Oct 2011 21:46:37 +0200
Subject: [PATCH] Fix typo in vlc.desktop

---
 share/vlc.desktop |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/share/vlc.desktop b/share/vlc.desktop
index abc39d9..71bbb43 100644
--- a/share/vlc.desktop
+++ b/share/vlc.desktop
@@ -38,7 +38,7 @@ Name[nl]=VLC Mediaspeler
 GenericName[nl]=Mediaspeler
 Comment[nl]=Uw multimediastreams afspelen, opnemen en uitzenden
 Name[nn]=VLC mediespelar
-Name[nn]=Mediespelar
+GenericName[nn]=Mediespelar
 Comment[nn]=Spel av, ta opp og send ut multimedia
 Name[pa]=VLC ਮੀਡਿਆ ਪਲੇਅਰ
 Comment[pa]=ਆਪਣੀ ਮਲਟੀਮੀਡਿਆ ਸਟਰੀਮ ਪੜ੍ਹੋ, ਕੈਪਚਰ ਤੇ ਬਰਾਡਕਾਸਟ ਕਰੋ 
-- 
1.7.4.4


0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch:
 kate.c |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE 0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch ---
>From 95ae1809a18f37d50e7746324daccc46a317246d Mon Sep 17 00:00:00 2001
From: Vincent Penquerc'h <ogg.k.ogg.k at googlemail.com>
Date: Wed, 5 Oct 2011 22:07:50 +0100
Subject: [PATCH] kate: do not access the renderer if it fails to initialize

---
 modules/codec/kate.c |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 49177da..769e0d9 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -404,14 +404,15 @@ static int OpenDecoder( vlc_object_t *p_this )
             p_sys->p_tr = NULL;
             p_sys->b_use_tiger = false;
         }
-
-        CHECK_TIGER_RET( tiger_renderer_set_surface_clear_color( p_sys->p_tr, 1, 0, 0, 0, 0 ) );
-
-        UpdateTigerFontEffect( p_dec );
-        UpdateTigerFontColor( p_dec );
-        UpdateTigerBackgroundColor( p_dec );
-        UpdateTigerQuality( p_dec );
-        UpdateTigerFontDesc( p_dec );
+        else {
+            CHECK_TIGER_RET( tiger_renderer_set_surface_clear_color( p_sys->p_tr, 1, 0, 0, 0, 0 ) );
+
+            UpdateTigerFontEffect( p_dec );
+            UpdateTigerFontColor( p_dec );
+            UpdateTigerBackgroundColor( p_dec );
+            UpdateTigerQuality( p_dec );
+            UpdateTigerFontDesc( p_dec );
+        }
     }
 
 #else
-- 
1.7.1



Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- vlc.spec	7 Oct 2011 08:09:24 -0000	1.130
+++ vlc.spec	7 Oct 2011 19:58:44 -0000	1.131
@@ -37,7 +37,9 @@
 Patch0:		vlc-1.1.0-vlc-cache-gen_noerror.patch
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
-Patch5:         vlc-1.1.8-bugfix.opencv22.patch
+Patch5:		vlc-1.1.8-bugfix.opencv22.patch
+Patch6:		0001-Fix-typo-in-vlc.desktop.patch
+Patch7:		0001-kate-do-not-access-the-renderer-if-it-fails-to-initi.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -251,6 +253,8 @@
 %patch5 -p1 -b .opencv22
 %endif
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
+%patch6 -p1
+%patch7 -p1
 
 rm modules/access/videodev2.h
 ln -sf %{_includedir}/linux/videodev2.h modules/access/videodev2.h
@@ -563,6 +567,7 @@
 %changelog
 * Fri Oct 07 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.12-1
 - Update to 1.1.12
+- Add 2 already merged patches
 
 * Tue Sep 20 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.11-2
 - Update to current bugfix