From fad81c49ae4a2cb0fbdc4bc5e274d0ae30a678f3 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Wed, 2 Feb 2011 16:52:43 +0000 Subject: [PATCH] Update to 1.1.7 --- .gitignore | 2 +- sources | 2 +- vlc-backport-lirc_fix.patch | 31 ------------------------------- vlc.spec | 6 +++++- 4 files changed, 7 insertions(+), 34 deletions(-) delete mode 100644 vlc-backport-lirc_fix.patch diff --git a/.gitignore b/.gitignore index 6cb201a..70f3d32 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -vlc-1.1.6.tar.bz2 +vlc-1.1.7.tar.bz2 diff --git a/sources b/sources index ded7e22..c3fd175 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2 +932ce1fa4afa54b56ac0ccc0655667b6 vlc-1.1.7.tar.bz2 diff --git a/vlc-backport-lirc_fix.patch b/vlc-backport-lirc_fix.patch deleted file mode 100644 index 3f2d5f3..0000000 --- a/vlc-backport-lirc_fix.patch +++ /dev/null @@ -1,31 +0,0 @@ -commit 942ab6c31026a84e4c5503cb8e68a5135dfc2f2b -Author: Pierre Ynard -Date: Sun Jan 23 18:19:05 2011 +0100 - - lirc: build fix - -diff --git a/modules/control/lirc.c b/modules/control/lirc.c -index aee33c3..e8c4780 100644 ---- a/modules/control/lirc.c -+++ b/modules/control/lirc.c -@@ -25,6 +25,7 @@ - * Preamble - *****************************************************************************/ - -+#include - #include - - #ifdef HAVE_CONFIG_H -@@ -154,10 +155,12 @@ - /* Wait for data */ - struct pollfd ufd = { .fd = p_sys->i_fd, .events = POLLIN, .revents = 0 }; - if( poll( &ufd, 1, -1 ) == -1 ) -+ { - if( errno == EINTR ) - continue; - else - break; -+ } - - /* Process */ - int canc = vlc_savecancel(); diff --git a/vlc.spec b/vlc.spec index 61755ba..0849785 100644 --- a/vlc.spec +++ b/vlc.spec @@ -25,7 +25,7 @@ Summary: The cross-platform open-source multimedia framework, player and server Name: vlc -Version: 1.1.6.1 +Version: 1.1.7 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -245,6 +245,7 @@ JACK audio plugin for the VLC media player. %patch0 -p1 -b .noerror %patch3 -p1 -b .hardode_path %patch4 -p1 -b .tls_path +%patch5 -p1 -b .signal sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in rm modules/access/videodev2.h @@ -552,6 +553,9 @@ fi || : %changelog +* Wed Feb 02 2011 Nicolas Chauvet - 1.1.7-1 +- Update to 1.1.7 + * Sat Jan 29 2011 Nicolas Chauvet - 1.1.6.1-1 - Update to 1.1.6.1 - Remove merged patches