ebasov
/
vlc
forked from rpms/vlc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to 2.2.0-rc1

Browse Source
el8
Nicolas Chauvet 10 years ago
parent 71897acdcd
commit c1f38c75bc
5 changed files with 35 additions and 90 deletions
Show Stats Download Patch File Download Diff File

2
.gitignore vendored
Unescape View File

@ -1 +1 @@
vlc-2.1.5.tar.xz vlc-2.2.0-rc1.tar.xz

2
sources
Unescape View File

@ -1 +1 @@
3941b561f590cc95ca5e795213cba2f2 vlc-2.1.5.tar.xz 0aac1f5f1f6e659770db225768f31f29 vlc-2.2.0-rc1.tar.xz

11
vlc-2.1.5-ffmpeg-2.4-bug.patch
Unescape View File

@ -1,11 +0,0 @@
--- a/modules/demux/avformat/demux.c 2013-12-03 10:12:34.000000000 +0100
+++ b/modules/demux/avformat/demux.c 2014-10-12 22:07:54.044769366 +0200
@@ -106,7 +106,7 @@ int OpenDemux( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys;
- AVProbeData pd;
+ AVProbeData pd = {0};
AVInputFormat *fmt = NULL;
unsigned int i;
int64_t i_start_time = -1;

16
vlc-2.1.5-ffmpeg-2.4.patch
Unescape View File

@ -1,16 +0,0 @@
diff --git a/configure.ac b/configure.ac
index a684338..053713a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2242,8 +2242,8 @@ AC_ARG_ENABLE(avcodec,
[ --enable-avcodec libavcodec codec (default enabled)])
AS_IF([test "${enable_avcodec}" != "no"], [
PKG_CHECK_MODULES(AVCODEC,[libavcodec >= 53.34.0 libavutil >= 51.22.0], [
- PKG_CHECK_EXISTS([libavcodec < 56],, [
- AC_MSG_ERROR([libavcodec versions 56 and later are not supported yet.])
+ PKG_CHECK_EXISTS([libavcodec < 57],, [
+ AC_MSG_ERROR([libavcodec versions 57 and later are not supported yet.])
])
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${AVCODEC_CFLAGS}"

94
vlc.spec
Unescape View File

@ -1,46 +1,45 @@
#global vlc_rc -rc1 %global vlc_rc -rc1
%global _with_bootstrap 1 %global _with_bootstrap 1
%global _with_workaround_circle_deps 1 %global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1} %if 0%{?!_without_freeworld:1}
%global _with_a52dec --with-a52dec %global _with_a52dec 1
%global _with_faad2 --with-faad2 %global _with_faad2 1
%global _with_ffmpeg --with-ffmpeg %global _with_ffmpeg 1
%global _with_libdca --with-libdca %global _with_libdca 1
%global _with_libdvbpsi --with-libdvbpsi %global _with_libdvbpsi 1
%global _with_libmad --with-libmad %global _with_libmad 1
%global _with_libmpeg2 --with-libmpeg2 %global _with_libmpeg2 1
%global _with_twolame --with-twolame %global _with_twolame 1
%global _with_x264 --with-x264 %global _with_x264 1
%global _with_xvidcore --with-xvidcore %ifarch x86_64 i686
%global _with_live555 --with-live555 # Currenly broken on armhfp
%global _with_vaapi --with-vaapi %global _with_x265 1
%endif
%global _with_xvidcore 1
%global _with_live555 1
%global _with_vaapi 1
%endif %endif
%if 0%{?fedora}
%global _with_fluidsynth 1
%global _with_bluray 1 %global _with_bluray 1
%global _with_opencv 1 %global _with_opencv 1
%ifarch x86_64 i686 %global _with_fluidsynth 1
%global _with_crystalhd 1 %if 0%{?fedora}
%endif %global _with_freerdp 1
%global _with_projectm 1 %global _with_projectm 1
%global _with_schroedinger 1 %global _with_schroedinger 1
%endif %endif
%if 0%{?fedora} < 21 %ifarch x86_64 i686
%global _with_freerdp 1 %global _with_crystalhd 1
%endif %endif
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: 2.1.5 Version: 2.2.0
Release: 7%{?dist} Release: 0.1%{?dist}
License: GPLv2+ License: GPLv2+
Group: Applications/Multimedia Group: Applications/Multimedia
URL: http://www.videolan.org URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{?vlc_rc}.tar.xz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Patch0: vlc-2.1.5-ffmpeg-2.4.patch
Patch1: vlc-2.1.5-ffmpeg-2.4-bug.patch
BuildRequires: desktop-file-utils BuildRequires: desktop-file-utils
@ -55,7 +54,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: avahi-devel BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel BuildRequires: cdparanoia-devel
BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(dbus-1)
BuildRequires: dirac-devel >= 1.0.0
%{?_with_faad2:BuildRequires: faad2-devel} %{?_with_faad2:BuildRequires: faad2-devel}
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0} %{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel BuildRequires: flac-devel
@ -137,6 +135,7 @@ BuildRequires: taglib-devel
%{?_with_twolame:BuildRequires: twolame-devel} %{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21} %{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028} %{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
%{?_with_x265:BuildRequires: x265-devel}
%{?_with_xvidcore:BuildRequires: xvidcore-devel} %{?_with_xvidcore:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel BuildRequires: zlib-devel
BuildRequires: zvbi-devel BuildRequires: zvbi-devel
@ -196,9 +195,6 @@ Summary: VLC media player core
Group: Applications/Multimedia Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release} Provides: vlc-nox = %{version}-%{release}
Obsoletes: vlc-nox < 1.1.5-2 Obsoletes: vlc-nox < 1.1.5-2
#Deprecated since F-19, can be dropped by F-21/EL-7
%{?live555date:Requires: live555date%{_isa} = %{live555date}}
#Introduced in F-19
%{?live555_version:Requires: live555%{?_isa} = %{live555_version}} %{?live555_version:Requires: live555%{?_isa} = %{live555_version}}
%description core %description core
@ -224,8 +220,6 @@ JACK audio plugin for the VLC media player.
%prep %prep
%setup -q -n %{name}-%{version}%{?vlc_rc} %setup -q -n %{name}-%{version}%{?vlc_rc}
%patch0 -p1 -b .ffmpeg24
%patch1 -p1 -b .ffmpeg24bug
%{?_with_bootstrap: %{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || : rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@ -250,9 +244,11 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
%{?_with_gnomevfs:--enable-gnomevfs} \ %{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \ %{?_with_vcdimager:--enable-vcdx} \
--enable-omxil \ --enable-omxil \
%ifarch armv5tel armv6l armv6hl
--enable-omxil-vout \ --enable-omxil-vout \
%ifarch armv6hl
--enable-rpi-omxil \ --enable-rpi-omxil \
--enable-mmal-codec \
--enable-mmal-vout \
%endif %endif
%{!?_with_a52dec:--disable-a52} \ %{!?_with_a52dec:--disable-a52} \
%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \ %{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
@ -265,7 +261,6 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-tremor \ --enable-tremor \
--enable-speex \ --enable-speex \
--enable-theora \ --enable-theora \
--enable-dirac \
--enable-libass \ --enable-libass \
--enable-shout \ --enable-shout \
%{!?_without_xcb:--enable-xcb --enable-xvideo} \ %{!?_without_xcb:--enable-xcb --enable-xvideo} \
@ -276,10 +271,7 @@ rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
--enable-jack \ --enable-jack \
--enable-pulse \ --enable-pulse \
--enable-ncurses \ --enable-ncurses \
--enable-lirc \ --enable-lirc
%if 0%{?fedora} < 19
--disable-vdpau \
%endif
%if 0 %if 0
@ -299,8 +291,6 @@ make %{?_smp_mflags}
%install %install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p" make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p" CPPROG="cp -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';' find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} ';'
@ -325,10 +315,6 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/vlc
%find_lang %{name} %find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post %post
touch --no-create %{_datadir}/icons/hicolor touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@ -377,7 +363,6 @@ fi || :
%files %files
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS %doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_datadir}/applications/*%{name}.desktop %{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop %{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
@ -394,14 +379,11 @@ fi || :
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{!?_without_xcb: %{!?_without_xcb:
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
%if 0%{?fedora} < 17
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so #{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
} }
%{_libdir}/vlc/plugins/gui/libskins2_plugin.so %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_projectm: %{?_with_projectm:
@ -410,7 +392,6 @@ fi || :
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so %{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang %files core -f %{name}.lang
%defattr(-,root,root,-)
%{_bindir}/vlc %{_bindir}/vlc
%{_bindir}/cvlc %{_bindir}/cvlc
%{_bindir}/nvlc %{_bindir}/nvlc
@ -446,7 +427,7 @@ fi || :
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so %exclude %{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so %exclude %{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so
%exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so %exclude %{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so
%exclude %{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so #{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
} }
%exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so %exclude %{_libdir}/vlc/plugins/gui/libskins2_plugin.so
%{?_with_opencv: %{?_with_opencv:
@ -462,7 +443,6 @@ fi || :
%{_mandir}/man1/vlc*.1* %{_mandir}/man1/vlc*.1*
%files plugin-jack %files plugin-jack
%defattr(-,root,root,-)
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so %{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so %{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%{?_with_fluidsynth: %{?_with_fluidsynth:
@ -470,7 +450,6 @@ fi || :
} }
%files extras %files extras
%defattr(-,root,root,-)
%{?_with_opencv: %{?_with_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so %{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
@ -485,7 +464,6 @@ fi || :
} }
%files devel %files devel
%defattr(-,root,root,-)
%dir %{_includedir}/vlc %dir %{_includedir}/vlc
%{_includedir}/vlc/* %{_includedir}/vlc/*
%{_libdir}/*.so %{_libdir}/*.so
@ -495,14 +473,8 @@ fi || :
%changelog %changelog
* Thu Nov 06 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.1.5-7 * Fri Nov 14 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.2.0-0.1
- Fix for flv - rfbz#3401 - Update to 2.2.0-rc1
* Wed Nov 05 2014 Nicolas Chauvet <kwizart@gmail.com> - 2.1.5-6
- Rebuilt for vaapi 0.36
* Sun Oct 19 2014 Sérgio Basto <sergio@serjux.com> - 2.1.5-5
- Rebuilt for FFmpeg 2.4.3
* Sun Sep 28 2014 kwizart <kwizart@gmail.com> - 2.1.5-4 * Sun Sep 28 2014 kwizart <kwizart@gmail.com> - 2.1.5-4
- Allow build with ffmpeg24 - Allow build with ffmpeg24

Write Preview
Loading…
Cancel
Save