diff options
-rw-r--r-- | media-sound/timidity++/ChangeLog | 9 | ||||
-rw-r--r-- | media-sound/timidity++/Manifest | 31 | ||||
-rw-r--r-- | media-sound/timidity++/files/50timidity++-gentoo.el | 6 | ||||
-rw-r--r-- | media-sound/timidity++/files/digest-timidity++-2.13.2-r5 | 6 | ||||
-rw-r--r-- | media-sound/timidity++/files/gnuconfig_update.patch | 11 | ||||
-rw-r--r-- | media-sound/timidity++/timidity++-2.13.2-r5.ebuild | 168 |
6 files changed, 207 insertions, 24 deletions
diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog index f45110c04dd8..947681a87f3d 100644 --- a/media-sound/timidity++/ChangeLog +++ b/media-sound/timidity++/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-sound/timidity++ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.86 2007/04/28 17:32:09 swegener Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.87 2007/07/08 15:48:04 flameeyes Exp $ + +*timidity++-2.13.2-r5 (08 Jul 2007) + + 08 Jul 2007; Diego Pettenò <flameeyes@gentoo.org> + +files/50timidity++-gentoo.el, -files/gnuconfig_update.patch, + +timidity++-2.13.2-r5.ebuild: + Improve emacs support, thanks to Ulrich Muller (Ulm) in bug #184478. 28 Apr 2007; Sven Wegener <swegener@gentoo.org> timidity++-2.13.2.ebuild: Fix *initd, *confd and *envd calls (#173884, #174266) diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest index 370939efd5ff..a2353a146055 100644 --- a/media-sound/timidity++/Manifest +++ b/media-sound/timidity++/Manifest @@ -1,14 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX 50timidity++-gentoo.el 180 RMD160 120c40280826edc0e6c746ed2b09372222235492 SHA1 0489f1a36d33c6d6402c30000af21274c85e2a5b SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0 +MD5 1745ec2f07aaeafa213fdbdd78f73eb6 files/50timidity++-gentoo.el 180 +RMD160 120c40280826edc0e6c746ed2b09372222235492 files/50timidity++-gentoo.el 180 +SHA256 a5ca92074ec2b79251bf33a1fb9c4007f528c036f951c6e4fa87311d7acc11a0 files/50timidity++-gentoo.el 180 AUX conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a SHA1 4636543aa1c2c90afb4ee02e8f11067bda2bd271 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3 MD5 dbfc5d45b6177ffaf7dd74d4971a520a files/conf.d.timidity 912 RMD160 ba936b4f721ed4d3dac2912659b13b125b09833a files/conf.d.timidity 912 SHA256 df5cec5d1335b9bdaf87c358b6d69f4f9300454c16aceaaccb212c98fb08f5a3 files/conf.d.timidity 912 -AUX gnuconfig_update.patch 477 RMD160 9c5ba3ec8b953f177110cc755a8bd1c5bed3042c SHA1 e4724ff72698bcb355294bb9fbf1eee361b957f4 SHA256 2906bd19277b08dbc3400708e568715298c54b904b12803c725ac72e08519447 -MD5 67ee26f08d8de1243029a0a8849cd022 files/gnuconfig_update.patch 477 -RMD160 9c5ba3ec8b953f177110cc755a8bd1c5bed3042c files/gnuconfig_update.patch 477 -SHA256 2906bd19277b08dbc3400708e568715298c54b904b12803c725ac72e08519447 files/gnuconfig_update.patch 477 AUX init.d.timidity 457 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 SHA1 50c7c2ce6aba6f2c0eb9612d93368cfd2b87cbd8 SHA256 8882137a10d5e858fa3c20f91d439192dca0759f43702180085d3514a12a59fd MD5 dbc4910aa5c6a5681dd4f121b5db63e8 files/init.d.timidity 457 RMD160 af1eb92172f06b02f6761e414ea88b6e40c446f4 files/init.d.timidity 457 @@ -51,14 +51,18 @@ EBUILD timidity++-2.13.2-r4.ebuild 4824 RMD160 6db07aa11bf8cdf93960aca52a88ec0cc MD5 becd051cafe3174c613b3f25f89efb96 timidity++-2.13.2-r4.ebuild 4824 RMD160 6db07aa11bf8cdf93960aca52a88ec0cc7397ed6 timidity++-2.13.2-r4.ebuild 4824 SHA256 f9a34543d70fd7f0c5794fbf53c7ee16e0e798ea96e31a4195cd788556ff9dff timidity++-2.13.2-r4.ebuild 4824 +EBUILD timidity++-2.13.2-r5.ebuild 4908 RMD160 a3d613b213b1ff087a7b1e337493c55b496e9a40 SHA1 5d79ef909697a2de381b9f20c5f0e754d772ce01 SHA256 7afb967aaa8fdb65e0162ad7b13da9cf1335893f871c9e3a950718bcbb739bd8 +MD5 c472a2bfd8581888be05dbef8a3e9c22 timidity++-2.13.2-r5.ebuild 4908 +RMD160 a3d613b213b1ff087a7b1e337493c55b496e9a40 timidity++-2.13.2-r5.ebuild 4908 +SHA256 7afb967aaa8fdb65e0162ad7b13da9cf1335893f871c9e3a950718bcbb739bd8 timidity++-2.13.2-r5.ebuild 4908 EBUILD timidity++-2.13.2.ebuild 3749 RMD160 637959ea34d9fdb257de92e00d6fca50d776a06d SHA1 4a1c4d5419abcc061672257353a177849e8d97fa SHA256 1abc22b7c6a71e1f5c75c07d8e6affc7cdefda0e952be2cc2d513b2a468ac6bf MD5 50dc8a3ea3919adf8df0b1eb7ade3081 timidity++-2.13.2.ebuild 3749 RMD160 637959ea34d9fdb257de92e00d6fca50d776a06d timidity++-2.13.2.ebuild 3749 SHA256 1abc22b7c6a71e1f5c75c07d8e6affc7cdefda0e952be2cc2d513b2a468ac6bf timidity++-2.13.2.ebuild 3749 -MISC ChangeLog 13775 RMD160 3911a86df7ae259fa1fd1d27e618832a558fb05f SHA1 be6b7d04f04a6933170692000ca366531bd82933 SHA256 43192b3e32afaef95d80d7dbd938eeb260b69246be98e199b797108b77a40561 -MD5 a76489937f12f86ddad6bb335992c772 ChangeLog 13775 -RMD160 3911a86df7ae259fa1fd1d27e618832a558fb05f ChangeLog 13775 -SHA256 43192b3e32afaef95d80d7dbd938eeb260b69246be98e199b797108b77a40561 ChangeLog 13775 +MISC ChangeLog 14034 RMD160 1eea986295be9edfca5c2cb7682c49e73a049b64 SHA1 2b073f0a1e11f89d80895ba53e1e762c8efa44c8 SHA256 3e4937d7b3664b310bed31cba617d14968731b201fe1be0f5fe018c8ee24cb09 +MD5 758fb7c5f4b8141a79091e2ffb743115 ChangeLog 14034 +RMD160 1eea986295be9edfca5c2cb7682c49e73a049b64 ChangeLog 14034 +SHA256 3e4937d7b3664b310bed31cba617d14968731b201fe1be0f5fe018c8ee24cb09 ChangeLog 14034 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b MD5 a1eaeb2ae801daeb712c90c060e922dc metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e metadata.xml 158 @@ -75,10 +79,13 @@ SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/di MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r4 536 RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r4 536 SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r4 536 +MD5 f9f8b7aa60633b1d571491781e2c2f1d files/digest-timidity++-2.13.2-r5 536 +RMD160 c335b2484ab9ba2e1c2cff0a5bc14325614c31ad files/digest-timidity++-2.13.2-r5 536 +SHA256 98bad02a8730d1cd370c7b6f53cecc9bf9ddaa29625e93f228b7feefed147f82 files/digest-timidity++-2.13.2-r5 536 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.3 (GNU/Linux) +Version: GnuPG v2.0.5 (GNU/Linux) -iD8DBQFGM4UoI1lqEGTUzyQRAitWAJ9rTKi7bKV0lqE4n+vHUYiAF0KXPwCgoVG3 -rXhPLFGAglP2BnQ7fEA4lQQ= -=Sy9u +iD8DBQFGkQc6AiZjviIA2XgRApbSAKCZCVDSi11XWYhFgw0d3ChnoY3fewCg4AfW +YcJSrN4WjKeLTao2OPY5iF0= +=ZCsl -----END PGP SIGNATURE----- diff --git a/media-sound/timidity++/files/50timidity++-gentoo.el b/media-sound/timidity++/files/50timidity++-gentoo.el new file mode 100644 index 000000000000..3f9e35ca106c --- /dev/null +++ b/media-sound/timidity++/files/50timidity++-gentoo.el @@ -0,0 +1,6 @@ + +;;; timidity++ site-lisp configuration + +(add-to-list 'load-path "@SITELISP@") +(autoload 'timidity "timidity" "TiMidity Interface" t) +(setq timidity-prog-path "/usr/bin/timidity") diff --git a/media-sound/timidity++/files/digest-timidity++-2.13.2-r5 b/media-sound/timidity++/files/digest-timidity++-2.13.2-r5 new file mode 100644 index 000000000000..7a95c8bb2fb6 --- /dev/null +++ b/media-sound/timidity++/files/digest-timidity++-2.13.2-r5 @@ -0,0 +1,6 @@ +MD5 a82ceeb2245e22f4de2b41da21eaee32 TiMidity++-2.13.2.tar.bz2 1581230 +RMD160 0156221846a88abef9312700a050972d85084fd8 TiMidity++-2.13.2.tar.bz2 1581230 +SHA256 0a8524b789b57eaf944c3d9bce32c21a4e893016b22a02a24cd0a4c6afee7260 TiMidity++-2.13.2.tar.bz2 1581230 +MD5 31bdaea612f18e2c3d45a8a73ab44c81 timidity++-2.13.2-exiterror.patch 21406 +RMD160 6b73552e18580422ca4471f12142440a4f3760a9 timidity++-2.13.2-exiterror.patch 21406 +SHA256 ccf1a3678beff5cd143bec07b64ca35620b8eac98b093898c072459051752b77 timidity++-2.13.2-exiterror.patch 21406 diff --git a/media-sound/timidity++/files/gnuconfig_update.patch b/media-sound/timidity++/files/gnuconfig_update.patch deleted file mode 100644 index 381e27727614..000000000000 --- a/media-sound/timidity++/files/gnuconfig_update.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN TiMidity++-2.12.0-pre1.orig/configure.in TiMidity++-2.12.0-pre1/configure.in ---- TiMidity++-2.12.0-pre1.orig/configure.in 2002-01-17 18:51:32.000000000 -0500 -+++ TiMidity++-2.12.0-pre1/configure.in 2003-11-16 17:43:19.354413704 -0500 -@@ -1268,6 +1268,7 @@ - ]) - - dnl UMP configuration -+AM_CONDITIONAL(ENABLE_PLUGIN, false) - CONFIG_INTERFACE(ump, PLUGIN, p, - [ --enable-ump UMP configuration (default is no)], - [ if test ! -d ump; then diff --git a/media-sound/timidity++/timidity++-2.13.2-r5.ebuild b/media-sound/timidity++/timidity++-2.13.2-r5.ebuild new file mode 100644 index 000000000000..d17eebf74421 --- /dev/null +++ b/media-sound/timidity++/timidity++-2.13.2-r5.ebuild @@ -0,0 +1,168 @@ +# Copyright 1999-2007 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-r5.ebuild,v 1.1 2007/07/08 15:48:04 flameeyes Exp $ + +inherit 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 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +IUSE="oss nas esd motif X gtk vorbis tk slang alsa arts jack portaudio emacs ao speex flac ncurses" + +DEPEND="ncurses? ( >=sys-libs/ncurses-5.0 ) + emacs? ( virtual/emacs ) + gtk? ( >=x11-libs/gtk+-2.0 ) + tk? ( >=dev-lang/tk-8.1 ) + motif? ( virtual/motif ) + esd? ( >=media-sound/esound-0.2.22 ) + nas? ( >=media-libs/nas-1.4 ) + alsa? ( media-libs/alsa-lib ) + slang? ( =sys-libs/slang-1.4* ) + arts? ( kde-base/arts ) + jack? ( media-sound/jack-audio-connection-kit ) + portaudio? ( media-libs/portaudio ) + vorbis? ( >=media-libs/libvorbis-1.0_beta4 ) + flac? ( >=media-libs/flac-1.1.2 ) + speex? ( >=media-libs/speex-1.1.5 ) + ao? ( >=media-libs/libao-0.8.5 )" + +RDEPEND="${DEPEND} + app-admin/eselect-timidity" + +PDEPEND="|| ( media-sound/timidity-eawpatches media-sound/timidity-shompatches media-sound/timidity-freepats )" + +SITEFILE=50${PN}-gentoo.el + +pkg_setup() { + if use alsa && ! built_with_use --missing true media-libs/alsa-lib midi; then + eerror "" + eerror "To be able to build TiMidity++ with ALSA support you need" + eerror "to have built media-libs/alsa-lib with midi USE flag." + die "Missing midi USE flag on media-libs/alsa-lib" + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${DISTDIR}/${P}-exiterror.patch" + epatch "${FILESDIR}/${P}-gtk26.patch" + epatch "${FILESDIR}/${P}-gcc4.patch" + epatch "${FILESDIR}/${P}-flac.patch" + epatch "${FILESDIR}/${P}-flac113.patch" + + # fix header location of speex + sed -i -e "s:#include <speex:#include <speex/speex:g" configure* timidity/speex_a.c +} + +src_compile() { + 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 esd && audios="${audios},esd" + use arts && audios="${audios},arts" + use jack && audios="${audios},jack" + use portaudio && use !ppc && audios="${audios},portaudio" + 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} || die + + emake || die +} + +src_install() { + make DESTDIR="${D}" install || die + + dodoc AUTHORS ChangeLog* + dodoc NEWS README* "${FILESDIR}/timidity.cfg" + + # these are only for the ALSA sequencer mode + if use alsa; then + newconfd "${FILESDIR}/conf.d.timidity" timidity + newinitd "${FILESDIR}/init.d.timidity" 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 +} + +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 + ewarn "sparc support is experimental. oss, alsa, esd, and portaudio do not work." + ewarn "-Ow (save to wave file) does..." + fi +} + +pkg_postrm() { + use emacs && elisp-site-regen +} |