From 7147229b2ab9cfaf9de686814b94a20a2dd36ae1 Mon Sep 17 00:00:00 2001
From: Tobias Doerffel <tobias.doerffel@gmail.com>
Date: Wed, 28 Jun 2006 10:45:09 +0000
Subject: [PATCH] small compat-fixes

git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@182 0778d3d1-df1d-0410-868b-ea421aaaa00d
---
 ChangeLog                     | 9 +++++++++
 acinclude.m4                  | 2 +-
 configure.in                  | 9 +++++----
 plugins/vestige/lvsl_server.c | 9 +++++++--
 4 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index eec36b720..316cef7e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,15 @@
 	- added level<->label methods
 	- minimized rounding errors
 
+2006-06-27	Tobias Doerffel	<tobydox/at/users/dot/sourceforge/dot/net>
+
+	* plugins/vestige/lvsl_server.c:
+	compatibility with older VST-headers (2.0) mentioned by configure
+
+	* acinclude.m4:
+	* configure.in:
+	compat-fixes for FreeBSD
+
 2006-06-27	Javier Serrano Polo <jasp00/at/terra/dot/es>
 
 	* include/time_pattern.h:
diff --git a/acinclude.m4 b/acinclude.m4
index 4fb2771cd..40ee2cea2 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -203,7 +203,7 @@ case "${host}" in
     *linux*)
         QT_LIBS="$QT_LIB"
         if test $QT_IS_STATIC = yes && test $QT_IS_EMBEDDED = no; then
-            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ldl -ljpeg"
+            QT_LIBS="$QT_LIBS -L$x_libraries -lXext -lX11 -lm -lSM -lICE -ljpeg"
         fi
         ;;
 
diff --git a/configure.in b/configure.in
index bc2d160ac..b660d8f24 100644
--- a/configure.in
+++ b/configure.in
@@ -429,6 +429,8 @@ if test $CXX == "g++" ; then
 	CXXFLAGS="$CXXFLAGS -ansi -Wall -fno-exceptions"
 fi
 
+LDFLAGS="$LDFLAGS -L/usr/local/lib"
+CXXFLAGS="$CXXFLAGS -I/usr/local/include"
 
 AC_CONFIG_FILES([Makefile
 		 buildtools/Makefile
@@ -670,11 +672,10 @@ else
 		echo " = in /usr/include/ or ./include. We cannot distribute them as they're licensed under"
 		echo " = a GPL-incompatible license, so you'll have to download them at"
 		echo " ="
-		echo " = http://www.steinberg.de/Steinberg/ygrabit/vstsdk/OnlineDoc/source/common/AEffect.h"
-		echo " = http://www.steinberg.de/Steinberg/ygrabit/vstsdk/OnlineDoc/source/common/aeffectx.h"
+		echo " = http://audacity.cvs.sourceforge.net/*checkout*/audacity/audacity-old/effects/aeffectx.h"
+		echo " = http://audacity.cvs.sourceforge.net/*checkout*/audacity/audacity-old/effects/AEffect.h"
 		echo " ="
-		echo " = and put the mentioned files into /usr/include/ or ./include. Make sure,"
-		echo "= they're patched with file vst_sdk23_headers.diff!"
+		echo " = and put the mentioned files into /usr/include/ or ./include."
 		echo " = Otherwise (now!) configure will disable LMMS's support for built-in VST-"
 		echo " = plugin-usage. If you do not intend to use VST-plugins with LMMS you can "
 		echo " = ignore this warning."
diff --git a/plugins/vestige/lvsl_server.c b/plugins/vestige/lvsl_server.c
index 7d917e4f5..837dec2d0 100644
--- a/plugins/vestige/lvsl_server.c
+++ b/plugins/vestige/lvsl_server.c
@@ -5,7 +5,7 @@
  * 
  * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net
  *
- * Code partly taken from XFST:
+ * Code partly taken from (X)FST:
  * 		Copyright (c) 2004 Paul Davis
  * 		Copyright (c) 2004 Torben Hohn
  *	 	Copyright (c) 2002 Kjetil S. Matheussen
@@ -611,14 +611,18 @@ void VSTPlugin::getParameterProperties( const Sint32 _idx )
 	memcpy( props.label, vst_props.label, sizeof( props.label ) );
 	memcpy( props.shortLabel, vst_props.shortLabel,
 						sizeof( props.shortLabel) );
+#if kVstVersion > 2
 	memcpy( props.categoryLabel, vst_props.categoryLabel,
 						sizeof( props.categoryLabel ) );
+#endif
 	props.minValue = vst_props.minInteger;
 	props.maxValue = vst_props.maxInteger;
 	props.step = ( vst_props.flags & kVstParameterUsesFloatStep ) ?
 							vst_props.stepFloat :
 							vst_props.stepInteger;
+#if kVstVersion > 2
 	props.category = vst_props.category;
+#endif
 	writeValue<Sint16>( VST_PARAMETER_PROPERTIES );
 	writeValue<vstParamProperties>( props );
 }
@@ -966,6 +970,7 @@ VstIntPtr VSTPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode,
 									0.0f );
 			return( 0 );
 
+#if kVstVersion > 2
 		case audioMasterBeginEdit:
 			SHOW_CALLBACK( "amc: audioMasterBeginEdit\n" );
 			// begin of automation session (when mouse down),	
@@ -983,7 +988,7 @@ VstIntPtr VSTPlugin::hostCallback( AEffect * _effect, VstInt32 _opcode,
 			// open a fileselector window with VstFileSelect*
 			// in <ptr>
 			return( 0 );
-
+#endif
 		default:
 			SHOW_CALLBACK( "VST master dispatcher: undefined: "
 						"%d\n", (int) _opcode );