Author: kwizart Update of /cvs/free/rpms/vlc/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv27706/F-14 Modified Files: .cvsignore sources vlc.spec Added Files: vlc-1.1-backport_20110607.patch Log Message: Update to 1.1.10 (final) vlc-1.1-backport_20110607.patch: audio_output/pulse.c | 2 +- demux/avformat/demux.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) --- NEW FILE vlc-1.1-backport_20110607.patch --- diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c index 7a5ef1f..64de04d 100644 --- a/modules/audio_output/pulse.c +++ b/modules/audio_output/pulse.c @@ -273,7 +273,7 @@ static int Open(vlc_object_t *obj) aout_instance_t *aout = (aout_instance_t *)obj; #if !defined(PA_CHECK_VERSION) || !PA_CHECK_VERSION(0,9,22) - if( !vlc_xlib_init( p_this ) ) + if( !vlc_xlib_init( obj ) ) return VLC_EGENERIC; #endif diff --git a/modules/demux/avformat/demux.c b/modules/demux/avformat/demux.c index fbb0b28..bd7c166 100644 --- a/modules/demux/avformat/demux.c +++ b/modules/demux/avformat/demux.c @@ -210,6 +210,9 @@ int OpenDemux( vlc_object_t *p_this ) */ p_sys->url.is_streamed = 1; p_sys->io.is_streamed = 1; +#if defined(AVIO_SEEKABLE_NORMAL) + p_sys->io.seekable = 0; +#endif } Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/.cvsignore,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- .cvsignore 12 Apr 2011 15:47:00 -0000 1.37 +++ .cvsignore 7 Jun 2011 10:21:05 -0000 1.38 @@ -1 +1 @@ -vlc-1.1.9.tar.bz2 +vlc-1.1.10.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/sources,v retrieving revision 1.43 retrieving revision 1.44 diff -u -r1.43 -r1.44 --- sources 12 Apr 2011 15:47:00 -0000 1.43 +++ sources 7 Jun 2011 10:21:05 -0000 1.44 @@ -1 +1 @@ -06adb1848e6b87fbe1ced77ec0f91e4c vlc-1.1.9.tar.bz2 +066cb94b1e3aa848d828121354d6be4d vlc-1.1.10.tar.bz2 Index: vlc.spec =================================================================== RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v retrieving revision 1.108 retrieving revision 1.109 diff -u -r1.108 -r1.109 --- vlc.spec 12 Apr 2011 17:56:58 -0000 1.108 +++ vlc.spec 7 Jun 2011 10:21:06 -0000 1.109 @@ -1,8 +1,8 @@ #global live555_date 2009.07.28 #global vlc_rc -rc3 %global vlc_bootstrap 1 -%global tarball_version 1.1.9 -#global _with_workaround_circle_deps 1 +%global tarball_version 1.1.10 +%global _with_workaround_circle_deps 1 %global _with_freeworld 1 %if 0%{?_with_freeworld:1} %global _with_a52dec --with-a52dec @@ -19,16 +19,13 @@ %global _with_live555 --with-live555 %global _with_vaapi --with-vaapi %endif -%if 0%{?fedora} > 14 -# Those need works in Rawhide -%global _without_mozilla 1 -%else +%if 0%{?fedora} < 15 %global _with_gnomevfs 1 %endif Summary: The cross-platform open-source multimedia framework, player and server Name: vlc -Version: 1.1.9 +Version: 1.1.10 Release: 1%{?dist} License: GPLv2+ Group: Applications/Multimedia @@ -41,6 +38,7 @@ Patch3: vlc-1.1.6-hardode_font_patch.patch Patch4: vlc-1.1.4-tls_path.patch Patch5: vlc-1.1.8-bugfix.opencv22.patch +Patch6: vlc-1.1-backport_20110607.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: desktop-file-utils @@ -253,6 +251,7 @@ %if 0%{?fedora} >= 15 %patch5 -p1 -b .opencv22 %endif +%patch6 -p1 sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in rm modules/access/videodev2.h @@ -564,6 +563,11 @@ %changelog +* Mon Jun 06 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.10-1 +- Update to 1.1.10 +- backport from 1.1-bugfix +- Re-add mozilla-vlc for f15 + * Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 1.1.9-1 - Update to 1.1.9