Index: head/multimedia/tvheadend/Makefile =================================================================== --- head/multimedia/tvheadend/Makefile (revision 547072) +++ head/multimedia/tvheadend/Makefile (revision 547073) @@ -1,90 +1,91 @@ # Created by: Bernhard Froehlich # $FreeBSD$ PORTNAME= tvheadend PORTVERSION= 4.2.8 DISTVERSIONPREFIX= v -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MAINTAINER= decke@FreeBSD.org COMMENT= TV streaming server supporting DVB, IPTV, SAT>IP and more LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.md BUILD_DEPENDS= bash:shells/bash \ cmake:devel/cmake \ ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat LIB_DEPENDS= libcurl.so:ftp/curl \ liburiparser.so:net/uriparser RUN_DEPENDS= dtv-scan-tables>=0:multimedia/dtv-scan-tables USES= compiler:c++11-lang gettext gmake pkgconfig python shebangfix ssl USE_GITHUB= yes GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USE_RC_SUBR= ${PORTNAME} SHEBANG_FILES= ${WRKSRC}/Autobuild.sh \ ${WRKSRC}/configure \ ${WRKSRC}/support/apt-update \ ${WRKSRC}/support/configure.inc \ ${WRKSRC}/support/getmuxlist \ ${WRKSRC}/support/version TVHUSER?= tvheadend TVHGROUP?= tvheadend USERS= ${TVHUSER} GROUPS= ${TVHGROUP} webcamd SUB_LIST+= TVHUSER="${TVHUSER}" \ TVHGROUP="${TVHGROUP}" CONFIGURE_ENV+= PLATFORM=freebsd CONFIGURE_ARGS+=--disable-dvbscan --disable-zlib --disable-hdhomerun_static \ --disable-bintray_cache --disable-ffmpeg_static --disable-pie CFLAGS+= -I${LOCALBASE}/include -Wno-conversion -Wno-int-to-pointer-cast LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo -lssl -lcrypto -lz OPTIONS_DEFINE= AVAHI DVBCSA DVBEN50221 HDHOMERUN INOTIFY TRANSCODING XMLTV OPTIONS_DEFAULT=DVBCSA HDHOMERUN INOTIFY AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app DVBCSA_DESC= Replace internal ffdecsa with dvbcsa DVBCSA_LIB_DEPENDS= libdvbcsa.so:multimedia/libdvbcsa DVBCSA_CONFIGURE_ENABLE= dvbcsa DVBEN50221_DESC= Hardware CAM support DVBEN50221_LIB_DEPENDS= libdvben50221.so:multimedia/dvb-apps DVBEN50221_CONFIGURE_ENABLE= dvben50221 HDHOMERUN_DESC= Native support for HDHomeRun network tuners HDHOMERUN_LIB_DEPENDS= libhdhomerun.so:multimedia/libhdhomerun HDHOMERUN_CONFIGURE_ENABLE= hdhomerun_client INOTIFY_DESC= File system notifications support INOTIFY_LIB_DEPENDS= libinotify.so:devel/libinotify INOTIFY_CONFIGURE_ENABLE= inotify INOTIFY_LDFLAGS= -linotify TRANSCODING_DESC= Transcoding for mobile and web clients 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 post-patch: @${REINPLACE_CMD} 's|-ldl||' \ ${WRKSRC}/Makefile @${REINPLACE_CMD} 's|-Werror||' \ ${WRKSRC}/Makefile post-install: ${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/tvheadend .include Index: head/multimedia/tvheadend/files/patch-fno-common.patch =================================================================== --- head/multimedia/tvheadend/files/patch-fno-common.patch (nonexistent) +++ head/multimedia/tvheadend/files/patch-fno-common.patch (revision 547073) @@ -0,0 +1,52 @@ +From 8a2942a361e95ccdbd30c1edc7627df3862cdbbe Mon Sep 17 00:00:00 2001 +From: James Le Cuirot +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) Property changes on: head/multimedia/tvheadend/files/patch-fno-common.patch ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property