Date: Tue, 16 Oct 2018 14:45:19 +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: r482231 - in head/multimedia/tvheadend: . files Message-ID: <201810161445.w9GEjJ4q045631@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: decke Date: Tue Oct 16 14:45:19 2018 New Revision: 482231 URL: https://svnweb.freebsd.org/changeset/ports/482231 Log: multimedia/tvheadend: Update to 4.2.7 Deleted: head/multimedia/tvheadend/files/patch-Makefile.webui head/multimedia/tvheadend/files/patch-src_tcp.c head/multimedia/tvheadend/files/patch-src_webui_webui.c Modified: head/multimedia/tvheadend/Makefile head/multimedia/tvheadend/distinfo head/multimedia/tvheadend/files/patch-src_wrappers.c Modified: head/multimedia/tvheadend/Makefile ============================================================================== --- head/multimedia/tvheadend/Makefile Tue Oct 16 14:26:45 2018 (r482230) +++ head/multimedia/tvheadend/Makefile Tue Oct 16 14:45:19 2018 (r482231) @@ -2,13 +2,9 @@ # $FreeBSD$ PORTNAME= tvheadend -PORTVERSION= 4.2.6 +PORTVERSION= 4.2.7 DISTVERSIONPREFIX= v -PORTREVISION= 5 CATEGORIES= multimedia - -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES= 3cb4f580565b.patch:-p1 MAINTAINER= decke@FreeBSD.org COMMENT= TV streaming server supporting DVB, IPTV, SAT>IP and more Modified: head/multimedia/tvheadend/distinfo ============================================================================== --- head/multimedia/tvheadend/distinfo Tue Oct 16 14:26:45 2018 (r482230) +++ head/multimedia/tvheadend/distinfo Tue Oct 16 14:45:19 2018 (r482231) @@ -1,5 +1,3 @@ -TIMESTAMP = 1522131748 -SHA256 (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 09b4d4ff436a2006001ef3c3f38553dc4db3ea31bf9871b046a33180a0e8a8b9 -SIZE (tvheadend-tvheadend-v4.2.6_GH0.tar.gz) = 21528720 -SHA256 (3cb4f580565b.patch) = b27328ece106d5c66bba3f3a39ce69b66a3182ea686acd57d393d1ae7255b0bb -SIZE (3cb4f580565b.patch) = 5541 +TIMESTAMP = 1539012290 +SHA256 (tvheadend-tvheadend-v4.2.7_GH0.tar.gz) = 8383990895be767a1b8f6d3a9356c2d5b2ea5d686d2293fbdb1552ffc6ea0640 +SIZE (tvheadend-tvheadend-v4.2.7_GH0.tar.gz) = 21544435 Modified: head/multimedia/tvheadend/files/patch-src_wrappers.c ============================================================================== --- head/multimedia/tvheadend/files/patch-src_wrappers.c Tue Oct 16 14:26:45 2018 (r482230) +++ head/multimedia/tvheadend/files/patch-src_wrappers.c Tue Oct 16 14:45:19 2018 (r482231) @@ -1,30 +1,24 @@ ---- src/wrappers.c.orig 2017-05-16 11:15:24.000000000 +0000 -+++ src/wrappers.c 2017-06-21 18:00:42.352871000 +0000 -@@ -290,6 +290,19 @@ - } while (r > 0); - } - -+#ifdef PLATFORM_FREEBSD -+int64_t -+tvh_usleep(int64_t us) -+{ -+ return usleep(us); -+} -+ -+int64_t -+tvh_usleep_abs(int64_t us) -+{ -+ return usleep(us - getfastmonoclock()); -+} -+#else +Use the implementation from Darwin for tvh_usleep() and tvh_usleep_abs() +in FreeBSD. + +Submitted by: Bernhard Froehlich <decke@FreeBSD.org> +--- src/wrappers.c.orig 2018-10-08 12:37:05.000000000 +0000 ++++ src/wrappers.c 2018-10-16 14:27:38.788502000 +0000 +@@ -324,7 +324,7 @@ int64_t tvh_usleep(int64_t us) { -@@ -323,6 +336,7 @@ - return val; - return r ? -r : 0; - } -+#endif - - /* - * qsort +-#if defined(PLATFORM_DARWIN) ++#if defined(PLATFORM_DARWIN) || defined(PLATFORM_FREEBSD) + return usleep(us); + #else + struct timespec ts; +@@ -345,7 +345,7 @@ + int64_t + tvh_usleep_abs(int64_t us) + { +-#if defined(PLATFORM_DARWIN) ++#if defined(PLATFORM_DARWIN) || defined(PLATFORM_FREEBSD) + /* Convert to relative wait */ + int64_t now = getmonoclock(); + int64_t relative = us - now;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201810161445.w9GEjJ4q045631>