pool/vlc
SHA256
12
0
Fork 1
Code Issues Pull Requests Activity

Accepting request 346557 from multimedia:libs

Browse Source 
Revert to rev 139 - the SLE fixes broke everything else.. keeping SLE still unresolvable

OBS-URL: https://build.opensuse.org/request/show/346557
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=141
This commit is contained in:
Dominique Leuenberger
2015-11-27 17:17:35 +00:00
committed by Git OBS Bridge
parent 1d67068124
commit 9b98174831
2 changed files with 20 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
vlc.changes
View File

@@ -1,8 +1,3 @@
-------------------------------------------------------------------
Mon Nov 23 11:22:58 UTC 2015 - alarrosa@suse.com
- Fixed build requirements for SLE12
-------------------------------------------------------------------
Sun Nov 22 21:14:44 UTC 2015 - jdelvare@suse.com

52
vlc.spec
View File

@@ -63,12 +63,10 @@ BuildRequires: git
BuildRequires: gnome-vfs2-devel
BuildRequires: gtk2-devel
BuildRequires: libavc1394-devel >= 0.5.3
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: libcddb-devel >= 0.9.5
BuildRequires: libdvbpsi-devel >= 1.0.0
%endif
BuildRequires: libcdio-devel >= 0.78.2
BuildRequires: libdc1394-devel >= 2.1.0
BuildRequires: libdvbpsi-devel >= 1.0.0
BuildRequires: libgcrypt-devel
BuildRequires: libidn-devel
BuildRequires: libjack-devel >= 1.9.7
@@ -81,7 +79,9 @@ BuildRequires: libopus-devel >= 1.0.3
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Widgets)
%if 0%{?suse_version} != 1315
BuildRequires: pkgconfig(Qt5X11Extras)
%endif
%else
BuildRequires: libqt4-devel >= 4.6.0
%endif
@@ -106,9 +106,7 @@ BuildRequires: schroedinger-devel >= 1.0.10
BuildRequires: slang-devel
BuildRequires: speex-devel >= 1.0.5
BuildRequires: update-desktop-files
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: vcdimager-devel
%endif
BuildRequires: xosd-devel
BuildRequires: xz
Requires: %{name}-noX = %{version}-%{release}
@@ -133,23 +131,21 @@ BuildRequires: pkgconfig(xproto)
BuildRequires: pkgconfig(zvbi-0.2) >= 0.2.28
%endif
%if 0%{?suse_version} >= 1140 && ( 0%{?suse_version} != 1315 && 0%{?is_opensuse} ) || 0%{?BUILD_ORIG}
%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
BuildRequires: pkgconfig(libswscale)
%endif
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%if 0%{?suse_version} != 1315
BuildRequires: pkgconfig(SDL_image) >= 1.2.10
BuildRequires: pkgconfig(libprojectM) >= 2.0.0
BuildRequires: pkgconfig(libupnp)
%endif
BuildRequires: pkgconfig(opencv) > 2.0
%endif
%endif
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
BuildRequires: libmatroska-devel
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
BuildRequires: pkgconfig(dvdnav) > 4.9.0
BuildRequires: pkgconfig(dvdread) > 4.9.0
%endif
BuildRequires: pkgconfig(libass) >= 0.9.8
BuildRequires: pkgconfig(libgme)
BuildRequires: pkgconfig(libmtp) >= 1.0.0
@@ -170,11 +166,13 @@ BuildRequires: pkgconfig(xpm)
%if %{with fluidsynth}
BuildRequires: pkgconfig(fluidsynth) >= 1.1.2
%endif
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%if 0%{?suse_version} != 1315
BuildRequires: pkgconfig(libchromaprint) >= 0.6.0
%endif
%endif
%if 0%{?suse_version} != 1315
BuildRequires: libkde4-devel
%endif
%if 0%{?suse_version} >= 1320
BuildRequires: pkgconfig(ncursesw)
%endif
@@ -349,14 +347,10 @@ export CXXFLAGS="%{optflags}"
%if ! 0%{?BUILD_ORIG}
--disable-avcodec \
%endif
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
--enable-dvbpsi \
%endif
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
--enable-dvdnav \
--enable-dvdread \
%endif
--enable-flac \
%endif
--enable-fast-install \
@@ -380,15 +374,17 @@ export CXXFLAGS="%{optflags}"
%endif
--enable-libcddb \
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315
--enable-opencv \
%endif
%endif
%if 0%{?suse_version} <= 1140
--disable-mmx \
--disable-sse \
%endif
--enable-sftp \
--disable-svgdec \
%if 0%{?suse_version} >= 1140 && ( 0%{?suse_version} != 1315 || 0%{?is_opensuse} ) || 0%{?BUILD_ORIG}
%if 0%{?suse_version} >= 1140 && 0%{?suse_version} != 1315 || 0%{?BUILD_ORIG}
--enable-swscale \
%else
--disable-swscale \
@@ -429,10 +425,8 @@ export CXXFLAGS="%{optflags}"
%endif
--enable-theora \
--enable-v4l2 \
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
--enable-vcd \
--enable-vcdx \
%endif
--enable-vorbis \
--disable-x265 \
%if 0%{?suse_version} > 1110
@@ -543,7 +537,7 @@ done
%{_libdir}/vlc/plugins/codec/liblibass_plugin.so
%endif
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%if 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/codec/libsdl_image_plugin.so
%endif
%endif
@@ -563,7 +557,7 @@ done
%{_libdir}/vlc/plugins/visualization/libglspectrum_plugin.so
%{_libdir}/vlc/plugins/video_output/libaa_plugin.so
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%if 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/visualization/libprojectm_plugin.so
%endif
%endif
@@ -700,9 +694,7 @@ done
%{_libdir}/vlc/plugins/access/libattachment_plugin.so
%{_libdir}/vlc/plugins/access/libcdda_plugin.so
%{_libdir}/vlc/plugins/access/libdtv_plugin.so
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%{_libdir}/vlc/plugins/access/libdvb_plugin.so
%endif
%{_libdir}/vlc/plugins/access/librar_plugin.so
%{_libdir}/vlc/plugins/access/libsftp_plugin.so
%{_libdir}/vlc/plugins/access/libsmb_plugin.so
@@ -712,7 +704,7 @@ done
%{_libdir}/vlc/plugins/access/libdc1394_plugin.so
%{_libdir}/vlc/plugins/access/libdv1394_plugin.so
%if (0%{?suse_version} > 1110 && (0%{?suse_version} != 1315 || 0%{?is_opensuse}) ) || 0%{?BUILD_ORIG}
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
%{_libdir}/vlc/plugins/access/libdvdread_plugin.so
%endif
@@ -739,9 +731,7 @@ done
%{_libdir}/vlc/plugins/access/libtimecode_plugin.so
%{_libdir}/vlc/plugins/access/libv4l2_plugin.so
%{_libdir}/vlc/plugins/access/libvcd_plugin.so
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%{_libdir}/vlc/plugins/access/libvcdx_plugin.so
%endif
%if 0%{?suse_version} > 1140
%{_libdir}/vlc/plugins/access/libvnc_plugin.so
@@ -891,9 +881,7 @@ done
%{_libdir}/vlc/plugins/demux/libreal_plugin.so
%{_libdir}/vlc/plugins/demux/libsmf_plugin.so
%{_libdir}/vlc/plugins/demux/libsubtitle_plugin.so
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%{_libdir}/vlc/plugins/demux/libts_plugin.so
%endif
%{_libdir}/vlc/plugins/demux/libtta_plugin.so
%{_libdir}/vlc/plugins/demux/libty_plugin.so
%{_libdir}/vlc/plugins/demux/libvc1_plugin.so
@@ -938,9 +926,7 @@ done
%{_libdir}/vlc/plugins/mux/libmux_mpjpeg_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_ogg_plugin.so
%{_libdir}/vlc/plugins/mux/libmux_ps_plugin.so
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%{_libdir}/vlc/plugins/mux/libmux_ts_plugin.so
%endif
%{_libdir}/vlc/plugins/mux/libmux_wav_plugin.so
%if 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/packetizer/libpacketizer_avparser_plugin.so
@@ -967,7 +953,7 @@ done
%{_libdir}/vlc/plugins/services_discovery/libsap_plugin.so
%{_libdir}/vlc/plugins/services_discovery/libudev_plugin.so
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315 || 0%{?is_opensuse}
%if 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/services_discovery/libupnp_plugin.so
%endif
%endif
@@ -982,7 +968,7 @@ done
%{_libdir}/vlc/plugins/stream_out/libstream_out_autodel_plugin.so
%{_libdir}/vlc/plugins/stream_out/libstream_out_bridge_plugin.so
%if 0%{?suse_version} > 1140 && ( 0%{?suse_version} != 1315 || 0%{?is_opensuse} )
%if 0%{?suse_version} > 1140 && 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/stream_out/libstream_out_chromaprint_plugin.so
%endif
%{_libdir}/vlc/plugins/stream_out/libstream_out_delay_plugin.so
@@ -1061,9 +1047,11 @@ done
%{_libdir}/vlc/plugins/video_filter/libmotionblur_plugin.so
%{_libdir}/vlc/plugins/video_filter/libmotiondetect_plugin.so
%if 0%{?suse_version} > 1110
%if 0%{?suse_version} != 1315
%{_libdir}/vlc/plugins/video_filter/libopencv_example_plugin.so
%{_libdir}/vlc/plugins/video_filter/libopencv_wrapper_plugin.so
%endif
%endif
%{_libdir}/vlc/plugins/video_filter/libposterize_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpsychedelic_plugin.so
%{_libdir}/vlc/plugins/video_filter/libpuzzle_plugin.so
@@ -1075,7 +1063,7 @@ 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
%if 0%{?suse_version} >= 1140 && ( 0%{?suse_version} != 1315 || 0%{?is_opensuse} ) || 0%{?BUILD_ORIG}
%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_filter/libtransform_plugin.so