From 6a00d158417408b44cacfeb96ed86c222332bd30 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Thu, 6 Oct 2011 15:04:43 +0000 Subject: [PATCH] export CFLAGS to EXTRACFLAGS wrt #385817 by Agostino Sarubbo Package-Manager: portage-2.2.0_alpha61/cvs/Linux x86_64 --- media-sound/timidity++/ChangeLog | 8 +- media-sound/timidity++/Manifest | 15 +- .../timidity++/timidity++-2.13.2-r14.ebuild | 178 ++++++++++++++++++ 3 files changed, 195 insertions(+), 6 deletions(-) create mode 100644 media-sound/timidity++/timidity++-2.13.2-r14.ebuild diff --git a/media-sound/timidity++/ChangeLog b/media-sound/timidity++/ChangeLog index 68e388c047d2..3827636f07fb 100644 --- a/media-sound/timidity++/ChangeLog +++ b/media-sound/timidity++/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-sound/timidity++ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.134 2011/02/16 16:24:52 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.135 2011/10/06 15:04:43 ssuominen Exp $ + +*timidity++-2.13.2-r14 (06 Oct 2011) + + 06 Oct 2011; Samuli Suominen + +timidity++-2.13.2-r14.ebuild: + export CFLAGS to EXTRACFLAGS wrt #385817 by Agostino Sarubbo 16 Feb 2011; Alexis Ballier timidity++-2.13.2-r13.ebuild: diff --git a/media-sound/timidity++/Manifest b/media-sound/timidity++/Manifest index 7c03b27b61f2..566bf938c8e9 100644 --- a/media-sound/timidity++/Manifest +++ b/media-sound/timidity++/Manifest @@ -21,12 +21,17 @@ DIST timidity++-2.13.2-exiterror.patch 21406 RMD160 6b73552e18580422ca4471f12142 DIST timidity++-2.13.2-patchset-2.tar.bz2 8465 RMD160 4b1e37c734d124757cbaf7cdf35b487c95a3660a SHA1 4805580e618bddac42bbb4ba9d035f5d1d162caa SHA256 d71bf95d27a87cbf9fbfb3d0a04dfc391f0413e0663b13622111c6325d2fb2dc EBUILD timidity++-2.13.2-r11.ebuild 5351 RMD160 8a7028ef934dff51b24b91aac90971ffbe09c8f6 SHA1 2e77d7b5811b0c39278e50a13f9d1811a2c9f104 SHA256 48141cb0ca704d6440523bfd18d2c47da2110d72f59646ddf54329c5cd618c27 EBUILD timidity++-2.13.2-r13.ebuild 5042 RMD160 0322a310846e7f9c6fae462f93396f83b7bb8ce0 SHA1 b607de2f8e19b066399f7c3272c9839a60a7efeb SHA256 ab6670bc79a73fe0a1cd533f8194129ba5a5c61488afa05faf4c819b5b34b9ab -MISC ChangeLog 21331 RMD160 666b436fe53e06990909a6bf46cba6b2f01fd28e SHA1 295e1c341411c5f5a9542752384a5079dd82aa35 SHA256 501836bf612dff87284a1a5b3060c27c7bd8ae3304e8c11415ed39d7702ae98b +EBUILD timidity++-2.13.2-r14.ebuild 5054 RMD160 dbb3353aaa0f35cdb709467d3cf99afe2aed3219 SHA1 20a354242b86b83647a4ca5c27698a44d8e80512 SHA256 776a3c3e6cbeedd446bb2ec74d6e746674c0058fb4f5e9801dca749cc4b56783 +MISC ChangeLog 21521 RMD160 7f4c8a564cf82af9a2a2c55fb454013f5730a43d SHA1 46b22a55dfcc478a5f0cc0ec903bdbfe9a2389a7 SHA256 ef81511c13b9c2a645ded6413852d793e401e4d0628d39127673eb088955fe73 MISC metadata.xml 158 RMD160 6842e2189a50bd8a98e84802c38180ac1421c00e SHA1 703cea5a2109d41f7c87993c1f01d418a4c85174 SHA256 dfb5b47e6836db39fb187301dfcff1c2605e91d13d21db160806a563d8c75f9b -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) +Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk1b+loACgkQvFcC4BYPU0q0SwCfa71wK2dblBzwPfHj8FdxayCj -GDAAn1hYMVQ4r7NFToRxRXNQxHoSpt2K -=mYwY +iQEcBAEBAgAGBQJOjcOuAAoJEEdUh39IaPFN+L8H/ig5Tg16S70Ejg5Lhm6AYyXG +IUSlvFECjjyQJPohkkybiIRN8U6E5HFALDLqdiHdOzwVjpK4s2fuymsTbx6RVK9p +80pvUc1guVDbWsLMcQJ6zHbAcLG66egEP0sVMNpfvBj4/rQLXykEzQiSWN6/a+nn +7PRPRxqn3vjsWovSiTU5d5I48nKjb/bWH8Y9LYwvKxFFBda1h2eA+ciY0YSybcnf +1G7Mty8dGRVpeq9w0SrOKIZioZEKrOK+pbarFPDbDNChu2cJAdTbTabUlsEczsNN +r9etTTZV3mS4HKsu1+2alaM0E44TynLHnzRSCUAV6RuS/Sloav6zDP3WJRkn6ao= +=VIIq -----END PGP SIGNATURE----- diff --git a/media-sound/timidity++/timidity++-2.13.2-r14.ebuild b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild new file mode 100644 index 000000000000..d6f92174c13b --- /dev/null +++ b/media-sound/timidity++/timidity++-2.13.2-r14.ebuild @@ -0,0 +1,178 @@ +# Copyright 1999-2011 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-r14.ebuild,v 1.1 2011/10/06 15:04:43 ssuominen Exp $ + +EAPI=4 +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}-patchset-2.tar.bz2" + +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-2.3:0 ) + X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 ) + !~media-libs/libpng-1.4.1" +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_SUFFIX="patch" epatch "${WORKDIR}"/patches + eautoreconf +} + +src_configure() { + export EXTRACFLAGS="${CFLAGS}" #385817 + + 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 + + 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 && /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 +} -- 2.26.2