diff options
| -rw-r--r-- | media-sound/timidity++/ChangeLog | 11 | ||||
| -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 |
3 files changed, 218 insertions, 2 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++/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 +} |