Hi, here is a version bump for d2x-rebirth. It's extremely similar to d1x-rebirth, except that d2x-rebirth does not work with the demo data (yet). Added -gl_transparency to command-line options, for some eye-candy. Removed 16 bits-per-pixel, because 32 is the default.
Created attachment 110472 [details] d2x-rebirth-0.51.ebuild
Created attachment 110532 [details] d2x-rebirth-0.51.ebuild Removed awe32 USE flag (is now the default).
Created attachment 111324 [details] d2x-rebirth-0.51.ebuild Removed "-nomovies -nocdrom", now that descent2-data (bug #168463) can include the movies.
Created attachment 118278 [details] d2x-rebirth-0.52.ebuild
Created attachment 123793 [details] d2x-rebirth-0.52.ebuild Neater sed command.
I can't get this to compile. First off, is awe32 still defaulted on in 0.52? arch/linux/hmiplay.c:22:1: warning: "__USE_GNU" redefined In file included from /usr/include/errno.h:29, from arch/linux/hmiplay.c:11: /usr/include/features.h:269:1: warning: this is the location of the previous definition arch/linux/hmiplay.c:33:29: error: linux/awe_voice.h: No such file or directory arch/linux/hmiplay.c: In function 'seq_init': arch/linux/hmiplay.c:162: error: 'SAMPLE_TYPE_AWE32' undeclared (first use in this function) There's like a billion more lines, but the gist of it is right on the second line. Oh yeah... Calculating dependencies... done! [ebuild N ] games-action/d2x-rebirth-0.52 USE="opengl -awe32 -debug -mixer -mpu401" 0 kB This is on ~x86. I haven't tried it on stable yet.
Created attachment 130974 [details] files/awe_voice.h /usr/include/linux/awe_voice.h has been removed from recent linux-headers.
Created attachment 130975 [details] d2x-rebirth-0.52.ebuild Fixes missing awe_voice.h, and my confusion over whether awe32 needed to be explicitly enabled. Added warning about the unstable SDL mixer. If it's a client rather than an engine, what's the server?
Created attachment 134177 [details] d2x-rebirth-0.53.ebuild New version. Seems to work OK with the demo data. AWE32 & MPU-401 midi is no longer available, disappointingly: http://dxx-rebirth.de/smf/index.php?topic=361 Replaced USE flags with sensible options, because no-one in their right mind would want to play this game without opengl or music :-)
Had a quick issue with scons when compiling it the first time, but re-emerged scons and emerged d2x-reborn (after adding ~amd64) and it worked fine, aside from not detecting the joystick sometimes, but the joystick might have gone to sleep (I use a wiimote for Descent). BTW, I'm running Sabayon 64bit all the way.
Created attachment 134732 [details] d2x-rebirth-0.53.ebuild Added ~amd64, and versioned the scons dependency.
Works fine for me on both prescott (x86) and nocona (amd64). Played many levels without much issue. Only requirement was to compile with gcc 3.4. Using gcc 4.1 on either architecture resulted in a binary that would go into an infinite loop after 0.5 to 5 minutes of game play. Tried gcc 4.1 with all possible compilation options; but always resulted in bad binary.
Version 0.54 is out. Compilation hints: http://aur.archlinux.org/packages.php?ID=11923 ftp://brebs.me.uk/fedora/9/
Created attachment 166828 [details] d2x-rebirth-0.54.ebuild Engine source now downloaded from SourceForge. Works fine with gcc-4.1.2 with -march=nocona on amd64
Created attachment 172570 [details] d2x-rebirth-0.54.ebuild "demo" use-flag was forgotten: fixed.
Hi! I tried the ebuild from Andreas Thillosen (comment #15) on ppc arch. KEYWORDS="~amd64 ~x86 ~ppc" The build works fine with USE="demo" (in lack of the "real" game...) When starting I can see the main menu, I can change settings and so on. Last message after "New game" is "prepare for ..." and then this: ---------------------------------------- # d2x-rebirth DESCENT 2 Full Version v1.2 D2X-Rebirth v0.54 Dec 7 2008 22:24:25 Copyright (C) 1994, 1995 Parallax Software Corporation DESCENT is a trademark of Interplay Productions, Inc. This is a MODIFIED version of Descent 2. Copyright (c) 1999 Peter Hawkins Copyright (c) 2002 Bradley Bell Copyright (c) 2005 Christian Beckhaeuser Type 'd2x-rebirth -help' for a list of command-line options. Using SDL_mixer library sdl-joystick: found 0 joysticks Can't open movielib <intro-h.mvl>: File not found Can't open movielib <other-h.mvl>: File not found Can't open movielib <robots-h.mvl>: File not found Can't open movie <intro.mve>: (null) Can't open movie <titles.mve>: (null) Music /home/andreas/.d2x-rebirth/Music/descent.mid could not be loaded Speicherzugriffsfehler ---------------------------------------- I tried # LC_ALL="C" d2x-rebirth but it still says "Speicherzugriffsfehler", translated something like "memory access error" or "memory corruption". Any ideas?
0.55 is out and there is also a new level set on the official page (actually there's a whole new official section called "Cubes Unlimited" that handles user-submitted level(set)s)
Created attachment 188460 [details] d2x-rebirth-0.55.1.ebuild Hello there. I refreshed ebuild to .55.1. I think same ebuild fits to d1x-rebirth, but unfortunally, I don't have data-files to check d1x-rebirth
I just installed d2x-rebirth-0.55.1.ebuild into my local overlay because the ebuild in portage kept failing with SAMPLE_TYPE_AWE32 errors as in comment six. It now works great, except for errors such as these: Can't open movielib <intro-h.mvl>: File not found Can't open movie <pla.mve>: (null) On the whole, though, it seems to work very well, so thank you for helping bring my x-year-old C.D. to life!
I think those relate to the movies. Either install them or run it with -nomovies.
Has anyone tried to install and play this recently? I'm trying right now and I simply cannot get it working. It builds perfectly fine, but everytime I run it I get this: $ d2x-rebirth Error: Could not find a valid hog file (descent2.hog or d2demo.hog) Possible locations are: $HOME/.d2x-rebirth /usr/share/games/d2x/ In a subdirectory called 'Data' Or use the -hogdir option to specify an alternate location. Error: Could not find a valid hog file (descent2.hog or d2demo.hog) Possible locations are: $HOME/.d2x-rebirth /usr/share/games/d2x/ In a subdirectory called 'Data' Or use the -hogdir option to specify an alternate location. Obviously it seems like it can't find the data files, but I've repeatedly checked to make sure the files are in the correct place, have the proper permissions, etc. I've tried copying them to the ~/.d2x-rebirth directory as suggested, moving them to a Data subdirectory, specifying the directory with -hogdir, as well as various combinations of the like. No luck. I've also tried this using the descent2-data package (via cdinstall), the descent2-demo (after first removing descent2-data), and even manually unpacking and copying the data files. Again, no luck at all. Can anyone else get a fresh install working right now? or is this just me? Thanks.
Can't try it myself right now but try running it with "strace -e trace=file d2x-rebirth" to see what it is doing file-wise.
Created attachment 254105 [details] Updated ebuild, SRC_URI + dos2unix Updated the ebuild, fixed the SRC_URI + passed the docs through dos2unix. Haven't debugged/fixed the .hog detection problem. strace shows that d2x-rebirth is looking in the right places for the files, so it should be finding them. It may be a problem for upstream
Created attachment 254107 [details] strace for missing hog problem With descent2.hog in ~/.d2x-rebirth and also in .d2x-rebirth/Data/ >> strace -e trace=file d2x-rebirth -hogdir .d2x-rebirth/Data/ &> file ; grep -i hog file > hog-nondetection-strace
Created attachment 254109 [details] Manual build output .hog not found bug also affects manual builds. Here is the build output from: >> scons sdlmixer=1
Upstream bug report: http://www.dxx-rebirth.com/frm/showthread.php?tid=777
Created attachment 254141 [details] d2x-rebirth-0.56.ebuild Ohh, hello everyone again! There updated and enchansed ebuild for 0.56. Also this ebuild added to gamerlay overlay, just layman -a gamerlay :). (In reply to comment #26) You should check that dev-games/physfs compiled with USE-flags hog, mvl, and zip. There changes happen since 2009 :). See my ebuild for reference.
Created attachment 254143 [details, diff] d2x-rebirth-0.56-printf-fix.patch
Created attachment 254419 [details] ebuild I've updated your ebuild: - The minimum EAPI needed is "2", not "3" and it's best to specify the minimum required. - app-arch/unzip should be in DEPEND, as it is not in the system set. - d2x now works with the demo data, so I kept the cdinstall USE flag - The src_unpack isn't required - I updated the elog messages Finally, your sprintf patch just seems to be aesthetic; what is it needed for? Otherwise, we have a working ebuild, ready for cvs.
Created attachment 254421 [details] updated ebuild Minor update, tweaking the elog messages to refer to the demo data
Created attachment 254423 [details] fix Fixed minor quoting problem. (sorry for spam)
Created attachment 254425 [details] Updated metadata.xml metadata.xml which defines USE="music"
(In reply to comment #29) > - app-arch/unzip should be in DEPEND, as it is not in the system set. Not required since game itself handles zip archives via dev-games/physfs[zip]. > - d2x now works with the demo data, so I kept the cdinstall USE flag Since Descent + Descent 2 now available on GOG.com, this mostly useless. > - The src_unpack isn't required src_unpack() required for unpacking only for *.tar.gz archive. Others *.zip archives should placed to gamedir unpacked. > Finally, your sprintf patch just seems to be aesthetic; what is it needed for? This solves potential format string vulnerability. This patch already commited by upstream in vcs.
> > - d2x now works with the demo data, so I kept the cdinstall USE flag > Since Descent + Descent 2 now available on GOG.com, this mostly useless. That's fine by me as long as the data ebuilds are kept separate. As well as the original D2X, I have also more or less got D2X-XL into a playable state.
>> - app-arch/unzip should be in DEPEND, as it is not in the system set. > Not required since game itself handles zip archives via dev-games/physfs[zip]. I see - you're right. > > - d2x now works with the demo data, so I kept the cdinstall USE flag > Since Descent + Descent 2 now available on GOG.com, this mostly useless. But not entirely. What if I want a quick game, and I can't find my cds. There's no reason to take the option of playing the demo away from people. > > - The src_unpack isn't required > src_unpack() required for unpacking only for *.tar.gz archive. Others *.zip > archives should placed to gamedir unpacked. Yes, but the one in your ebuild is the same as the default. It works just as well without it. >> Finally, your sprintf patch just seems to be aesthetic; what is it needed for? > This solves potential format string vulnerability. This patch already commited > by upstream in vcs. I see; devs usually annote ebuilds with links to upstream bug reports / patch commits when they pull upstream patches.
(In reply to comment #35) > > > - d2x now works with the demo data, so I kept the cdinstall USE flag > > Since Descent + Descent 2 now available on GOG.com, this mostly useless. > But not entirely. What if I want a quick game, and I can't find my cds. There's > no reason to take the option of playing the demo away from people. I don't think that's what he meant. You can still install descent2-data or descent2-demodata as you wish but controlling this with the cdinstall USE flag doesn't make sense. The demo USE flag may make more sense.
Created attachment 254575 [details] updated ebuild I see what you mean. Still, whenever possible an ebuild with default USE flags should install a complete program. Unless we set IUSE="+demo", that wouldn't happen. I prefer having cdinstall, with USE="-cdinstall" as the default. That way emerge d2x-rebirth gets a working install. The descent2-data ebuild will pick up GOG data from $DISTDIR if it's there anyway. I re-added the sprintf patch, with a link to the commit.
Created attachment 269397 [details] games-action/d2x-rebirth-0.56.ebuild Updated copyright, added detail to einfo. Fixed || die precedence problem + added || die. Ready for others to test + inclusion imo.
Created attachment 301211 [details] games-action/d2x-rebirth-0.57.1.ebuild Hello! As a result of attempting to install 0.57.1 of both d1x-rebirth and d2x-rebirth, I ended up refactoring the associated ebuilds a fair amount, to account for a lot of upstream changes. Please see bug 369419 for the full description of the changes required for 0.57.1. I've made an attempt to reconcile the efforts between that thread and this one, and this ebuild reflects what I think is the best union of both. Not surprisingly, the d1x-rebirth and d2x-rebirth ebuilds are very nearly identical (and I think they should remain so). I'll follow up with a new metadata.xml, as well, which handles the critical USE changes. Note that I fully expect this to need another round or two of tweaks, to satisfy the various interested parties. Please provide feedback and we'll try to keep this up to date and conforming to best practices. Thanks!!
Created attachment 301213 [details] d2x-rebirth metadata.xml New metadata.xml file (corresponds to USE changes in the 0.57.1 ebuild). Provides custom descriptions for the following USE flags: linguas_de, opl3, sc55. Also includes a long description.
+*d2x-rebirth-0.57.3 (06 Feb 2013) + + 06 Feb 2013; Julian Ospald <hasufell@gentoo.org> +d2x-rebirth-0.57.3.ebuild, + +files/d2x-rebirth-0.57.3-flags.patch: + version bump wrt #167341
