Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/gnusound/ChangeLog7
-rw-r--r--media-sound/gnusound/files/digest-gnusound-0.6.11
-rw-r--r--media-sound/gnusound/files/gnusound-0.6.2-destdir.patch41
-rw-r--r--media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch12
-rw-r--r--media-sound/gnusound/gnusound-0.6.1.ebuild37
-rw-r--r--media-sound/gnusound/gnusound-0.6.2.ebuild15
6 files changed, 69 insertions, 44 deletions
diff --git a/media-sound/gnusound/ChangeLog b/media-sound/gnusound/ChangeLog
index 80fd2aa16320..b20681e6aa1b 100644
--- a/media-sound/gnusound/ChangeLog
+++ b/media-sound/gnusound/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-sound/gnusound
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.6 2004/10/08 07:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/ChangeLog,v 1.7 2004/11/23 02:55:21 eradicator Exp $
+
+ 22 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/gnusound-0.6.2-destdir.patch, +files/gnusound-0.6.2-gcc34.patch,
+ -gnusound-0.6.1.ebuild, gnusound-0.6.2.ebuild:
+ Cleaned up and added to -amd64, -sparc.
08 Oct 2004; Jeremy Huddleston <eradicator@gentoo.org> metadata.xml,
gnusound-0.6.2.ebuild, +files/gnusound-0.6.2-gtkdep.patch:
diff --git a/media-sound/gnusound/files/digest-gnusound-0.6.1 b/media-sound/gnusound/files/digest-gnusound-0.6.1
deleted file mode 100644
index d66eec072b8d..000000000000
--- a/media-sound/gnusound/files/digest-gnusound-0.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 4dbf15289dabd2367d8e07cdcfb23ad0 gnusound-0.6.1.tar.bz2 254965
diff --git a/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch b/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch
new file mode 100644
index 000000000000..9d51eef1b4d7
--- /dev/null
+++ b/media-sound/gnusound/files/gnusound-0.6.2-destdir.patch
@@ -0,0 +1,41 @@
+--- gnusound-0.6.2/doc/Makefile.in.orig 2004-11-22 18:34:09.525925468 -0800
++++ gnusound-0.6.2/doc/Makefile.in 2004-11-22 18:35:03.293071290 -0800
+@@ -27,9 +27,9 @@
+
+ install:
+ for lang in $(LANGUAGES); do \
+- mkdir -p $(datadir)/$$lang; \
++ mkdir -p $(DESTDIR)$(datadir)/$$lang; \
+ cp $$lang/*.xml $$lang/*.html $$lang/topic.dat \
+- $(datadir)/$$lang; \
++ $(DESTDIR)$(datadir)/$$lang; \
+ done
+
+ dist:
+--- gnusound-0.6.2/Makefile.in.orig 2004-11-22 18:38:50.955574862 -0800
++++ gnusound-0.6.2/Makefile.in 2004-11-22 18:39:27.437565359 -0800
+@@ -86,15 +86,15 @@
+
+ install: all
+ $(MAKE) -C doc install
+- mkdir -p $(bindir)
+- mkdir -p $(moduledir)
+- mkdir -p $(pixmapdir)
+- mkdir -p $(desktopdir)
+- install -m 755 -o root -g root $(name) $(bindir)
+- install -m 644 -o root -g root $(module_files) $(moduledir)
+- install -m 644 -o root -g root $(pixmap_files) $(pixmapdir)
+- install -m 644 -o root -g root $(lib_files) $(libdir)
+- install -m 644 -o root -g root $(desktop_files) $(desktopdir)
++ mkdir -p $(DESTDIR)$(bindir)
++ mkdir -p $(DESTDIR)$(moduledir)
++ mkdir -p $(DESTDIR)$(pixmapdir)
++ mkdir -p $(DESTDIR)$(desktopdir)
++ install -m 755 -o root -g root $(name) $(DESTDIR)$(bindir)
++ install -m 644 -o root -g root $(module_files) $(DESTDIR)$(moduledir)
++ install -m 644 -o root -g root $(pixmap_files) $(DESTDIR)$(pixmapdir)
++ install -m 644 -o root -g root $(lib_files) $(DESTDIR)$(libdir)
++ install -m 644 -o root -g root $(desktop_files) $(DESTDIR)$(desktopdir)
+
+ uninstall:
+ $(MAKE) -C doc uninstall
diff --git a/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch b/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch
new file mode 100644
index 000000000000..ff26389460c1
--- /dev/null
+++ b/media-sound/gnusound/files/gnusound-0.6.2-gcc34.patch
@@ -0,0 +1,12 @@
+diff -Naur gnusound-0.6.2.orig/play.c gnusound-0.6.2/play.c
+--- gnusound-0.6.2.orig/play.c 2003-01-14 21:11:36.000000000 -0800
++++ gnusound-0.6.2/play.c 2004-11-22 18:19:47.000000000 -0800
+@@ -817,7 +817,7 @@
+
+ DEBUG("player.draws_requested: %d, player.draws_prevented: %d\n",
+ shl->player.draws_requested, shl->player.draws_prevented);
+- cleanup:
++ cleanup:;
+ pthread_cleanup_pop(1);
+ return NULL;
+ }
diff --git a/media-sound/gnusound/gnusound-0.6.1.ebuild b/media-sound/gnusound/gnusound-0.6.1.ebuild
deleted file mode 100644
index 6ef61c0f0769..000000000000
--- a/media-sound/gnusound/gnusound-0.6.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.1.ebuild,v 1.3 2004/06/25 00:02:38 agriffis Exp $
-
-DESCRIPTION="GNUsound is a sound editor for Linux/x86"
-HOMEPAGE="http://gnusound.sourceforge.net/"
-SRC_URI="http://gnusound.sourceforge.net/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86"
-IUSE="libsamplerate"
-
-DEPEND=">=gnome-base/libglade-2.0.1
- gnome-base/gnome-libs
- >=gnome-base/libgnomeui-2.2.0.1
- >=media-libs/audiofile-0.2.3
- libsamplerate? ( media-libs/libsamplerate )"
-
-src_unpack() {
- unpack ${A} || die "unpack failure"
- cd ${S} || die "workdir not found"
- rm -f doc/Makefile || die "could not remove doc Makefile"
- rm -f modules/Makefile || die "could not remove modules Makefile"
- sed -i "s:docrootdir:datadir:" doc/Makefile.in
-}
-
-src_compile() {
- econf `use_with libsamplerate` --enable-optimization || die "Configure failure"
-
- emake || die "Make failure"
-}
-
-src_install() {
- einstall || die "make install failure"
- dodoc LICENSE README NOTES TODO CHANGES
-}
diff --git a/media-sound/gnusound/gnusound-0.6.2.ebuild b/media-sound/gnusound/gnusound-0.6.2.ebuild
index d4d3a04f49d9..59699b839c82 100644
--- a/media-sound/gnusound/gnusound-0.6.2.ebuild
+++ b/media-sound/gnusound/gnusound-0.6.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.4 2004/10/08 07:14:12 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/gnusound/gnusound-0.6.2.ebuild,v 1.5 2004/11/23 02:55:21 eradicator Exp $
IUSE="libsamplerate"
@@ -12,7 +12,8 @@ SRC_URI="http://gnusound.sourceforge.net/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="x86"
+# -amd64, -sparc: 0.6.2 - eradicator - segfault on startup
+KEYWORDS="-amd64 x86 -sparc"
DEPEND=">=gnome-base/libglade-2.0.1
gnome-base/gnome-libs
@@ -30,16 +31,20 @@ src_unpack() {
# Bug #54980
epatch ${FILESDIR}/${P}-gtkdep.patch
+ # Bug #68345
+ epatch ${FILESDIR}/${P}-gcc34.patch
+
+ epatch ${FILESDIR}/${P}-destdir.patch
+
gnuconfig_update
}
src_compile() {
econf `use_with libsamplerate` --enable-optimization || die "Configure failure"
-
emake || die "Make failure"
}
src_install() {
- einstall || die "make install failure"
- dodoc LICENSE README NOTES TODO CHANGES
+ make DESTDIR="${D}" install || die
+ dodoc README NOTES TODO CHANGES
}