Version bump.

(Portage version: 2.2.0_alpha131/cvs/Linux x86_64)

5 files changed, 151 insertions, 1 deletions

diff --git a/media-sound/denemo/ChangeLog b/media-sound/denemo/ChangeLog
index 2634740bcbaf..baf45987a0c9 100644
--- a/media-sound/denemo/ChangeLog
+++ b/media-sound/denemo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/denemo
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.38 2012/07/11 23:44:25 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/ChangeLog,v 1.39 2012/09/22 00:49:21 radhermit Exp $
+
+*denemo-0.9.6 (22 Sep 2012)
+
+  22 Sep 2012; Tim Harder <radhermit@gentoo.org> +denemo-0.9.6.ebuild,
+  +files/denemo-0.9.6-alsa.patch, +files/denemo-0.9.6-desktop.patch,
+  +files/denemo-0.9.6-implicit-declarations.patch:
+  Version bump.
 
 *denemo-0.9.4 (11 Jul 2012)
 
diff --git a/media-sound/denemo/denemo-0.9.6.ebuild b/media-sound/denemo/denemo-0.9.6.ebuild
new file mode 100644
index 000000000000..dcb6cc66833d
--- /dev/null
+++ b/media-sound/denemo/denemo-0.9.6.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/denemo/denemo-0.9.6.ebuild,v 1.1 2012/09/22 00:49:21 radhermit Exp $
+
+EAPI=4
+inherit eutils fdo-mime
+
+DESCRIPTION="A music notation editor"
+HOMEPAGE="http://www.denemo.org/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 OFL-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa jack +fluidsynth nls +portaudio portmidi"
+
+COMMON_DEPEND="
+	>=app-text/evince-3
+	dev-libs/libxml2:2
+	>=dev-scheme/guile-1.8
+	gnome-base/librsvg:2
+	>=media-libs/libsmf-1.3
+	x11-libs/gtk+:3
+	x11-libs/gtksourceview:3.0
+	alsa? ( media-libs/alsa-lib )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.102 )
+	fluidsynth? ( media-sound/fluidsynth )
+	portaudio? (
+		media-libs/portaudio
+		media-libs/aubio
+		sci-libs/fftw:3.0
+		media-libs/libsamplerate
+	)
+	portmidi? ( media-libs/portmidi )"
+RDEPEND="${COMMON_DEPEND}
+	media-sound/lilypond"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/flex
+	virtual/pkgconfig
+	virtual/yacc
+	nls? ( sys-devel/gettext )"
+
+DOCS=( AUTHORS ChangeLog doc/{DESIGN{,.lilypond},GOALS,TODO} NEWS )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-desktop.patch
+	epatch "${FILESDIR}"/${P}-alsa.patch
+	epatch "${FILESDIR}"/${P}-implicit-declarations.patch
+}
+
+src_configure() {
+	econf \
+		--disable-static \
+		--enable-gtk3 \
+		$(use_enable alsa) \
+		$(use_enable fluidsynth) \
+		$(use_enable jack) \
+		$(use_enable nls) \
+		$(use_enable portaudio) \
+		$(use_enable portmidi)
+}
+
+pkg_postinst() { fdo-mime_desktop_database_update; }
+pkg_postrm() { fdo-mime_desktop_database_update; }
diff --git a/media-sound/denemo/files/denemo-0.9.6-alsa.patch b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
new file mode 100644
index 000000000000..484a11d9f59d
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-alsa.patch
@@ -0,0 +1,26 @@
+--- src/alsabackend.h
++++ src/alsabackend.h
+@@ -0,0 +1,23 @@
++/*
++ * alsabackend.h
++ * ALSA sequencer MIDI backend.
++ *
++ * for Denemo, a gtk+ frontend to GNU Lilypond
++ * Copyright (C) 2011  Dominic Sacré
++ *
++ * 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 3 of the License, or
++ * (at your option) any later version.
++ */
++
++#ifndef ALSABACKEND_H
++#define ALSABACKEND_H
++
++#include "audiointerface.h"
++
++extern backend_t alsa_seq_midi_backend;
++
++
++#endif // ALSABACKEND_H
++
diff --git a/media-sound/denemo/files/denemo-0.9.6-desktop.patch b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
new file mode 100644
index 000000000000..ade8c4595ed0
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-desktop.patch
@@ -0,0 +1,11 @@
+--- denemo-0.9.6/pixmaps/denemo.desktop
++++ denemo-0.9.6/pixmaps/denemo.desktop
+@@ -4,7 +4,7 @@
+ StartupNotify=true
+ Terminal=false
+ Type=Application
+-Categories=GNOME;Audio;AudioVideo;Music;Education
++Categories=GNOME;GTK;Audio;AudioVideo;Music;Education;
+ 
+ Name=GNU Denemo
+ Name[de]=GNU Denemo
diff --git a/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
new file mode 100644
index 000000000000..b1f17e3d2df6
--- /dev/null
+++ b/media-sound/denemo/files/denemo-0.9.6-implicit-declarations.patch
@@ -0,0 +1,42 @@
+--- denemo-0.9.6/src/audiointerface.c
++++ denemo-0.9.6/src/audiointerface.c
+@@ -14,6 +14,7 @@
+ #include "audiointerface.h"
+ #include "eventqueue.h"
+ #include "dummybackend.h"
++#include "sourceaudio.h"
+ 
+ #ifdef _HAVE_JACK_
+   #include "jackbackend.h"
+--- denemo-0.9.6/src/audiointerface.h
++++ denemo-0.9.6/src/audiointerface.h
+@@ -228,6 +228,9 @@
+ gboolean read_event_from_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
+                                double *event_time, double until_time);
+ 
++gboolean read_event_from_mixer_queue(backend_type_t backend, unsigned char *event_buffer, size_t *event_length,
++                               double *event_time, double until_time);
++
+ /**
+  * Called by a backend to notify the audio subsystem that the current playback
+  * time changed. Usually this is called once per period during playback.
+--- denemo-0.9.6/src/eventqueue.c
++++ denemo-0.9.6/src/eventqueue.c
+@@ -13,6 +13,7 @@
+ 
+ #include "eventqueue.h"
+ #include "midi.h"
++#include "moveviewport.h"
+ 
+ #include <glib.h>
+ #include <string.h>
+--- denemo-0.9.6/src/portaudiobackend.c
++++ denemo-0.9.6/src/portaudiobackend.c
+@@ -16,6 +16,7 @@
+ #include "portaudioutil.h"
+ #include "midi.h"
+ #include "fluid.h"
++#include "audiointerface.h"
+ 
+ #include <portaudio.h>
+ #include <glib.h>