From c3eb893effa6316b812ab991fc1678fcccf47428 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Mon, 2 Sep 2013 15:40:12 +0000 Subject: [PATCH] - Fix dependency on portaudio - Fix build with clang --- multimedia/openmovieeditor/Makefile | 2 +- .../files/patch-src-NodeEditor-SrcNode.H | 11 ++++++++++ .../files/patch-src-TimelineView.cxx | 20 +++++++++++++++++++ 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H create mode 100644 multimedia/openmovieeditor/files/patch-src-TimelineView.cxx diff --git a/multimedia/openmovieeditor/Makefile b/multimedia/openmovieeditor/Makefile index 4f2a554e066f..5fdf875dfac6 100644 --- a/multimedia/openmovieeditor/Makefile +++ b/multimedia/openmovieeditor/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= samplerate:${PORTSDIR}/audio/libsamplerate \ 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 diff --git a/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H b/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H new file mode 100644 index 000000000000..8186e7f49cc6 --- /dev/null +++ b/multimedia/openmovieeditor/files/patch-src-NodeEditor-SrcNode.H @@ -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: diff --git a/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx b/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx new file mode 100644 index 000000000000..d075069fefa8 --- /dev/null +++ b/multimedia/openmovieeditor/files/patch-src-TimelineView.cxx @@ -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 {