Accepting request 288342 from home:dimstar:branches:multimedia:libs

Update to version 2.2.0 - getting it to the users ASAP; we can add more features as we go along

OBS-URL: https://build.opensuse.org/request/show/288342
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=96
This commit is contained in:
2015-03-01 17:33:44 +00:00
committed by Git OBS Bridge
parent 7cc0d9f63a
commit 0bdbb67551
5 changed files with 57 additions and 303 deletions

View File

@@ -18,7 +18,7 @@
%define libvlc 5
%define libvlccore 7
%define libvlccore 8
%define conflicts vlc-beta
# Currently no ncurses support. Will have to find the right trick for integrating curses (which is a curse)
@@ -37,7 +37,7 @@ Summary: Video Lan Client multimedia player
License: GPL-2.0+ and LGPL-2.1+
Group: Productivity/Multimedia/Video/Players
Name: vlc
Version: 2.1.5
Version: 2.2.0
Release: 0
Url: http://www.videolan.org/
Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{version}.tar.xz
@@ -45,8 +45,6 @@ Source: http://download.videolan.org/%{name}/%{version}/%{name}-%{versio
Source1: %{name}.changes
# PATCH-FIX-OPENSUSE vlc-2.1.5-fix-skins2-default-skin-creation.patch -- see description in patch header
Patch1: vlc-2.1.5-fix-skins2-default-skin-creation.patch
# PATCH-FIX-UPSTREAM vlc-CVE-2014-9625.patch boo#914268 CVE-2014-9625 dimstar@opensuse.org -- Fix various buffer overflows and null ptr deref
Patch2: vlc-CVE-2014-9625.patch
Patch3: 0001-no-return-in-non-void.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: Mesa-devel
@@ -304,7 +302,6 @@ for gnome-vfs2.
%prep
%setup -q
%patch1 -p1
%patch2 -p1
%patch3 -p1
# We do not rely on contrib but make use of system libraries
rm -rf contrib
@@ -479,7 +476,7 @@ done
%{_libdir}/vlc/plugins//video_filter/libremoteosd_plugin.so
%{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/video_filter/libpanoramix_plugin.so
%{_libdir}/vlc/plugins/video_splitter/libpanoramix_plugin.so
%{_libdir}/vlc/plugins/video_output/libxcb_glx_plugin.so
%endif
%if %{with opengles}
@@ -487,8 +484,10 @@ done
%{_libdir}/vlc/plugins/video_output/libgles2_plugin.so
%endif
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so
%if 0%{?suse_version} >= 1220
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
%{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
%endif
%files noX-lang -f vlc.lang
@@ -539,22 +538,17 @@ done
%dir %{_libdir}/vlc/plugins/lua
%dir %{_libdir}/vlc/plugins/meta_engine
%dir %{_libdir}/vlc/plugins/misc
%ifarch %{ix86} x86_64
%dir %{_libdir}/vlc/plugins/mmx
%endif
%dir %{_libdir}/vlc/plugins/mux
%dir %{_libdir}/vlc/plugins/notify
%dir %{_libdir}/vlc/plugins/packetizer
%dir %{_libdir}/vlc/plugins/services_discovery
%ifarch %{ix86} x86_64
%dir %{_libdir}/vlc/plugins/sse2
%endif
%dir %{_libdir}/vlc/plugins/stream_filter
%dir %{_libdir}/vlc/plugins/stream_out
%dir %{_libdir}/vlc/plugins/text_renderer
%dir %{_libdir}/vlc/plugins/video_chroma
%dir %{_libdir}/vlc/plugins/video_filter
%dir %{_libdir}/vlc/plugins/video_output
%dir %{_libdir}/vlc/plugins/video_splitter
%dir %{_libdir}/vlc/plugins/visualization
# Files explicitly listed... so we are in full control of what goes to -noX, -codec or the X-depending pkg.
%{_libdir}/vlc/vlc-cache-gen
@@ -564,7 +558,6 @@ done
%{_libdir}/vlc/lua/intf/dumpmeta.luac
%{_libdir}/vlc/lua/intf/http.luac
%{_libdir}/vlc/lua/intf/luac.luac
%{_libdir}/vlc/lua/intf/modules/common.luac
%{_libdir}/vlc/lua/intf/modules/host.luac
%{_libdir}/vlc/lua/intf/modules/httprequests.luac
%{_libdir}/vlc/lua/intf/telnet.luac
@@ -574,6 +567,7 @@ done
%{_libdir}/vlc/lua/meta/art/03_lastfm.luac
%{_libdir}/vlc/lua/meta/fetcher/tvrage.luac
%{_libdir}/vlc/lua/meta/reader/filename.luac
%{_libdir}/vlc/lua/modules/common.luac
%{_libdir}/vlc/lua/modules/dkjson.luac
%{_libdir}/vlc/lua/modules/sandbox.luac
%{_libdir}/vlc/lua/modules/simplexml.luac
@@ -606,6 +600,7 @@ done
%{_libdir}/vlc/lua/playlist/youtube_homepage.luac
%{_libdir}/vlc/lua/playlist/zapiks.luac
%{_libdir}/vlc/lua/sd/fmc.luac
%{_libdir}/vlc/lua/sd/icast.luac
%{_libdir}/vlc/lua/sd/icecast.luac
%{_libdir}/vlc/lua/sd/jamendo.luac
%{_libdir}/vlc/lua/sd/metachannels.luac
@@ -613,23 +608,23 @@ done
%{_libdir}/vlc/plugins/altivec/libi420_yuy2_altivec_plugin.so
%endif
%{_libdir}/vlc/plugins/access/libaccess_alsa_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_attachment_plugin.so
%{_libdir}/vlc/plugins/access/libattachment_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_bd_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_ftp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_http_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_imem_plugin.so
%{_libdir}/vlc/plugins/access/libftp_plugin.so
%{_libdir}/vlc/plugins/access/libhttp_plugin.so
%{_libdir}/vlc/plugins/access/libimem_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_jack_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_mms_plugin.so
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so
%endif
%{_libdir}/vlc/plugins/access/libaccess_rar_plugin.so
%{_libdir}/vlc/plugins/access/librar_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_sftp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_smb_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_tcp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_udp_plugin.so
%{_libdir}/vlc/plugins/access/libaccess_vdr_plugin.so
%{_libdir}/vlc/plugins/access/libsftp_plugin.so
%{_libdir}/vlc/plugins/access/libsmb_plugin.so
%{_libdir}/vlc/plugins/access/libtcp_plugin.so
%{_libdir}/vlc/plugins/access/libudp_plugin.so
%{_libdir}/vlc/plugins/access/libvdr_plugin.so
%{_libdir}/vlc/plugins/access/libcdda_plugin.so
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/access/libdc1394_plugin.so
@@ -652,7 +647,6 @@ done
%{_libdir}/vlc/plugins/access/librtp_plugin.so
%{_libdir}/vlc/plugins/access/libsdp_plugin.so
%{_libdir}/vlc/plugins/access/libshm_plugin.so
%{_libdir}/vlc/plugins/access/libstream_filter_rar_plugin.so
%{_libdir}/vlc/plugins/access/libtimecode_plugin.so
%{_libdir}/vlc/plugins/access/libv4l2_plugin.so
%{_libdir}/vlc/plugins/access/libvcd_plugin.so
@@ -660,7 +654,7 @@ done
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%endif
%if 0%{?suse_version} >= 1310
%{_libdir}/vlc/plugins/access/liblibvnc_plugin.so
%{_libdir}/vlc/plugins/access/libvnc_plugin.so
%endif
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so
@@ -711,7 +705,6 @@ done
%{_libdir}/vlc/plugins/codec/libcdg_plugin.so
%{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so
%{_libdir}/vlc/plugins/codec/libddummy_plugin.so
%{_libdir}/vlc/plugins/codec/libdirac_plugin.so
%{_libdir}/vlc/plugins/codec/libdts_plugin.so
%{_libdir}/vlc/plugins/codec/libdvbsub_plugin.so
%{_libdir}/vlc/plugins/codec/libedummy_plugin.so
@@ -720,6 +713,7 @@ done
%{_libdir}/vlc/plugins/codec/libfluidsynth_plugin.so
%endif
%{_libdir}/vlc/plugins/codec/libg711_plugin.so
%{_libdir}/vlc/plugins/codec/libjpeg_plugin.so
%{_libdir}/vlc/plugins/codec/libkate_plugin.so
%{_libdir}/vlc/plugins/codec/liblpcm_plugin.so
%{_libdir}/vlc/plugins/codec/libmpeg_audio_plugin.so
@@ -732,8 +726,12 @@ done
%{_libdir}/vlc/plugins/codec/libstl_plugin.so
%{_libdir}/vlc/plugins/codec/libscte27_plugin.so
%{_libdir}/vlc/plugins/codec/libsubsdec_plugin.so
%{_libdir}/vlc/plugins/codec/libsubstx3g_plugin.so
%{_libdir}/vlc/plugins/codec/libsubsusf_plugin.so
%{_libdir}/vlc/plugins/codec/libsvcdsub_plugin.so
%if 0%{?suse_version} > 1320
%{_libdir}/vlc/plugins/codec/libsvgdec_plugin.so
%endif
%{_libdir}/vlc/plugins/codec/libt140_plugin.so
%{_libdir}/vlc/plugins/codec/libtelx_plugin.so
%{_libdir}/vlc/plugins/codec/libtheora_plugin.so
@@ -747,22 +745,22 @@ done
%{_libdir}/vlc/plugins/control/libdummy_plugin.so
%{_libdir}/vlc/plugins/control/libgestures_plugin.so
%{_libdir}/vlc/plugins/control/libhotkeys_plugin.so
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/control/libglobalhotkeys_plugin.so
%endif
%{_libdir}/vlc/plugins/control/liblirc_plugin.so
%{_libdir}/vlc/plugins/control/libmotion_plugin.so
%{_libdir}/vlc/plugins/control/libnetsync_plugin.so
%{_libdir}/vlc/plugins/control/liboldrc_plugin.so
%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so
%{_libdir}/vlc/plugins/demux/libaiff_plugin.so
%{_libdir}/vlc/plugins/demux/libasf_plugin.so
%{_libdir}/vlc/plugins/demux/libau_plugin.so
%{_libdir}/vlc/plugins/demux/libavi_plugin.so
%{_libdir}/vlc/plugins/demux/libcaf_plugin.so
%{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so
%{_libdir}/vlc/plugins/demux/libdemux_stl_plugin.so
%{_libdir}/vlc/plugins/demux/libdemuxdump_plugin.so
%{_libdir}/vlc/plugins/demux/libdirac_plugin.so
%{_libdir}/vlc/plugins/demux/libdiracsys_plugin.so
%{_libdir}/vlc/plugins/demux/libes_plugin.so
%{_libdir}/vlc/plugins/demux/libhevc_plugin.so
%{_libdir}/vlc/plugins/demux/libflacsys_plugin.so
%{_libdir}/vlc/plugins/demux/libgme_plugin.so
%{_libdir}/vlc/plugins/demux/libh264_plugin.so
@@ -797,6 +795,8 @@ done
%{_libdir}/vlc/plugins/lua/liblua_plugin.so
%{_libdir}/vlc/plugins/meta_engine/libfolder_plugin.so
%{_libdir}/vlc/plugins/meta_engine/libtaglib_plugin.so
%{_libdir}/vlc/plugins/misc/libaddonsfsstorage_plugin.so
%{_libdir}/vlc/plugins/misc/libaddonsvorepository_plugin.so
%{_libdir}/vlc/plugins/misc/libaudioscrobbler_plugin.so
%{_libdir}/vlc/plugins/misc/libdbus_screensaver_plugin.so
%{_libdir}/vlc/plugins/misc/libexport_plugin.so
@@ -813,13 +813,6 @@ done
%{_libdir}/vlc/plugins/misc/libxdg_screensaver_plugin.so
%endif
%{_libdir}/vlc/plugins/misc/libxml_plugin.so
%ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/mmx/libi420_rgb_mmx_plugin.so
%{_libdir}/vlc/plugins/mmx/libi420_yuy2_mmx_plugin.so
%{_libdir}/vlc/plugins/mmx/libi422_yuy2_mmx_plugin.so
#{_libdir}/vlc/plugins/mmx/libmemcpymmx_plugin.so
#{_libdir}/vlc/plugins/mmxext/libmemcpymmxext_plugin.so
%endif
%{_libdir}/vlc/plugins/mux/libmux_asf_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_avi_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_dummy_plugin.so
@@ -833,6 +826,7 @@ done
%{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_flac_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_h264_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_hevc_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_mlp_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4audio_plugin.so
%{_libdir}/vlc/plugins/packetizer/libpacketizer_mpeg4video_plugin.so
@@ -851,11 +845,6 @@ done
%if 0%{?suse_version} >= 1140
%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so
%endif
%ifarch %{ix86} x86_64
%{_libdir}/vlc/plugins/sse2/libi420_rgb_sse2_plugin.so
%{_libdir}/vlc/plugins/sse2/libi420_yuy2_sse2_plugin.so
%{_libdir}/vlc/plugins/sse2/libi422_yuy2_sse2_plugin.so
%endif
%{_libdir}/vlc/plugins/stream_filter/libdecomp_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libdash_plugin.so
%{_libdir}/vlc/plugins/stream_filter/libhttplive_plugin.so
@@ -881,14 +870,21 @@ done
%{_libdir}/vlc/plugins/stream_out/libstream_out_setid_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_smem_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_standard_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_stats_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_transcode_plugin.so
%{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so
%{_libdir}/vlc/plugins/text_renderer/libtdummy_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_mmx_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_rgb_sse2_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_mmx_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_sse2_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_mmx_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_sse2_plugin.so
%{_libdir}/vlc/plugins/video_chroma/librv32_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libyuy2_i420_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libyuy2_i422_plugin.so
@@ -903,14 +899,15 @@ done
%{_libdir}/vlc/plugins/video_filter/libblendbench_plugin.so
%{_libdir}/vlc/plugins/video_filter/libbluescreen_plugin.so
%{_libdir}/vlc/plugins/video_filter/libcanvas_plugin.so
%{_libdir}/vlc/plugins/video_filter/libchain_plugin.so
%{_libdir}/vlc/plugins/video_filter/libclone_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libchain_plugin.so
%{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so
%{_libdir}/vlc/plugins/video_filter/libcolorthres_plugin.so
%{_libdir}/vlc/plugins/video_filter/libcroppadd_plugin.so
%{_libdir}/vlc/plugins/video_filter/libdeinterlace_plugin.so
%{_libdir}/vlc/plugins/video_filter/libdynamicoverlay_plugin.so
%{_libdir}/vlc/plugins/video_filter/liberase_plugin.so
%{_libdir}/vlc/plugins/video_filter/libextract_plugin.so
%{_libdir}/vlc/plugins/video_filter/libfreeze_plugin.so
%{_libdir}/vlc/plugins/video_filter/libgaussianblur_plugin.so
%{_libdir}/vlc/plugins/video_filter/libgradfun_plugin.so
%{_libdir}/vlc/plugins/video_filter/libgradient_plugin.so
@@ -924,6 +921,7 @@ done
%{_libdir}/vlc/plugins/video_filter/libmosaic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
%{_libdir}/vlc/plugins/video_filter/liboldmovie_plugin.so
%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
@@ -939,11 +937,12 @@ done
%{_libdir}/vlc/plugins/video_filter/libsepia_plugin.so
%{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
%{_libdir}/vlc/plugins/video_filter/libsubsdelay_plugin.so
%{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so
%{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so
%endif
%{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
%{_libdir}/vlc/plugins/video_filter/libwall_plugin.so
%{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so
%{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
%{_libdir}/vlc/plugins/video_filter/libyuvp_plugin.so
%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so
@@ -996,7 +995,7 @@ done
%files gnome
%defattr(-,root,root)
%{_libdir}/vlc/plugins/access/libaccess_gnomevfs_plugin.so
%{_libdir}/vlc/plugins/access/libgnomevfs_plugin.so
%files devel
%defattr(-,root,root)