Date: Sun, 30 Aug 2020 18:54:56 +0000 (UTC) From: Bernhard Froehlich <decke@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r547073 - in head/multimedia/tvheadend: . files Message-ID: <202008301854.07UIsu4Y044442@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Sun Aug 30 18:54:56 2020 New Revision: 547073 URL: https://svnweb.freebsd.org/changeset/ports/547073 Log: multimedia/tvheadend: - Fix building with -fno-common (default from GCC 10 and LLVM 11) - Add missing option description for XMLTV Obtained from: https://github.com/tvheadend/tvheadend/commit/8a2942a361e95ccdbd30c1edc7627df3862cdbbe MFH: 2020Q3 Added: head/multimedia/tvheadend/files/patch-fno-common.patch (contents, props changed) Modified: head/multimedia/tvheadend/Makefile Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Sun Aug 30 18:39:38 2020 (r547072) +++ head/multimedia/tvheadend/Makefile Sun Aug 30 18:54:56 2020 (r547073) @@ -4,7 +4,7 @@ PORTNAME= tvheadend PORTVERSION= 4.2.8 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org @@ -74,6 +74,7 @@ TRANSCODING_DESC= Transcoding for mobile and web clien TRANSCODING_LIB_DEPENDS= libavcodec.so:multimedia/ffmpeg TRANSCODING_CONFIGURE_ENABLE= libav +XMLTV_DESC= XMLTV grabber for television listings XMLTV_RUN_DEPENDS= p5-xmltv>=0:textproc/p5-xmltv .include <bsd.port.pre.mk> Added: head/multimedia/tvheadend/files/patch-fno-common.patch ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/tvheadend/files/patch-fno-common.patch Sun Aug 30 18:54:56 2020 (r547073) @@ -0,0 +1,52 @@ +From 8a2942a361e95ccdbd30c1edc7627df3862cdbbe Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Fri, 15 May 2020 17:45:30 +0100 +Subject: [PATCH] Fix building with -fno-common (default from GCC 10) + +--- + src/input.h | 4 ++-- + src/input/mpegts.c | 2 ++ + src/input/mpegts.h | 2 +- + 3 files changed, 5 insertions(+), 3 deletions(-) + +diff --git a/src/input.h b/src/input.h +index a9c96df048..3dce355c6a 100644 +--- src/input.h ++++ src/input.h +@@ -133,8 +133,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) +diff --git a/src/input/mpegts.c b/src/input/mpegts.c +index e02d491f19..fca4f34296 100644 +--- src/input/mpegts.c ++++ src/input/mpegts.c +@@ -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 --git a/src/input/mpegts.h b/src/input/mpegts.h +index 9dda3bacaa..9c4c57b73b 100644 +--- src/input/mpegts.h ++++ src/input/mpegts.h +@@ -1149,7 +1149,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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008301854.07UIsu4Y044442>