Merge with upstream r10.

Update README to reflect accurate upstream revision.
Add merging utility scripts to repository.


git-svn-id: http://svn.drobilla.net/lad/trunk/mda-lv2@2476 a436a847-0d15-0410-975c-d299462d15a1

3 files changed, 23 insertions, 1 deletions

diff --git a/README b/README
index 65c681f..23faf4b 100644
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ v2 or later, or the MIT license.  Thanks, Paul!
 This port is by Dave Robillard, and is 100% Free Software (including the only
 dependency lv2.h) released under the GPL v2 or later. See COPYING for details.
 
-This port is based on revision 1 of the MDA SVN repository at:
+This port is based on revision 10 of the MDA SVN repository at:
 https://mda-vst.svn.sourceforge.net/svnroot/mda-vst
 
 
diff --git a/src/post_merge.sh b/src/post_merge.sh
new file mode 100755
index 0000000..144cd35
--- /dev/null
+++ b/src/post_merge.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+rm -f mdaDe-ess.h
+rm -f mdaDe-ess.cpp
+rm -f mdaRePsycho!.h
+rm -f mdaRePsycho!.cpp
+rm -f mdaspecmeter.cpp
+
+sed -i 's/VstInt32/LvzInt32/g' *.h *.cpp
+sed -i 's/VstInt16/LvzInt16/g' *.h *.cpp
+sed -i 's/DECLARE_VST_DEPRECATED/DECLARE_LVZ_DEPRECATED/g' *.h *.cpp
diff --git a/src/pre_merge.sh b/src/pre_merge.sh
new file mode 100755
index 0000000..e3a13d0
--- /dev/null
+++ b/src/pre_merge.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+ln -fs mdaDeEss.h mdaDe-ess.h
+ln -fs mdaDeEss.cpp mdaDe-ess.cpp
+ln -fs mdaRePsycho.h mdaRePsycho!.h
+ln -fs mdaRePsycho.cpp mdaRePsycho!.cpp
+ln -fs mdaSpecMeter.cpp mdaspecmeter.cpp
+
+sed -i 's/LvzInt32/VstInt32/g' *.h *.cpp
+sed -i 's/LvzInt16/VstInt16/g' *.h *.cpp
+sed -i 's/DECLARE_LVZ_DEPRECATED/DECLARE_VST_DEPRECATED/g' *.h *.cpp