From f281f4cce634425753cbd972d90a34ad8aba03168fd513e5c055bdde354b2c2d Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 25 Jul 2018 14:06:27 +0000 Subject: [PATCH] Updating link to change in openSUSE:Factory/vlc revision 88.0 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=4caa3ef34315fad5efdaf0a6cccc828b --- vlc.changes | 11 ++++++++ vlc.spec | 74 +++++++++++++++++++++++++++-------------------------- 2 files changed, 49 insertions(+), 36 deletions(-) diff --git a/vlc.changes b/vlc.changes index b462671..413f281 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue Jul 17 12:25:26 UTC 2018 - hpj@urpla.net + +- fix last change for openSUSE < 1500 + conditionally include libglconv_vaapi_wl_plugin.so only + +------------------------------------------------------------------- +Fri Jul 13 09:26:34 UTC 2018 - dimstar@opensuse.org + +- Move plugins that link X-libraries from vlc-noX to vlc. + ------------------------------------------------------------------- Mon Jun 25 16:14:10 UTC 2018 - dimstar@opensuse.org diff --git a/vlc.spec b/vlc.spec index f50637c..ac51d7c 100644 --- a/vlc.spec +++ b/vlc.spec @@ -571,22 +571,60 @@ done %{_datadir}/solid %dir %{_datadir}/kde4 %dir %{_datadir}/kde4/apps +%{_libdir}/vlc/libvlc_pulse.so +%{_libdir}/vlc/libvlc_pulse.so.0 +%{_libdir}/vlc/libvlc_pulse.so.0.0.0 %{_libdir}/vlc/libvlc_xcb_events.so %{_libdir}/vlc/libvlc_xcb_events.so.0 %{_libdir}/vlc/libvlc_xcb_events.so.0.0.0 +%{_libdir}/vlc/plugins/access/libavio_plugin.so +%{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so +%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so +%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so +%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so %{_libdir}/vlc/plugins/codec/liblibass_plugin.so %if 0%{?is_opensuse} %{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so %endif +%{_libdir}/vlc/plugins/control/libxcb_hotkeys_plugin.so +%{_libdir}/vlc/plugins/demux/libavformat_plugin.so %{_libdir}/vlc/plugins/gui/libskins2_plugin.so +%{_libdir}/vlc/plugins/notify/libnotify_plugin.so +%{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so +%{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so +%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so +%if 0%{?is_opensuse} +%{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so +%endif %{_libdir}/vlc/plugins/text_renderer/libfreetype_plugin.so +%{_libdir}/vlc/plugins/text_renderer/libsvg_plugin.so +%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} +%{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so +%endif +%if 0%{?is_opensuse} +%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so +%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so +%endif %{_libdir}/vlc/plugins/video_output/libaa_plugin.so +%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %{_libdir}/vlc/plugins/video_output/libegl_x11_plugin.so +%if 0%{?suse_version} >= 1500 && 0%{?is_opensuse} +%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so +%endif %if %{with opengles} %{_libdir}/vlc/plugins/video_output/libgles2_plugin.so %endif +%{_libdir}/vlc/plugins/video_output/libglx_plugin.so +%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so +%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so +%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so %{_libdir}/vlc/plugins/video_splitter/libpanoramix_plugin.so %{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so +%if 0%{?is_opensuse} +%ifarch %{ix86} x86_64 +%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so +%endif +%endif %files lang -f vlc.lang @@ -610,9 +648,6 @@ done %{_mandir}/man1/vlc* # Own the file.. but it's an auto-generated file, so ghost it. %ghost %{_libdir}/vlc/plugins/plugins.dat -%{_libdir}/vlc/libvlc_pulse.so -%{_libdir}/vlc/libvlc_pulse.so.0 -%{_libdir}/vlc/libvlc_pulse.so.0.0.0 %dir %{_libdir}/vlc %dir %{_libdir}/vlc/lua %dir %{_libdir}/vlc/lua/extensions @@ -698,7 +733,6 @@ done %{_libdir}/vlc/plugins/access/libaccess_mtp_plugin.so %{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so %{_libdir}/vlc/plugins/access/libattachment_plugin.so -%{_libdir}/vlc/plugins/access/libavio_plugin.so %{_libdir}/vlc/plugins/access/libcdda_plugin.so %{_libdir}/vlc/plugins/access/libdc1394_plugin.so %{_libdir}/vlc/plugins/access/libdtv_plugin.so @@ -716,7 +750,6 @@ done %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so %{_libdir}/vlc/plugins/access/liblive555_plugin.so -%{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so %if 0%{?suse_version} < 1330 && ( 0%{?sle_version} < 120200 || 0%{?is_opensuse} < 1 ) %{_libdir}/vlc/plugins/access/librdp_plugin.so %endif @@ -738,7 +771,6 @@ done %if %{with vnc} %{_libdir}/vlc/plugins/access/libvnc_plugin.so %endif -%{_libdir}/vlc/plugins/access/libxcb_screen_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_dummy_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_file_plugin.so %{_libdir}/vlc/plugins/access_output/libaccess_output_http_plugin.so @@ -778,12 +810,10 @@ done %{_libdir}/vlc/plugins/audio_output/libafile_plugin.so %{_libdir}/vlc/plugins/audio_output/libalsa_plugin.so %{_libdir}/vlc/plugins/audio_output/libamem_plugin.so -%{_libdir}/vlc/plugins/audio_output/libpulse_plugin.so %{_libdir}/vlc/plugins/codec/liba52_plugin.so %{_libdir}/vlc/plugins/codec/libadpcm_plugin.so %{_libdir}/vlc/plugins/codec/libaes3_plugin.so %{_libdir}/vlc/plugins/codec/libaraw_plugin.so -%{_libdir}/vlc/plugins/codec/libavcodec_plugin.so %{_libdir}/vlc/plugins/codec/libcc_plugin.so %{_libdir}/vlc/plugins/codec/libcdg_plugin.so %{_libdir}/vlc/plugins/codec/libcvdsub_plugin.so @@ -838,12 +868,10 @@ done %{_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/libadaptive_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/libavformat_plugin.so %{_libdir}/vlc/plugins/demux/libavi_plugin.so %{_libdir}/vlc/plugins/demux/libcaf_plugin.so %{_libdir}/vlc/plugins/demux/libdemux_cdg_plugin.so @@ -919,9 +947,7 @@ done %{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so %{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so %{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so -%{_libdir}/vlc/plugins/notify/libnotify_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_a52_plugin.so -%{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_copy_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_dirac_plugin.so %{_libdir}/vlc/plugins/packetizer/libpacketizer_dts_plugin.so @@ -938,13 +964,11 @@ done %{_libdir}/vlc/plugins/services_discovery/libmediadirs_plugin.so %{_libdir}/vlc/plugins/services_discovery/libmtp_plugin.so %{_libdir}/vlc/plugins/services_discovery/libpodcast_plugin.so -%{_libdir}/vlc/plugins/services_discovery/libpulselist_plugin.so %{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so %{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so %if 0%{?is_opensuse} %{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so %endif -%{_libdir}/vlc/plugins/services_discovery/libxcb_apps_plugin.so %{_libdir}/vlc/plugins/spu/libaudiobargraph_v_plugin.so %{_libdir}/vlc/plugins/spu/libdynamicoverlay_plugin.so %{_libdir}/vlc/plugins/spu/liblogo_plugin.so @@ -965,9 +989,6 @@ done %{_libdir}/vlc/plugins/stream_filter/libskiptags_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so -%if 0%{?is_opensuse} -%{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so -%endif %{_libdir}/vlc/plugins/stream_out/libstream_out_chromecast_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_cycle_plugin.so %{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so @@ -985,7 +1006,6 @@ done %{_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/libchain_plugin.so %{_libdir}/vlc/plugins/video_chroma/libgrey_yuv_plugin.so @@ -1006,9 +1026,6 @@ done %{_libdir}/vlc/plugins/video_chroma/libi420_yuy2_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_i420_plugin.so %{_libdir}/vlc/plugins/video_chroma/libi422_yuy2_plugin.so -%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG} -%{_libdir}/vlc/plugins/video_chroma/libswscale_plugin.so -%endif %{_libdir}/vlc/plugins/video_chroma/librv32_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuvp_plugin.so %{_libdir}/vlc/plugins/video_chroma/libyuy2_i420_plugin.so @@ -1053,10 +1070,8 @@ done %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so %{_libdir}/vlc/plugins/video_filter/libvhs_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so -%{_libdir}/vlc/plugins/video_output/libcaca_plugin.so %if 0%{?suse_version} >= 1500 && 0%{?is_opensuse} %{_libdir}/vlc/plugins/video_output/libegl_wl_plugin.so -%{_libdir}/vlc/plugins/video_output/libglconv_vaapi_wl_plugin.so %{_libdir}/vlc/plugins/video_output/libwl_shell_plugin.so %{_libdir}/vlc/plugins/video_output/libwl_shm_plugin.so %{_libdir}/vlc/plugins/video_output/libxdg_shell_plugin.so @@ -1066,24 +1081,11 @@ done %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_drm_plugin.so %{_libdir}/vlc/plugins/video_output/libglconv_vaapi_x11_plugin.so %{_libdir}/vlc/plugins/video_output/libgl_plugin.so -%{_libdir}/vlc/plugins/video_output/libglx_plugin.so %{_libdir}/vlc/plugins/video_output/libvdummy_plugin.so %{_libdir}/vlc/plugins/video_output/libvmem_plugin.so -%if 0%{?is_opensuse} -%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so -%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so -%endif -%{_libdir}/vlc/plugins/video_output/libxcb_window_plugin.so -%{_libdir}/vlc/plugins/video_output/libxcb_x11_plugin.so -%{_libdir}/vlc/plugins/video_output/libxcb_xv_plugin.so %{_libdir}/vlc/plugins/video_output/libyuv_plugin.so %{_libdir}/vlc/plugins/video_splitter/libclone_plugin.so %{_libdir}/vlc/plugins/video_splitter/libwall_plugin.so -%if 0%{?is_opensuse} -%ifarch %{ix86} x86_64 -%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so -%endif -%endif %{_libdir}/vlc/plugins/visualization/libvisual_plugin.so %{_libdir}/vlc/plugins/vaapi/libvaapi_filters_plugin.so %{_libdir}/vlc/vlc-cache-gen