Date: Mon, 2 Sep 2013 15:40:12 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r326015 - in head/multimedia/openmovieeditor: . files Message-ID: <201309021540.r82FeCm8044897@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Sep 2 15:40:12 2013 New Revision: 326015 URL: http://svnweb.freebsd.org/changeset/ports/326015 Log: - Fix dependency on portaudio - Fix build with clang Added: head/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H (contents, props changed) head/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx (contents, props changed) Modified: head/multimedia/openmovieeditor/Makefile Modified: head/multimedia/openmovieeditor/Makefile ============================================================================== --- head/multimedia/openmovieeditor/Makefile Mon Sep 2 15:40:00 2013 (r326014) +++ head/multimedia/openmovieeditor/Makefile Mon Sep 2 15:40:12 2013 (r326015) @@ -19,7 +19,7 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audi avcodec:${PORTSDIR}/multimedia/ffmpeg \ jack:${PORTSDIR}/audio/jack \ fltk:${PORTSDIR}/x11-toolkits/fltk \ - portaudio:${PORTSDIR}/audio/portaudio2 + portaudio.2:${PORTSDIR}/audio/portaudio2 BUILD_DEPENDS= ${LOCALBASE}/lib/libmpeg3.a:${PORTSDIR}/multimedia/libmpeg3 \ ${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame RUN_DEPENDS= ${LOCALBASE}/lib/libquicktime/lqt_lame.so:${PORTSDIR}/multimedia/libquicktime-lame Added: head/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H Mon Sep 2 15:40:12 2013 (r326015) @@ -0,0 +1,11 @@ +--- src/NodeEditor/SrcNode.H.orig 2008-04-19 18:19:27.000000000 +0400 ++++ src/NodeEditor/SrcNode.H 2013-08-30 16:56:41.373227557 +0400 +@@ -4,7 +4,7 @@ + + #include "INode.H" + +-class nle::NodeFilter; ++namespace nle { class NodeFilter; } + class SrcNode : public INode + { + public: Added: head/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx Mon Sep 2 15:40:12 2013 (r326015) @@ -0,0 +1,20 @@ +--- src/TimelineView.cxx.orig 2008-10-29 13:46:23.000000000 +0300 ++++ src/TimelineView.cxx 2013-08-30 17:22:00.908622066 +0400 +@@ -206,13 +206,15 @@ + cl = get_clip( _x, _y ); + if ( cl && ( _x < get_screen_position( cl->position(), cl->track()->stretchFactor() ) + 8 ) ) { + if ( current_cursor != FL_CURSOR_WE ) { +- flmm_cursor( window(), &Flmm_Cursor_Shape(clip_a_cursor_crsr) ); ++ Flmm_Cursor_Shape cs(clip_a_cursor_crsr); ++ flmm_cursor( window(), &cs ); + //window()->cursor( FL_CURSOR_WE, fl_rgb_color(254,254,254), fl_rgb_color(1,1,1) ); + current_cursor = FL_CURSOR_WE; + } + } else if ( cl && ( _x > get_screen_position( cl->position() + (cl->length()+1), cl->track()->stretchFactor() ) - 8 ) ) { + if ( current_cursor != FL_CURSOR_NE ) { +- flmm_cursor( window(), &Flmm_Cursor_Shape(clip_b_cursor_crsr) ); ++ Flmm_Cursor_Shape cs(clip_b_cursor_crsr); ++ flmm_cursor( window(), &cs ); + current_cursor = FL_CURSOR_NE; + } + } else {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201309021540.r82FeCm8044897>