Date: Sat, 9 Apr 2016 10:22:23 +0000 (UTC) From: Thomas Zander <riggs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r412804 - branches/2016Q2/multimedia/vdr/files Message-ID: <201604091022.u39AMNcN010662@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: riggs Date: Sat Apr 9 10:22:23 2016 New Revision: 412804 URL: https://svnweb.freebsd.org/changeset/ports/412804 Log: MFH: r412803 Fix build with libc++ 3.8.0 PR: 208468 Submitted by: dim Approved by: ports-secteam (build fix blanket) Added: branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff - copied unchanged from r412803, head/multimedia/vdr/files/patch-abs-types.diff Modified: Directory Properties: branches/2016Q2/ (props changed) Copied: branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff (from r412803, head/multimedia/vdr/files/patch-abs-types.diff) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q2/multimedia/vdr/files/patch-abs-types.diff Sat Apr 9 10:22:23 2016 (r412804, copy of r412803, head/multimedia/vdr/files/patch-abs-types.diff) @@ -0,0 +1,27 @@ +--- dvbdevice.c.orig ++++ dvbdevice.c +@@ -766,7 +766,7 @@ bool cDvbTuner::SetFrontend(void) + CHECK(ioctl(fd_frontend, FE_SET_VOLTAGE, volt)); + CHECK(ioctl(fd_frontend, FE_SET_TONE, tone)); + } +- frequency = abs(frequency); // Allow for C-band, where the frequency is less than the LOF ++ frequency = abs((int)frequency); // Allow for C-band, where the frequency is less than the LOF + + // DVB-S/DVB-S2 (common parts) + SETCMD(DTV_FREQUENCY, frequency * 1000UL); +--- remux.c.orig 2012-03-02 11:56:49.000000000 +0100 ++++ remux.c 2016-04-02 19:05:34.753289000 +0200 +@@ -890,11 +943,11 @@ int cFrameDetector::Analyze(const uchar + uint32_t Delta = ptsValues[0]; + // determine frame info: + if (isVideo) { +- if (abs(Delta - 3600) <= 1) ++ if (abs((int)Delta - 3600) <= 1) + framesPerSecond = 25.0; + else if (Delta % 3003 == 0) + framesPerSecond = 30.0 / 1.001; +- else if (abs(Delta - 1800) <= 1) { ++ else if (abs((int)Delta - 1800) <= 1) { + if (numFrames > 50) { + // this is a "best guess": if there are more than 50 frames between two I-frames, we assume each "frame" actually contains a "field", so two "fields" make one "frame" + framesPerSecond = 25.0;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201604091022.u39AMNcN010662>