Browse Source

Merge pull request #13075 from neheb/tvh

tvheadend: fix compilation with GCC 10
lilik-openwrt-22.03
Rosen Penev 4 years ago
committed by GitHub
parent
commit
02a5a79542
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 1 deletions
  1. +1
    -1
      multimedia/tvheadend/Makefile
  2. +24
    -0
      multimedia/tvheadend/patches/030-gcc10.patch

+ 1
- 1
multimedia/tvheadend/Makefile View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=tvheadend
PKG_VERSION:=4.0.10
PKG_RELEASE:=4
PKG_RELEASE:=5
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/tvheadend/tvheadend/tar.gz/v$(PKG_VERSION)?


+ 24
- 0
multimedia/tvheadend/patches/030-gcc10.patch View File

@ -0,0 +1,24 @@
--- a/src/input.h
+++ b/src/input.h
@@ -120,8 +120,8 @@ void tvh_hardware_delete ( tvh_hardware_t *th );
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)
--- a/src/input/mpegts.h
+++ b/src/input/mpegts.h
@@ -1017,7 +1017,7 @@ typedef struct mpegts_listener
void (*ml_mux_delete) (mpegts_mux_t *mm, void *p);
} mpegts_listener_t;
-LIST_HEAD(,mpegts_listener) mpegts_listeners;
+static LIST_HEAD(,mpegts_listener) mpegts_listeners;
#define mpegts_add_listener(ml)\
LIST_INSERT_HEAD(&mpegts_listeners, ml, ml_link)

Loading…
Cancel
Save