Update to 1.1.11

el8
Nicolas Chauvet 14 years ago
parent fb7cdd178f
commit 792347d935

2
.gitignore vendored

@ -1 +1 @@
vlc-1.1.10.tar.bz2 vlc-1.1.11.tar.bz2

@ -1 +1 @@
066cb94b1e3aa848d828121354d6be4d vlc-1.1.10.tar.bz2 a64846d6f21ea179ae8e8bfb6f9447fe vlc-1.1.11.tar.bz2

@ -1,27 +0,0 @@
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
}

@ -1,7 +1,7 @@
#global live555_date 2009.07.28 #global live555_date 2009.07.28
#global vlc_rc -rc3 #global vlc_rc -rc3
%global vlc_bootstrap 1 %global vlc_bootstrap 1
%global tarball_version 1.1.10 %global tarball_version 1.1.11
%global _with_workaround_circle_deps 1 %global _with_workaround_circle_deps 1
%global _with_freeworld 1 %global _with_freeworld 1
%if 0%{?_with_freeworld:1} %if 0%{?_with_freeworld:1}
@ -25,8 +25,8 @@
Summary: The cross-platform open-source multimedia framework, player and server Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc Name: vlc
Version: 1.1.10 Version: 1.1.11
Release: 2%{?dist} Release: 1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.videolan.org URL: http://www.videolan.org
@ -38,7 +38,6 @@ Patch0: vlc-1.1.0-vlc-cache-gen_noerror.patch
Patch3: vlc-1.1.6-hardode_font_patch.patch Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch Patch4: vlc-1.1.4-tls_path.patch
Patch5: vlc-1.1.8-bugfix.opencv22.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) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -251,7 +250,6 @@ JACK audio plugin for the VLC media player.
%if 0%{?fedora} >= 15 %if 0%{?fedora} >= 15
%patch5 -p1 -b .opencv22 %patch5 -p1 -b .opencv22
%endif %endif
%patch6 -p1
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h rm modules/access/videodev2.h
@ -563,6 +561,9 @@ fi || :
%changelog %changelog
* Wed Jul 20 2011 Nicolas Chauvet <kwizart@gmail.com> - 1.1.11-1
- Update to 1.1.11
* Fri Jul 15 2011 Nicolas Chauvet <kwizart@gmail.com> - 1.1.10-2 * Fri Jul 15 2011 Nicolas Chauvet <kwizart@gmail.com> - 1.1.10-2
- Rebuilt for x264 ABI 115 - Rebuilt for x264 ABI 115

Loading…
Cancel
Save