summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/amp/ChangeLog6
-rw-r--r--media-sound/amp/Manifest6
-rw-r--r--media-sound/amp/amp-0.7.6.ebuild12
-rw-r--r--media-sound/amp/files/amp-0.7.6-gcc34.patch11
-rw-r--r--media-sound/amp/files/amp-0.7.6-gentoo.diff22
5 files changed, 29 insertions, 28 deletions
diff --git a/media-sound/amp/ChangeLog b/media-sound/amp/ChangeLog
index acab7b7a85d2..5ba25eb9b707 100644
--- a/media-sound/amp/ChangeLog
+++ b/media-sound/amp/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-sound/amp
# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/ChangeLog,v 1.6 2004/07/04 09:25:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/ChangeLog,v 1.7 2004/07/07 22:31:47 eradicator Exp $
+
+ 07 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org>
+ +files/amp-0.7.6-gcc34.patch, -files/amp-0.7.6-gentoo.diff:
+ gcc3.4 fixes close bug #56023. ~amd64
04 Jul 2004; Jeremy Huddleston <eradicator@gentoo.org> amp-0.7.6.ebuild:
~sparc.
diff --git a/media-sound/amp/Manifest b/media-sound/amp/Manifest
index a771a662ff4e..a6174148ab8b 100644
--- a/media-sound/amp/Manifest
+++ b/media-sound/amp/Manifest
@@ -1,5 +1,5 @@
-MD5 289ba5cb59e4fd8cb6a5da2f0a74cfba ChangeLog 641
-MD5 58c5c6e1e597d7a6a4c1dd2335d78c03 amp-0.7.6.ebuild 499
+MD5 bcee164fd5aa4ec4d17fb6150fc9a452 ChangeLog 802
+MD5 e81e7adc02bf5d3bafc0da670f1b3eea amp-0.7.6.ebuild 600
MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158
-MD5 2bb79d0ff57876221f93b8ee0ef7fdb7 files/amp-0.7.6-gentoo.diff 512
MD5 dfa9cfdfc2fdefe0a9a21f46d270707b files/digest-amp-0.7.6 61
+MD5 114cc11c329e1a2810dd61a99f5873af files/amp-0.7.6-gcc34.patch 338
diff --git a/media-sound/amp/amp-0.7.6.ebuild b/media-sound/amp/amp-0.7.6.ebuild
index 9f6d8b00bae9..4490e1a87d93 100644
--- a/media-sound/amp/amp-0.7.6.ebuild
+++ b/media-sound/amp/amp-0.7.6.ebuild
@@ -1,16 +1,24 @@
# Copyright 1999-2004 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/amp-0.7.6.ebuild,v 1.9 2004/07/04 09:25:50 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/amp/amp-0.7.6.ebuild,v 1.10 2004/07/07 22:31:47 eradicator Exp $
IUSE=""
+inherit eutils
+
DESCRIPTION="AMP - the Audio Mpeg Player"
LICENSE="as-is"
SRC_URI="http://distro.ibiblio.org/pub/Linux/distributions/slackware/slackware_source/ap/amp/${P}.tar.gz"
-KEYWORDS="x86 ~sparc"
+KEYWORDS="x86 ~sparc ~amd64"
SLOT="0"
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+ epatch ${FILESDIR}/${P}-gcc34.patch
+}
+
src_install() {
dobin amp || die
dodoc BUGS CHANGES README TODO doc/*
diff --git a/media-sound/amp/files/amp-0.7.6-gcc34.patch b/media-sound/amp/files/amp-0.7.6-gcc34.patch
new file mode 100644
index 000000000000..6e04bebe7d9b
--- /dev/null
+++ b/media-sound/amp/files/amp-0.7.6-gcc34.patch
@@ -0,0 +1,11 @@
+diff -Naur amp-0.7.6.orig/guicontrol.c amp-0.7.6/guicontrol.c
+--- amp-0.7.6.orig/guicontrol.c 1997-08-23 04:30:51.000000000 -0700
++++ amp-0.7.6/guicontrol.c 2004-07-07 15:27:54.694249000 -0700
+@@ -376,6 +376,7 @@
+ case GETHDR_SYN: warn("oops, we're out of sync.\n");
+ break;
+ default:
++ break;
+ }
+ break;
+ }
diff --git a/media-sound/amp/files/amp-0.7.6-gentoo.diff b/media-sound/amp/files/amp-0.7.6-gentoo.diff
deleted file mode 100644
index dcef8bcae534..000000000000
--- a/media-sound/amp/files/amp-0.7.6-gentoo.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-*** Makefile Sat Feb 8 17:57:02 2003
---- Makefile.new Sat Feb 8 20:33:52 2003
-***************
-*** 11,16 ****
---- 11,17 ----
- DEFINES = -DNO_BYTE_SWAPPING -DOS_Linux -DARCH_i686
- CFLAGS = -O6 -ffast-math -fomit-frame-pointer ${DEFINES} ${DEBUG}
- LDFLAGS =
-+ INSTALL=install
-
- #
- # uncomment both of these if you want profiling support
-***************
-*** 50,53 ****
---- 51,57 ----
- dep:
- gcc -MM ${DEFINES} ${DEBUG} *.c > .depend
-
-+ install: amp
-+ $(INSTALL) amp /usr/bin
-+
- #-include .depend