vapier 14/04/29 03:09:40 Modified: ChangeLog Added: timidity++-2.14.0-r2.ebuild Log: Move non-binary files from /usr/lib/timidity to /usr/share/timidity #377245 by Michał Górny. Fix pkg-config handling and use it to get ncurses info #497362 by Dave Kemper. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.161 media-sound/timidity++/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/ChangeLog?rev=1.161&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/ChangeLog?rev=1.161&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/ChangeLog?r1=1.160&r2=1.161 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v retrieving revision 1.160 retrieving revision 1.161 diff -u -r1.160 -r1.161 --- ChangeLog 29 Apr 2014 02:45:19 -0000 1.160 +++ ChangeLog 29 Apr 2014 03:09:40 -0000 1.161 @@ -1,6 +1,14 @@ # ChangeLog for media-sound/timidity++ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.160 2014/04/29 02:45:19 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/ChangeLog,v 1.161 2014/04/29 03:09:40 vapier Exp $ + +*timidity++-2.14.0-r2 (29 Apr 2014) + + 29 Apr 2014; Mike Frysinger <[email protected]> + +files/timidity++-2.14.0-pkg-config.patch, +timidity++-2.14.0-r2.ebuild: + Move non-binary files from /usr/lib/timidity to /usr/share/timidity #377245 by + Michał Górny. Fix pkg-config handling and use it to get ncurses info #497362 + by Dave Kemper. 29 Apr 2014; Mike Frysinger <[email protected]> +files/timidity++-2.14.0-configure-flags.patch, timidity++-2.14.0-r1.ebuild: 1.1 media-sound/timidity++/timidity++-2.14.0-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r2.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r2.ebuild?rev=1.1&content-type=text/plain Index: timidity++-2.14.0-r2.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-sound/timidity++/timidity++-2.14.0-r2.ebuild,v 1.1 2014/04/29 03:09:40 vapier Exp $ EAPI=5 inherit autotools eutils elisp-common user systemd toolchain-funcs 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.xz" 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-8.5.13 ) 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/motif-2.3:0 ) X? ( x11-libs/libXaw x11-libs/libXext >=media-libs/libpng-1.4.2 )" RDEPEND="${DEPEND} alsa? ( media-sound/alsa-utils ) app-admin/eselect-timidity" PDEPEND="|| ( media-sound/timidity-eawpatches 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 \ "${FILESDIR}"/${P}-params.patch \ "${FILESDIR}"/${P}-revert-for-required-ctl_speana_data-function.patch \ "${FILESDIR}"/${P}-tcltk86.patch \ "${FILESDIR}"/${P}-ar.patch \ "${FILESDIR}"/${P}-configure-flags.patch \ "${FILESDIR}"/${P}-pkg-config.patch eautoreconf } src_configure() { export EXTRACFLAGS="${CFLAGS}" #385817 local myconf=() local audios use flac && audios+=",flac" use speex && audios+=",speex" use vorbis && audios+=",vorbis" use oss && audios+=",oss" use jack && audios+=",jack" use ao && audios+=",ao" if use nas; then audios+=",nas" 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+=",alsa" 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+=( --enable-motif --with-x ) use X || ewarn "Basic X11 support will be enabled because required by motif." fi econf \ --localstatedir=/var/state/timidity++ \ --with-module-dir="${EPREFIX}/usr/share/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.4 timidity systemd_dounit "${FILESDIR}"/timidity.service 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 } 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 }
