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

Accepting request 296178 from home:alois:branches:multimedia:libs

Browse Source 
Removed DTV/DVB patch that was fixed upstream.

OBS-URL: https://build.opensuse.org/request/show/296178
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/vlc?expand=0&rev=122
This commit is contained in:
Dominique Leuenberger 2015-04-15 05:53:30 +00:00 committed by Git OBS Bridge
parent c7b62e518f
commit c4aeccd954
3 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vlc-rpmlintrc
View File

@ -4,6 +4,3 @@ addFilter("libvlccore.* shared-lib-calls-exit")
# there's a good reason for packaging vlc and vlc.desktop separately
addFilter("desktopfile-without-binary")
# plugins.dat is created on startup if necessary
addFilter("vlc-noX.* ghost-files-without-postin")

5
vlc.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Apr 14 10:38:47 UTC 2015 - aloisio@gmx.com
- Removed DTV/DVB patch that was fixed upstream.
-------------------------------------------------------------------
Mon Apr 13 14:59:16 UTC 2015 - joerg.lorenzen@ki.tng.de

24
vlc.spec
View File

@ -66,6 +66,7 @@ BuildRequires: libavc1394-devel >= 0.5.3
BuildRequires: libcddb-devel >= 0.9.5
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
@ -142,7 +143,6 @@ BuildRequires: pkgconfig(libva-x11)
BuildRequires: pkgconfig(taglib) >= 1.9
%endif
%if 0%{?suse_version} > 1140
BuildRequires: libdvbpsi-devel >= 1.0.0
BuildRequires: pkgconfig(dbus-1) >= 1.6.0
BuildRequires: pkgconfig(freerdp) >= 1.0.1
BuildRequires: pkgconfig(gnutls) >= 3.2.0
@ -298,11 +298,6 @@ FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE1} '+%%b %%e %%Y')
sed -e "s/__TIME__/\"$FAKE_BUILDTIME\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
sed -e "s/__DATE__/\"$FAKE_BUILDDATE\"/" -i modules/gui/qt4/dialogs/help.cpp src/config/help.c
# no --disable-dvb switch unfortunately
%if 0%{?suse_version} <= 1140
sed -e '/^#include.*dvb/d' -i configure
%endif
echo '********* ENDED PREP PHASE *********'
date
@ -322,11 +317,7 @@ export CXXFLAGS="%{optflags}"
--disable-avcodec \
%endif
--enable-dca \
%if 0%{?suse_version} > 1140
--enable-dvbpsi \
%else
--disable-dvbpsi \
%endif
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
--enable-dvdnav \
--enable-dvdread \
@ -656,6 +647,8 @@ done
%{_libdir}/vlc/plugins/access/libaccess_realrtsp_plugin.so
%{_libdir}/vlc/plugins/access/libattachment_plugin.so
%{_libdir}/vlc/plugins/access/libcdda_plugin.so
%{_libdir}/vlc/plugins/access/libdtv_plugin.so
%{_libdir}/vlc/plugins/access/libdvb_plugin.so
%{_libdir}/vlc/plugins/access/librar_plugin.so
%{_libdir}/vlc/plugins/access/libsftp_plugin.so
%{_libdir}/vlc/plugins/access/libsmb_plugin.so
@ -665,11 +658,6 @@ done
%{_libdir}/vlc/plugins/access/libdc1394_plugin.so
%{_libdir}/vlc/plugins/access/libdv1394_plugin.so
%if 0%{?suse_version} > 1140
%{_libdir}/vlc/plugins/access/libdtv_plugin.so
%{_libdir}/vlc/plugins/access/libdvb_plugin.so
%endif
%if 0%{?suse_version} > 1110 || 0%{?BUILD_ORIG}
%{_libdir}/vlc/plugins/access/libdvdnav_plugin.so
%{_libdir}/vlc/plugins/access/libdvdread_plugin.so
@ -846,10 +834,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} > 1140
%{_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
@ -894,10 +879,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} > 1140
%{_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