From 87dc6a2be603f2965b8b527dc3ef831d1bc483d2 Mon Sep 17 00:00:00 2001 From: Raffael Mancini Date: Fri, 26 Sep 2014 17:20:02 +0200 Subject: Added Freewheeling a live looping instrument for jack with MIDI support revision r100 from subversion --- .../audio/freewheeling/am_path_sdl.patch | 40 ++++++++++++++++++++++ pkgs/applications/audio/freewheeling/default.nix | 30 ++++++++++++++++ pkgs/applications/audio/freewheeling/xml.patch | 13 +++++++ 3 files changed, 83 insertions(+) create mode 100644 pkgs/applications/audio/freewheeling/am_path_sdl.patch create mode 100644 pkgs/applications/audio/freewheeling/default.nix create mode 100644 pkgs/applications/audio/freewheeling/xml.patch (limited to 'pkgs/applications/audio/freewheeling') diff --git a/pkgs/applications/audio/freewheeling/am_path_sdl.patch b/pkgs/applications/audio/freewheeling/am_path_sdl.patch new file mode 100644 index 0000000000000..2bc3b4f45ac2c --- /dev/null +++ b/pkgs/applications/audio/freewheeling/am_path_sdl.patch @@ -0,0 +1,40 @@ +--- code-r100/configure.ac 2014-09-25 23:44:41.059174904 +0200 ++++ code-r100.new/configure.ac 2014-09-26 01:37:18.507017390 +0200 +@@ -44,6 +44,8 @@ + [AC_MSG_ERROR(CONFIG: You need libxml2-dev installed. + http://www.xmlsoft.org/)]) + ++PKG_CHECK_MODULES([libxml], [libxml-2.0]) ++ + AC_CHECK_LIB([m], [sqrt], , [AC_MSG_ERROR(CORE: You need libm installed)]) + AC_CHECK_LIB([pthread], [pthread_self], , [AC_MSG_ERROR(CORE: You need libpthread installed)]) + +@@ -79,12 +81,12 @@ + echo "--- Enabling USB LCD display --"; + fi + +-#SDL_VERSION=1.2.4 +-#AM_PATH_SDL($SDL_VERSION, +-# :, +-# AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found! +-# http://www.libsdl.org/]) +-#) ++SDL_VERSION=1.2.4 ++AM_PATH_SDL($SDL_VERSION, ++ :, ++ AC_MSG_ERROR([VIDEO: *** SDL version $SDL_VERSION not found! ++ http://www.libsdl.org/]) ++) + + AC_CHECK_LIB([vorbis], [main], , + [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed. +@@ -95,6 +97,9 @@ + AC_CHECK_LIB([vorbisenc], [main], , + [AC_MSG_ERROR(AUDIO: You need libvorbis-dev installed. + http://www.xiph.org/ogg/vorbis/)]) ++AC_CHECK_LIB([ogg], [main], , ++ [AC_MSG_ERROR(AUDIO: You need libogg-dev installed. ++ http://www.xiph.org/ogg/)]) + + AC_CHECK_LIB([sndfile], [main], , + [AC_MSG_ERROR(AUDIO: you need libsndfile installed. diff --git a/pkgs/applications/audio/freewheeling/default.nix b/pkgs/applications/audio/freewheeling/default.nix new file mode 100644 index 0000000000000..8be639b762be6 --- /dev/null +++ b/pkgs/applications/audio/freewheeling/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchsvn, pkgconfig, autoconf, automake, gnutls, freetype, SDL, SDL_gfx, SDL_ttf, liblo, libxml2, alsaLib, jack2, libvorbis, libsndfile, libogg }: + +stdenv.mkDerivation { + name = "freewheeling-100"; + + src = fetchsvn { + url = svn://svn.code.sf.net/p/freewheeling/code; + rev = 100; + sha256 = "1m6z7p93xyha25qma9bazpzbp04pqdv5h3yrv6851775xsyvzksv"; + }; + + buildInputs = [ pkgconfig autoconf automake gnutls freetype + SDL SDL_gfx SDL_ttf liblo libxml2 jack2 alsaLib + libvorbis libsndfile libogg ]; + + preConfigure = "autoreconf -vfi"; + + patches = [ ./am_path_sdl.patch ./xml.patch ]; + + meta = { + description = "A live looping instrument with jack and MIDI support"; + longDescription = ""; + version = "r100"; + homepage = "http://freewheeling.sourceforge.net"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.sepi ]; + priority = 10; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/audio/freewheeling/xml.patch b/pkgs/applications/audio/freewheeling/xml.patch new file mode 100644 index 0000000000000..fd9d4fb39fe41 --- /dev/null +++ b/pkgs/applications/audio/freewheeling/xml.patch @@ -0,0 +1,13 @@ +--- code-r100/src/Makefile.am 2014-09-25 23:44:41.043174832 +0200 ++++ code-r100.new/src/Makefile.am 2014-09-26 01:21:03.750015888 +0200 +@@ -24,7 +24,8 @@ + + fweelindir = $(datadir)/fweelin + +-FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 -I/usr/include/libxml2 -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9 ++XML_CFLAGS = `xml2-config --cflags` ++FWEELIN_CFLAGS = -I. -g -Wall -Wno-write-strings -Wno-non-virtual-dtor -D_REENTRANT -DPTHREADS -DNDEBUG -DVERSION=\"$(VERSION)\" -DFWEELIN_DATADIR=\"$(fweelindir)\" -DADDON_DIR=\"/usr/local/lib/jack\" -I/usr/include/freetype2 $(XML_CFLAGS) -funroll-loops -finline-functions -fomit-frame-pointer -ffast-math -fexpensive-optimizations -fstrict-aliasing -falign-loops=2 -falign-jumps=2 -falign-functions=2 -O9 + + AM_CFLAGS = $(CFLAGS) $(FWEELIN_CFLAGS) +-AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) ++AM_CXXFLAGS = $(CFLAGS) $(CXXFLAGS) $(FWEELIN_CFLAGS) ${libxml2_CFLAGS} -- cgit 1.4.1