[SM-Commit] GIT changes to master grimoire by Andraž Levstik (7763468d1f7e512e0de1c7540e88ab559a429fbb)

Andraž Levstik scm at sourcemage.org
Sun Nov 9 02:46:58 EST 2008


GIT changes to master grimoire by Andraž Levstik <ruskie at codemages.net>:

 audio-creation/ggseq/DEPENDS                                   |    4 
 audio-creation/ggseq/HISTORY                                   |    8 
 audio-creation/ggseq/PRE_BUILD                                 |    3 
 audio-creation/ggseq/use_system_portaudio_and_soundtouch.patch |   97 ++++++++++
 4 files changed, 111 insertions(+), 1 deletion(-)

New commits:
commit 7763468d1f7e512e0de1c7540e88ab559a429fbb
Author: Andraž Levstik <ruskie at codemages.net>
Commit: Andraž Levstik <ruskie at codemages.net>

    ggseq: use system libs for portaudio and soundtouch now

diff --git a/audio-creation/ggseq/DEPENDS b/audio-creation/ggseq/DEPENDS
index c02c24e..d3c2167 100755
--- a/audio-creation/ggseq/DEPENDS
+++ b/audio-creation/ggseq/DEPENDS
@@ -1,4 +1,6 @@
 depends g++ &&
 depends wxgtk &&
 depends libsndfile &&
-depends libsamplerate
+depends libsamplerate &&
+depends portaudio &&
+depends soundtouch
diff --git a/audio-creation/ggseq/HISTORY b/audio-creation/ggseq/HISTORY
index 6dfcdbb..3346e39 100644
--- a/audio-creation/ggseq/HISTORY
+++ b/audio-creation/ggseq/HISTORY
@@ -1,3 +1,11 @@
+2008-11-09 Andraž "ruskie" Levstik <ruskie at mages.ath.cx>
+	* PRE_BUILD: added to apply a patch
+	* use_system_portaudio_and_soundtouch.patch: use system libs patch,
+	  due to the outdated version of the included soundtouch it failed to
+	  build so this is a necessity and while we're at it why not make it
+	  fully work with system libs along the way
+	* DEPENDS: now depends on soundtouch and portaudio
+
 2006-10-03 Juuso Alasuutari <iuso at sourcemage.org>
 	* DETAILS: [automated] Removed UPDATED.
 
diff --git a/audio-creation/ggseq/PRE_BUILD b/audio-creation/ggseq/PRE_BUILD
new file mode 100755
index 0000000..c7dcf49
--- /dev/null
+++ b/audio-creation/ggseq/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build  &&
+cd $SOURCE_DIRECTORY  &&
+patch -p1 < $SPELL_DIRECTORY/use_system_portaudio_and_soundtouch.patch
diff --git a/audio-creation/ggseq/use_system_portaudio_and_soundtouch.patch b/audio-creation/ggseq/use_system_portaudio_and_soundtouch.patch
new file mode 100644
index 0000000..9ffbe17
--- /dev/null
+++ b/audio-creation/ggseq/use_system_portaudio_and_soundtouch.patch
@@ -0,0 +1,97 @@
+diff -Nuar ggseq-0.3.1.old/src/Makefile.am ggseq-0.3.1/src/Makefile.am
+--- ggseq-0.3.1.old/src/Makefile.am	2005-05-06 20:12:49.000000000 +0000
++++ ggseq-0.3.1/src/Makefile.am	2008-11-09 07:24:51.000000000 +0000
+@@ -8,7 +8,7 @@
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-SUBDIRS = portaudio SoundTouch
++SUBDIRS = 
+ 
+ bin_PROGRAMS = ggseq
+ ggseq_SOURCES = PreferencesDialog.h\
+@@ -102,6 +102,6 @@
+                 TLXmlLoader2.h\
+ 		TLMuteButton.h
+ 
+-ggseq_LDADD = portaudio/libportaudio.a SoundTouch/libSoundTouch.a
++ggseq_LDADD = -lportaudio -lSoundTouch
+ 
+ AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"  -I$(top_srcdir)/icons -DINSTALL_PREFIX="\"$(prefix)\""
+diff -Nuar ggseq-0.3.1.old/src/Makefile.in ggseq-0.3.1/src/Makefile.in
+--- ggseq-0.3.1.old/src/Makefile.in	2005-06-06 12:00:38.000000000 +0000
++++ ggseq-0.3.1/src/Makefile.in	2008-11-09 07:24:51.000000000 +0000
+@@ -113,13 +113,13 @@
+ WX_LIBS_STATIC = @WX_LIBS_STATIC@
+ WX_VERSION = @WX_VERSION@
+ 
+-SUBDIRS = portaudio SoundTouch
++SUBDIRS = 
+ 
+ bin_PROGRAMS = ggseq
+ ggseq_SOURCES = PreferencesDialog.h                 PreferencesDialog.cpp 		SampleEdit.cpp 		Listeners.h 		SampleEdit.h 		PlayerInterface.h 		PlayerInterface.cpp 		ggseq_ui.cpp 		MouseDragHandler.cpp 		MouseDragHandler.h 		SelectionDragHandler.cpp 		SelectionDragHandler.h 		RubberDragHandler.h 		RubberDragHandler.cpp                 ggseq_ui.h 		EnvelopeDragHandler.h 		EnvelopeDragHandler.cpp 		TrimmerDialog.h 		TrimmerDialog.cpp 		WaveEditor.h 		WaveEditor.cpp                 ggseq_ui_wdr.cpp 		colour_helper.h 		colour_helper.cpp                 ggseq_ui_wdr.h                 ui_helper.cpp                 ui_helper.h                 tinyxmlparser.cpp                 TLMiniFiler2.cpp                 TLSelectionSet.cpp                 SoundManager.cpp                 TLColourManager.cpp                 TLPanel.cpp                 TLTrack.cpp                 tinystr.cpp                 TLData.cpp                 TLSample.cpp                 TLView.cpp                 tinyxml.cpp                 TLItem.cpp                 TLSampleManager.cpp                 TLXmlLoader2.cpp                 tinyxmlerror.cpp                 TLLoadSaveManager.cpp                 GgseqGlobalProps.cpp                 GgseqGlobalProps.h 		TLMuteButton.cpp 		dial.cpp 		dial.h 		TLTrackVolumeDial.h 		TLTrackVolumeDial.cpp 		MiniPlayer.h 		MiniPlayer.cpp 		stuff.h 		Ruler.h 		Ruler.cpp 		UpdateListener.cpp 		UpdateListener.h 		StatusProgressBar.cpp 		StatusProgressBar.h 		DisableListener.h 		DisableListener.cpp 		SidePanel.cpp 		SidePanel.h 		FileInfoPanel.cpp 		FileInfoPanel.h 		ggEvtHandler.h 		ggEvtHandler.cpp 		BigScrollBar.cpp 		BigScrollBar.h 		GgseqDocManager.cpp 		GgseqDocManager.h 		ImportPackDialog.cpp 		ImportPackDialog.h                 SoundManager.h                 tinystr.h                 tinyxml.h                 TLColourManager.h                 TLData.h                 TLItem.h                 TLLoadSaveManager.h                 TLMiniFiler2.h                 TLPanel.h                 TLSample.h                 TLSampleManager.h                 TLSelectionSet.h                 TLTrack.h                 TLView.h                 TLXmlLoader2.h 		TLMuteButton.h
+ 
+ 
+-ggseq_LDADD = portaudio/libportaudio.a SoundTouch/libSoundTouch.a
++ggseq_LDADD = -lportaudio -lSoundTouch
+ 
+ AM_CPPFLAGS = @CPPFLAGS@ -DLOCALEDIR=\"$(NLSDIR)\"  -I$(top_srcdir)/icons -DINSTALL_PREFIX="\"$(prefix)\""
+ mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
+@@ -151,8 +151,7 @@
+ SidePanel.$(OBJEXT) FileInfoPanel.$(OBJEXT) ggEvtHandler.$(OBJEXT) \
+ BigScrollBar.$(OBJEXT) GgseqDocManager.$(OBJEXT) \
+ ImportPackDialog.$(OBJEXT)
+-ggseq_DEPENDENCIES =  portaudio/libportaudio.a \
+-SoundTouch/libSoundTouch.a
++ggseq_DEPENDENCIES = 
+ ggseq_LDFLAGS = 
+ CXXFLAGS = @CXXFLAGS@
+ CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+diff -Nuar ggseq-0.3.1.old/src/SampleEdit.cpp ggseq-0.3.1/src/SampleEdit.cpp
+--- ggseq-0.3.1.old/src/SampleEdit.cpp	2005-05-06 17:48:36.000000000 +0000
++++ ggseq-0.3.1/src/SampleEdit.cpp	2008-11-09 07:24:51.000000000 +0000
+@@ -17,7 +17,7 @@
+  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+  */
+ 
+-#include "SoundTouch/SoundTouch.h"
++#include <soundtouch/SoundTouch.h>
+ //#include <soundtouch/SoundTouch.h>
+ 
+ #include "SampleEdit.h"
+diff -Nuar ggseq-0.3.1.old/src/SoundManager.cpp ggseq-0.3.1/src/SoundManager.cpp
+--- ggseq-0.3.1.old/src/SoundManager.cpp	2005-05-06 17:48:36.000000000 +0000
++++ ggseq-0.3.1/src/SoundManager.cpp	2008-11-09 07:26:40.000000000 +0000
+@@ -23,7 +23,7 @@
+     #include "wx/wx.h"
+ #endif
+ 
+-#include "portaudio/portaudio.h"
++#include <portaudio.h>
+ #include "stuff.h"
+ #include "TLItem.h"
+ #include "TLData.h"
+diff -Nuar ggseq-0.3.1.old/src/TLItem.cpp ggseq-0.3.1/src/TLItem.cpp
+--- ggseq-0.3.1.old/src/TLItem.cpp	2005-06-02 06:16:51.000000000 +0000
++++ ggseq-0.3.1/src/TLItem.cpp	2008-11-09 07:24:51.000000000 +0000
+@@ -29,7 +29,7 @@
+ #ifdef __WXMSW__
+ 	#include <soundtouch/SoundTouch.h>
+ #else
+-	#include "SoundTouch/SoundTouch.h"
++	#include <soundtouch/SoundTouch.h>
+ #endif
+ 
+ #include "stuff.h"
+diff -Nuar ggseq-0.3.1.old/src/TLItem.h ggseq-0.3.1/src/TLItem.h
+--- ggseq-0.3.1.old/src/TLItem.h	2005-06-02 06:20:12.000000000 +0000
++++ ggseq-0.3.1/src/TLItem.h	2008-11-09 07:24:51.000000000 +0000
+@@ -40,7 +40,7 @@
+ #ifdef __WXMSW__
+ 	#include <soundtouch/SoundTouch.h>
+ #else
+-	#include "SoundTouch/SoundTouch.h"
++	#include <soundtouch/SoundTouch.h>
+ #endif
+ 
+ class TLSample;



More information about the SM-Commit mailing list