Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 18 Jul 2016 21:13:06 +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: r418752 - branches/2016Q3/multimedia/mpeg4ip/files
Message-ID:  <201607182113.u6ILD6Ji031616@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: riggs
Date: Mon Jul 18 21:13:06 2016
New Revision: 418752
URL: https://svnweb.freebsd.org/changeset/ports/418752

Log:
  MFH: r418702
  
  Fix build with libc++ 3.8.0
  
  Approved by:	ports-secteam (build fix blanket)

Added:
  branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp
     - copied unchanged from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp
  branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h
     - copied unchanged from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h
Modified:
Directory Properties:
  branches/2016Q3/   (props changed)

Copied: branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp (from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp	Mon Jul 18 21:13:06 2016	(r418752, copy of r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.cpp)
@@ -0,0 +1,20 @@
+--- server/mp4live/audio_oss_source.cpp.orig	2005-09-07 22:28:01 UTC
++++ server/mp4live/audio_oss_source.cpp
+@@ -265,7 +265,7 @@ bool COSSAudioSource::InitDevice(void)
+ 
+   rc = ioctl(m_audioDevice, SNDCTL_DSP_SPEED, &samplingRate);
+ 
+-  if (rc < 0 || abs(samplingRate - targetSamplingRate) > 1) {
++  if (rc < 0 || abs((int)(samplingRate - targetSamplingRate) > 1)) {
+     error_message("Couldn't set sampling rate for %s", deviceName);
+     close(m_audioDevice);
+     return false;
+@@ -450,7 +450,7 @@ bool CAudioCapabilities::ProbeDevice()
+     rc = ioctl(audioDevice, SNDCTL_DSP_SPEED, &samplingRate);
+ 
+     // invalid sampling rate, allow deviation of 1 sample/sec
+-    if (rc < 0 || abs(samplingRate - targetRate) > 1) {
++    if (rc < 0 || abs((int)(samplingRate - targetRate) > 1)) {
+       debug_message("audio device %s doesn't support sampling rate %u",
+                     m_deviceName, targetRate);
+       continue;

Copied: branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h (from r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2016Q3/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h	Mon Jul 18 21:13:06 2016	(r418752, copy of r418702, head/multimedia/mpeg4ip/files/patch-server_mp4live_audio__oss__source.h)
@@ -0,0 +1,11 @@
+--- server/mp4live/audio_oss_source.h.orig	2006-05-15 17:52:52 UTC
++++ server/mp4live/audio_oss_source.h
+@@ -104,7 +104,7 @@ class CAudioCapabilities : public CCapab
+ 	return rate;
+       }
+       int32_t calc;
+-      calc = abs(m_samplingRates[ix] - rate);
++      calc = abs((int)(m_samplingRates[ix] - rate));
+       if (calc < diff) {
+ 	diff = calc;
+ 	ret_rate = m_samplingRates[ix];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607182113.u6ILD6Ji031616>