diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 10:18:09 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-09 10:18:09 +0000 |
commit | 0de043cb828d63df2bce61285dbbb23fcb7535b8 (patch) | |
tree | 98339e2668b77e9ae9270378a0be2fd1e0d4becf /media-sound/timidity++ | |
parent | x86 stable, security bug 303747 (diff) | |
download | historical-0de043cb828d63df2bce61285dbbb23fcb7535b8.tar.gz historical-0de043cb828d63df2bce61285dbbb23fcb7535b8.tar.bz2 historical-0de043cb828d63df2bce61285dbbb23fcb7535b8.zip |
Don't use obsolete png_set_dither wrt #308619.
Package-Manager: portage-2.2_rc65/cvs/Linux x86_64
Diffstat (limited to 'media-sound/timidity++')
-rw-r--r-- | media-sound/timidity++/ChangeLog | 11 | ||||
-rw-r--r-- | media-sound/timidity++/Manifest | 4 | ||||
-rw-r--r-- | media-sound/timidity++/files/timidity++-2.13.2-no_png_set_dither.patch | 22 | ||||
-rw-r--r-- | media-sound/timidity++/timidity++-2.13.2-r12.ebuild | 187 |
4 files changed, 221 insertions, 3 deletions
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog index 151b01044cf6..a3e5de703dfd 100644 --- a/media-sound/timidity++/ChangeLog +++ b/media-sound/timidity++/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/timidity++ -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.129 2009/11/16 23:42:39 jer Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.130 2010/03/09 10:18:09 ssuominen Exp $ + +*timidity++-2.13.2-r12 (09 Mar 2010) + + 09 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + +timidity++-2.13.2-r12.ebuild, + +files/timidity++-2.13.2-no_png_set_dither.patch: + Don't use obsolete png_set_dither wrt #308619. 16 Nov 2009; Jeroen Roovers <jer@gentoo.org> timidity++-2.13.2-r11.ebuild: Stable for HPPA (bug #285945). diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest index b64c0a738a1f..25ec118f5a43 100644 --- a/media-sound/timidity++/Manifest +++ b/media-sound/timidity++/Manifest @@ -6,6 +6,7 @@ AUX timidity++-2.13.2-flac.patch 735 RMD160 65abbbc330b0ae486af3686cea8329a4f9a1 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,5 +18,6 @@ DIST TiMidity++-2.13.2.tar.bz2 1581230 RMD160 0156221846a88abef9312700a050972d85 DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142440a4f3760a9 SHA1 7cd697b4f7cb1ce45cec46c2e0f6e5e8bf1d9d60 SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77 EBUILD timidity++-2.13.2-r10.ebuild 4639 RMD160 21e650caf537afb9faeb9ddd1ce46409239add48 SHA1 140e6ad322a58ce5d968380dc4772628bf2be526 SHA256 48cd342a2066f7cce5e83ce868eea22278c7cee1a9a30253a32e87668265af49 EBUILD timidity++-2.13.2-r11.ebuild 5315 RMD160 37327d023d76108b88a4d400ca6094f749e6d32c SHA1 60f43d032166fed241e45e6519804322aefb1392 SHA256 6fb63d85eff872883b8f23e4282f95c3762276abcff93007d58db9b3d50933e8 -MISC ChangeLog 20278 RMD160 3b658f2ce40ff00b4859e7b8b7aa1ee6971aede9 SHA1 114c33c25c38b5edafabb568da7982204969d626 SHA256 6862cde4672c09269aacc1911399eff3ef0b189b45b9b73082cbf08b488368c9 +EBUILD timidity++-2.13.2-r12.ebuild 5375 RMD160 a50c8c0f586a8158819bc28ca8a239c831c6fbdb SHA1 5c3577867e2fa674cc68384d264fb7f377afca4b SHA256 7714b22b926dc91caea3921934f8112e7313d067fa9b239510dec7821e0a8e6a +MISC ChangeLog 20511 RMD160 a185206ca4bb15034298c0a49d3848d2135ffad2 SHA1 bb9de18a8e248eca956d6d80e9110cfa6cb91350 SHA256 63330e4402075f28e2de3769b79657eecee33648db8ff8d00ee67a76d71eef53 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b 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 new file mode 100644 index 000000000000..774a620ae73f --- /dev/null +++ b/media-sound/timidity++/files/timidity++-2.13.2-no_png_set_dither.patch @@ -0,0 +1,22 @@ +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-r12.ebuild b/media-sound/timidity++/timidity++-2.13.2-r12.ebuild new file mode 100644 index 000000000000..7302ca02232a --- /dev/null +++ b/media-sound/timidity++/timidity++-2.13.2-r12.ebuild @@ -0,0 +1,187 @@ +# 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.1 2010/03/09 10:18:09 ssuominen Exp $ + +EAPI=2 +inherit autotools eutils elisp-common + +MY_PV=${PV/_/-} +MY_P=TiMidity++-${MY_PV} +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="motif oss nas X gtk vorbis tk slang alsa jack emacs ao speex flac ncurses" + +DEPEND="ncurses? ( >=sys-libs/ncurses-5 ) + emacs? ( virtual/emacs ) + gtk? ( x11-libs/gtk+:2 ) + tk? ( dev-lang/tk ) + nas? ( >=media-libs/nas-1.4 ) + alsa? ( media-libs/alsa-lib ) + slang? ( sys-libs/slang ) + jack? ( media-sound/jack-audio-connection-kit ) + vorbis? ( media-libs/libvorbis ) + flac? ( media-libs/flac ) + speex? ( media-libs/speex ) + ao? ( >=media-libs/libao-0.8.5 ) + motif? ( x11-libs/openmotif ) + X? ( x11-libs/libXaw + x11-libs/libXext )" +RDEPEND="${DEPEND} + alsa? ( media-sound/alsa-utils ) + app-admin/eselect-timidity" + +PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + enewgroup audio 18 # Just make sure it exists + enewuser timidity -1 -1 /var/lib/timidity audio +} + +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 + + # fix header location of speex + sed -i -e "s:#include <speex:#include <speex/speex:g" \ + configure.in timidity/speex_a.c || die "sed failed" + + eautoreconf +} + +src_configure() { + local myconf + local audios + + use flac && audios="${audios},flac" + use speex && audios="${audios},speex" + use vorbis && audios="${audios},vorbis" + + use oss && audios="${audios},oss" + use jack && audios="${audios},jack" + use ao && audios="${audios},ao" + + if use nas; then + audios="${audios},nas" + myconf="${myconf} --with-nas-library=/usr/$(get_libdir)/libaudio.so --with-x" + use X || ewarn "Basic X11 support will be enabled because required by nas." + fi + + if use alsa; then + audios="${audios},alsa" + myconf="${myconf} --with-default-output=alsa --enable-alsaseq" + fi + + # We disable motif by default and then only enable it if it's requested. + if use motif; then + myconf="${myconf} --enable-motif --with-x" + use X || ewarn "Basic X11 support will be enabled because required by motif." + fi + + econf \ + --localstatedir=/var/state/timidity++ \ + --with-lispdir="${SITELISP}/${PN}" \ + --with-elf \ + --enable-audio=${audios} \ + --enable-server \ + --enable-network \ + --enable-dynamic \ + --enable-vt100 \ + --enable-spline=cubic \ + $(use_enable emacs) \ + $(use_enable slang) \ + $(use_enable ncurses) \ + $(use_with X x) \ + $(use_enable X spectrogram) \ + $(use_enable X wrd) \ + $(use_enable X xskin) \ + $(use_enable X xaw) \ + $(use_enable gtk) \ + $(use_enable tk tcltk) \ + --disable-motif \ + ${myconf} +} + +src_install() { + emake DESTDIR="${D}" install || die "emake install failed" + + dodoc AUTHORS ChangeLog* + dodoc NEWS README* "${FILESDIR}/timidity.cfg-r1" + + # these are only for the ALSA sequencer mode + if use alsa; then + newconfd "${FILESDIR}"/conf.d.timidity.2 timidity + newinitd "${FILESDIR}"/init.d.timidity.3 timidity + fi + + insinto /etc + newins "${FILESDIR}/timidity.cfg-r1" timidity.cfg + + dodir /usr/share/timidity + dosym /etc/timidity.cfg /usr/share/timidity/timidity.cfg + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi + + diropts -o timidity -g nobody -m 0700 + keepdir /var/lib/timidity + + doicon "${FILESDIR}"/timidity.xpm + newmenu "${FILESDIR}"/timidity.desktop.2 timidity.desktop + + # Order of preference: gtk, X (Xaw), ncurses, slang + # Do not create menu item for terminal ones + local interface="-id" + local terminal="true" + local nodisplay="true" + if use gtk || use X; then + interface="-ia" + terminal="false" + nodisplay="false" + use gtk && interface="-ig" + elif use ncurses || use slang; then + local interface="-is" + use ncurses && interface="-in" + fi + sed -e "s/Exec=timidity/Exec=timidity ${interface}/" \ + -e "s/Terminal=.*/Terminal=${terminal}/" \ + -e "s/NoDisplay=.*/NoDisplay=${nodisplay}/" \ + -i "${D}"/usr/share/applications/timidity.desktop || die "sed failed" +} + +pkg_postinst() { + use emacs && elisp-site-regen + + elog "A timidity config file has been installed in /etc/timidity.cfg." + elog "Do not edit this file as it will interfere with the eselect timidity tool." + elog "The tool 'eselect timidity' can be used to switch between installed patchsets." + + if use alsa; then + elog "An init script for the alsa timidity sequencer has been installed." + elog "If you wish to use the timidity virtual sequencer, edit /etc/conf.d/timidity" + elog "and run 'rc-update add timidity <runlevel> && /etc/init.d/timidity start'" + fi + + if use sparc; then + elog "Only saving to wave file and ALSA soundback has been tested working." + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |