rpms/vlc/devel vlc-backport-signal_fix.patch, NONE, 1.1 vlc.spec, 1.105, 1.106

[Nicolas Chauvet]

Author: kwizart

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

Modified Files:
	vlc.spec 
Added Files:
	vlc-backport-signal_fix.patch 
Log Message:
Backport another patch that worth been tested on KDE 4.6
https://bugs.kde.org/show_bug.cgi?id=260719


vlc-backport-signal_fix.patch:
 override.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE vlc-backport-signal_fix.patch ---
commit de68b12937589cdcbe5143f162dabd7654969362
Author: Rémi Denis-Courmont <remi at remlab.net>
Date:   Sat Jul 24 13:43:56 2010 +0300

    Do not override signal functions for the time being

diff --git a/bin/override.c b/bin/override.c
index 2385f2b..ac9e14c 100644
--- a/bin/override.c
+++ b/bin/override.c
@@ -201,6 +201,7 @@ int rand (void)
 }
 
 
+#if 0
 /** Signals **/
 #include <signal.h>
 
@@ -252,6 +253,7 @@ error:
     LOG("Blocked", "%d, %p, %p", signum, act, old);
     return -1;
 }
+#endif
 
 
 /*** Locales ***



Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- vlc.spec	25 Jan 2011 13:54:51 -0000	1.105
+++ vlc.spec	25 Jan 2011 17:15:53 -0000	1.106
@@ -26,7 +26,7 @@
 Summary:	The cross-platform open-source multimedia framework, player and server
 Name:		vlc
 Version:	1.1.6
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org
@@ -39,6 +39,7 @@
 Patch3:		vlc-1.1.6-hardode_font_patch.patch
 Patch4:		vlc-1.1.4-tls_path.patch
 Patch5:		vlc-backport-lirc_fix.patch
+Patch6:         vlc-backport-signal_fix.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	desktop-file-utils
@@ -248,6 +249,7 @@
 %patch3 -p1 -b .hardode_path
 %patch4 -p1 -b .tls_path
 %patch5 -p1 -b .lirc_fix
+%patch6 -p1 -b .signal_fix
 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
 
 rm modules/access/videodev2.h
@@ -555,8 +557,9 @@
 
 
 %changelog
-* Mon Jan 24 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.6-1
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart at gmail.com> - 1.1.6-2
 - Update to 1.1.6
+- backport lirc and signal fixes
 
 * Sat Dec 18 2010 Nicolas Chauvet <kwizart at gmail.com> - 1.1.5-2
 -  Clear execstack on dmo and real plugin for i686