Page MenuHomeSolus

Clean up and simplify GZDoom package
ClosedPublic

Authored by aleksvor on Jun 16 2019, 9:45 AM.

Details

Summary
  1. Removed manual installations of files in favor of using install macro.
    1. Use sed to remove hardcoded games folder from installation script.
  2. Remove fluidsynth from dependencies as GZDoom doesn't support FluidSynth 2.x:
    1. With DYN_FLUIDSYNTH=OFF flag the build will fail due to API changes in FS 2.x.
    2. With dynamic loading GZDoom won't be able to load the library, because it looks for libfluidsynth.so.1 which we don't have anymore.
Test Plan

Played several WADs with engine from the new package.

Diff Detail

Repository
R1130 gzdoom
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

aleksvor created this revision.Jun 16 2019, 9:45 AM
aleksvor requested review of this revision.Jun 16 2019, 9:45 AM
aleksvor edited the summary of this revision. (Show Details)Jun 16 2019, 9:47 AM
aleksvor updated this revision to Diff 15699.Jun 18 2019, 5:18 PM
aleksvor edited the summary of this revision. (Show Details)
  1. Added a homepage.
  2. Use xpm icon instead of converting .ico to .png. Also allows to drop imagemagick from builddeps.
JoshStrobl requested changes to this revision.Jun 21 2019, 1:38 PM
JoshStrobl added a subscriber: JoshStrobl.
JoshStrobl added inline comments.
pspec_x86_64.xml
30–37

I'd say none of this is really necessary.

This revision now requires changes to proceed.Jun 21 2019, 1:38 PM
aleksvor updated this revision to Diff 15755.Jun 21 2019, 4:29 PM

Removed license texts from /usr/share/doc.

JoshStrobl added inline comments.Jun 27 2019, 2:34 PM
package.yml
25

Can you not just set -DINSTALL_PK3_PATH=/usr/share/doom ?

aleksvor updated this revision to Diff 15843.Jun 27 2019, 4:59 PM

Properly set installation dir.

aleksvor marked an inline comment as done.Jun 27 2019, 5:01 PM
aleksvor added inline comments.
package.yml
25

My CMake-Fu wasn't good enough - I thought that set() command always overrides previous value. Today I learned that it's not the case for cache strings :)

JoshStrobl accepted this revision.Jun 28 2019, 3:38 PM

LGTM, thanks!

package.yml
25

It's okay, not much a fan of cmake myself.

This revision is now accepted and ready to land.Jun 28 2019, 3:38 PM
This revision was automatically updated to reflect the committed changes.