Fix mistake made in bug 309713; move patchset to mirrors. Drop unrequired -no_png_set_dither.patch patch since it's working again with libpng >= 1.4.2_rc5.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

5 files changed, 19 insertions, 88 deletions

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 95eebce8eece..6ff36a7526e5 100644
--- a/media-sound/timidity++/ChangeLog
+++ b/media-sound/timidity++/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-sound/timidity++
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.131 2010/03/16 08:26:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.132 2010/05/03 21:04:01 ssuominen Exp $
+
+*timidity++-2.13.2-r13 (03 May 2010)
+
+  03 May 2010; Samuli Suominen <ssuominen@gentoo.org>
+  timidity++-2.13.2-r12.ebuild, +timidity++-2.13.2-r13.ebuild:
+  Fix mistake made in bug 309713; move patchset to mirrors. Drop unrequired
+  -no_png_set_dither.patch patch since it's working again with libpng >=
+  1.4.2_rc5.
 
   16 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
   timidity++-2.13.2-r12.ebuild, +files/timidity++-2.13.2-decl.patch:
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-decl.patch b/media-sound/timidity++/files/timidity++-2.13.2-decl.patch
deleted file mode 100644
index f7fa756326da..000000000000
--- a/media-sound/timidity++/files/timidity++-2.13.2-decl.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugs.gentoo.org/show_bug.cgi?id=309713
-
-diff -ur TiMidity++-2.13.2.orig/timidity/effect.c TiMidity++-2.13.2/timidity/effect.c
---- TiMidity++-2.13.2.orig/timidity/effect.c	2004-03-25 07:51:51.000000000 +0200
-+++ TiMidity++-2.13.2/timidity/effect.c	2010-03-16 10:17:24.000000000 +0200
-@@ -29,6 +29,8 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- 
-+#include <stdlib.h>
-+
- #ifndef NO_STRING_H
- #include <string.h>
- #else
-diff -ur TiMidity++-2.13.2.orig/timidity/sndfont.c TiMidity++-2.13.2/timidity/sndfont.c
---- TiMidity++-2.13.2.orig/timidity/sndfont.c	2010-03-16 10:16:57.000000000 +0200
-+++ TiMidity++-2.13.2/timidity/sndfont.c	2010-03-16 10:17:24.000000000 +0200
-@@ -55,6 +55,7 @@
- #include "output.h"
- #include "filter.h"
- #include "resample.h"
-+#include "freq.h"
- 
- #define FILENAME_NORMALIZE(fname) url_expand_home_dir(fname)
- #define FILENAME_REDUCED(fname)   url_unexpand_home_dir(fname)
-@@ -1615,8 +1616,6 @@
- 
-  *********************************************************************/
- 
--#include "freq.h"
--
- #define CFG_FOR_SF_SUPPORT_FFT	1
- 
- static FILE *x_out;
-diff -ur TiMidity++-2.13.2.orig/timidity/speex_a.c TiMidity++-2.13.2/timidity/speex_a.c
---- TiMidity++-2.13.2.orig/timidity/speex_a.c	2010-03-16 10:16:57.000000000 +0200
-+++ TiMidity++-2.13.2/timidity/speex_a.c	2010-03-16 10:18:34.000000000 +0200
-@@ -26,6 +26,7 @@
- #include "config.h"
- #endif /* HAVE_CONFIG_H */
- #include <stdio.h>
-+#include <stdlib.h>
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif
diff --git a/media-sound/timidity++/files/timidity++-2.13.2-no_png_set_dither.patch b/media-sound/timidity++/files/timidity++-2.13.2-no_png_set_dither.patch
deleted file mode 100644
index 774a620ae73f..000000000000
--- a/media-sound/timidity++/files/timidity++-2.13.2-no_png_set_dither.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-http://sourceforge.net/mailarchive/forum.php?thread_name=e56ccc8f0812151445ybd95eb0i78eb9aef434a6e28%40mail.gmail.com&forum_name=png-mng-misc
-http://bugs.gentoo.org/show_bug.cgi?id=308619
-http://bugs.gentoo.org/show_bug.cgi?id=308617
-
---- interface/x_sherry.c
-+++ interface/x_sherry.c
-@@ -902,6 +902,7 @@
-     png_set_gamma (pngPtr, screenGamma, 0.50);
- #endif
- 
-+#if 0
-     if(png_get_valid(pngPtr, infoPtr, PNG_INFO_PLTE))
-     {
- 	png_get_PLTE(pngPtr, infoPtr, &palette, &numPalette);
-@@ -942,6 +943,7 @@
- 	palette = pngPtr->palette;
- 	numPalette = pngPtr->num_palette;
-     }
-+#endif
- 
-     if(png_get_valid(pngPtr, infoPtr, PNG_INFO_tRNS))
- 	png_get_tRNS(pngPtr, infoPtr, &trans, &numTrans, &transValues);
diff --git a/media-sound/timidity++/timidity++-2.13.2-r11.ebuild b/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
index bc1077c76cdf..ff5a56f6b467 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r11.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r11.ebuild,v 1.8 2009/11/16 23:42:39 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r11.ebuild,v 1.9 2010/05/03 21:04:01 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils elisp-common
@@ -32,7 +32,8 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
 	ao? ( >=media-libs/libao-0.8.5 )
 	motif? ( x11-libs/openmotif )
 	X? ( x11-libs/libXaw
-		x11-libs/libXext )"
+		x11-libs/libXext )
+	!~media-libs/libpng-1.4.1"
 RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
diff --git a/media-sound/timidity++/timidity++-2.13.2-r12.ebuild b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
index 92f1d87a1d0e..750b23b562f9 100644
--- a/media-sound/timidity++/timidity++-2.13.2-r12.ebuild
+++ b/media-sound/timidity++/timidity++-2.13.2-r13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r12.ebuild,v 1.2 2010/03/16 08:26:13 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.13.2-r13.ebuild,v 1.1 2010/05/03 21:04:01 ssuominen Exp $
 
 EAPI=2
 inherit autotools eutils elisp-common
@@ -11,7 +11,8 @@ S=${WORKDIR}/${MY_P}
 
 DESCRIPTION="A handy MIDI to WAV converter with OSS and ALSA output support"
 HOMEPAGE="http://timidity.sourceforge.net/"
-SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2 mirror://gentoo/${P}-exiterror.patch"
+SRC_URI="mirror://sourceforge/timidity/${MY_P}.tar.bz2
+	http://dev.gentoo.org/~ssuominen/${P}-patchset-1.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -32,7 +33,8 @@ DEPEND="ncurses? ( >=sys-libs/ncurses-5 )
 	ao? ( >=media-libs/libao-0.8.5 )
 	motif? ( x11-libs/openmotif )
 	X? ( x11-libs/libXaw
-		x11-libs/libXext )"
+		x11-libs/libXext )
+	!~media-libs/libpng-1.4.1"
 RDEPEND="${DEPEND}
 	alsa? ( media-sound/alsa-utils )
 	app-admin/eselect-timidity"
@@ -47,20 +49,7 @@ pkg_setup() {
 }
 
 src_prepare() {
-	epatch "${DISTDIR}"/${P}-exiterror.patch \
-		"${FILESDIR}"/${P}-gtk26.patch \
-		"${FILESDIR}"/${P}-gcc4.patch \
-		"${FILESDIR}"/${P}-flac.patch \
-		"${FILESDIR}"/${P}-flac113.patch \
-		"${FILESDIR}"/${P}-protos.patch \
-		"${FILESDIR}"/${P}-params.patch \
-		"${FILESDIR}"/${P}-no_png_set_dither.patch \
-		"${FILESDIR}"/${P}-decl.patch
-
-	# fix header location of speex
-	sed -i -e "s:#include <speex:#include <speex/speex:g" \
-		configure.in timidity/speex_a.c || die "sed failed"
-
+	EPATCH_SUFFIX="patch" epatch "${WORKDIR}"/patches
 	eautoreconf
 }