minisatip: fix compilation with GCC10

Backported upstream patch.

Signed-off-by: Rosen Penev <rosenp@gmail.com>

diff --git a/multimedia/minisatip/Makefile b/multimedia/minisatip/Makefile
index afbf530397c45075e726b1f8e56f7c090b76f261..8d2eb8f9faba0ceedf9f98b59d430095d3d89fba 100644 (file)
--- a/multimedia/minisatip/Makefile
+++ b/multimedia/minisatip/Makefile
@@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minisatip
 PKG_VERSION:=1.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/catalinii/minisatip/tar.gz/$(PKG_VERSION)?

diff --git a/multimedia/minisatip/patches/010-gcc10.patch b/multimedia/minisatip/patches/010-gcc10.patch
new file mode 100644 (file)
index 0000000..465e326
--- /dev/null
+++ b/multimedia/minisatip/patches/010-gcc10.patch
@@ -0,0 +1,43 @@
+From b7a9982022ea54d87d310a041c38c6c69b6e49da Mon Sep 17 00:00:00 2001
+From: Klaas de Waal <klaas@kldo.nl>
+Date: Sun, 17 May 2020 23:00:09 +0200
+Subject: [PATCH] Fix declaration and definition of global variables
+
+Definition of global variable httpc now in utils.c with declaration in utils.h.
+Definition of global variable source_map now in adapter.c with declaration in adapter.h.
+This fixes multiple defined symbol linking errors with linking issue with multiple defined symbols
+in Fedora 32 with gcc version 10.1.1 20200507 (Red Hat 10.1.1-1) (GCC)
+---
+ src/adapter.c | 1 +
+ src/adapter.h | 2 +-
+ src/utils.c   | 2 ++
+ src/utils.h   | 3 ++-
+ 4 files changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/src/utils.c b/src/utils.c
+index 8c27954..5be35fd 100644
+--- a/src/utils.c
++++ b/src/utils.c
+@@ -63,6 +63,8 @@
+ int MAX_SINFO;
+ char pn[256];
+ 
++Shttp_client *httpc[MAX_HTTPC];
++
+ typedef struct tmpinfo
+ {
+       unsigned char enabled;
+diff --git a/src/utils.h b/src/utils.h
+index 6ef1831..efcccfa 100644
+--- a/src/utils.h
++++ b/src/utils.h
+@@ -88,7 +88,8 @@ typedef struct struct_http_client
+ 
+ #define get_httpc(i) ((i >= 0 && i < MAX_HTTPC && httpc[i] && httpc[i]->enabled) ? httpc[i] : NULL)
+ 
+-Shttp_client *httpc[MAX_HTTPC];
++extern Shttp_client *httpc[MAX_HTTPC];
++
+ int http_client(char *url, char *request, void *callback, void *opaque);
+ 
+ unsigned char *getItem(uint32_t key);