From 9608512e98bc1d1b92502f2b5ee689ab92ed03af0fb91d91200f59063366a26c Mon Sep 17 00:00:00 2001 From: Tomas Cech Date: Sun, 18 Mar 2018 08:50:08 +0000 Subject: [PATCH] Accepting request 588193 from home:FunkyM:branches:multimedia:apps - Add dvb-scan data that is needed for network scanning - Enable transcoding support OBS-URL: https://build.opensuse.org/request/show/588193 OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/tvheadend?expand=0&rev=26 --- dvb-scan-git20180220.tar.gz | 3 +++ tvheadend.changes | 6 ++++++ tvheadend.spec | 11 +++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 dvb-scan-git20180220.tar.gz diff --git a/dvb-scan-git20180220.tar.gz b/dvb-scan-git20180220.tar.gz new file mode 100644 index 0000000..44d3b57 --- /dev/null +++ b/dvb-scan-git20180220.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:10d408b9eb8d9d3d100e511bdefa17110943a2b2678c3cb3b6957a3b65b55a79 +size 263242 diff --git a/tvheadend.changes b/tvheadend.changes index 7d7d7a5..d0debd5 100644 --- a/tvheadend.changes +++ b/tvheadend.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Feb 19 23:10:28 UTC 2018 - opensuse@sukimashita.com + +- Add dvb-scan data that is needed for network scanning +- Enable transcoding support + ------------------------------------------------------------------- Wed Jan 3 21:21:57 UTC 2018 - in.gottwald@gmail.com diff --git a/tvheadend.spec b/tvheadend.spec index 3b2aa78..bf5c21b 100644 --- a/tvheadend.spec +++ b/tvheadend.spec @@ -32,12 +32,14 @@ Summary: A TV Streaming Server # parsers are from FFMpeg project under LGPL-2.1 # FFdecsa and extra/capmt_ca.c is GPL-2.0+ which is compatibile with GPL-3.0+ # rest of code seems to be GPL-3.0+ -License: GPL-3.0+ and LGPL-2.1 +License: GPL-3.0-or-later AND LGPL-2.1-only Group: Productivity/Multimedia/Other Url: https://tvheadend.org/ Source0: https://github.com/%{name}/%{name}/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source2: %{name}-rpmlintrc Source3: %{name}_super +# From https://github.com/tvheadend/dtv-scan-tables.git as build system fails to retrieve them +Source4: dvb-scan-git20180220.tar.gz # PATCH-FIX-OPENSUSE tvheadend-fix-service-dependency.patch -- do not wait for or require syslog Patch2: %{name}-fix-service-dependency.patch BuildRequires: fdupes @@ -47,6 +49,7 @@ BuildRequires: python-devel BuildRequires: pkgconfig(avahi-client) BuildRequires: pkgconfig(dbus-1) BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavfilter) BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavresample) BuildRequires: pkgconfig(libavutil) @@ -74,14 +77,18 @@ day-to-day operations, such as searching the electronic program guide sed -e "s/-u \([^ ]*\) -g \([^ ]*\)/-u %{htsuser} -g %{htsgroup}/" -i rpm/%{name}.sysconfig sed -e '/^TVH_ARGS/cTVH_ARGS="-C"' -i debian/%{name}.default sed -e '/cmake/d' -i configure +# Disable failing attempt to download from within the build host which has no internet connectivity +sed -e 's@"${ROOTDIR}/support/getmuxlist"@true@g' -i configure echo %{version} > rpm/version %build export CFLAGS_NO_WERROR="yes" %configure \ - --disable-dvbscan \ --disable-ffmpeg_static \ --disable-hdhomerun_static +mkdir -p data/dvb-scan +tar -C data/dvb-scan -xvf %{SOURCE4} +touch data/dvb-scan/.stamp make V=1 %{?_smp_mflags} %install