rpm/vlc
SHA256
1
0
Fork 0
forked from pool/vlc
Code Pull Requests Activity

Accepting request 204235 from KDE:Distro:Factory

Browse Source 
Make vlc build on OBS for openSUSE 12.3 - BuildRequire pkgconfig(libswscale) and live555-devel on >= 13.1, and on BUILD_ORIG case

OBS-URL: https://build.opensuse.org/request/show/204235
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=50
This commit is contained in:
Dominique Leuenberger 2013-10-21 20:32:39 +00:00 committed by Git OBS Bridge
parent 16a4cd6281
commit 5aa89eae57
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vlc.changes
View File

@ -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 Sat Oct 12 09:42:57 UTC 2013 - scarabeus@opensuse.org

14
vlc.spec
View File

@ -93,7 +93,9 @@ BuildRequires: libva-devel
BuildRequires: libvorbis-devel BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel BuildRequires: libxml2-devel
BuildRequires: lirc-devel BuildRequires: lirc-devel
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
BuildRequires: live555-devel BuildRequires: live555-devel
%endif
BuildRequires: lua51-devel BuildRequires: lua51-devel
BuildRequires: pcre-devel BuildRequires: pcre-devel
BuildRequires: pulseaudio-devel BuildRequires: pulseaudio-devel
@ -108,7 +110,9 @@ BuildRequires: pkgconfig(dirac) >= 0.10.0
BuildRequires: pkgconfig(libgme) BuildRequires: pkgconfig(libgme)
# This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations # This is intentionally done the pkgconfig way: 3rd party repos might have alternative implementations
# and can favor one over the other. # and can favor one over the other.
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(libswscale)
%endif
# BuildRequires that are not actively used for VLC, but for the build itself to work smoothly # BuildRequires that are not actively used for VLC, but for the build itself to work smoothly
BuildRequires: findutils BuildRequires: findutils
@ -276,8 +280,13 @@ export CXXFLAGS="%{optflags} -L%{_libdir}/live -Wno-return-type $smbclient"
--enable-libass \ --enable-libass \
--enable-libcddb \ --enable-libcddb \
--enable-lirc \ --enable-lirc \
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
--enable-swscale \ --enable-swscale \
--enable-live555 \ --enable-live555 \
%else
--disable-swscale \
--disable-live555 \
%endif
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
--enable-libmpeg2 \ --enable-libmpeg2 \
--enable-mad \ --enable-mad \
@ -509,7 +518,9 @@ done
%{_libdir}/vlc/plugins/access/libfilesystem_plugin.so %{_libdir}/vlc/plugins/access/libfilesystem_plugin.so
%{_libdir}/vlc/plugins/access/libidummy_plugin.so %{_libdir}/vlc/plugins/access/libidummy_plugin.so
%{_libdir}/vlc/plugins/access/liblibbluray_plugin.so %{_libdir}/vlc/plugins/access/liblibbluray_plugin.so
%if 0%{?suse_version} >= 1310 || 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/access/liblive555_plugin.so %{_libdir}/vlc/plugins/access/liblive555_plugin.so
%endif
%{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_hdsdi_plugin.so
%{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so %{_libdir}/vlc/plugins/access/liblinsys_sdi_plugin.so
%{_libdir}/vlc/plugins/access/libpulsesrc_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/libsepia_plugin.so
%{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so %{_libdir}/vlc/plugins/video_filter/libsharpen_plugin.so
%{_libdir}/vlc/plugins/video_filter/libsubsdelay_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 %{_libdir}/vlc/plugins/video_filter/libswscale_plugin.so
%endif
%{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so %{_libdir}/vlc/plugins/video_filter/libtransform_plugin.so
%{_libdir}/vlc/plugins/video_filter/libwall_plugin.so %{_libdir}/vlc/plugins/video_filter/libwall_plugin.so
%{_libdir}/vlc/plugins/video_filter/libwave_plugin.so %{_libdir}/vlc/plugins/video_filter/libwave_plugin.so
@ -834,6 +847,7 @@ done
%post noX %post noX
/sbin/ldconfig /sbin/ldconfig
touch %{_libdir}/vlc/plugins/plugins.dat touch %{_libdir}/vlc/plugins/plugins.dat
%postun noX -p /sbin/ldconfig %postun noX -p /sbin/ldconfig
%post -n libvlc%{libvlc} -p /sbin/ldconfig %post -n libvlc%{libvlc} -p /sbin/ldconfig