Fix mistake made in bug 309713; move patchset to mirrors. Drop unrequired -no_png_set...

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog
index 95eebce8eece07d4679161c5bb024ec0606b6ad7..6ff36a7526e5b476ba464237ed4c49b67f35e424 100644 (file)
--- 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++/Manifest b/media-sound/timidity++/Manifest
index 103d492f8a576fe0130ee7698f8c685bc674c436..b2b81112b237f812f3bf5918e2e980881ee78c59 100644 (file)
--- a/media-sound/timidity++/Manifest
+++ b/media-sound/timidity++/Manifest
@@ -2,12 +2,10 @@ AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 S
 AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3
 AUX conf.d.timidity.2 972 RMD160 60bd6643d195fd846185ca23132a969eef950f55 SHA1 c74e787f048229b7e3795e2783207d85ec9c3dad SHA256 a3a6fc74fc1353f2c5e7eda51a244fb3212cd5f33b407fe5ce1245ca2757593e
 AUX init.d.timidity.3 502 RMD160 45dcebcc3e2dd3048b4551941464a6ffcf1b8b0e SHA1 4e9f0069d14bdd121c83163d95f75a02801707a9 SHA256 b11e108210446221ccc8344f07a780349197248194bde5956ca69552f7aa5b14
-AUX timidity++-2.13.2-decl.patch 1488 RMD160 7ccabe43cd08e86089d94e7e892d4a37c7293651 SHA1 50ae680ce08657619437debce3b5ff4b8c3a53e2 SHA256 50bc82b0f66d56a20e431a5a79dded3a4c57f51fe29dfe956622e9067ec2a934
 AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1b75c SHA1 53f4cbf7a343002a3f6508938ba3e24d1f4bf5f5 SHA256 5ae270f3bc0b74def45dde4b85d178c8ebfbef01752ef6b4ec2588ffda48bbca
 AUX timidity++-2.13.2-flac113.patch 11509 RMD160 709a31cc664a9686f1ac22974459e0c932511418 SHA1 173cc8f2ec5ecfc834d5a0027aa3cdecd3f9f14d SHA256 2ed4abfb75d225f6bd295ba4ffbc63f47c6caab57cb09e670df508c5d7447424
 AUX timidity++-2.13.2-gcc4.patch 1325 RMD160 31383eb4a1d0a839d60af8d635aeba02febc9bb5 SHA1 8d50618a2379c078b07e8d0fc59457855c16106c SHA256 20ca5deb95ccbb527c0212f4ad002a5a8df1a9c005e210494abe7bc240cef3ee
 AUX timidity++-2.13.2-gtk26.patch 588 RMD160 588eefcb0727af0162b24b17970df300ea5fdd64 SHA1 ce115e84d99708f0bdb5b57bd98b0c3514fa2bf4 SHA256 fdb95708e353425fbc8f141d45f5b876fa85636f953200cdbc147834b4a31f56
-AUX timidity++-2.13.2-no_png_set_dither.patch 711 RMD160 20f2e06fe26ae4546d3b8455dd45189d54e698eb SHA1 2194c420cc3e29d52456d64e8d80f3c13750bcb7 SHA256 e5554f2af68190864228e2335c94653926ef81d555a33842e3d0ad0191c3e66f
 AUX timidity++-2.13.2-params.patch 1834 RMD160 7984132baa0c6e6277a3520343e79280945c3704 SHA1 a1d0436a217852a62e6e5ec8bf814fc49733a583 SHA256 ca87dd8d303501c613491ca34b2876a21fa0bfb03610d4b035aeb51388ca587d
 AUX timidity++-2.13.2-polling.patch 960 RMD160 404beaffd1d1618ad6579ef952567f514e82da5d SHA1 6c4f62c045380a6d27c44002c72352943af0fa2b SHA256 933afdd0a6f4dfc98b25818c8c07ea7e2ba8a10a422f23953143d0ae09e39845
 AUX timidity++-2.13.2-protos.patch 231 RMD160 4ae219704a9da1dfc792bde1a9ebc991eac168a1 SHA1 26ce16fa02127896fe3d919a758a067c63b6b8bd SHA256 14ae61bc72897cbbe817227f5dbda68c388c80531bd1659b0a595884747de78e
@@ -17,7 +15,8 @@ AUX timidity.desktop.2 257 RMD160 9820f1876d172775bc69a25c577d4f2e5efd6edc SHA1
 AUX timidity.xpm 1522 RMD160 2b64234979909343fc2775e5eedfe8960a3190d1 SHA1 181555a128d9a512bb74192c85cbfa20099f41d1 SHA256 4b085a4b8af1648495dccc36bcb7b7637318ffb3e9c2011cc8ac43119a8b4db6
 DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85084fd8 SHA1 8e603146e1164335303a5ac5dff291f369241b4e SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260
 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77
-EBUILD timidity++-2.13.2-r11.ebuild 5315 RMD160 37327d023d76108b88a4d400ca6094f749e6d32c SHA1 60f43d032166fed241e45e6519804322aefb1392 SHA256 6fb63d85eff872883b8f23e4282f95c3762276abcff93007d58db9b3d50933e8
-EBUILD timidity++-2.13.2-r12.ebuild 5409 RMD160 d81b5aecb1aff2d1aa8c7516b4a9834ae5876083 SHA1 14c3759a5211f25c406b5380db587b193e9baa39 SHA256 6022c198642a899363494c59b38481fa72c92f6a6c198f73b75e2ffbf9f0cb01
-MISC ChangeLog 20720 RMD160 889ae87ed414ff1f5ebeb743a0bca120d1a12458 SHA1 632a8d7316b2f36dd891236e362161861e5de49d SHA256 79b340fa646a901d2e24cb2b7d6d5869d8f2d3af145e7fd358fbc9f29428cb74
+DIST timidity++-2.13.2-patchset-1.tar.bz2 8018 RMD160 4efe175ac87a0d35ab94d2bedb7d78d59f161af5 SHA1 775bdd7a2abc9a9bc7e09289fc667b63604e7703 SHA256 adfd4ce6876e24a0be9f4e6eb6dd0802722d72082a117564d1adc658fb07c9e0
+EBUILD timidity++-2.13.2-r11.ebuild 5348 RMD160 70c959fae6ab4768c5e77f8bcdbe5891fd6f6af2 SHA1 7cdc72f01a05d885eeb926a360245c3512d9e301 SHA256 788846de306dcc15a8234ffdc11c9c5cad5d405e1b6079d3066a88fe85cae0eb
+EBUILD timidity++-2.13.2-r13.ebuild 5028 RMD160 35de24dd1e7db6469586e2cb1d5d0be16ac17a84 SHA1 5e38b4397ddd1579a0b3cfcd88144e051159ebe2 SHA256 4e250eb7ab4b2bfea81ebb891003b7238313e42a2689723d3a073277d9e41dbd
+MISC ChangeLog 21038 RMD160 19865952ea66763922bf24529e9980af0131a32b SHA1 3cf4d6723191ce03d2ac534b8029dce8c8fa9436 SHA256 96abb9b6436e5364af99672ad01d957477fb9e71454ae659db58b570a0b05138
 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b

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 (file)
index f7fa756..0000000
--- 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 (file)
index 774a620..0000000
--- 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 bc1077c76cdfa0f7fe3e809f1d1c67c2e61aa87f..ff5a56f6b46768f9a10b7fe7c37b6175ffd745ee 100644 (file)
--- 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
similarity index 87%
rename from media-sound/timidity++/timidity++-2.13.2-r12.ebuild
rename to media-sound/timidity++/timidity++-2.13.2-r13.ebuild
index 92f1d87a1d0e3962676bdfe714fa95c2a48cf680..750b23b562f956ef8cbdb28195f8f63651a2c9f3 100644 (file)
--- 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
 }