9:44 a.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv23528/F-14
Modified Files:
.cvsignore sources vlc.spec
Added Files:
vlc-1.1.6-hardode_font_patch.patch vlc-backport-lirc_fix.patch
vlc-backport-signal_fix.patch
Removed Files:
vlc-1.1.0-pending-taglib-not-tread_safe.patch
vlc-1.1.4-hardode_font_patch.patch vlc-handlers.schemas
Log Message:
Update to 1.1.6
vlc-1.1.6-hardode_font_patch.patch:
projectm.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE vlc-1.1.6-hardode_font_patch.patch ---
diff -up vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path
vlc-1.1.6/modules/visualization/projectm.cpp
--- vlc-1.1.6/modules/visualization/projectm.cpp.hardode_path 2011-01-17
17:30:54.000000000 +0100
+++ vlc-1.1.6/modules/visualization/projectm.cpp 2011-01-25 10:55:30.791607002
+0100
@@ -89,9 +89,9 @@ vlc_module_begin ()
add_directory( "projectm-preset-path",
"/usr/share/projectM/presets", NULL,
#endif
PRESET_PATH_TXT, PRESET_PATH_LONGTXT, true )
- add_file( "projectm-title-font",
"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSans.ttf", NULL,
+ add_file( "projectm-title-font",
"/usr/share/fonts/dejavu/DejaVuSans.ttf", NULL,
TITLE_FONT_TXT, TITLE_FONT_LONGTXT, true )
- add_file( "projectm-menu-font",
"/usr/share/fonts/truetype/ttf-dejavu/DejaVuSansMono.ttf", NULL,
+ add_file( "projectm-menu-font",
"/usr/share/fonts/dejavu/DejaVuSansMono.ttf", NULL,
MENU_FONT_TXT, MENU_FONT_LONGTXT, true )
#endif
add_integer( "projectm-width", 800, NULL, WIDTH_TEXT, WIDTH_LONGTEXT,
vlc-backport-lirc_fix.patch:
lirc.c | 3 +++
1 file changed, 3 insertions(+)
--- NEW FILE vlc-backport-lirc_fix.patch ---
commit 942ab6c31026a84e4c5503cb8e68a5135dfc2f2b
Author: Pierre Ynard <linkfanel(a)yahoo.fr>
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 <errno.h>
#include <fcntl.h>
#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();
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(a)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: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/.cvsignore,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- .cvsignore 14 Nov 2010 22:57:19 -0000 1.33
+++ .cvsignore 28 Jan 2011 09:44:35 -0000 1.34
@@ -1 +1 @@
-vlc-1.1.5.tar.bz2
+vlc-1.1.6.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources 14 Nov 2010 22:57:19 -0000 1.39
+++ sources 28 Jan 2011 09:44:35 -0000 1.40
@@ -1 +1 @@
-fdc23693351ed57af9f4c85ea885b536 vlc-1.1.5.tar.bz2
+c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -r1.102 -r1.103
--- vlc.spec 22 Jan 2011 10:13:05 -0000 1.102
+++ vlc.spec 28 Jan 2011 09:44:35 -0000 1.103
@@ -17,11 +17,15 @@
%global _with_live555 --with-live555
%global _with_vaapi --with-vaapi
%endif
-
+%if 0%{?fedora} > 14
+# Those need works in Rawhide
+%global _without_opencv 1
+%global _without_mozilla 1
+%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.5
+Version: 1.1.6
Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
@@ -32,8 +36,10 @@
%endif
Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
Patch1: 0001-Libnotify-depends-on-a-gtk.patch
-Patch3: vlc-1.1.4-hardode_font_patch.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
@@ -88,6 +94,7 @@
BuildRequires: libprojectM-qt-devel
BuildRequires: libproxy-devel
BuildRequires: librsvg2-devel >= 2.9.0
+BuildRequires: librtmp-devel
BuildRequires: libssh2-devel
BuildRequires: libsysfs-devel
BuildRequires: libshout-devel
@@ -113,7 +120,7 @@
BuildRequires: minizip-devel
%{?_with_libmpeg2:BuildRequires: mpeg2dec-devel >= 0.3.2}
BuildRequires: ncurses-devel
-BuildRequires: opencv-devel
+%{!?_without_opencv:BuildRequires: opencv-devel}
BuildRequires: openslp-devel
BuildRequires: pcre-devel
BuildRequires: pulseaudio-libs-devel >= 0.9.8
@@ -208,6 +215,7 @@
Provides: ffmpeg4vlc-devel = 0.6-0.5
Obsoletes: ffmpeg4vlc-libs < 0.6-0.5
Obsoletes: ffmpeg4vlc-devel < 0.6-0.5
+%{?live555date:Requires: live555date%{_isa} = %{live555date}}
%description core
VLC media player core components
@@ -240,6 +248,8 @@
%patch1 -p1 -b .gtk23
%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
@@ -280,7 +290,7 @@
--with-live555-tree=live \
%endif
--enable-dv \
- --enable-opencv \
+%{!?_without_opencv:--enable-opencv} \
--enable-sftp \
--enable-pvr \
--enable-gnomevfs \
@@ -491,8 +501,10 @@
%exclude %{_libdir}/vlc/plugins/video_output/libdirectfb_plugin.so
}
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
+%{!?_without_opencv:
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
%if 0%{?fedora} > 11 || 0%{?rhel} > 5
%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
%endif
@@ -518,8 +530,10 @@
%if 0%{?fedora} < 15
%{_libdir}/vlc/plugins/misc/libnotify_plugin.so
%endif
+%{!?_without_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
+}
%ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/video_output/libsvgalib_plugin.so
%endif
@@ -543,6 +557,10 @@
%changelog
+* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.6-2
+- Update to 1.1.6
+- backport lirc and signal fixes
+
* Sat Dec 18 2010 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.5-2
- Clear execstack on dmo and real plugin for i686
--- vlc-1.1.0-pending-taglib-not-tread_safe.patch DELETED ---
--- vlc-1.1.4-hardode_font_patch.patch DELETED ---
--- vlc-handlers.schemas DELETED ---