Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
Bug 127397 - games-fps/freedoom should not block games-fps/doom-data
Summary: games-fps/freedoom should not block games-fps/doom-data
Status: RESOLVED FIXED
Alias: None
Product: Gentoo Linux
Classification: Unclassified
Component: [OLD] Games (show other bugs)
Hardware: All Linux
: High enhancement (vote)
Assignee: Gentoo Games
URL: http://freedoom.sourceforge.net/
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-03-24 01:03 UTC by Paul Bredbury
Modified: 2010-01-24 20:39 UTC (History)
0 users

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


Attachments
doomsday-1.8.6-r1.diff (doomsday-1.8.6-r1.diff,3.31 KB, patch)
2006-03-24 01:04 UTC, Paul Bredbury
Details | Diff
doom-data-1.diff (doom-data-1.diff,797 bytes, patch)
2006-03-24 01:09 UTC, Paul Bredbury
Details | Diff
freedoom-0.4.1.diff (freedoom-0.4.1.diff,884 bytes, patch)
2006-03-24 01:09 UTC, Paul Bredbury
Details | Diff
freedoom-0.4.1.ebuild (freedoom-0.4.1.ebuild,1.51 KB, text/plain)
2006-09-02 23:45 UTC, Paul Bredbury
Details
doomsday-1.9.0_beta4.ebuild.patch (by tupone) (doomsday-1.9.0_beta4.ebuild.patch,898 bytes, patch)
2006-09-03 23:44 UTC, Tupone Alfredo
Details | Diff
doom-data-1.ebuild.patch (by Tupone) (doom-data-1.ebuild.patch,1.09 KB, patch)
2006-09-03 23:46 UTC, Tupone Alfredo
Details | Diff
freedoom-0.4.1.ebuild.patch (by tupone) (freedoom-0.4.1.ebuild.patch,1.50 KB, patch)
2006-09-03 23:49 UTC, Tupone Alfredo
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Paul Bredbury 2006-03-24 01:03:44 UTC
Hi, here are the 3 ebuild diffs required to:

* Stop freedoom from blocking doom-data.
* Add USE flags to doomsday, to enable 2 completely free "Doom experiences".
* Allow doomsday to be bumped to version 1.9.0_beta3 with just a filename change.

The ebuilds to end up with are:

doomsday-1.8.6-r2.ebuild
doom-data-1-r1.ebuild
freedoom-0.4.1-r1.ebuild
Comment 1 Paul Bredbury 2006-03-24 01:04:52 UTC
Created attachment 82988 [details, diff]
doomsday-1.8.6-r1.diff
Comment 2 Paul Bredbury 2006-03-24 01:09:10 UTC
Created attachment 82989 [details, diff]
doom-data-1.diff
Comment 3 Paul Bredbury 2006-03-24 01:09:46 UTC
Created attachment 82990 [details, diff]
freedoom-0.4.1.diff
Comment 4 Tupone Alfredo gentoo-dev 2006-08-31 08:37:20 UTC
Seems nice.
But what about the other games that are looking for doom-data ?
Comment 5 Paul Bredbury 2006-08-31 09:56:56 UTC
They shouldn't be affected. The enclosed patches change the directory of *freedoom* so as not to conflict with doom-data.

doom1.wad is the shareware demo (in doom-data ebuild), and doom.wad (manual install) is the retail Doom 1.

To help reduce the confusion, feel free to rename doom-data to doom1-demodata ;)
Comment 6 Tupone Alfredo gentoo-dev 2006-09-01 09:30:48 UTC
Understand.
You mean that doomlegacy and lsdldoom cannot work with freedoom.
Is that right?
Comment 7 Paul Bredbury 2006-09-01 14:18:33 UTC
(In reply to comment #6)
> You mean that doomlegacy and lsdldoom cannot work with freedoom.

I haven't tried them with freedoom. I have only tried doomsday, because doomsday is far better ;)

There's nothing here which will prevent other Doom engines from using freedoom also.
Comment 8 Tupone Alfredo gentoo-dev 2006-09-01 14:56:22 UTC
Sorry, I don't understand.

You want to make doom-data and freedom not blocking each other, changing the location of the file of freedom.
The other doom engines look by default to the old location so they will only get the doom-data files.

To get the freedoom data you should apply the same set of change you do to doomsday to all the other engines, or at least write instruction on how to select freedom wad files.

Am I wrong?
Comment 9 Paul Bredbury 2006-09-01 16:13:55 UTC
The purpose of these patches is to get *doomsday* working with freedoom and the Doom demo data. It does not aid or hinder other Doom engines & ebuilds.

Anyone is free to enhance the other Doom ebuilds in a similar fashion. Is it impossible for other Doom engines to use freedoom when it's installed in a "freedoom" subdirectory? If it is, that's their problem. Inferior engines should not be holding back the good ones. Users can create symlinks to the "freedoom" subdirectory if they wish.

Currently, the freedoom ebuild in Portage *blocks* doom-data, which is *bad* because they can co-exist and both be usable if installed in separate directories. Which is the point of these patches.
Comment 10 Tupone Alfredo gentoo-dev 2006-09-02 17:53:15 UTC
Enhancement will be blocked until other doom engine are inline with this solution, or at least they will not degraded by it
Comment 11 Paul Bredbury 2006-09-02 23:45:15 UTC
Created attachment 95812 [details]
freedoom-0.4.1.ebuild

Fixes the degredation by showing the user how to create symlinks.
Comment 12 Paul Bredbury 2006-09-02 23:47:25 UTC
Prboom works with the symlinks.
Comment 13 SpanKY gentoo-dev 2006-09-03 17:49:17 UTC
post patches without extraneous style changes
Comment 14 Tupone Alfredo gentoo-dev 2006-09-03 23:44:43 UTC
Created attachment 95921 [details, diff]
doomsday-1.9.0_beta4.ebuild.patch (by tupone)
Comment 15 Tupone Alfredo gentoo-dev 2006-09-03 23:46:26 UTC
Created attachment 95922 [details, diff]
doom-data-1.ebuild.patch (by Tupone)
Comment 16 Tupone Alfredo gentoo-dev 2006-09-03 23:49:52 UTC
Created attachment 95923 [details, diff]
freedoom-0.4.1.ebuild.patch (by tupone)
Comment 17 Tupone Alfredo gentoo-dev 2006-09-03 23:52:02 UTC
well, sorry for 2 of my patch to be reversed :)
Basically I create the wrapper in the data ebuild, so if I just change the USE flags, I will unpack the game data (like freedoom) and create a new wrapper to run  it.
It should be less expensive then re-creating the whole engine
Comment 18 Paul Bredbury 2006-09-04 02:08:06 UTC
I think the "demo" and "freedoom" USE flags are important enough to be *within* the doomsday ebuild, so that it is obvious that these options exist. These options are important because they are the only ones AFAIK which allow Doom to be played for *free*.

Of course, there are lots of large 3rd-party wad collections for Doom 1 & 2, which could have their own ebuilds with "doomsday" USE flags, but they require iD's commercial wad files.
Comment 19 Tupone Alfredo gentoo-dev 2006-09-05 12:33:42 UTC
Added a doomsday use flag.
doom-data no more block freedoom
Now in CVS
Thanks for your ebuild and the explainations
Comment 20 Dave 2006-09-14 02:26:57 UTC
(In reply to comment #19)
> Added a doomsday use flag.
> doom-data no more block freedoom
> Now in CVS
> Thanks for your ebuild and the explainations

One of the Doomsday developers(DaniJ) has just told me that simply changing the load code to read the freedoom IWAD is not enough to implement support and that there are other large changes needed within the engine due to missing features required by the freedoom IWAD.

You can get in contact with him in the doomsday irc channel #doomsday irc.freenode.net