Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 321559 - games-simultion/openttd-1.0.1: disable automagic linking to libtimidity, use timidity++ instead of aplaymidi, fix elogs.
Summary: games-simultion/openttd-1.0.1: disable automagic linking to libtimidity, use ...
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Games (show other bugs)
Hardware: All Linux
: High normal (vote)
Assignee: Gentoo Games
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-26 14:14 UTC by Ai Locke Shinseiko (Wizzleby)
Modified: 2010-05-26 21:06 UTC (History)
0 users

See Also:
Package list:
Runtime testing required: ---


Attachments
openttd-1.0.1.ebuild-general-fixes.patch (openttd-1.0.1.ebuild-general-fixes.patch,4.76 KB, patch)
2010-05-26 14:46 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
openttd-1.0.1.ebuild-general-fixes.patch (openttd-1.0.1.ebuild-general-fixes.patch,4.63 KB, patch)
2010-05-26 16:04 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
metadata.xml.patch (metadata.xml.patch,727 bytes, patch)
2010-05-26 16:10 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
openttd-1.0.1.ebuild-timidity.patch (openttd-1.0.1.ebuild-timidity.patch,1.21 KB, patch)
2010-05-26 16:30 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
openttd-1.0.1.ebuild-no-automagic-libtimidity.patch (openttd-1.0.1.ebuild-no-automagic-libtimidity.patch,516 bytes, patch)
2010-05-26 16:31 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
openttd-1.0.1.ebuild-elog-fix.patch (openttd-1.0.1.ebuild-elog-fix.patch,2.95 KB, patch)
2010-05-26 16:33 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff
openttd-1.0.1.ebuild.patch (openttd-1.0.1.ebuild.patch,4.67 KB, patch)
2010-05-26 17:36 UTC, Ai Locke Shinseiko (Wizzleby)
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Ai Locke Shinseiko (Wizzleby) 2010-05-26 14:14:00 UTC
As it is in tree, openttd automagically links to libtimidity if it is installed.
This sound driver for openttd is not maintained and does not work. Patch forces --without-libtimidity.

Openttd also is built with aplaymidi as a midi player, this requires setting ALSA_PORTS to work, and either a sound card with midi ports, or running timidity++ as a service. Instead, we can use timidity as the extmidi driver, and have music work out of the box (requires conditional dep on timidity++)

Also integrated are cleanups of the elog text for legibility, clarity, and correctness. (Upstream pointed out a few inaccuracies amongst the general
incomprehensibility of the grammar (much of which was my fault, at least grammar-wise))
Comment 1 Ai Locke Shinseiko (Wizzleby) 2010-05-26 14:46:19 UTC
Created attachment 233003 [details, diff]
openttd-1.0.1.ebuild-general-fixes.patch

Summary of changes:
    Elog fixes, remove ALSA bit, was inaccurate. Music could be enabled without ALSA at all. Fix inaccuracy about case sensitivity in elog triggered when user omits the openmedia flag.

    Add +midi, and aplaymidi use flags. Use timidity when USE=midi (upstream default), aplaymidi only with aplaymidi use flag.

    Add conditional RDEP  on timidity++ when USE=midi but -aplaymidi.
Comment 2 Ai Locke Shinseiko (Wizzleby) 2010-05-26 16:04:54 UTC
Created attachment 233017 [details, diff]
openttd-1.0.1.ebuild-general-fixes.patch

Fix a semantics oversight from the last patch. --with-midi='/usr/bin/timidity' is default anyway, so don't set it.

Remove aplaymidi useflag.
Comment 3 Ai Locke Shinseiko (Wizzleby) 2010-05-26 16:10:09 UTC
Created attachment 233021 [details, diff]
metadata.xml.patch

useflag description for 'midi'
Comment 4 Ai Locke Shinseiko (Wizzleby) 2010-05-26 16:30:42 UTC
Created attachment 233023 [details, diff]
openttd-1.0.1.ebuild-timidity.patch

Use timidity++ instead of aplaymidi (patch 1 of 3)
Comment 5 Ai Locke Shinseiko (Wizzleby) 2010-05-26 16:31:38 UTC
Created attachment 233025 [details, diff]
openttd-1.0.1.ebuild-no-automagic-libtimidity.patch

Don't link to libtimidity.
Comment 6 Ai Locke Shinseiko (Wizzleby) 2010-05-26 16:33:12 UTC
Created attachment 233027 [details, diff]
openttd-1.0.1.ebuild-elog-fix.patch

Clean up elog messages (Patch 3 of 3)
Comment 7 Ai Locke Shinseiko (Wizzleby) 2010-05-26 17:36:06 UTC
Created attachment 233033 [details, diff]
openttd-1.0.1.ebuild.patch

Too many revisions, re-combining the patch to save me ~10m for every revision.
Add back the aplaymidi flag.
Comment 8 Mr. Bones. (RETIRED) gentoo-dev 2010-05-26 21:06:16 UTC
in portage.