--- kluppe-0.5.1.orig/src/frontend/kluppe/Makefile +++ kluppe-0.5.1/src/frontend/kluppe/Makefile @@ -12,8 +12,10 @@ install: kluppe - install -m 755 kluppe $(BIN_DIR) - install -m 644 kluppe.png $(PIXMAPS_DIR) + install -d $(DESTDIR)$(BIN_DIR) + install -m 755 kluppe $(DESTDIR)$(BIN_DIR) + install -d $(DESTDIR)$(PIXMAPS_DIR) + install -m 644 kluppe.png $(DESTDIR)$(PIXMAPS_DIR) clean: rm -f *.o kluppe --- kluppe-0.5.1.orig/src/common/jackmixer.c +++ kluppe-0.5.1/src/common/jackmixer.c @@ -361,6 +361,7 @@ fprintf (stderr, "jack server not running?\n"); info->jack_info->name = malloc(sizeof(char) * 10); strncpy (info->jack_info->name,"nojack!",7); + info->can_process = -1; return info->jack_info; } @@ -656,7 +657,9 @@ /* pthread_create (&info->mix_thread_id, &attr, mix_thread, info);*/ pthread_create (&info->mix_thread_id, NULL, mix_thread, info); - while (!info->can_process); + while (!info->can_process) usleep(1); + + if (info->can_process == -1) return info->jack_info; if (jack_activate (info->jack_info->client)) { fprintf (stderr, "cannot activate client\n"); --- kluppe-0.5.1.orig/src/common/midi.c +++ kluppe-0.5.1/src/common/midi.c @@ -42,7 +42,7 @@ if (snd_seq_open(&seq_handle, "hw", SND_SEQ_OPEN_DUPLEX, 0) < 0) { fprintf(stderr, "Error opening ALSA sequencer.\n"); - exit(1); + return NULL; //exit(1); } snd_seq_set_client_name(seq_handle, name); @@ -50,7 +50,7 @@ SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE, SND_SEQ_PORT_TYPE_APPLICATION)) < 0) { fprintf(stderr, "Error creating sequencer port.\n"); - exit(1); + return NULL; //exit(1); } return(seq_handle); } @@ -137,6 +137,7 @@ signal (SIGHUP, SIG_IGN); minfo->seq = open_seq("kluppe"); + if (!minfo->seq) return NULL; minfo->seq_nfds = snd_seq_poll_descriptors_count(minfo->seq, POLLIN); minfo->pfds = (struct pollfd*)alloca(minfo->seq_nfds * sizeof(struct pollfd)); snd_seq_poll_descriptors(minfo->seq, minfo->pfds, minfo->seq_nfds, POLLIN); --- kluppe-0.5.1.orig/Makefile +++ kluppe-0.5.1/Makefile @@ -1,12 +1,12 @@ CC = gcc VERSION = `cat VERSION` -INSTALL_PREFIX = /usr/local +INSTALL_PREFIX = /usr BIN_DIR = $(INSTALL_PREFIX)/bin PIXMAPS_DIR = $(INSTALL_PREFIX)/share/pixmaps TEMP_ROOT = /tmp TEMP_DIR = kluppe-$(VERSION) #CFLAGS = -O3 -Wall -march=pentium3 -g -CFLAGS = -pthread -O3 -Wall -DHAVE_ALSA +CFLAGS = -pthread -O2 -Wall -g -DHAVE_ALSA export kluppe: commons --- kluppe-0.5.1.orig/debian/kluppe.1 +++ kluppe-0.5.1/debian/kluppe.1 @@ -0,0 +1,58 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH KLUPPE 1 "May 3, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) +.SH NAME +kluppe \- loop-player and recorder designed for live use +.SH SYNOPSIS +.B kluppe +.br +.SH DESCRIPTION +This manual page documents briefly the +.B kluppe +program, a graphical loop player and recorder. +.PP + +To start using +.B kluppe +, first start the jackd server, then kluppe, and create a new looper. You can +either start recording a new sound (using create a new buffer), or load a sound +file. For each looper, select the buffer you want to use. +.PP +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. +\fBkluppe\fP features include: +.br + - multiple files buffers, multiple 'loopers' tracks +.br + - direct (gui) access to all loopers +.br + - combined and per loop output ports for jack +.br + - different playmodes including "granular" +.br +.SH OPTIONS +\fBKluppe\fP does not take any command line arguments. +.SH SEE ALSO +.B jackd +(1) +.br +The program homepage is at +.IR http://kluppe.klingt.org/ +.SH AUTHOR +This manual page was written by Paul Brossier , for the Debian +project (but may be used by others). --- kluppe-0.5.1.orig/debian/changelog +++ kluppe-0.5.1/debian/changelog @@ -0,0 +1,53 @@ +kluppe (0.5.1-1ubuntu0) dapper; urgency=low + + * Rebuild to use the newer libjack. (Malone #28521) + + -- Loic Pefferkorn Sat, 14 Jan 2006 16:10:57 +0100 + +kluppe (0.5.1-1) unstable; urgency=low + + * New upstream release + * Added libasound2-dev to build-deps + * src/common/midi.c: change exit to warnings + (graceful exit when snd-seq is not loaded) + + -- Paul Brossier Mon, 1 Aug 2005 23:51:26 +0100 + +kluppe (0.5-2) unstable; urgency=low + + * Changed optimisation level to 2 + * Fix infinite loop when no jackd is running + * Fix icon and menu entry installation, add .desktop + * Remove README.Debian, update copyright + * Complete manpage, update long description + * Recommends jackd + + -- Paul Brossier Mon, 18 Jul 2005 02:28:26 +0100 + +kluppe (0.5-1) unstable; urgency=low + + * New upstream release + * Upload to unstable (closes: #247160) + + -- Paul Brossier Fri, 8 Jul 2005 05:57:45 +0100 + +kluppe (0.4.7-1) unstable; urgency=low + + * New upstream release + * Added libxml2-dev Build-Depends + * Added watch file, bumped Standard Version, corrected spelling + + -- Paul Brossier Tue, 26 Apr 2005 19:44:15 +0100 + +kluppe (0.4.5-1) unstable; urgency=low + + * New upstream release + + -- Paul Brossier Sun, 3 Apr 2005 18:34:24 +0100 + +kluppe (0.1-1) unstable; urgency=low + + * Initial Release. + + -- Paul Brossier Mon, 3 May 2004 16:41:24 +0100 + --- kluppe-0.5.1.orig/debian/kluppe.desktop +++ kluppe-0.5.1/debian/kluppe.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Name=Kluppe +Comment=audio loop-player and recorder +Exec="/usr/bin/kluppe" +Icon=/usr/share/pixmaps/kluppe.png +Terminal=false +Type=Application +Categories=Application;AudioVideo; --- kluppe-0.5.1.orig/debian/menu +++ kluppe-0.5.1/debian/menu @@ -0,0 +1,6 @@ +?package(kluppe): \ + needs="X11" \ + section="Apps/Sound" \ + title="Kluppe" \ + command="/usr/bin/kluppe" \ + icon="/usr/share/pixmaps/kluppe.xpm" --- kluppe-0.5.1.orig/debian/compat +++ kluppe-0.5.1/debian/compat @@ -0,0 +1 @@ +4 --- kluppe-0.5.1.orig/debian/dirs +++ kluppe-0.5.1/debian/dirs @@ -0,0 +1 @@ +usr/bin --- kluppe-0.5.1.orig/debian/rules +++ kluppe-0.5.1/debian/rules @@ -0,0 +1,100 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + touch configure-stamp + + +build: build-stamp + +build-stamp: configure-stamp + dh_testdir + + # Add here commands to compile the package. + $(MAKE) INSTALL_PREFIX=/usr + #/usr/bin/docbook-to-man debian/kluppe.sgml > kluppe.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean INSTALL_PREFIX=/usr + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/kluppe. + $(MAKE) install DESTDIR=$(CURDIR)/debian/kluppe INSTALL_PREFIX=/usr + + dh_install debian/kluppe.desktop usr/share/applications + dh_install debian/kluppe.xpm usr/share/pixmaps + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs CHANGES.log + dh_installdocs + dh_installexamples +# dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- kluppe-0.5.1.orig/debian/copyright +++ kluppe-0.5.1/debian/copyright @@ -0,0 +1,22 @@ +This package was debianized by Paul Brossier on +Mon, 3 May 2004 16:41:24 +0100. + +It was downloaded from http://kluppe.klingt.org/ + +Upstream Author: + + dieb13 + +Copyright: + + The gtk meter was created by Steve Harris: + +License: + + The code is released under the terms of the GNU General Public License: + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 2, or (at your option) any later version. + + The GPL may be found in /usr/share/common-licenses/GPL on a Debian system. --- kluppe-0.5.1.orig/debian/kluppe.manpages +++ kluppe-0.5.1/debian/kluppe.manpages @@ -0,0 +1 @@ +debian/kluppe.1 --- kluppe-0.5.1.orig/debian/docs +++ kluppe-0.5.1/debian/docs @@ -0,0 +1,2 @@ +README.txt +TODO --- kluppe-0.5.1.orig/debian/kluppe.xpm +++ kluppe-0.5.1/debian/kluppe.xpm @@ -0,0 +1,149 @@ +/* XPM */ +static char *kluppe[] = { +/* columns rows colors chars-per-pixel */ +"32 32 111 2", +" c #00003E", +". c #00003F", +"X c #1D0032", +"o c #1D0033", +"O c #1D0034", +"+ c #26003B", +"@ c #000040", +"# c #040047", +"$ c #040048", +"% c #0B0045", +"& c #0A0046", +"* c #0F004D", +"= c #2B0055", +"- c #2A0056", +"; c #2C0055", +": c #2E005B", +"> c #3F004E", +", c #4D0079", +"< c #4E0079", +"1 c #53007A", +"2 c #5F007B", +"3 c #71005D", +"4 c #71005E", +"5 c #730061", +"6 c #760069", +"7 c #720079", +"8 c #730079", +"9 c #750078", +"0 c #7A007E", +"q c #7D007B", +"w c #7E007E", +"e c #7E007F", +"r c #7F007E", +"t c #7F007F", +"y c #7A0083", +"u c #7B0082", +"i c #7C0081", +"p c #7D0080", +"a c #7C0082", +"s c #7F0080", +"d c #7F0081", +"f c #9E005F", +"g c #82007B", +"h c #83007A", +"j c #80007D", +"k c #80007F", +"l c #840079", +"z c #850078", +"x c #8A0073", +"c c #8B0072", +"v c #880075", +"b c #890074", +"n c #8C0071", +"m c #8D0070", +"M c #8C0072", +"N c #8E0070", +"B c #970066", +"V c #92006B", +"C c #93006A", +"Z c #9B0062", +"A c #A70056", +"S c #A70057", +"D c #A2005B", +"F c #A2005C", +"G c #A50058", +"H c #AB0052", +"J c #A80055", +"K c #A80056", +"L c #AA0054", +"P c #AC0051", +"I c #AC0052", +"U c #B70046", +"Y c #B70047", +"T c #B3004A", +"R c #B1004C", +"E c #B1004D", +"W c #B80045", +"Q c #B90044", +"! c #BE0040", +"~ c #DF001F", +"^ c #C0003D", +"/ c #C50038", +"( c #C50039", +") c #CB0033", +"_ c #C80036", +"` c #D60027", +"' c #D70026", +"] c #D3002A", +"[ c #D3002B", +"{ c #D0002E", +"} c #D60028", +"| c #DB0023", +" . c #D80026", +".. c #DC0022", +"X. c #EF000E", +"o. c #EF000F", +"O. c #E4001A", +"+. c #E90015", +"@. c #ED0011", +"#. c #EE0010", +"$. c #F3000B", +"%. c #F1000C", +"&. c #F1000D", +"*. c #F0000E", +"=. c #F50009", +"-. c #F4000A", +";. c #FB0003", +":. c #F90005", +">. c #FA0004", +",. c red", +"<. c None", +/* pixels */ +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.e b m m x x x x x x x x x x x x x x x x x x x x b m l <.<.", +"<.<.<.F o.` ( O.-.$.$.$.$.$.$.$.$.$.-.$.$.$.$.$.$.$.-.%.) B <.<.", +"<.<.<.[ ~ m <.F %.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.;.-.| S h <.<.<.", +"<.<.<._ C <.<.<.R ,.,.,.,.,.,.,.,.;.} o.,.,.%.[ U x v <.<.<.<.<.", +"<.<.<.f v <.<.<.V U Y Y Y Y Y U Y R e F U Y F <.<.<.<.<.<.<.<.<.", +"<.<.<.! x <.<.<.G %.%.#.%.#.#.#.%.+.R ' %.%.` H Z <.<.<.<.<.<.<.", +"<.<.<.{ ^ e <.x ' ,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.o.[ Q v e <.<.<.", +"<.<.<.Q :.( H | ,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.,.;.o.T S h <.", +"<.<.<.h G P P P P P H H H H H H H H H H H H H H H H H P P H h <.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.", +"<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<.<." +}; --- kluppe-0.5.1.orig/debian/watch +++ kluppe-0.5.1/debian/watch @@ -0,0 +1,6 @@ +# Example watch control file for uscan +# Rename this file to "watch" and then you can run the "uscan" command +# to check for upstream updates and more. +# Site Directory Pattern Version Script +version=2 +http://dieb13.klingt.org/downloads/ kluppe-(.*)\.tar\.gz debian uupdate --- kluppe-0.5.1.orig/debian/control +++ kluppe-0.5.1/debian/control @@ -0,0 +1,23 @@ +Source: kluppe +Section: sound +Priority: optional +Maintainer: Paul Brossier +Build-Depends: debhelper (>= 4.0.0), libgtk2.0-dev, libjack-dev, libsndfile1-dev, libxml2-dev, libasound2-dev +Standards-Version: 3.6.2 + +Package: kluppe +Section: sound +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: jackd +Description: a loop-player and recorder designed for live use + kluppe is written in c and uses jack, gtk and sndfile. Features include: + . + - multiple files buffers, multiple 'loopers' tracks + - direct (gui) access to all loopers + - combined and per loop output ports for jack + - different playmodes including "granular" + . + kluppe is the austrian word for clip and sounds even crazier if you loop it. + . + Homepage: http://kluppe.klingt.org/