3:53 p.m.
commit 05bd6db6693642308d16fdf8cb7b3b6fd8ef1d72
Author: Mohamed El Morabity <melmorabity(a)fedoraproject.org>
Date: Thu Aug 20 17:53:50 2020 +0200
Fix FTBFS
1342.patch | 52 ---------------------------------------------
tvheadend-4.2.8-gcc10.patch | 42 ++++++++++++++++++++++++++++++++++--
tvheadend.spec | 17 ++++++++++-----
3 files changed, 52 insertions(+), 59 deletions(-)
---
diff --git a/tvheadend-4.2.8-gcc10.patch b/tvheadend-4.2.8-gcc10.patch
index d9fc3d1..6b98312 100644
--- a/tvheadend-4.2.8-gcc10.patch
+++ b/tvheadend-4.2.8-gcc10.patch
@@ -1,6 +1,6 @@
diff -up ./src/epggrab/module/xmltv.c.orig ./src/epggrab/module/xmltv.c
---- ./src/epggrab/module/xmltv.c.orig 2019-01-12 09:58:47.000000000 +0100
-+++ ./src/epggrab/module/xmltv.c 2020-03-11 10:32:50.940753193 +0100
+--- ./src/epggrab/module/xmltv.c.orig 2019-01-12 08:58:47.000000000 +0000
++++ ./src/epggrab/module/xmltv.c 2020-08-20 15:12:27.533589454 +0000
@@ -190,11 +190,12 @@ static void parse_xmltv_dd_progid
(epggrab_module_t *mod, const char *s, char **uri, char **suri,
epg_episode_num_t *epnum)
@@ -24,3 +24,41 @@ diff -up ./src/epggrab/module/xmltv.c.orig
./src/epggrab/module/xmltv.c
}
/**
+diff -up ./src/input.h.orig ./src/input.h
+--- ./src/input.h.orig 2019-01-12 08:58:47.000000000 +0000
++++ ./src/input.h 2020-08-20 15:13:19.246306382 +0000
+@@ -128,8 +128,8 @@ void tvh_hardware_delete ( tvh_hardware_
+ extern const idclass_t tvh_input_class;
+ extern const idclass_t tvh_input_instance_class;
+
+-tvh_input_list_t tvh_inputs;
+-tvh_hardware_list_t tvh_hardware;
++extern tvh_input_list_t tvh_inputs;
++extern tvh_hardware_list_t tvh_hardware;
+
+ #define TVH_INPUT_FOREACH(x) LIST_FOREACH(x, &tvh_inputs, ti_link)
+ #define TVH_HARDWARE_FOREACH(x) LIST_FOREACH(x, &tvh_hardware, th_link)
+diff -up ./src/input/mpegts.c.orig ./src/input/mpegts.c
+--- ./src/input/mpegts.c.orig 2019-01-12 08:58:47.000000000 +0000
++++ ./src/input/mpegts.c 2020-08-20 15:13:19.246306382 +0000
+@@ -20,6 +20,8 @@
+ #include "mpegts/fastscan.h"
+ #include "memoryinfo.h"
+
++struct mpegts_listeners mpegts_listeners;
++
+ extern memoryinfo_t mpegts_input_queue_memoryinfo;
+ extern memoryinfo_t mpegts_input_table_memoryinfo;
+
+diff -up ./src/input/mpegts.h.orig ./src/input/mpegts.h
+--- ./src/input/mpegts.h.orig 2019-01-12 08:58:47.000000000 +0000
++++ ./src/input/mpegts.h 2020-08-20 15:13:19.247306357 +0000
+@@ -1132,7 +1132,7 @@ typedef struct mpegts_listener
+ void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
+ } mpegts_listener_t;
+
+-LIST_HEAD(,mpegts_listener) mpegts_listeners;
++extern LIST_HEAD(mpegts_listeners, mpegts_listener) mpegts_listeners;
+
+ #define mpegts_add_listener(ml)\
+ LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)
diff --git a/tvheadend.spec b/tvheadend.spec
index cb5bd77..4344f4f 100644
--- a/tvheadend.spec
+++ b/tvheadend.spec
@@ -20,7 +20,7 @@
Name: tvheadend
Version: 4.2.8
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: TV streaming server and digital video recorder
License: GPLv3+
@@ -45,10 +45,9 @@ Patch5: %{name}-4.2.7-python3.patch
Patch6: %{name}-4.2.8-gcc9.patch
# Fix build with hdhomerun >= 20190621
Patch7: %{name}-4.2.8-hdhomerun20190621.patch
-# Fix build with GCC 10
+# Fix build with GCC 10 (see also
+# https://github.com/tvheadend/tvheadend/pull/1342.patch)
Patch8: %{name}-4.2.8-gcc10.patch
-# Fix build with GCC 10 II
-Patch9: https://github.com/tvheadend/tvheadend/pull/1342.patch
BuildRequires: bzip2
BuildRequires: gcc
@@ -110,6 +109,7 @@ MPEG-TS stream generated by ffmpeg/libav from a V4L device.
%package -n python2-tvh
Summary: HTSP client for Python
BuildArch: noarch
+%{?python_provide:%python_provide python2-tvh}
%description -n python2-tvh
%{summary}.
@@ -120,6 +120,7 @@ BuildArch: noarch
%package -n python3-tvh
Summary: HTSP client for Python
BuildArch: noarch
+%{?python_provide:%python_provide python3-tvh}
%description -n python3-tvh
%{summary}.
@@ -141,7 +142,10 @@ done
%build
-export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes -Wno-error=stringop-truncation"
+# Enable errors on detected implicit function declarations
+# (-Werror=implicit-function-declaration) to force the build system to use
+# internal implementations of strlcat()/strlcpy()
+export CFLAGS="$RPM_OPT_FLAGS -Wno-attributes -Wno-error=stringop-truncation
-Werror=implicit-function-declaration"
echo "%{version}-%{release}" >rpm/version
# Note: --disable-lib* correspond to options to build bundled FFmpeg
%configure \
@@ -237,6 +241,9 @@ exit 0
%changelog
+* Thu Aug 20 2020 Mohamed El Morabity <melmorabity(a)fedoraproject.org> - 4.2.8-12
+- Fix F33 FTBFS
+
* Tue Aug 18 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> -
4.2.8-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild