diff --git a/vlc-backport-signal_fix.patch b/vlc-backport-signal_fix.patch new file mode 100644 index 0000000..16d1367 --- /dev/null +++ b/vlc-backport-signal_fix.patch @@ -0,0 +1,27 @@ +commit de68b12937589cdcbe5143f162dabd7654969362 +Author: RĂ©mi Denis-Courmont +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 + +@@ -252,6 +253,7 @@ error: + LOG("Blocked", "%d, %p, %p", signum, act, old); + return -1; + } ++#endif + + + /*** Locales *** + diff --git a/vlc.spec b/vlc.spec index c49b271..09c669f 100644 --- a/vlc.spec +++ b/vlc.spec @@ -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 @@ Patch1: 0001-Libnotify-depends-on-a-gtk.patch 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 @@ JACK audio plugin for the VLC media player. %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 @@ fi || : %changelog -* Mon Jan 24 2011 Nicolas Chauvet - 1.1.6-1 +* Mon Jan 24 2011 Nicolas Chauvet - 1.1.6-2 - Update to 1.1.6 +- backport lirc and signal fixes * Sat Dec 18 2010 Nicolas Chauvet - 1.1.5-2 - Clear execstack on dmo and real plugin for i686