Browse Source

Add missing files (patches for osx build deps)

tags/1.9.7
falkTX 9 years ago
parent
commit
9bfe70add7
3 changed files with 63 additions and 0 deletions
  1. +29
    -0
      data/macos/patches/libgig_fix-build.patch
  2. +24
    -0
      data/macos/patches/linuxsampler_allow-no-drivers-build.patch
  3. +10
    -0
      data/macos/patches/linuxsampler_disable-ladspa-fx.patch

+ 29
- 0
data/macos/patches/libgig_fix-build.patch View File

@@ -0,0 +1,29 @@
diff --git a/src/DLS.h b/src/DLS.h
index 065bfe6..6c9d76c 100644
--- a/src/DLS.h
+++ b/src/DLS.h
@@ -515,10 +515,10 @@ namespace DLS {
virtual void Save(const String& Path, progress_t* pProgress = NULL);
virtual void Save(progress_t* pProgress = NULL);
virtual ~File();
- protected:
typedef std::list<Sample*> SampleList;
typedef std::list<Instrument*> InstrumentList;
+ protected:
RIFF::File* pRIFF;
std::list<RIFF::File*> ExtensionFiles;
SampleList* pSamples;
diff --git a/src/gig.cpp b/src/gig.cpp
index 6a24f16..902e1ae 100644
--- a/src/gig.cpp
+++ b/src/gig.cpp
@@ -4181,7 +4181,7 @@ namespace {
* @param pGroup - script's new group
*/
void Script::SetGroup(ScriptGroup* pGroup) {
- if (this->pGroup = pGroup) return;
+ if (this->pGroup == pGroup) return;
if (pChunk)
pChunk->GetParent()->MoveSubChunk(pChunk, pGroup->pList);
this->pGroup = pGroup;

+ 24
- 0
data/macos/patches/linuxsampler_allow-no-drivers-build.patch View File

@@ -0,0 +1,24 @@
--- linuxsampler-static-1.0.0+svn2356.orig/configure.ac
+++ linuxsampler-static-1.0.0+svn2356/configure.ac
@@ -556,21 +556,6 @@ if test "x$MAC_PLUGIN_INSTALL_DIR" = "x"
fi
AC_SUBST(MAC_PLUGIN_INSTALL_DIR)
-# have we found at least one MIDI input and one audio output driver ?
-if test "$have_midi_input_driver" = "false"; then
- echo "No supported MIDI input system found!"
- echo "Sorry, LinuxSampler only supports the following MIDI drivers at the moment:"
- echo "ALSA, JACK, MIDIShare, CoreMIDI, MME."
- echo "If you think you have one of those available on your system, make sure you"
- echo "also have the respective development (header) files installed."
- exit -1;
-fi
-if test "$have_audio_output_driver" = "false"; then
- echo "No supported audio output system found!"
- echo "Sorry, LinuxSampler only supports ALSA, JACK, ARTS and ASIO as audio output"
- echo "driver at the moment!"
- exit -1;
-fi

+ 10
- 0
data/macos/patches/linuxsampler_disable-ladspa-fx.patch View File

@@ -0,0 +1,10 @@
--- linuxsampler-static-1.0.0+svn2497.orig/src/effects/LadspaEffect.cpp
+++ linuxsampler-static-1.0.0+svn2497/src/effects/LadspaEffect.cpp
@@ -374,6 +374,7 @@ static String defaultLadspaDir() {
std::vector<EffectInfo*> LadspaEffect::AvailableEffects() {
std::vector<EffectInfo*> v; // will be filled in callback function _foundLadspaDll()
+ return v;
char* pcLadspaPath = getenv("LADSPA_PATH");
String ladspaDir = pcLadspaPath ? pcLadspaPath : defaultLadspaDir();

Loading…
Cancel
Save