svn commit: r346587 - in head/audio/spiralsynthmodular: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sat Mar  1 00:51:37 2014
New Revision: 346587
URL: http://svnweb.freebsd.org/changeset/ports/346587
QAT: https://qat.redports.org/buildarchive/r346587/

Log:
  - Fix build with clang
  - Fix patch filenames

Added:
  head/audio/spiralsynthmodular/files/patch-SpiralSound-PluginManager.C
     - copied unchanged from r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::PluginManager.C
  head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h   (contents, props changed)
  head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-OutputPlugin-OutputPlugin.C
     - copied unchanged from r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::OutputPlugin::OutputPlugin.C
Deleted:
  head/audio/spiralsynthmodular/files/patch-SpiralSound::PluginManager.C
  head/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::OutputPlugin::OutputPlugin.C
Modified:
  head/audio/spiralsynthmodular/Makefile

Modified: head/audio/spiralsynthmodular/Makefile
==============================================================================
--- head/audio/spiralsynthmodular/Makefile	Sat Mar  1 00:51:31 2014	(r346586)
+++ head/audio/spiralsynthmodular/Makefile	Sat Mar  1 00:51:37 2014	(r346587)
@@ -24,7 +24,7 @@ CONFIGURE_ENV=	FLTK_CONFIG="${FLTK_CONFI
 		LIBS="${LIBS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CPPFLAGS+=	-I${LOCALBASE}/include
 
-WRKSRC=	${WRKDIR}/spiralmodular-0.2.2
+WRKSRC=		${WRKDIR}/spiralmodular-0.2.2
 
 OPTIONS_DEFINE=	OPTIMIZED_CFLAGS
 

Copied: head/audio/spiralsynthmodular/files/patch-SpiralSound-PluginManager.C (from r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::PluginManager.C)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/spiralsynthmodular/files/patch-SpiralSound-PluginManager.C	Sat Mar  1 00:51:37 2014	(r346587, copy of r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::PluginManager.C)
@@ -0,0 +1,29 @@
+--- SpiralSound/PluginManager.C.orig	Mon Jan  6 01:17:04 2003
++++ SpiralSound/PluginManager.C	Mon Jan  6 01:17:45 2003
+@@ -48,7 +48,7 @@
+     }
+ 		
+ 	// Link the neccesary functions 
+-	char *error;
++	const char *error;
+ 	
+ 	NewPlugin->CreateInstance  = (SpiralPlugin*(*)()) dlsym(NewPlugin->Handle, "CreateInstance"); 	
+ 	
+@@ -89,7 +89,7 @@
+ 	if (IsValid(ID))
+     {
+ 		dlclose(GetPlugin(ID)->Handle);
+-		char *error;				
++		const char *error;				
+ 	    if ((error = dlerror()) != NULL)
+ 	    {
+ 			SpiralInfo::Alert("Error unlinking plugin: \n"+string(error));
+@@ -103,7 +103,7 @@
+ 		 i!=m_PluginVec.end(); i++)
+ 	{		
+ 		dlclose((*i)->Handle);
+-		char *error;				
++		const char *error;				
+ 	    if ((error = dlerror()) != NULL)
+ 	    {
+ 			SpiralInfo::Alert("Error unlinking plugin: \n"+string(error));

Added: head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-LADSPAPlugin-LADSPAInfo.h	Sat Mar  1 00:51:37 2014	(r346587)
@@ -0,0 +1,11 @@
+--- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h.orig	2014-02-13 05:56:16.387137838 +0400
++++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h	2014-02-13 05:57:44.261183646 +0400
+@@ -91,7 +91,7 @@
+ 		unsigned long   UniqueID;
+ 		std::string     Name;
+ 
+-		bool operator<(const PluginEntry& pe)
++		bool operator<(const PluginEntry& pe) const
+ 		{
+ 			return (Name<pe.Name);
+ 		}

Copied: head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-OutputPlugin-OutputPlugin.C (from r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::OutputPlugin::OutputPlugin.C)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/spiralsynthmodular/files/patch-SpiralSound-Plugins-OutputPlugin-OutputPlugin.C	Sat Mar  1 00:51:37 2014	(r346587, copy of r346581, head/audio/spiralsynthmodular/files/patch-SpiralSound::Plugins::OutputPlugin::OutputPlugin.C)
@@ -0,0 +1,19 @@
+--- SpiralSound/Plugins/OutputPlugin/OutputPlugin.C.orig	Thu Dec 12 16:23:11 2002
++++ SpiralSound/Plugins/OutputPlugin/OutputPlugin.C	Tue Jan  7 01:03:15 2003
+@@ -20,6 +20,7 @@
+ #define	_ISOC9X_SOURCE	1
+ #define _ISOC99_SOURCE	1
+ #include  <math.h>
++#define lrintf(flt)             ((int) (flt))
+ 
+ #include <sys/types.h>
+ #include <stdio.h>
+@@ -27,7 +28,7 @@
+ #include <unistd.h>
+ #include <limits.h>
+ #if defined (__FreeBSD__)
+-	#include <machine/soundcard.h>
++	#include <sys/soundcard.h>
+ #else
+ #if defined (__NetBSD__) || defined (__OpenBSD__)
+ 	#include <soundcard.h>            /* OSS emulation */