diff --git a/vlc.changes b/vlc.changes index ad27032..66abdcf 100644 --- a/vlc.changes +++ b/vlc.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Oct 21 18:04:36 UTC 2013 - hrvoje.senjan@gmail.com + +- Make vlc build on OBS for openSUSE 12.3 - BuildRequire + pkgconfig(libswscale) and live555-devel on >= 13.1, and on + BUILD_ORIG case + ------------------------------------------------------------------- Sat Oct 12 09:42:57 UTC 2013 - scarabeus@opensuse.org diff --git a/vlc.spec b/vlc.spec index e6122b9..2e455c1 100644 --- a/vlc.spec +++ b/vlc.spec @@ -93,7 +93,9 @@ BuildRequires: libva-devel BuildRequires: libvorbis-devel BuildRequires: libxml2-devel BuildRequires: lirc-devel +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: live555-devel +%endif BuildRequires: lua51-devel BuildRequires: pcre-devel BuildRequires: pulseaudio-devel @@ -108,7 +110,9 @@ BuildRequires: pkgconfig(dirac) >= 0.10.0 BuildRequires: pkgconfig(libgme) # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations # and can favor one over the other. +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} BuildRequires: pkgconfig(libswscale) +%endif # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly BuildRequires: findutils @@ -276,8 +280,13 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient" --enable-libass \ --enable-libcddb \ --enable-lirc \ +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} --enable-swscale \ --enable-live555 \ +%else + --disable-swscale \ + --disable-live555 \ +%endif %if 0%{?BUILD_ORIG} --enable-libmpeg2 \ --enable-mad \ @@ -509,7 +518,9 @@ done %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so +%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/access/liblive555_plugin.so +%endif %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so %{_libdir}/vlc/plugins/access/libpulsesrc_plugin.so @@ -770,7 +781,9 @@ 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} >= 1310 || 0%{?BUILD_ORIG} %{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so +%endif %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so %{_libdir}/vlc/plugins/video_filter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so @@ -834,6 +847,7 @@ done %post noX /sbin/ldconfig touch %{_libdir}/vlc/plugins/plugins.dat + %postun noX -p /sbin/ldconfig %post -n libvlc%{libvlc} -p /sbin/ldconfig