Author: kwizart Update of /cvs/free/rpms/vlc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv30812 Modified Files: vlc.spec sources .cvsignore Added Files: vlc-1.1.6-hardode_font_patch.patch vlc-backport-lirc_fix.patch Removed Files: vlc-1.1.4-hardode_font_patch.patch Log Message: VLC 1.1.6 - 'The Luggage' This is the seventh release of the 1.1.x branch of VLC. This is a minor release, focused on minor features, bugfixes and security issues: - Various security issues in Real demuxer, CDG and subtitle decoders, transcode - Important Visualisation improvements, notably in projectM and goom - Faster Webm/VP8 decoding - Fixes in WMV seeking, Icy metadata, freetype, XDG screensaver and KDE solid - Fixes and improvements on PulseAudio output - MPC SV7/SV8 support on Windows/MacOS X, Midi on MacOS X - Support for audio/L24 in RTP - Fix for Audio CD playback on Windows - Qt4 and Media Keys processing improvements 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&gt; 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 @@ static void Run( intf_thread_t *p_intf ) /* 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 */ Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v retrieving revision 1.103 retrieving revision 1.104 diff -u -r1.103 -r1.104 --- vlc.spec 22 Jan 2011 10:11:28 -0000 1.103 +++ vlc.spec 25 Jan 2011 11:57:16 -0000 1.104 @@ -17,12 +17,16 @@ %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 -Release: 3%{?dist} +Version: 1.1.6 +Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia URL: http://www.videolan.org @@ -32,8 +36,9 @@ %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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -88,6 +93,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 +119,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 +214,7 @@ Provides: ffmpeg4vlc-devel = 0.6-0.5 Obsoletes: ffmpeg4vlc-libs < 0.6-0.5 Obsoletes: ffmpeg4vlc-devel < 0.6-0.5 +%{?live555date:Requires: live555%{_isa} = %{live555date}} %description core VLC media player core components @@ -240,6 +247,7 @@ %patch1 -p1 -b .gtk23 %patch3 -p1 -b .hardode_path %patch4 -p1 -b .tls_path +%patch5 -p1 -b .lirc_fix sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in rm modules/access/videodev2.h @@ -280,7 +288,7 @@ --with-live555-tree=live \ %endif --enable-dv \ - --enable-opencv \ +%{!?_without_opencv:--enable-opencv} \ --enable-sftp \ --enable-pvr \ --enable-gnomevfs \ @@ -491,8 +499,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 +528,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,8 +555,8 @@ %changelog -* Sat Jan 22 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.5-3 -- Rebuilt for OpenCV 2.2 +* Mon Jan 24 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.6-1 +- Update to 1.1.6 * Sat Dec 18 2010 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.5-2 - Clear execstack on dmo and real plugin for i686 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/devel/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 25 Jan 2011 11:57:16 -0000 1.40 @@ -1 +1 @@ -fdc23693351ed57af9f4c85ea885b536 vlc-1.1.5.tar.bz2 +c47f3ebc886f2aff8c95b98c564d1759 vlc-1.1.6.tar.bz2 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/devel/.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 25 Jan 2011 11:57:16 -0000 1.34 @@ -1 +1 @@ -vlc-1.1.5.tar.bz2 +vlc-1.1.6.tar.bz2 --- vlc-1.1.4-hardode_font_patch.patch DELETED ---