Enable FLTK widget support for csound scores.

5 files changed, 51 insertions, 57 deletions

diff --git a/audio/csound-dev/Makefile b/audio/csound-dev/Makefile
index 2a07f3a8757..e54a8467adb 100644
--- a/audio/csound-dev/Makefile
+++ b/audio/csound-dev/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/22 07:15:00 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/19 04:49:40 ben Exp $
 #
 
 DISTNAME=		Csound-4.24.1
@@ -22,5 +22,7 @@ USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 CONFLICTS=		csound-bath*
 
+.include "../../x11/fltk/buildlink2.mk"
 .include "../../mk/ossaudio.buildlink2.mk"
+.include "../../mk/pthread.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/csound-dev/distinfo b/audio/csound-dev/distinfo
index 8bb9c3db0ff..d5b769bffff 100644
--- a/audio/csound-dev/distinfo
+++ b/audio/csound-dev/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.2 2004/01/23 19:34:09 kristerw Exp $
+$NetBSD: distinfo,v 1.3 2004/02/19 04:49:40 ben Exp $
 
 SHA1 (csound/Csound-4.24.1.tar.bz2) = a14903e23b72c78a870b0d38df7bbdb5e1a56c9e
 Size (csound/Csound-4.24.1.tar.bz2) = 1116589 bytes
-SHA1 (patch-aa) = 586cf46e97b9386fae79e924bebedc06b149feaf
+SHA1 (patch-aa) = b596c7bec6060b7d3a8902e4cd2d0e5982b5fe4c
 SHA1 (patch-ab) = 64a0cf6a5b720d05d625613117c26f5669553d79
 SHA1 (patch-ac) = 4c59bab1d38ae65fba96cab5b8718f8d41646ccd
-SHA1 (patch-ad) = e7655efd4ac71e56d0a0ffa29d7651ccbde5e4dc
+SHA1 (patch-ad) = 8e001b34e1e0a2a1beba5d50667b1b402143c532
 SHA1 (patch-ae) = 75b35e8161390aef418055a1d834120f16c7c99c
 SHA1 (patch-af) = 6641f5fce8e919dbe39c0132fd35f6799b54d24d
 SHA1 (patch-ag) = 1cbc8e5070efa0416fd771a77c181f859a3ae4e7
@@ -24,3 +24,4 @@ SHA1 (patch-as) = 45a18ea81022a722c489aee4013589172490c60f
 SHA1 (patch-at) = fd424477994e026526ed14d9d64a951abcfbb6fb
 SHA1 (patch-au) = 5c002177662b6f9b4eacccba023e88ba8c0699af
 SHA1 (patch-av) = 3f0ab825be6b3e1ce8f5f9a5e019b70b93bcc385
+SHA1 (patch-aw) = a3b52e7a40bba5ca7e2a422d4718b4c11b0f7b95
diff --git a/audio/csound-dev/patches/patch-aa b/audio/csound-dev/patches/patch-aa
index 63c7ebca56c..651e42c65ea 100644
--- a/audio/csound-dev/patches/patch-aa
+++ b/audio/csound-dev/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2003/12/13 20:26:03 ben Exp $
+$NetBSD: patch-aa,v 1.2 2004/02/19 04:49:40 ben Exp $
 
 --- Makefile.defs.orig	2003-02-25 19:24:01.000000000 -0800
 +++ Makefile.defs
@@ -11,16 +11,21 @@ $NetBSD: patch-aa,v 1.1 2003/12/13 20:26:03 ben Exp $
  
  BINDIR	= $(INSTDIR)/bin
  LIBDIR	= $(INSTDIR)/lib
-@@ -70,9 +70,9 @@ RANLIB = ranlib
- # General defines. These set the type of system for which Csound is compiled,
- # and select various features to be enabled.
- 
--DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DLINUX -DHAVE_TERMIOS_H		\
--	  -DIV_VERSION -DPIPES -DMACROS -DHAVE_FLTK -D_REENTRANT	\
+@@ -62,7 +62,7 @@ CC = gcc
+ CXX = g++
+ LD = gcc
+ AR = ar rc
+-MAKEDLL_L = ld -E -s -shared -O1
++MAKEDLL_L = $(CXX) -Wl,-E -Wl,-shared
+ MAKEDLL_P = ld -E -s -shared -O1
+ RANLIB = ranlib
+ 
+@@ -72,7 +72,7 @@ RANLIB = ranlib
+ 
+ DEFINES = -DWINDOWS -DSFIRCAM -DSYS5 -DLINUX -DHAVE_TERMIOS_H		\
+ 	  -DIV_VERSION -DPIPES -DMACROS -DHAVE_FLTK -D_REENTRANT	\
 -	  -DHAVE_SSTREAM -DMYFLT=float
-+DEFINES = -DSFIRCAM -DSYS5 -DLINUX -DBSD -DHAVE_TERMIOS_H		\
-+	  -DIV_VERSION -DPIPES -DMACROS -D_REENTRANT			\
-+	  -DHAVE_SSTREAM -DMYFLT=float -DDEVOSSSOUND="\"$(DEVOSSSOUND)\""
++	  -DHAVE_SSTREAM -DMYFLT=float -DBSD -DDEVOSSSOUND="\"$(DEVOSSSOUND)\""
  # choose any of -
  #	-DSYS5		invoke System V headers, e.g. 'string.h' for 'strings.h'
  #	-DHAVE_SSTREAM	include <sstream> header from C++ sources, instead of
@@ -53,30 +58,18 @@ $NetBSD: patch-aa,v 1.1 2003/12/13 20:26:03 ben Exp $
  # `fltk-config --cxxflags`		try adding this if the compilation of
  #					FLTK widgets stops with error messages
  #					related to not finding include files
-@@ -159,14 +154,13 @@ CXXFLAGS = $(CFLAGS) $(C_FLAGS) -fno-exc
- # -----------------------------------------------------------------------------
- # uncomment these if HAVE_FLTK was enabled in DEFINES
- 
--FLTKSRC = buttonsched.c widgets.cpp
--FLTKOBJ = buttonsched.o widgets.o
-+FLTKSRC =
-+FLTKOBJ =
- # source and object files for FLTK widgets
+@@ -165,8 +160,7 @@ FLTKOBJ = buttonsched.o widgets.o
  
  # FLTKLIB = -lfltk -lpthread -lstdc++
  # FLTKLIB = `fltk-config --libs`
 -FLTKLIB = /usr/local/FLTK-1.1.0/Linux/lib/libfltk.a			\
 -	  /usr/local/gcc-3.2.2/lib/libstdc++.a
-+FLTKLIB =
++FLTKLIB = -lfltk -lstdc++
  # libraries required by widgets.cpp
  #	-lfltk -lpthread -lstdc++		use dynamic libraries
  #
-@@ -185,10 +179,10 @@ FLTKLIB = /usr/local/FLTK-1.1.0/Linux/li
- # -----------------------------------------------------------------------------
- # libraries
- 
--LIBS = -lpthread -lm
-+LIBS = -lm
+@@ -188,7 +182,7 @@ FLTKLIB = /usr/local/FLTK-1.1.0/Linux/li
+ LIBS = -lpthread -lm
  # used for linking all executables
  
 -MISC_LIB = -ldl
@@ -84,22 +77,12 @@ $NetBSD: patch-aa,v 1.1 2003/12/13 20:26:03 ben Exp $
  # these are used by the main Csound executable only
  
  #	-lefence                        for debugging only
-@@ -203,15 +197,15 @@ MISC_LIB = -ldl
- # select source and object files for window (X11, FLTK, etc.) displays
- # all files are in sysdep directory
- 
--WINSRC = sysdep/winX11.c
--WINOBJ = sysdep/winX11.o
-+WINSRC =
-+WINOBJ =
- # ;if WINDOWS enabled in DEFINES, choose one of -
- #	winX11.o	for X11 window graphics
- #	winSGI.o	for SGI window graphics
+@@ -211,7 +205,7 @@ WINOBJ = sysdep/winX11.o
  #	winFLTK.o and FL_graph.o for `improved' X graphics
  # otherwise leave empty
  
 -WINLIBS = -L/usr/X11R6/lib -lX11
-+WINLIBS =
++WINLIBS = -lX11
  # ;window system libraries
  #	-lX11				for X window calls
  #	-L/usr/lib/X11R4		for HP X11 library, v.4
diff --git a/audio/csound-dev/patches/patch-ad b/audio/csound-dev/patches/patch-ad
index 48235fe9c41..875997fca2e 100644
--- a/audio/csound-dev/patches/patch-ad
+++ b/audio/csound-dev/patches/patch-ad
@@ -1,7 +1,16 @@
-$NetBSD: patch-ad,v 1.1 2003/12/13 20:26:03 ben Exp $
+$NetBSD: patch-ad,v 1.2 2004/02/19 04:49:40 ben Exp $
 
 --- Makefile.orig	2003-02-25 19:24:01.000000000 -0800
 +++ Makefile
+@@ -133,7 +133,7 @@ else
+ $(LIBCSND_D): $(CSOBJS) $(OPOBJS)
+ 	rm -f $@
+ 	$(MAKEDLL_L) -o $@ $(CSOBJS) $(OPOBJS) $(FLTKLIB) $(WINLIBS)	\
+-			   $(AUDLIBS) $(MISC_LIB) $(LIBS)
++			   $(AUDLIBS) $(MISC_LIB) $(LIBS) $(LDFLAGS)
+ endif
+ 
+ # ---- main Csound executable ----
 @@ -170,7 +170,7 @@ $(INSTALL_DIRS):
  
  install_libs: $(INSTALL_DIRS)
@@ -43,17 +52,3 @@ $NetBSD: patch-ad,v 1.1 2003/12/13 20:26:03 ben Exp $
  ifneq ($(strip $(BUILD_UTILS)),)
  	cd utils ; make $@
  endif
-@@ -254,13 +254,11 @@ ifneq ($(strip $(BUILD_PLUGINS)),)
- endif
- 	$(CXX) -M $(CXXFLAGS) $(OPSRCS) > .depend
- 	$(CXX) -M $(CXXFLAGS) $(CSSRCS) >> .depend
--	$(CXX) -M $(CXXFLAGS) $(WINSRC) $(FLTKSRC) >> .depend
- 	$(CXX) -M $(CXXFLAGS) main.c >> .depend
- 
- .depend:
- 	$(CXX) -M $(CXXFLAGS) $(OPSRCS) > .depend
- 	$(CXX) -M $(CXXFLAGS) $(CSSRCS) >> .depend
--	$(CXX) -M $(CXXFLAGS) $(WINSRC) $(FLTKSRC) >> .depend
- 	$(CXX) -M $(CXXFLAGS) main.c >> .depend
- 
- include .depend
diff --git a/audio/csound-dev/patches/patch-aw b/audio/csound-dev/patches/patch-aw
new file mode 100644
index 00000000000..f4e894e5404
--- /dev/null
+++ b/audio/csound-dev/patches/patch-aw
@@ -0,0 +1,13 @@
+$NetBSD: patch-aw,v 1.1 2004/02/19 04:49:40 ben Exp $
+
+--- widgets.cpp.orig	2003-02-25 19:24:01.000000000 -0800
++++ widgets.cpp
+@@ -1631,7 +1631,7 @@ extern "C" void FL_run(FLRUN *p)
+     pthread_t       thread1;
+     // IV - Aug 27 2002: widget thread is always run with normal priority
+     pthread_attr_init(&a);
+-#ifdef LINUX
++#if defined(LINUX) && !defined(BSD)
+     pthread_attr_setschedpolicy(&a, SCHED_OTHER);
+     pthread_attr_setinheritsched(&a, PTHREAD_EXPLICIT_SCHED);
+ #endif