diff options
author | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 18:06:33 +0000 |
---|---|---|
committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-02-28 18:06:33 +0000 |
commit | 9fd57bfe78de237110e95e152530bccef8f2a6c2 (patch) | |
tree | 4ef3f679ef39c51473ce4c8a09168fdfe8a386a9 /media-sound | |
parent | Use virtual/jpeg. (diff) | |
download | historical-9fd57bfe78de237110e95e152530bccef8f2a6c2.tar.gz historical-9fd57bfe78de237110e95e152530bccef8f2a6c2.tar.bz2 historical-9fd57bfe78de237110e95e152530bccef8f2a6c2.zip |
old
Package-Manager: portage-2.2.0_alpha25/cvs/Linux x86_64
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/mup/Manifest | 4 | ||||
-rw-r--r-- | media-sound/mup/files/mup-5.1css.patch | 242 | ||||
-rw-r--r-- | media-sound/mup/mup-5.1.ebuild | 87 |
3 files changed, 0 insertions, 333 deletions
diff --git a/media-sound/mup/Manifest b/media-sound/mup/Manifest index fc60f2166e92..f2dfc9262eda 100644 --- a/media-sound/mup/Manifest +++ b/media-sound/mup/Manifest @@ -1,11 +1,7 @@ -AUX mup-5.1css.patch 7807 RMD160 0064ea652ef0485089704f48ae9bf5d2bfd59112 SHA1 9161f66c9bf325a2d59a4831fd6bccfb20353c6b SHA256 341879eadc23e207c5113fb971136042131ee249e3764f37ee73dd11b01d581d AUX mup-5.4-Makefile.patch 9853 RMD160 11c9708a39dbd9ae49080fe3af7bd388ade7cb70 SHA1 a9d7fb3904708d6707c57b9c86200d186f2021b8 SHA256 3c8780b7abdd0dfcca4b1948054e9f1c685735f3aa9af4d2d83e20283f3206c8 AUX mup-5.6-Makefile.patch 11140 RMD160 d5958ab4b496b47e7a9e999e70a4d9100725fdf1 SHA1 99d529bf0e13ce7c6b3a6012e026cda0a3821b6a SHA256 d72e6453f2c761cd576d284732681ca08bd15c39cf2eeb5bc69ef71fb520e6e4 -DIST mup51doc.tar.gz 667966 RMD160 b07f97a21306e47bfe62c7ab2bf1a255632623f9 SHA1 cda0d1af0509e98b3a28091352ad35772cf793c6 SHA256 7d0ea9b91b7764dc734d769fe97c544b3336abf0dba46367d0bc7bd5862ac954 -DIST mup51src.tar.gz 816673 RMD160 6d097dc832bcb065fef6e5398acb96be9cb6b11d SHA1 5decf377f9178c6a653e0f8db83c47c81440e087 SHA256 29a4108d881f92e59672542858ea72466dfa52e0f265e7b81003155dc530d2af DIST mup54src.tar.gz 1705171 RMD160 27687208fe59bf41c208cc8a54ff9ed149a4a748 SHA1 70864d8bf935fe3bf24bec7a922a7ea2b3c74ee7 SHA256 a29b6b4a1294b8b52e3f265d980c6a16e5a90cc233e8b4254131159e78216ec0 DIST mup56src.tar.gz 1845464 RMD160 01983c6d13a5d352f7da5c2ac77c627a10d99f26 SHA1 fe16153c364427f3a78700a95d343c5c82c30703 SHA256 2751be81131b155e01d770c5c6c8b5507748eeb21ea8b2dd7dba321ffd8fb1b6 -EBUILD mup-5.1.ebuild 2209 RMD160 4c236d73dc55a32f089a07336c0e5549e20f23f7 SHA1 2e9e26046f68cabf89ce12f23527b05d541ffdac SHA256 fe2cb7130f62136e92c3ca17fe0fb25bcc7cfd0880fe153330e7f7340a394e0b EBUILD mup-5.4.ebuild 1063 RMD160 e0490e57072349e73b435bf61ae5c093ea476f54 SHA1 addc841d0b4d7818464b1d0e9eeab833f9fdd639 SHA256 e083a441054ee0861811289f187310d5480b725e16418db6da7ccc5f2860fcda EBUILD mup-5.6.ebuild 1066 RMD160 bee4a9181df3627fe57773918ab446df3fff7f78 SHA1 23507bf8483de4f903864699f0445637976bf317 SHA256 a7217b261f8d5afa3de42e4bf7bec5bce1451a9ac4343605d28429ef93b3d472 MISC ChangeLog 3972 RMD160 65c39196da3048c0b54ae10c0bec9c3662f5a60a SHA1 8d8a0bd31b5e8fe08c606c4934cfe77ec81a1924 SHA256 684e1d2e7ba840c0e251c3c8ac9daa5b479470106e994540a6c6f93577c8bc09 diff --git a/media-sound/mup/files/mup-5.1css.patch b/media-sound/mup/files/mup-5.1css.patch deleted file mode 100644 index ed6bed2916c6..000000000000 --- a/media-sound/mup/files/mup-5.1css.patch +++ /dev/null @@ -1,242 +0,0 @@ -diff -ur mup-5.1-orig/mup/absvert.c mup-5.1/mup/absvert.c ---- mup-5.1-orig/mup/absvert.c 2005-05-01 01:00:29.000000000 +0200 -+++ mup-5.1/mup/absvert.c 2005-05-31 09:19:23.000000000 +0200 -@@ -1661,14 +1661,14 @@ - horzavoid(); - - /* -- * Back in relvert.c, we skipped placing phrases whose endpoint groups -- * were affected by CSS. Now that we know where the final group -- * boundaries are, we set up the coords for these phrases. -- * phrase_points destroys groups' AN and AS, and depends on them -- * starting out as zero. So zero them now and restore them later. -- * Because phrases can cross bar lines, we need to zap all of these -- * coords in this first loop, and have a separate loop below to do the -- * phrase work (and restore the groups' coords). -+ * Back in relvert.c, we skipped placing tie/slur/bend/phrases whose -+ * endpoint groups were affected by CSS. Now that we know where the -+ * final group boundaries are, we set up the coords for these items. -+ * tieslur_points and phrase_points destroy groups' AN and AS, and -+ * depends on them starting out as zero. So zero them now and restore -+ * them later. Because these items can cross bar lines, we need -+ * to zap all of these coords in this first loop, and have a separate -+ * loop to do the main work (and restore the groups' coords). - */ - for (mainll_p = Mainllhc_p; mainll_p != 0; mainll_p = mainll_p->next) { - if (mainll_p->str != S_STAFF) { -@@ -1692,29 +1692,57 @@ - thisstaff_p = mainll_p->u.staff_p; - - /* -- * Find every phrase starting in this staff and handle them. -+ * Find and handle every tie/slur/bend/phrase starting in this -+ * staff. - */ - for (stuff_p = thisstaff_p->stuff_p; - stuff_p != 0; stuff_p = stuff_p->next) { -- if (stuff_p->stuff_type != ST_PHRASE) { -- continue; -- } -- if (css_affects_phrase(stuff_p, mainll_p) == YES) { -- phrase_points(mainll_p, stuff_p); -+ switch (stuff_p->stuff_type) { -+ case ST_PHRASE: -+ if (css_affects_phrase(stuff_p, -+ mainll_p) == YES) { -+ phrase_points(mainll_p, stuff_p); -+ -+ stuff_p->c[AY] = thisstaff_p->c[AY] -+ + stuff_p->c[RY]; -+ stuff_p->c[AN] = thisstaff_p->c[AY] -+ + stuff_p->c[RN]; -+ stuff_p->c[AS] = thisstaff_p->c[AY] -+ + stuff_p->c[RS]; -+ -+ /* do the phrase points too */ -+ for (pp_p = stuff_p->crvlist_p; -+ pp_p != 0; pp_p = pp_p->next) { -+ -+ pp_p->y += thisstaff_p->c[AY]; -+ } -+ } -+ break; -+ case ST_TIESLUR: -+ case ST_BEND: -+ if (css_affects_tieslurbend(stuff_p, -+ mainll_p) == YES) { -+ if (stuff_p->stuff_type == ST_TIESLUR) { -+ tieslur_points(mainll_p, stuff_p); -+ } else { -+ bend_points(mainll_p, stuff_p); -+ } - -- stuff_p->c[AY] = thisstaff_p->c[AY] -- + stuff_p->c[RY]; -- stuff_p->c[AN] = thisstaff_p->c[AY] -- + stuff_p->c[RN]; -- stuff_p->c[AS] = thisstaff_p->c[AY] -- + stuff_p->c[RS]; -- -- /* do the phrase points too */ -- for (pp_p = stuff_p->crvlist_p; -- pp_p != 0; pp_p = pp_p->next) { -+ stuff_p->c[AY] = thisstaff_p->c[AY] -+ + stuff_p->c[RY]; -+ stuff_p->c[AN] = thisstaff_p->c[AY] -+ + stuff_p->c[RN]; -+ stuff_p->c[AS] = thisstaff_p->c[AY] -+ + stuff_p->c[RS]; -+ -+ /* do the tie/slur/bend points too */ -+ for (pp_p = stuff_p->crvlist_p; -+ pp_p != 0; pp_p = pp_p->next) { - -- pp_p->y += thisstaff_p->c[AY]; -+ pp_p->y += thisstaff_p->c[AY]; -+ } - } -+ break; - } - } - -diff -ur mup-5.1-orig/mup/globals.h mup-5.1/mup/globals.h ---- mup-5.1-orig/mup/globals.h 2005-05-01 01:00:29.000000000 +0200 -+++ mup-5.1/mup/globals.h 2005-05-31 09:19:23.000000000 +0200 -@@ -568,6 +568,8 @@ - extern double solvecubic P((double a, double b, double c, double d, - double lo, double hi, double thresh)); - extern int css_affects_stemtip P((struct GRPSYL *gs1_p)); -+extern int css_affects_tieslurbend P((struct STUFF *stuff_p, -+ struct MAINLL *mll_p)); - extern int css_affects_phrase P((struct STUFF *stuff_p, struct MAINLL *mll_p)); - extern struct GRPSYL *nextsimilar P((struct GRPSYL *)); - extern struct GRPSYL *prevsimilar P((struct GRPSYL *)); -diff -ur mup-5.1-orig/mup/plutils.c mup-5.1/mup/plutils.c ---- mup-5.1-orig/mup/plutils.c 2005-05-01 01:00:29.000000000 +0200 -+++ mup-5.1/mup/plutils.c 2005-05-31 09:19:23.000000000 +0200 -@@ -1853,6 +1853,95 @@ - } - - /* -+ * Name: css_affects_tieslurbend() -+ * -+ * Abstract: Do CSS notes (if any) affect the position of this tie/slur/bend? -+ * -+ * Returns: YES or NO -+ * -+ * Description: This function decides whether the given tie, slur, or bend is -+ * affected by CSS notes in any of the groups it covers. -+ */ -+ -+int -+css_affects_tieslurbend(stuff_p, mll_p) -+ -+struct STUFF *stuff_p; /* the tie, slur, or bend */ -+struct MAINLL *mll_p; /* MLL item where this tie/slur/bend starts */ -+ -+{ -+ struct GRPSYL *sg_p; /* starting group of the tie/slur/bend */ -+ struct GRPSYL *eg_p; /* starting group of the tie/slur/bend */ -+ struct NOTE *snote_p; /* starting note of the tie/slur/bend */ -+ struct NOTE *enote_p; /* ending note of the tie/slur/bend */ -+ int idx; /* index of note in the group */ -+ -+ -+ /* if not cross staff stemming, don't waste time checking */ -+ if (CSSused == NO) { -+ return (NO); -+ } -+ -+ sg_p = stuff_p->beggrp_p; -+ snote_p = stuff_p->begnote_p; -+ -+ /* find the index of the note in the group */ -+ for (idx = 0; idx < sg_p->nnotes; idx++) { -+ if (&sg_p->notelist[idx] == snote_p) { -+ break; -+ } -+ } -+ if (idx == sg_p->nnotes) { -+ pfatal("can't find tied/slurred/bent note in group"); -+ } -+ -+ /* if this starting note is CSS, return YES */ -+ if (IS_CSS_NOTE(sg_p, idx)) { -+ return (YES); -+ } -+ -+ /* -+ * Find the end note of the tie/slur/bend. If none, we don't care -+ * about the end note. -+ */ -+ eg_p = nextgrpsyl(sg_p, &mll_p); -+ if (eg_p == 0) { -+ return (NO); -+ } -+ -+ /* find the note tied/slurred/bent to */ -+ if (stuff_p->curveno == -1) { /* this is a tie */ -+ enote_p = find_matching_note(eg_p, snote_p->letter, -+ snote_p->octave, (char *)0); -+ } else { /* this is a slur or bend */ -+ enote_p = find_matching_note(eg_p, -+ snote_p->slurtolist[stuff_p->curveno].letter, -+ snote_p->slurtolist[stuff_p->curveno].octave, -+ (char *)0); -+ } -+ -+ if (enote_p == 0) { -+ return (NO); -+ } -+ -+ /* find the index of the note in the group */ -+ for (idx = 0; idx < eg_p->nnotes; idx++) { -+ if (&eg_p->notelist[idx] == enote_p) { -+ break; -+ } -+ } -+ if (idx == eg_p->nnotes) { -+ pfatal("can't find tied/slurred/bent-to note in group"); -+ } -+ -+ /* if this ending note is CSS, return YES */ -+ if (IS_CSS_NOTE(eg_p, idx)) { -+ return (YES); -+ } -+ -+ return (NO); -+} -+/* - * Name: css_affects_phrase() - * - * Abstract: Do CSS notes (if any) affect the position of this phrase mark? -diff -ur mup-5.1-orig/mup/relvert.c mup-5.1/mup/relvert.c ---- mup-5.1-orig/mup/relvert.c 2005-05-01 01:00:29.000000000 +0200 -+++ mup-5.1/mup/relvert.c 2005-05-31 09:19:23.000000000 +0200 -@@ -1000,12 +1000,26 @@ - if (place == PL_ABOVE) { - switch (stuff_p->stuff_type) { - case ST_TIESLUR: -+ /* don't call tieslur_points now if the -+ * positions of the tie/slur's endpoints -+ * would change later due to CSS */ -+ if (css_affects_tieslurbend(stuff_p, -+ mainll_p) == YES) { -+ break; -+ } - tieslur_points(mainll_p, stuff_p); - break; - case ST_TABSLUR: - tabslur_points(mainll_p, stuff_p); - break; - case ST_BEND: -+ /* don't call bend_points now if the -+ * positions of the bend's endpoints -+ * would change later due to CSS */ -+ if (css_affects_tieslurbend(stuff_p, -+ mainll_p) == YES) { -+ break; -+ } - bend_points(mainll_p, stuff_p); - break; - case ST_PHRASE: diff --git a/media-sound/mup/mup-5.1.ebuild b/media-sound/mup/mup-5.1.ebuild deleted file mode 100644 index 245a3e5484e9..000000000000 --- a/media-sound/mup/mup-5.1.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/mup/mup-5.1.ebuild,v 1.9 2007/07/22 08:26:52 drac Exp $ - -inherit eutils toolchain-funcs - -DESCRIPTION="Program for printing music scores" -HOMEPAGE="http://www.arkkra.com/" -SRC_URI="ftp://ftp.arkkra.com/pub/unix/mup${PV//.}src.tar.gz - ftp://ftp.arkkra.com/pub/unix/mup${PV//.}doc.tar.gz" - -LICENSE="Arkkra" -SLOT="0" -KEYWORDS="amd64 ~ppc sparc x86" -IUSE="X svga" - -RDEPEND="X? ( x11-libs/libX11 ) - svga? ( >=media-libs/svgalib-1.4.3 )" -DEPEND="${RDEPEND} - X? ( x11-proto/xextproto )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}css.patch -} - -src_compile() { - local param - - cd "${S}"/mup - echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mup *.c -lm || die "mup compile failed" - - cd "${S}"/mkmupfnt - echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mkmupfnt *.c - $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mkmupfnt *.c || die "mkmupfnt compile failed" - - if use X || use svga ; then - cd "${S}"/mupdisp - if use X ; then - param="-lX11 -L/usr/X11R6/lib" - else - sed -i '/XWINDOW/s:.*::' dispttyp.h - fi - if use svga ; then - param="${param} -lvga" - else - param="${param} -DNO_VGA_LIB" - fi - echo $(tc-getCC) ${CFLAGS} ${LDFLAGS} -o mupdisp *.c -lm ${param} - $(tc-getCC) ${CFLAGS} ${LDFLAS} -o mupdisp *.c -lm ${param} || die "mupdisp compile failed" - fi -} - -src_install() { - dobin mup/mup mkmupfnt/mkmupfnt mupprnt || die - if use X || use svga ; then - dobin mupdisp/mupdisp || die - fi - - dodoc README0 - cd docs - dodoc *.txt README1 - doman mup.1 mkmupfnt.1 mupprnt.1 - if use X || use svga ; then - doman mupdisp.1 - fi - dohtml uguide/* - docinto sample - dodoc *.mup *.ps -} - -pkg_postinst() { - if use svga ; then - elog "Please note that using mupdisp in SVGA mode on the console" - elog "requires that it can write to the console device. To allow" - elog "this, make mupdisp setuid to root, like this:" - elog - elog "\tchown root /usr/bin/mupdisp" - elog "\tchmod u+s /usr/bin/mupdisp" - fi - if use X || use svga ; then - echo - elog "If you want to use mupdisp, make sure you also install ghostscript." - fi -} |