From 9c46b8263b7fc2c3e78777c1a3a687448d45b411 Mon Sep 17 00:00:00 2001
From: Clifford Wolf <clifford@clifford.at>
Date: Fri, 23 Nov 2007 08:42:29 +0000
Subject: [PATCH] Clifford Wolf: 	Updated lmms (0.3.0)

[2007110910091419350] (https://www.rocklinux.net/submaster)



git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8860 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc
---
 package/clifford/lmms/lmms.conf        |  8 +++++
 package/clifford/lmms/lmms.desc        |  4 +--
 package/clifford/lmms/samplerate.patch | 44 ++++++++++++++++++++++++++
 3 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 package/clifford/lmms/lmms.conf
 create mode 100644 package/clifford/lmms/samplerate.patch

diff --git a/package/clifford/lmms/lmms.conf b/package/clifford/lmms/lmms.conf
new file mode 100644
index 000000000..c2353e670
--- /dev/null
+++ b/package/clifford/lmms/lmms.conf
@@ -0,0 +1,8 @@
+
+# lmms is trying to build c++ stuff with the c-compiler..
+CC="$CXX"
+
+# for windows.h and windef.h
+var_append CFLAGS " " "-I/usr/include/wine/windows"
+var_append CXXFLAGS " " "-I/usr/include/wine/windows"
+
diff --git a/package/clifford/lmms/lmms.desc b/package/clifford/lmms/lmms.desc
index 008ab24cf..b5e649130 100644
--- a/package/clifford/lmms/lmms.desc
+++ b/package/clifford/lmms/lmms.desc
@@ -43,8 +43,8 @@
 
 [L] GPL
 [S] Stable
-[V] 0.2.1
+[V] 0.3.0
 [P] X --?--5---9 203.800
 
-[D] 4262576994 lmms-0.2.1.tar.bz2 http://switch.dl.sourceforge.net/sourceforge/lmms/
+[D] 14891066 lmms-0.3.0.tar.bz2 http://switch.dl.sourceforge.net/sourceforge/lmms/
 
diff --git a/package/clifford/lmms/samplerate.patch b/package/clifford/lmms/samplerate.patch
new file mode 100644
index 000000000..dc45560a4
--- /dev/null
+++ b/package/clifford/lmms/samplerate.patch
@@ -0,0 +1,44 @@
+--- ./src/3rdparty/samplerate/samplerate.c.orig	2007-11-09 08:44:58.000000000 +0000
++++ ./src/3rdparty/samplerate/samplerate.c	2007-11-09 08:46:09.000000000 +0000
+@@ -42,7 +42,7 @@
+ 		return NULL ;
+ 		} ;
+ 
+-	if ((psrc = calloc (1, sizeof (*psrc))) == NULL)
++	if ((psrc = (SRC_PRIVATE*)calloc (1, sizeof (*psrc))) == NULL)
+ 	{	if (error)
+ 			*error = SRC_ERR_MALLOC_FAILED ;
+ 		return NULL ;
+--- ./src/3rdparty/samplerate/src_linear.c.orig	2007-11-09 08:47:36.000000000 +0000
++++ ./src/3rdparty/samplerate/src_linear.c	2007-11-09 08:47:42.000000000 +0000
+@@ -166,7 +166,7 @@
+ 		} ;
+ 
+ 	if (psrc->private_data == NULL)
+-	{	linear = calloc (1, sizeof (*linear) + psrc->channels * sizeof (float)) ;
++	{	linear = (LINEAR_DATA*)calloc (1, sizeof (*linear) + psrc->channels * sizeof (float)) ;
+ 		if (linear == NULL)
+ 			return SRC_ERR_MALLOC_FAILED ;
+ 		psrc->private_data = linear ;
+--- ./src/3rdparty/samplerate/src_sinc.c.orig	2007-11-09 08:46:30.000000000 +0000
++++ ./src/3rdparty/samplerate/src_sinc.c	2007-11-09 08:46:52.000000000 +0000
+@@ -207,7 +207,7 @@
+ 	temp_filter.b_len = 1000 + 2 * lrint (0.5 + temp_filter.coeff_len / (temp_filter.index_inc * 1.0) * SRC_MAX_RATIO) ;
+ 	temp_filter.b_len *= temp_filter.channels ;
+ 
+-	if ((filter = calloc (1, sizeof (SINC_FILTER) + sizeof (filter->buffer [0]) * (temp_filter.b_len + temp_filter.channels))) == NULL)
++	if ((filter = (SINC_FILTER*)calloc (1, sizeof (SINC_FILTER) + sizeof (filter->buffer [0]) * (temp_filter.b_len + temp_filter.channels))) == NULL)
+ 		return SRC_ERR_MALLOC_FAILED ;
+ 
+ 	*filter = temp_filter ;
+--- ./src/3rdparty/samplerate/src_zoh.c.orig	2007-11-09 08:47:07.000000000 +0000
++++ ./src/3rdparty/samplerate/src_zoh.c	2007-11-09 08:47:20.000000000 +0000
+@@ -157,7 +157,7 @@
+ 		} ;
+ 
+ 	if (psrc->private_data == NULL)
+-	{	zoh = calloc (1, sizeof (*zoh) + psrc->channels * sizeof (float)) ;
++	{	zoh = (ZOH_DATA*)calloc (1, sizeof (*zoh) + psrc->channels * sizeof (float)) ;
+ 		if (zoh == NULL)
+ 			return SRC_ERR_MALLOC_FAILED ;
+ 		psrc->private_data = zoh ;