Merge pull request #13307 from neheb/minis

minisatip: update to 1.0.4

multimedia/minisatip/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=minisatip
-PKG_VERSION:=1.0.3
-PKG_RELEASE:=2
+PKG_VERSION:=1.0.4
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/catalinii/minisatip/tar.gz/$(PKG_VERSION)?
-PKG_HASH:=04d208369331ef0ee165766438a80ed826bb6a6552bbc56a38a6f2dd04603da3
+PKG_HASH:=aa6ef68228a19faf04cf1283e994cae80134a01d9ee6bc45b9969d145b1281e5
 
 PKG_MAINTAINER:=Daniel Kucera <github@danman.eu>
 PKG_LICENSE:=GPL-2.0-or-later

multimedia/minisatip/patches/010-gcc10.patch

@@ -1,43 +0,0 @@
-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);