Port from ladcca to lash, thanks to proaudio overlay maintainers.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

5 files changed, 247 insertions, 18 deletions

diff --git a/media-sound/vkeybd/ChangeLog b/media-sound/vkeybd/ChangeLog
index ccef5162207e..71051a9a9f0a 100644
--- a/media-sound/vkeybd/ChangeLog
+++ b/media-sound/vkeybd/ChangeLog
@@ -1,16 +1,21 @@
 # ChangeLog for media-sound/vkeybd
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.32 2008/04/14 18:50:37 drac Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/ChangeLog,v 1.33 2009/07/15 17:33:34 ssuominen Exp $
 
-  14 Apr 2008; Samuli Suominen <drac@gentoo.org>
+*vkeybd-0.1.17b-r1 (15 Jul 2009)
+
+  15 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
+  +vkeybd-0.1.17b-r1.ebuild, +files/vkeybd-0.1.17b-lash.patch:
+  Port from ladcca to lash, thanks to proaudio overlay maintainers.
+
+  14 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
   +files/vkeybd-0.1.17b-desktop-entry.patch, vkeybd-0.1.17b.ebuild:
   Missing Categories entry in .desktop file.
 
-  10 Apr 2008; Samuli Suominen <drac@gentoo.org>
-  -files/vkeybd-0.1.15-makefile.patch, -files/vkeybd-0.1.17a-makefile.patch,
-  -vkeybd-0.1.15-r2.ebuild, -vkeybd-0.1.17a.ebuild, vkeybd-0.1.17b.ebuild:
+  10 Apr 2008; Samuli Suominen <ssuominen@gentoo.org>
+  vkeybd-0.1.17b.ebuild:
   amd64/x86 stable, because current linux-headers doesn't provide awe_voice.h
-  wrt #205949, #216928
+  wrt #205949 and #216928.
 
 *vkeybd-0.1.17b (26 Jan 2008)
 
@@ -18,10 +23,6 @@
   +files/vkeybd-0.1.17b-makefile.patch, +vkeybd-0.1.17b.ebuild:
   version bump, closes bug #205949
 
-  22 Jul 2007; Samuli Suominen <drac@gentoo.org> -vkeybd-0.1.15-r1.ebuild,
-  vkeybd-0.1.15-r2.ebuild, vkeybd-0.1.17a.ebuild:
-  Remove unused version and virtual/x11 references.
-
   27 Nov 2006; <malc@gentoo.org> vkeybd-0.1.15-r2.ebuild:
   Stable on amd64 - bug #155639
 
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch b/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch
index 152e6163c512..7b1a7357e5db 100644
--- a/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch
+++ b/media-sound/vkeybd/files/vkeybd-0.1.17b-desktop-entry.patch
@@ -1,8 +1,10 @@
 diff -ur vkeybd.orig/vkeybd.desktop vkeybd/vkeybd.desktop
 --- vkeybd.orig/vkeybd.desktop	2004-03-03 16:06:30.000000000 +0200
-+++ vkeybd/vkeybd.desktop	2008-04-14 21:47:10.000000000 +0300
-@@ -4,3 +4,4 @@
++++ vkeybd/vkeybd.desktop	2009-07-15 20:35:38.000000000 +0300
+@@ -3,4 +3,5 @@
+ Name=vkeybd
  Comment=A virtual MIDI keyboard
  Exec=vkeybd
- Icon=vkeybd
+-Icon=vkeybd
++Icon=vkeybd_48x48
 +Categories=AudioVideo;Audio;
diff --git a/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch b/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch
new file mode 100644
index 000000000000..c5c150d981bc
--- /dev/null
+++ b/media-sound/vkeybd/files/vkeybd-0.1.17b-lash.patch
@@ -0,0 +1,168 @@
+diff -ur vkeybd.orig/Makefile vkeybd/Makefile
+--- vkeybd.orig/Makefile	2007-08-06 20:22:15.000000000 +0300
++++ vkeybd/Makefile	2009-07-15 20:23:43.000000000 +0300
+@@ -30,7 +30,7 @@
+ USE_AWE = 1
+ USE_MIDI = 1
+ USE_ALSA = 1
+-USE_LADCCA = 0
++USE_LASH = 0
+ 
+ #
+ # Tcl/Tk library -- depends on your distribution
+@@ -68,14 +68,14 @@
+ endif
+ 
+ #
+-# LADCCA stuff
++# LASH stuff
+ #
+-ifeq (1,$(USE_LADCCA))
+-LADCCACFLAGS = $(shell pkg-config --cflags ladcca-1.0) \
+-	       $(shell pkg-config --exists ladcca-1.0 && echo "-DHAVE_LADCCA" )
+-LADCCALIBS   = $(shell pkg-config --libs ladcca-1.0)
+-DEVICES += $(LADCCACFLAGS)
+-EXTRALIB += $(LADCCALIBS)
++ifeq (1,$(USE_LASH))
++LASHCFLAGS = $(shell pkg-config --cflags lash-1.0) \
++	       $(shell pkg-config --exists lash-1.0 && echo "-DHAVE_LASH" )
++LASHLIBS   = $(shell pkg-config --libs lash-1.0)
++DEVICES += $(LASHCFLAGS)
++EXTRALIB += $(LASHLIBS)
+ endif
+ 
+ #----------------------------------------------------------------
+@@ -88,7 +88,7 @@
+ CFLAGS = $(COPTFLAGS) -DVKB_TCLFILE=\"$(VKB_TCLFILE)\" \
+ 	-DVKBLIB_DIR=\"$(VKBLIB_DIR)\"\
+ 	-DVERSION_STR=\"$(VERSION)\"\
+-	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LADCCACFLAGS)
++	$(DEVICES) $(XINC) $(TCLINC) $(TKINC) $(LASHCFLAGS)
+ 
+ TARGETS = vkeybd sftovkb
+ 
+diff -ur vkeybd.orig/oper_alsa.c vkeybd/oper_alsa.c
+--- vkeybd.orig/oper_alsa.c	2004-03-03 15:58:48.000000000 +0200
++++ vkeybd/oper_alsa.c	2009-07-15 20:23:44.000000000 +0300
+@@ -78,8 +78,8 @@
+ static vkb_optarg_t alsa_opts[] = {
+ 	{"addr", "subscriber", "--addr client:port or 'subscriber' : ALSA sequencer destination"},
+ 	{"name", DEFAULT_NAME, "--name string : use the specified string as client/port names"},
+-#ifdef HAVE_LADCCA	
+-	{"ladcca", "no", "--ladcca <yes|no> : support LADCCA (default = no)"},
++#ifdef HAVE_LASH	
++	{"lash", "no", "--lash <yes|no> : support LASH (default = no)"},
+ #endif
+ 	{NULL},
+ };
+@@ -100,8 +100,8 @@
+ static int seq_client, seq_port;
+ static int chan_no;
+ 
+-#ifdef HAVE_LADCCA	
+-static cca_client_t * cca_client = NULL;
++#ifdef HAVE_LASH	
++static lash_client_t * lash_client = NULL;
+ #endif
+ 
+ /*
+@@ -156,25 +156,25 @@
+ 	/* get my client id */
+ 	my_client = snd_seq_client_id(seq_handle);
+ 	
+-	/* tell the ladcca server our client id */
+-#ifdef HAVE_LADCCA
+-	if ((var = Tcl_GetVar2(ip, "optvar", "ladcca", TCL_GLOBAL_ONLY)) != NULL) {
++	/* tell the lash server our client id */
++#ifdef HAVE_LASH
++	if ((var = Tcl_GetVar2(ip, "optvar", "lash", TCL_GLOBAL_ONLY)) != NULL) {
+ 		if (*var == 'y' || *var == 'Y' || *var == '1') {
+-			cca_client = cca_init (cca_args,
++			lash_client = lash_init (lash_args,
+ 					       "vkeybd",
+-					       my_client, CCA_PROTOCOL_VERSION);
+-			if (cca_enabled (cca_client)) {
+-				cca_event_t * event;
++					       my_client, LASH_PROTOCOL_VERSION);
++			if (lash_enabled (lash_client)) {
++				lash_event_t * event;
+ 				unsigned char id[2];
+-				event = cca_event_new_with_type (CCA_Alsa_Client_ID);
++				event = lash_event_new_with_type (LASH_Alsa_Client_ID);
+ 				id[0] = snd_seq_client_id (seq_handle);
+ 				id[1] = '\0';
+-				cca_event_set_string (event, id);
+-				cca_send_event (cca_client, event);
++				lash_event_set_string (event, id);
++				lash_send_event (lash_client, event);
+ 			}
+ 		}
+ 	}
+-#endif /* HAVE_LADCCA */
++#endif /* HAVE_LASH */
+  
+ 	/* set client info */
+ 	if ((var = Tcl_GetVar2(ip, "optvar", "name", TCL_GLOBAL_ONLY)) != NULL)
+@@ -203,8 +203,8 @@
+ 	if (seq_client != SND_SEQ_ADDRESS_SUBSCRIBERS) {
+ 		/* subscribe to MIDI port */
+ 		if (
+-#ifdef HAVE_LADCCA
+-		    !cca_enabled (cca_client) &&
++#ifdef HAVE_LASH
++		    !lash_enabled (lash_client) &&
+ #endif
+ 		    snd_seq_connect_to(seq_handle, my_port, seq_client, seq_port) < 0) {
+ 			vkb_error(ip, "can't subscribe to MIDI port (%d:%d)\n", seq_client, seq_port);
+diff -ur vkeybd.orig/vkb.c vkeybd/vkb.c
+--- vkeybd.orig/vkb.c	2003-08-19 18:47:59.000000000 +0300
++++ vkeybd/vkb.c	2009-07-15 20:23:44.000000000 +0300
+@@ -64,8 +64,8 @@
+ static int seq_bend = 0;
+ static vkb_oper_t *oper;
+ 
+-#ifdef HAVE_LADCCA	
+-cca_args_t * cca_args = NULL;
++#ifdef HAVE_LASH	
++lash_args_t * lash_args = NULL;
+ #endif
+  
+ /*
+@@ -77,9 +77,9 @@
+ 	char **nargv;
+ 	int c, nargc;
+ 
+-#ifdef HAVE_LADCCA	
+-	cca_args = cca_extract_args(&argc, &argv);
+-#endif /* HAVE_LADCCA */
++#ifdef HAVE_LASH	
++	lash_args = lash_extract_args(&argc, &argv);
++#endif /* HAVE_LASH */
+ 
+ 	nargc = argc + 1;
+ 	if ((nargv = (char**)malloc(sizeof(char*) * nargc)) == NULL) {
+diff -ur vkeybd.orig/vkb.h vkeybd/vkb.h
+--- vkeybd.orig/vkb.h	2004-03-03 15:58:48.000000000 +0200
++++ vkeybd/vkb.h	2009-07-15 20:23:43.000000000 +0300
+@@ -23,8 +23,8 @@
+ 
+ #include <tcl.h>
+ 
+-#ifdef HAVE_LADCCA
+-#include <ladcca/ladcca.h>
++#ifdef HAVE_LASH
++#include <lash/lash.h>
+ #endif
+ 
+ #ifndef VKB_TCLFILE
+@@ -72,8 +72,8 @@
+ void vkb_error(Tcl_Interp *ip, char *fmt, ...);
+ int vkb_get_int(Tcl_Interp *ip, char *opt, int *ret);
+ 
+-#ifdef HAVE_LADCCA
+-extern cca_args_t *cca_args;
++#ifdef HAVE_LASH
++extern lash_args_t *lash_args;
+ #endif
+ 
+ #endif
diff --git a/media-sound/vkeybd/metadata.xml b/media-sound/vkeybd/metadata.xml
index ea12fab7b274..ae573a60407f 100644
--- a/media-sound/vkeybd/metadata.xml
+++ b/media-sound/vkeybd/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sound</herd>
-<maintainer>
-  <email>sound@gentoo.org</email>
-  </maintainer>
+	<herd>sound</herd>
 </pkgmetadata>
diff --git a/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild b/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
new file mode 100644
index 000000000000..c09dd0a6a4d5
--- /dev/null
+++ b/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/vkeybd/vkeybd-0.1.17b-r1.ebuild,v 1.1 2009/07/15 17:33:34 ssuominen Exp $
+
+EAPI=2
+inherit toolchain-funcs eutils
+
+DESCRIPTION="A virtual MIDI keyboard for X"
+HOMEPAGE="http://www.alsa-project.org/~iwai/alsa.html"
+SRC_URI="http://www.gtlib.gatech.edu/pub/suse/people/tiwai/vkeybd/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+IUSE="alsa lash oss"
+
+RDEPEND="alsa? ( media-libs/alsa-lib )
+	>=dev-lang/tk-8.3
+	lash? ( media-sound/lash )
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-proto/xf86bigfontproto
+	x11-proto/bigreqsproto
+	x11-proto/xextproto
+	x11-proto/xcmiscproto"
+
+S=${WORKDIR}/${PN}
+
+pkg_setup() {
+	TCL_VERSION=`echo 'puts [info tclversion]' | tclsh`
+
+	vkeybconf="PREFIX=/usr"
+
+	if use alsa; then
+		vkeybconf+=" USE_ALSA=1"
+		use oss || vkeybconf+=" USE_AWE=0 USE_MIDI=0"
+	else
+		vkeybconf+=" USE_ALSA=0 USE_AWE=1 USE_MIDI=1"
+	fi
+
+	use lash && vkeybconf+=" USE_LASH=1"
+
+	vkeybconf+=" TCL_VERSION=${TCL_VERSION}"
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch \
+		"${FILESDIR}"/${P}-desktop-entry.patch \
+		"${FILESDIR}"/${P}-lash.patch
+}
+
+src_compile() {
+	tc-export CC
+	emake ${vkeybconf} COPTFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" || die "emake failed"
+}
+
+src_install() {
+	emake ${vkeybconf} DESTDIR="${D}" \
+		install-all || die "emake install failed"
+	dodoc ChangeLog README
+}