- Fix dependency on portaudio

- Fix build with clang
This commit is contained in:
Dmitry Marakasov 2013-09-02 15:40:12 +00:00
parent f3b28b1ba8
commit c3eb893eff
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=326015
3 changed files with 32 additions and 1 deletions

View file

@ -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

View file

@ -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:

View file

@ -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 {