9:28 p.m.
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15826/devel
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
vlc-2.1.5-ffmpeg-2.4-bug.patch vlc-2.1.5-ffmpeg-2.4.patch
Log Message:
Update to 2.2.0-rc1
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -r1.60 -r1.61
--- .cvsignore 26 Jul 2014 14:34:33 -0000 1.60
+++ .cvsignore 14 Nov 2014 21:28:41 -0000 1.61
@@ -1 +1 @@
-vlc-2.1.5.tar.xz
+vlc-2.2.0-rc1.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- sources 26 Jul 2014 14:34:33 -0000 1.70
+++ sources 14 Nov 2014 21:28:41 -0000 1.71
@@ -1 +1 @@
-3941b561f590cc95ca5e795213cba2f2 vlc-2.1.5.tar.xz
+0aac1f5f1f6e659770db225768f31f29 vlc-2.2.0-rc1.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.209
retrieving revision 1.210
diff -u -r1.209 -r1.210
--- vlc.spec 6 Nov 2014 10:49:06 -0000 1.209
+++ vlc.spec 14 Nov 2014 21:28:41 -0000 1.210
@@ -1,46 +1,45 @@
-#global vlc_rc -rc1
+%global vlc_rc -rc1
%global _with_bootstrap 1
%global _with_workaround_circle_deps 1
%if 0%{?!_without_freeworld:1}
-%global _with_a52dec --with-a52dec
-%global _with_faad2 --with-faad2
-%global _with_ffmpeg --with-ffmpeg
-%global _with_libdca --with-libdca
-%global _with_libdvbpsi --with-libdvbpsi
-%global _with_libmad --with-libmad
-%global _with_libmpeg2 --with-libmpeg2
-%global _with_twolame --with-twolame
-%global _with_x264 --with-x264
-%global _with_xvidcore --with-xvidcore
-%global _with_live555 --with-live555
-%global _with_vaapi --with-vaapi
+%global _with_a52dec 1
+%global _with_faad2 1
+%global _with_ffmpeg 1
+%global _with_libdca 1
+%global _with_libdvbpsi 1
+%global _with_libmad 1
+%global _with_libmpeg2 1
+%global _with_twolame 1
+%global _with_x264 1
+%ifarch x86_64 i686
+# Currenly broken on armhfp
+%global _with_x265 1
+%endif
+%global _with_xvidcore 1
+%global _with_live555 1
+%global _with_vaapi 1
%endif
-%if 0%{?fedora}
-%global _with_fluidsynth 1
%global _with_bluray 1
%global _with_opencv 1
-%ifarch x86_64 i686
-%global _with_crystalhd 1
-%endif
+%global _with_fluidsynth 1
+%if 0%{?fedora}
+%global _with_freerdp 1
%global _with_projectm 1
%global _with_schroedinger 1
%endif
-%if 0%{?fedora} < 21
-%global _with_freerdp 1
+%ifarch x86_64 i686
+%global _with_crystalhd 1
%endif
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.1.5
-Release: 7%{?dist}
+Version: 2.2.0
+Release: 0.1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
-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
@@ -55,7 +54,6 @@
BuildRequires: avahi-devel
BuildRequires: cdparanoia-devel
BuildRequires: pkgconfig(dbus-1)
-BuildRequires: dirac-devel >= 1.0.0
%{?_with_faad2:BuildRequires: faad2-devel}
%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9-0}
BuildRequires: flac-devel
@@ -137,6 +135,7 @@
%{?_with_twolame:BuildRequires: twolame-devel}
%{?_with_vcdimager:BuildRequires: vcdimager-devel >= 0.7.21}
%{?_with_x264:BuildRequires: x264-devel >= 0-0.8.20061028}
+%{?_with_x265:BuildRequires: x265-devel}
%{?_with_xvidcore:BuildRequires: xvidcore-devel}
BuildRequires: zlib-devel
BuildRequires: zvbi-devel
@@ -196,9 +195,6 @@
Group: Applications/Multimedia
Provides: vlc-nox = %{version}-%{release}
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}}
%description core
@@ -224,8 +220,6 @@
%prep
%setup -q -n %{name}-%{version}%{?vlc_rc}
-%patch0 -p1 -b .ffmpeg24
-%patch1 -p1 -b .ffmpeg24bug
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -250,9 +244,11 @@
%{?_with_gnomevfs:--enable-gnomevfs} \
%{?_with_vcdimager:--enable-vcdx} \
--enable-omxil \
-%ifarch armv5tel armv6l armv6hl
--enable-omxil-vout \
+%ifarch armv6hl
--enable-rpi-omxil \
+ --enable-mmal-codec \
+ --enable-mmal-vout \
%endif
%{!?_with_a52dec:--disable-a52} \
%{!?_with_ffmpeg:--disable-avcodec --disable-avformat \
@@ -265,7 +261,6 @@
--enable-tremor \
--enable-speex \
--enable-theora \
- --enable-dirac \
--enable-libass \
--enable-shout \
%{!?_without_xcb:--enable-xcb --enable-xvideo} \
@@ -276,10 +271,7 @@
--enable-jack \
--enable-pulse \
--enable-ncurses \
- --enable-lirc \
-%if 0%{?fedora} < 19
- --disable-vdpau \
-%endif
+ --enable-lirc
%if 0
@@ -299,8 +291,6 @@
%install
-rm -rf $RPM_BUILD_ROOT
-
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 '*.a' -exec rm -f {} ';'
@@ -325,10 +315,6 @@
%find_lang %{name}
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
%post
touch --no-create %{_datadir}/icons/hicolor
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
@@ -377,7 +363,6 @@
%files
-%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog NEWS README THANKS
%{_datadir}/applications/*%{name}.desktop
%{_datadir}/kde4/apps/solid/actions/vlc-*.desktop
@@ -394,14 +379,11 @@
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
%{!?_without_xcb:
%{_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_x11_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_window_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
%{?_with_projectm:
@@ -410,7 +392,6 @@
%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so
%files core -f %{name}.lang
-%defattr(-,root,root,-)
%{_bindir}/vlc
%{_bindir}/cvlc
%{_bindir}/nvlc
@@ -446,7 +427,7 @@
%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_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
%{?_with_opencv:
@@ -462,7 +443,6 @@
%{_mandir}/man1/vlc*.1*
%files plugin-jack
-%defattr(-,root,root,-)
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/audio_output/libjack_plugin.so
%{?_with_fluidsynth:
@@ -470,7 +450,6 @@
}
%files extras
-%defattr(-,root,root,-)
%{?_with_opencv:
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
@@ -485,7 +464,6 @@
}
%files devel
-%defattr(-,root,root,-)
%dir %{_includedir}/vlc
%{_includedir}/vlc/*
%{_libdir}/*.so
@@ -495,14 +473,8 @@
%changelog
-* Thu Nov 06 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.5-7
-- Fix for flv - rfbz#3401
-
-* Wed Nov 05 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.1.5-6
-- Rebuilt for vaapi 0.36
-
-* Sun Oct 19 2014 Sérgio Basto <sergio(a)serjux.com> - 2.1.5-5
-- Rebuilt for FFmpeg 2.4.3
+* Fri Nov 14 2014 Nicolas Chauvet <kwizart(a)gmail.com> - 2.2.0-0.1
+- Update to 2.2.0-rc1
* Sun Sep 28 2014 kwizart <kwizart(a)gmail.com> - 2.1.5-4
- Allow build with ffmpeg24
--- vlc-2.1.5-ffmpeg-2.4-bug.patch DELETED ---
--- vlc-2.1.5-ffmpeg-2.4.patch DELETED ---