diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-05 10:22:57 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2009-06-05 10:22:57 +0000 |
commit | 0a0cd75d076d12f73c6b77a3858382db203fa8d0 (patch) | |
tree | e4840b5fbe93a3a20b3cfc1a6a4883c76b65d7e5 | |
parent | Fix repoman warnings (diff) | |
download | gentoo-2-0a0cd75d076d12f73c6b77a3858382db203fa8d0.tar.gz gentoo-2-0a0cd75d076d12f73c6b77a3858382db203fa8d0.tar.bz2 gentoo-2-0a0cd75d076d12f73c6b77a3858382db203fa8d0.zip |
Fix repoman warnings
(Portage version: 2.1.6.13/cvs/Linux x86_64)
-rw-r--r-- | media-sound/jamin/files/jamin-0.9.0-geq.patch | 21 | ||||
-rw-r--r-- | media-sound/jamin/files/jamin-0.9.0-jack99.patch | 272 | ||||
-rw-r--r-- | media-sound/jamin/files/jamin-0.9.0-scenes.patch | 21 | ||||
-rw-r--r-- | media-sound/jamin/jamin-0.9.0-r1.ebuild | 38 | ||||
-rw-r--r-- | media-sound/jamin/jamin-0.95.0-r1.ebuild | 29 | ||||
-rw-r--r-- | media-sound/jamin/jamin-0.95.0-r2.ebuild | 26 | ||||
-rw-r--r-- | media-sound/jamin/jamin-0.95.0.ebuild | 28 |
7 files changed, 13 insertions, 422 deletions
diff --git a/media-sound/jamin/files/jamin-0.9.0-geq.patch b/media-sound/jamin/files/jamin-0.9.0-geq.patch deleted file mode 100644 index 6c37e64d0780..000000000000 --- a/media-sound/jamin/files/jamin-0.9.0-geq.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur jamin-0.9.0-orig/src/geq.c jamin-0.9.0/src/geq.c ---- jamin-0.9.0-orig/src/geq.c 2004-08-05 21:29:29.576383960 +0200 -+++ jamin-0.9.0/src/geq.c 2004-08-20 22:56:08.970301536 +0200 -@@ -122,7 +122,7 @@ - int i, bin; - - -- if (length != BINS / 2 - 1) -+ if (length < BINS / 2 - 1) - { - errstr = - g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"), -@@ -155,7 +155,7 @@ - float value; - - -- if (length != BINS / 2 - 1) -+ if (length < BINS / 2 - 1) - { - errstr = g_strdup_printf (_("Splined length %d does not match BINS / 2 - 1 (%d)"), - length, BINS / 2 - 1); diff --git a/media-sound/jamin/files/jamin-0.9.0-jack99.patch b/media-sound/jamin/files/jamin-0.9.0-jack99.patch deleted file mode 100644 index 5d0b05f52c4c..000000000000 --- a/media-sound/jamin/files/jamin-0.9.0-jack99.patch +++ /dev/null @@ -1,272 +0,0 @@ -diff -Naur jamin-0.9.0.orig/configure.in jamin-0.9.0/configure.in ---- jamin-0.9.0.orig/configure.in 2004-08-05 10:39:43.000000000 -0700 -+++ jamin-0.9.0/configure.in 2004-09-29 23:53:58.269328327 -0700 -@@ -1,7 +1,7 @@ - dnl Process this file with autoconf to produce a configure script. - - AC_INIT(configure.in) --AM_INIT_AUTOMAKE(jamin, 0.9.0) -+AM_INIT_AUTOMAKE(jamin, 0.9.03) - AM_CONFIG_HEADER(config.h) - AM_MAINTAINER_MODE - -@@ -32,11 +32,13 @@ - [AC_DEFINE(HAVE_POSIX_SCHED,,[POSIX scheduler support])]) - - PKG_CHECK_MODULES(JACK, jack >= 0.80.0) -+AC_CHECK_LIB(jack,jack_create_thread, -+ [AC_DEFINE(HAVE_JACK_CREATE_THREAD,,[JACK supports thread creation])]) - AC_CHECK_LIB(jack,jack_ringbuffer_create, -- [AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])],) -+ [AC_DEFINE(HAVE_JACK_RINGBUFFER,,[JACK has ringbuffer support])]) - AC_CHECK_LIB(jack,jack_client_name_size, - [AC_DEFINE(HAVE_JACK_CLIENT_NAME_SIZE,, -- [JACK returns client name size])],) -+ [JACK returns client name size])]) - - [if test "${enable_double_fft+set}" = set; then] - PKG_CHECK_MODULES(FFTW, fftw3 >= 3.0, AC_DEFINE(FFTW_TYPE, [double], [Datatype used by installed FFTW libraries]), [AC_MSG_ERROR([Didn't find any double precision FFTW3 libraries])]) -diff -Naur jamin-0.9.0.orig/src/compressor-ui.c jamin-0.9.0/src/compressor-ui.c ---- jamin-0.9.0.orig/src/compressor-ui.c 2004-07-17 07:34:58.000000000 -0700 -+++ jamin-0.9.0/src/compressor-ui.c 2004-09-29 23:53:58.271327996 -0700 -@@ -139,13 +139,6 @@ - ma[i] = scale; - - auto_gain[i] = 0; -- -- prev_value_at[i] = -1.0; -- prev_value_re[i] = -1.0; -- prev_value_th[i] = 1.0; -- prev_value_ra[i] = -1.0; -- prev_value_kn[i] = -1.0; -- prev_value_ma[i] = -1.0; - } - } - -@@ -166,14 +159,7 @@ - - if (!suspend_gang && gang_at[i]) - { -- if (prev_value_at[i] > 0.0) -- { -- diff = value - prev_value_at[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_at[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -213,14 +199,7 @@ - - if (!suspend_gang && gang_re[i]) - { -- if (prev_value_re[i] > 0.0) -- { -- diff = value - prev_value_re[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_re[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -260,14 +239,7 @@ - - if (!suspend_gang && gang_th[i]) - { -- if (prev_value_th[i] < 0.0) -- { -- diff = value - prev_value_th[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_th[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -317,14 +289,7 @@ - - if (!suspend_gang && gang_ra[i]) - { -- if (prev_value_ra[i] > 0.0) -- { -- diff = value - prev_value_ra[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_ra[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -374,14 +339,7 @@ - - if (!suspend_gang && gang_kn[i]) - { -- if (prev_value_kn[i] > 0.0) -- { -- diff = value - prev_value_kn[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_kn[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -423,14 +381,7 @@ - - if (!suspend_gang && gang_ma[i]) - { -- if (prev_value_ma[i] > 0.0) -- { -- diff = value - prev_value_ma[i]; -- } -- else -- { -- diff = 0.0; -- } -+ diff = value - prev_value_ma[i]; - - for (j = 0 ; j < XO_BANDS ; j++) - { -@@ -581,7 +532,7 @@ - gang_at[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_at[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_at[band] = -1.0; -+ prev_value_at[band] = gtk_adjustment_get_value (adj_at[band]); - } - else - { -@@ -598,7 +549,7 @@ - gang_re[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_re[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_re[band] = -1.0; -+ prev_value_re[band] = gtk_adjustment_get_value (adj_re[band]); - } - else - { -@@ -615,7 +566,7 @@ - gang_th[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_th[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_th[band] = 1.0; -+ prev_value_th[band] = gtk_adjustment_get_value (adj_th[band]); - } - else - { -@@ -632,7 +583,7 @@ - gang_ra[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_ra[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_ra[band] = -1.0; -+ prev_value_ra[band] = gtk_adjustment_get_value (adj_ra[band]); - } - else - { -@@ -648,7 +599,7 @@ - gang_kn[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_kn[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_kn[band] = -1.0; -+ prev_value_kn[band] = gtk_adjustment_get_value (adj_kn[band]); - } - else - { -@@ -665,7 +616,7 @@ - gang_ma[band] = FALSE; - gtk_widget_modify_fg ((GtkWidget *) lab_ma[band], GTK_STATE_NORMAL, - get_color (TEXT_COLOR)); -- prev_value_ma[band] = -1.0; -+ prev_value_ma[band] = gtk_adjustment_get_value (adj_ma[band]); - } - else - { -diff -Naur jamin-0.9.0.orig/src/io.c jamin-0.9.0/src/io.c ---- jamin-0.9.0.orig/src/io.c 2004-04-02 18:47:19.000000000 -0800 -+++ jamin-0.9.0/src/io.c 2004-09-29 23:54:06.053042018 -0700 -@@ -58,6 +58,8 @@ - * + JACK not running realtime - */ - -+#include "config.h" -+ - #include <stdio.h> - #include <stdarg.h> - #include <stdlib.h> -@@ -71,8 +73,10 @@ - #include <errno.h> - #include <assert.h> - #include <jack/jack.h> -+#ifdef HAVE_JACK_CREATE_THREAD -+#include <jack/thread.h> -+#endif - --#include "config.h" - #include "ringbuffer.h" /* uses <jack/ringbuffer.h>, if available */ - #include "process.h" - #include "resource.h" -@@ -857,9 +861,12 @@ - { - int rc; - int policy; -- struct sched_param rt_param, my_param; -+ struct sched_param rt_param; - pthread_attr_t attributes; - pthread_attr_init(&attributes); -+#ifndef HAVE_JACK_CREATE_THREAD -+ struct sched_param my_param; -+#endif - - /* Set priority and scheduling parameters based on the attributes - * of the JACK client thread. */ -@@ -884,6 +891,23 @@ - } else - IF_DEBUG(DBG_TERSE, io_trace("JACK subsystem not realtime")); - -+#ifdef HAVE_JACK_CREATE_THREAD -+ -+ rc = jack_create_thread(&dsp_thread, rt_param.sched_priority, -+ jst.realtime, io_dsp_thread, NULL); -+ switch (rc) { -+ case 0: -+ IF_DEBUG(DBG_TERSE, io_trace("DSP thread created")); -+ break; -+ case EPERM: -+ io_errlog(EPERM, "no realtime privileges for DSP thread"); -+ break; -+ default: -+ io_errlog(rc, "error creating DSP thread"); -+ } -+ -+#else /* !HAVE_JACK_CREATE_THREAD */ -+ - rc = pthread_attr_setschedpolicy(&attributes, policy); - if (rc) { - io_errlog(EPERM, "cannot set scheduling policy, rc = %d.", rc); -@@ -984,10 +1008,11 @@ - /* return this thread to the scheduler it used before */ - sched_setscheduler(0, policy, &my_param); - IF_DEBUG(DBG_TERSE, io_trace("DSP thread finally created")); -- return 0; --#else /* !HAVE_POSIX_SCHED */ -- return rc; -+ rc = 0; - #endif /* HAVE_POSIX_SCHED */ -+#endif /* HAVE_JACK_CREATE_THREAD */ -+ -+ return rc; - } - - diff --git a/media-sound/jamin/files/jamin-0.9.0-scenes.patch b/media-sound/jamin/files/jamin-0.9.0-scenes.patch deleted file mode 100644 index 8b0c207c61a6..000000000000 --- a/media-sound/jamin/files/jamin-0.9.0-scenes.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ur jamin-0.9.0-orig/src/scenes.c jamin-0.9.0/src/scenes.c ---- jamin-0.9.0-orig/src/scenes.c 2004-08-18 01:49:23.576383960 +0200 -+++ jamin-0.9.0/src/scenes.c 2004-08-18 01:54:06.970301536 +0200 -@@ -60,8 +60,6 @@ - *LED_yellow = NULL, *LED_red = NULL; - - --void set_EQ_curve_values (); -- - - /* Initialize all scene related structures and get the widget addresses. */ - -@@ -210,7 +208,7 @@ - - s_crossfade_to_state (&scene_state[i], -1.0f); - -- set_EQ_curve_values (); -+ set_EQ_curve_values (0, 0.0); - - s_history_add_state (scene_state[i]); - diff --git a/media-sound/jamin/jamin-0.9.0-r1.ebuild b/media-sound/jamin/jamin-0.9.0-r1.ebuild deleted file mode 100644 index 349ae972503c..000000000000 --- a/media-sound/jamin/jamin-0.9.0-r1.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.9.0-r1.ebuild,v 1.6 2005/09/09 13:05:41 flameeyes Exp $ - -inherit eutils - -IUSE="" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="x86 amd64 ~ppc" - -DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface" -HOMEPAGE="http://jamin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0 - >=media-plugins/swh-plugins-0.4.6 - media-libs/ladspa-sdk - >=sci-libs/fftw-3.0.1 - media-libs/libsndfile - >=media-libs/alsa-lib-0.9.0 - >=dev-libs/libxml2-2.5.0 - >=x11-libs/gtk+-2.0.0" - -src_unpack() { - unpack ${A} - - cd ${S} - epatch ${FILESDIR}/${P}-scenes.patch - epatch ${FILESDIR}/${P}-geq.patch - epatch ${FILESDIR}/${P}-jack99.patch -} - -src_install() { - make install DESTDIR=${D} - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-sound/jamin/jamin-0.95.0-r1.ebuild b/media-sound/jamin/jamin-0.95.0-r1.ebuild deleted file mode 100644 index 28c651c0b713..000000000000 --- a/media-sound/jamin/jamin-0.95.0-r1.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r1.ebuild,v 1.4 2005/09/09 13:05:41 flameeyes Exp $ - -inherit eutils - -DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface" -HOMEPAGE="http://jamin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="osc" - -DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0 - >=media-plugins/swh-plugins-0.4.6 - media-libs/ladspa-sdk - >=sci-libs/fftw-3.0.1 - media-libs/libsndfile - >=media-libs/alsa-lib-0.9.0 - >=dev-libs/libxml2-2.5.0 - >=x11-libs/gtk+-2.0.0 - osc? ( >=media-libs/liblo-0.5 )" - -src_install() { - make install DESTDIR=${D} || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/media-sound/jamin/jamin-0.95.0-r2.ebuild b/media-sound/jamin/jamin-0.95.0-r2.ebuild index 78ca5d96459c..b4a95a0d245d 100644 --- a/media-sound/jamin/jamin-0.95.0-r2.ebuild +++ b/media-sound/jamin/jamin-0.95.0-r2.ebuild @@ -1,7 +1,8 @@ -# Copyright 1999-2007 Gentoo Foundation +# Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r2.ebuild,v 1.4 2007/03/09 04:36:09 beandog Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0-r2.ebuild,v 1.5 2009/06/05 10:22:57 ssuominen Exp $ +EAPI=2 inherit eutils DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface" @@ -13,28 +14,27 @@ SLOT="0" KEYWORDS="amd64 ~ppc x86" IUSE="osc" -DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0 +RDEPEND=">=media-sound/jack-audio-connection-kit-0.80.0 >=media-plugins/swh-plugins-0.4.6 media-libs/ladspa-sdk >=sci-libs/fftw-3.0.1 media-libs/libsndfile - >=media-libs/alsa-lib-0.9.0 - >=dev-libs/libxml2-2.5.0 - >=x11-libs/gtk+-2.0.0 + media-libs/alsa-lib + >=dev-libs/libxml2-2.5 + >=x11-libs/gtk+-2:2 osc? ( >=media-libs/liblo-0.5 )" +DEPEND="${RDEPEND}" -src_unpack() { - unpack ${A} - cd "${S}" +src_prepare() { epatch "${FILESDIR}/${P}-multilib-strict.patch" } -src_compile() { - econf `use_enable osc` || die "configure failed" - emake || die +src_configure() { + econf \ + $(use_enable osc) } src_install() { - make install DESTDIR=${D} || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" dodoc AUTHORS ChangeLog NEWS README TODO } diff --git a/media-sound/jamin/jamin-0.95.0.ebuild b/media-sound/jamin/jamin-0.95.0.ebuild deleted file mode 100644 index 12faf30405a2..000000000000 --- a/media-sound/jamin/jamin-0.95.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/jamin/jamin-0.95.0.ebuild,v 1.2 2005/09/09 13:05:41 flameeyes Exp $ - -inherit eutils - -DESCRIPTION="JAMin is the JACK Audio Connection Kit (JACK) Audio Mastering interface" -HOMEPAGE="http://jamin.sourceforge.net" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~x86 ~amd64 ~ppc" -IUSE="" - -DEPEND=">=media-sound/jack-audio-connection-kit-0.80.0 - >=media-plugins/swh-plugins-0.4.6 - media-libs/ladspa-sdk - >=sci-libs/fftw-3.0.1 - media-libs/libsndfile - >=media-libs/alsa-lib-0.9.0 - >=dev-libs/libxml2-2.5.0 - >=x11-libs/gtk+-2.0.0" - -src_install() { - make install DESTDIR=${D} || die "make install failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} |