Bugzilla Bug 127397

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

Created an attachment (id=82988) [details]
doomsday-1.8.6-r1.diff

Created an attachment (id=82989) [details]
doom-data-1.diff

Created an attachment (id=82990) [details]
freedoom-0.4.1.diff

Seems nice.
But what about the other games that are looking for doom-data ?

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
;)

Understand.
You mean that doomlegacy and lsdldoom cannot work with freedoom.
Is that right?

(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.

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?

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.

Enhancement will be blocked until other doom engine are inline with this
solution, or at least they will not degraded by it

Created an attachment (id=95812) [details]
freedoom-0.4.1.ebuild

Fixes the degredation by showing the user how to create symlinks.

Prboom works with the symlinks.

post patches without extraneous style changes

Created an attachment (id=95921) [details]
doomsday-1.9.0_beta4.ebuild.patch (by tupone)

Created an attachment (id=95922) [details]
doom-data-1.ebuild.patch (by Tupone)

Created an attachment (id=95923) [details]
freedoom-0.4.1.ebuild.patch (by tupone)

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

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.

Added a doomsday use flag.
doom-data no more block freedoom
Now in CVS
Thanks for your ebuild and the explainations

(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