[SCM] phasex/master: Drop LASH support.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit f94c595fffd674291c92a59acc041dc55273f53b
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Jan 2 11:47:27 2012 +0100

    Drop LASH support.

diff --git a/debian/control b/debian/control
index 4c8947e..17ac7c0 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,6 @@ Build-Depends: debhelper (>= 7.0.50~),
  libasound2-dev [linux-any],
  libsamplerate0-dev,
  libgtk2.0-dev,
- liblash-compat-dev,
  libjack-dev
 Standards-Version: 3.9.2
 Homepage: http://disabled.github.com/phasex-dev/
diff --git a/debian/patches/12-drop_lash.patch b/debian/patches/12-drop_lash.patch
new file mode 100644
index 0000000..0db692c
--- /dev/null
+++ b/debian/patches/12-drop_lash.patch
@@ -0,0 +1,87 @@
+Description: Drop LASH support.
+Author: Alessio Treglia <alessio at debian.org>
+Applied-Upstream: yes
+---
+ configure.ac    |    8 --------
+ src/Makefile.am |    3 +--
+ src/jack.c      |    4 ----
+ src/phasex.c    |   12 ------------
+ 4 files changed, 1 insertion(+), 26 deletions(-)
+
+--- phasex.orig/configure.ac
++++ phasex/configure.ac
+@@ -130,14 +130,6 @@ PKG_CHECK_MODULES(SAMPLERATE,
+ )
+ AC_SUBST(SAMPLERATE_CFLAGS)
+ 
+-#lash
+-PKG_CHECK_MODULES(LASH,
+-  lash-1.0 >= 0.5.4,
+-  true,
+-  AC_MSG_ERROR([need lash >= 0.5.4])
+-)
+-AC_SUBST(LASH_CFLAGS)
+-
+ # restore original vars
+ CFLAGS="$ORIG_CFLAGS"
+ CONF_LIBS="$LIBS"
+--- phasex.orig/src/Makefile.am
++++ phasex/src/Makefile.am
+@@ -18,8 +18,7 @@ phasex_SOURCES = \
+ 	bank.c bank.h \
+ 	settings.c settings.h \
+ 	help.c help.h \
+-	gtkknob.c gtkknob.h \
+-	lash.c lash.h
++	gtkknob.c gtkknob.h
+ 
+ AM_CFLAGS   = @PHASEX_CFLAGS@
+ AM_CPPFLAGS = $(EXTRA_CPPFLAGS) @PHASEX_CPPFLAGS@
+--- phasex.orig/src/jack.c
++++ phasex/src/jack.c
+@@ -34,7 +34,6 @@
+ #include "engine.h"
+ #include "settings.h"
+ #include "gtkui.h"
+-#include "lash.h"
+ 
+ jack_client_t			*client;
+ 
+@@ -683,9 +682,6 @@ jack_watchdog(void) {
+ 	    start_gtkui_thread ();
+ 	}
+ 
+-    /* poll lash for events */
+-    lash_pollevent();
+-
+ 	/* everybody sleeps */
+ 	usleep (250000);
+ 
+--- phasex.orig/src/phasex.c
++++ phasex/src/phasex.c
+@@ -48,8 +48,6 @@
+ #include "bank.h"
+ #include "settings.h"
+ #include "help.h"
+-#include "lash.h"
+-
+ 
+ /* command line options */
+ #define HAS_ARG		1
+@@ -688,16 +686,6 @@ main(int argc, char **argv) {
+ 	phasex_shutdown ("Unable to start initial JACK client.  Shutting Down.");
+     }
+ 
+-    /* init lash client */
+-    if (lash_clinit(argc, argv, client, midi->seq) == 0)
+-    {
+-    if (debug) {
+-        fprintf (stderr, "Main: LASH client started.\n");
+-    }
+-    }
+-    else
+-        fprintf (stderr, "Unable to start lash client.\n");
+-
+     /* sit here and restart jack client & poll lash client for events */
+     jack_watchdog ();
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 0483020..a493268 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 02-gcc_flags.patch
 03-binutils_gold.patch
 11-fix_portamento.patch
+12-drop_lash.patch

-- 
phasex packaging