Date: Mon, 8 Oct 2007 05:29:20 +0400 (MSD) From: Dmitry Marakasov <amdmi3@amdmi3.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/117002: [MAINTAINER] multimedia/openmovieeditor: fix build with gcc42 Message-ID: <20071008012920.8E9B44197@hades.panopticon> Resent-Message-ID: <200710080130.l981U2r6051690@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117002
>Category: ports
>Synopsis: [MAINTAINER] multimedia/openmovieeditor: fix build with gcc42
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Oct 08 01:30:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator: Dmitry Marakasov
>Release: FreeBSD 6.1-RELEASE-p12 i386
>Organization:
>Environment:
System: FreeBSD hades.panopticon 6.1-RELEASE-p12 FreeBSD 6.1-RELEASE-p12 #0: Tue Jan 16 23:12:21 MSK 2007 amdmi3@hades.panopticon:/usr/obj/usr/src/sys/HADES i386
>Description:
Fix build with gcc42
Reported by: Mark Linimon <linimon@hub.freebsd.org>
>How-To-Repeat:
>Fix:
--- openmovieeditor.patch begins here ---
diff -ruN openmovieeditor.orig/files/patch-src-JackPlaybackCore.cxx openmovieeditor/files/patch-src-JackPlaybackCore.cxx
--- openmovieeditor.orig/files/patch-src-JackPlaybackCore.cxx Thu Jan 1 03:00:00 1970
+++ openmovieeditor/files/patch-src-JackPlaybackCore.cxx Fri Oct 5 01:24:06 2007
@@ -0,0 +1,11 @@
+--- src/JackPlaybackCore.cxx.orig Fri Oct 5 01:19:48 2007
++++ src/JackPlaybackCore.cxx Fri Oct 5 01:20:24 2007
+@@ -291,7 +291,7 @@
+ * possibly resulting in a backwards seek.
+ */
+ int spin = 1000000;
+- while (abs(jack_poll_frame()-m_currentFrame) > 2 && spin-- > 0 );
++ while (llabs(jack_poll_frame()-m_currentFrame) > 2 && spin-- > 0 );
+ }
+ if (g_use_jack_transport) jack_play();
+
diff -ruN openmovieeditor.orig/files/patch-src-PortAudioPlaybackCore.cxx openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx
--- openmovieeditor.orig/files/patch-src-PortAudioPlaybackCore.cxx Thu Jan 1 03:00:00 1970
+++ openmovieeditor/files/patch-src-PortAudioPlaybackCore.cxx Fri Oct 5 01:24:24 2007
@@ -0,0 +1,11 @@
+--- src/PortAudioPlaybackCore.cxx.orig Fri Oct 5 01:19:48 2007
++++ src/PortAudioPlaybackCore.cxx Fri Oct 5 01:20:55 2007
+@@ -187,7 +187,7 @@
+ m_lastFrame++;
+ pthread_mutex_lock( &condition_mutex );
+ int64_t diff = m_lastFrame - m_currentFrame;
+- if ( abs( diff ) > VIDEO_DRIFT_LIMIT ) {
++ if ( llabs( diff ) > VIDEO_DRIFT_LIMIT ) {
+ if ( diff > 0 ) {
+ while( ( m_lastFrame - m_currentFrame ) > VIDEO_DRIFT_LIMIT && Pa_StreamActive( g_stream ) ) {
+ pthread_cond_wait( &condition_cond, &condition_mutex );
--- openmovieeditor.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20071008012920.8E9B44197>