diff options
Diffstat (limited to 'games-fps/doomsday')
| -rw-r--r-- | games-fps/doomsday/ChangeLog | 11 | ||||
| -rw-r--r-- | games-fps/doomsday/doomsday-1.9.8.ebuild | 126 | ||||
| -rw-r--r-- | games-fps/doomsday/files/doomsday-1.9.8-2to3.patch | 309 | ||||
| -rw-r--r-- | games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch | 158 | ||||
| -rw-r--r-- | games-fps/doomsday/metadata.xml | 9 |
5 files changed, 611 insertions, 2 deletions
diff --git a/games-fps/doomsday/ChangeLog b/games-fps/doomsday/ChangeLog index ffb11a4b1535..8d82cf13174e 100644 --- a/games-fps/doomsday/ChangeLog +++ b/games-fps/doomsday/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for games-fps/doomsday -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.41 2011/10/23 20:12:14 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/ChangeLog,v 1.42 2012/05/30 10:21:55 maksbotan Exp $ + +*doomsday-1.9.8 (30 May 2012) + + 30 May 2012; Maxim Koltsov <maksbotan@gentoo.org> +doomsday-1.9.8.ebuild, + +files/doomsday-1.9.8-2to3.patch, +files/doomsday-1.9.8-openal-link.patch, + metadata.xml: + Bump to 1.9.8, bug 410043. Remake wrapper generation, bump to eapi4 23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -doomsday-1.9.0_beta62.ebuild: diff --git a/games-fps/doomsday/doomsday-1.9.8.ebuild b/games-fps/doomsday/doomsday-1.9.8.ebuild new file mode 100644 index 000000000000..5a6e5bd9a64b --- /dev/null +++ b/games-fps/doomsday/doomsday-1.9.8.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/games-fps/doomsday/doomsday-1.9.8.ebuild,v 1.1 2012/05/30 10:21:55 maksbotan Exp $ + +EAPI=4 + +PYTHON_DEPEND="snowberry? 2" + +inherit python confutils eutils games qt4-r2 + +DESCRIPTION="A modern gaming engine for Doom, Heretic, and Hexen" +HOMEPAGE="http://www.dengine.net/" +SRC_URI="mirror://sourceforge/deng/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openal snowberry +doom demo freedoom heretic hexen resources" + +DEPEND=" + virtual/opengl + virtual/glu + media-libs/libsdl[joystick] + media-libs/sdl-mixer + media-libs/libpng + x11-libs/qt-opengl + x11-libs/qt-gui + net-misc/curl + openal? ( media-libs/openal ) + " +RDEPEND="${RDEPEND} + snowberry? ( dev-python/wxpython )" +PDEPEND=" + demo? ( games-fps/doom-data ) + freedoom? ( games-fps/freedoom ) + resources? ( games-fps/doomsday-resources ) + " + +S="${S}"/${PN} + +REQUIRED_USE="demo? ( doom ) freedoom? ( doom ) resources? ( doom )" +PATCHES=( "${FILESDIR}"/${P}-2to3.patch ) + +pkg_setup(){ + python_pkg_setup + games_pkg_setup +} + +src_prepare() { + sed -i -e "/^DENG_BASE_DIR =/s:\$\$PREFIX/share:${GAMES_DATADIR}:" config_unix.pri + echo "CONFIG += nostrip" > config_user.pri + echo "PREFIX=/usr/games" >> config_user.pri + use snowberry && \ + echo "CONFIG += deng_snowberry" >> config_user.pri || \ + echo "CONFIG += deng_nosnowberry" >> config_user.pri + + if use openal; then + echo "CONFIG += deng_openal" >> config_user.pri + sed -i 's:\# Generic Unix.:LIBS += -lopenal:' doomsday/dep_openal.pri + epatch "${FILESDIR}"/${P}-openal-link.patch + fi + + qt4-r2_src_prepare +} + +#Usage: doom_make_wrapper <name> <game> <icon> <desktop entry title> [args] +doom_make_wrapper() { + local name=$1 game=$2 icon=$3 de_title=$4 + shift 4 + games_make_wrapper $name \ + "doomsday -game ${game} $@" + make_desktop_entry $name "${de_title}" ${icon} +} + +src_install() { + qt4-r2_src_install + + mv "${D}/${GAMES_DATADIR}"/{${PN}/data/jdoom,doom-data} || die + dosym "${GAMES_DATADIR}"/doom-data "${GAMES_DATADIR}"/${PN}/data/jdoom || die + + if use snowberry; then + doicon ../snowberry/graphics/snowberry.png + python_convert_shebangs 2 "${D}"/"${GAMES_BINDIR}"/launch-doomsday + make_desktop_entry launch-doomsday "Snowberry DoomsDay" snowberry + fi + + if use doom; then + local res_arg + if use resources; then + res_arg="-def \"${GAMES_DATADIR}\"/${PN}/defs/jdoom/jDRP.ded" + fi + + doicon ../snowberry/graphics/orb-doom.png + doom_make_wrapper jdoom doom1 orb-doom "DoomsDay Engine: Doom 1" "${res_arg}" + einfo "Created jdoom launcher. To play Doom place your doom.wad to" + einfo "\"${GAMES_DATADIR}\"/doom-data" + einfo + + if use demo; then + doom_make_wrapper jdoom-demo doom1-share orb-doom "DoomsDay Engine: Doom 1 Demo" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/doom1.wad ${res_arg}" + fi + if use freedoom; then + doom_make_wrapper jdoom-freedoom doom1-share orb-doom "DoomsDay Engine: FreeDoom" \ + "-iwad \"${GAMES_DATADIR}\"/doom-data/freedoom/doom1.wad" + fi + fi + if use hexen; then + doicon ../snowberry/graphics/orb-hexen.png + doom_make_wrapper jhexen hexen orb-hexen "DoomsDay Engine: Hexen" + + einfo "Created jhexen launcher. To play Hexen place your hexen.wad to" + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jhexen" + einfo + fi + if use heretic; then + doicon ../snowberry/graphics/orb-heretic.png + doom_make_wrapper jheretic heretic orb-heretic "DoomsDay Engine: Heretic" + + einfo "Created jheretic launcher. To play Heretic place your heretic.wad to" + einfo "\"${GAMES_DATADIR}\"/${PN}/data/jheretic" + einfo + fi + + prepgamesdirs +} diff --git a/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch b/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch new file mode 100644 index 000000000000..62b4db2627ec --- /dev/null +++ b/games-fps/doomsday/files/doomsday-1.9.8-2to3.patch @@ -0,0 +1,309 @@ +--- ./build/mac/createfont_osx.py (original) ++++ ./build/mac/createfont_osx.py (refactored) +@@ -36,7 +36,7 @@ + + + def _getBitmapImageRep(size, hasAlpha=True): +- width, height = map(int, size) ++ width, height = list(map(int, size)) + return NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bytesPerRow_bitsPerPixel_(None, width, height, 8, 4, hasAlpha, False, NSDeviceRGBColorSpace, width*4, 32) + + +@@ -55,7 +55,7 @@ + + def filter_range(n): + offset = 1 # - int(n/5) +- return range(-n/2 + offset, n/2 + offset) ++ return list(range(-n/2 + offset, n/2 + offset)) + + + class SysFont(object): +@@ -79,7 +79,7 @@ + self._isBold and 'Bold' or '', + self._isOblique and 'Oblique' or '') + self._font = NSFont.fontWithName_size_(name, self._size) +- print name, self._font ++ print(name, self._font) + if self._font is None: + if self._isBold: + self._font = NSFont.boldSystemFontOfSize(self._size) +@@ -121,10 +121,10 @@ + self._isUnderline = isUnderline + + def size(self, text): +- return tuple(map(int,map(math.ceil, NSString.sizeWithAttributes_(text, { ++ return tuple(map(int,list(map(math.ceil, NSString.sizeWithAttributes_(text, { + NSFontAttributeName: self._font, + NSUnderlineStyleAttributeName: self._isUnderline and 1.0 or 0, +- })))) ++ }))))) + + def advancement(self, glyph): + return tuple(self._font.advancementForGlyph_(ord(glyph))) +@@ -196,7 +196,7 @@ + [6, 36, 90, 120, 90, 36, 6], + [1, 6, 15, 20, 15, 6, 1]] + else: +- print "factors for filter size", filter_size, "not defined!" ++ print("factors for filter size", filter_size, "not defined!") + factors = 0 + + # Filter a shadow. +@@ -269,7 +269,7 @@ + + if __name__=='__main__': + if len(sys.argv) < 5: +- print "usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)" ++ print("usage: " + sys.argv[0] + " (font-name) (font-size) (texture-width) (output-file)") + sys.exit(0) + + out_filename = sys.argv[4] +@@ -286,17 +286,17 @@ + + texture_width = int(sys.argv[3]) + font_point_height = s.get_height() +- print "Font texture width =", texture_width +- print "Line height =", font_point_height, "pt" +- print "Font size =", point_size, "pt" ++ print("Font texture width =", texture_width) ++ print("Line height =", font_point_height, "pt") ++ print("Font size =", point_size, "pt") + + ascent = s.get_ascent() + descent = s.get_descent() +- print "Ascent =", ascent, "pt Descent =", descent, "pt" +- +- print "Shadow filter is sized %i for this font." % s.shadow_filter_size() ++ print("Ascent =", ascent, "pt Descent =", descent, "pt") ++ ++ print("Shadow filter is sized %i for this font." % s.shadow_filter_size()) + border_size = s.border_size() +- print "Glyph borders are %i pixels wide." % border_size ++ print("Glyph borders are %i pixels wide." % border_size) + + rover = (0, 0) + line_height = 0 +@@ -304,7 +304,7 @@ + used_pixels = 0 + + # Only the basic ASCII set, and some specific characters. +- char_range = range(0x20, 0x7F) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1] ++ char_range = list(range(0x20, 0x7F)) + [0x96, 0x97, 0xA3, 0xA4, 0xA9, 0xB0, 0xB1] + for code in char_range: + glyph = Glyph(code) + try: +@@ -320,7 +320,7 @@ + # No, move to the new row. + rover = (0, rover[1] + line_height) + texture_height += line_height +- print "Finished a %i pixels tall line." % line_height ++ print("Finished a %i pixels tall line." % line_height) + line_height = 0 + + glyph.pos = rover +@@ -332,20 +332,20 @@ + glyphs.append(glyph) + #except Exception, x: + except KeyboardInterrupt: +- print "Code %i: Failed to render." % code +- print x +- +- print "Finished rendering %i glyphs." % len(glyphs) ++ print("Code %i: Failed to render." % code) ++ print(x) ++ ++ print("Finished rendering %i glyphs." % len(glyphs)) + actual_line_height = glyphs[0].dims[1] - border_size*2 +- print "Actual line height is %i pixels." % actual_line_height +- +- print "Size of the finished texture is %i x %i." % (texture_width, texture_height) ++ print("Actual line height is %i pixels." % actual_line_height) ++ ++ print("Size of the finished texture is %i x %i." % (texture_width, texture_height)) + + actual_height = pow2(texture_height) + total_pixels = texture_width * actual_height + +- print "Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels))) +- print "Writing output to file: %s" % out_filename ++ print("Unused texture area: %.2f %%" % (100*(1.0 - used_pixels/float(total_pixels)))) ++ print("Writing output to file: %s" % out_filename) + + out = file(out_filename, 'wb') + +@@ -365,10 +365,10 @@ + scale = float(actual_line_height) / font_point_height + pixel_ascent = int(math.ceil(scale * ascent)) + pixel_descent = int(math.ceil(scale * descent)) +- print " Pixel ascent/descent:", pixel_ascent, '/', pixel_descent ++ print(" Pixel ascent/descent:", pixel_ascent, '/', pixel_descent) + + pixel_line_height = int(scale * font_point_height) +- print " Pixel line height:", pixel_line_height ++ print(" Pixel line height:", pixel_line_height) + + # Ascent and descent. + out.write(struct.pack('<HHH', pixel_line_height, pixel_ascent, pixel_descent)) +@@ -379,7 +379,7 @@ + g.dims[0], g.dims[1])) + + # Glyph map. +- print " Writing glyph map..." ++ print(" Writing glyph map...") + for y in range(texture_height): + for x in range(texture_width): + pixel = find_pixel(glyphs, x, y) +--- ./build/scripts/packres.py (original) ++++ ./build/scripts/packres.py (refactored) +@@ -6,8 +6,8 @@ + import sys, os, os.path, zipfile + + if len(sys.argv) < 2: +- print "Usage: %s pk3-target-dir" % sys.argv[0] +- print "(run in build/scripts/)" ++ print("Usage: %s pk3-target-dir" % sys.argv[0]) ++ print("(run in build/scripts/)") + sys.exit(0) + + # Check quiet flag. +@@ -27,7 +27,7 @@ + self.files += fileNamesArray + + def msg(self, text): +- if not quietMode: print text ++ if not quietMode: print(text) + + def create(self, name): + full_name = os.path.join(target_dir, name) +@@ -61,7 +61,7 @@ + process_dir(full_src, dest) + + # Write it out. +- print "Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist())) ++ print("Created %s (with %i files)." % (os.path.normpath(full_name), len(pk3.namelist()))) + pk3.close() + + # First up, doomsday.pk3. +--- ./build/scripts/wadcompiler.py (original) ++++ ./build/scripts/wadcompiler.py (refactored) +@@ -49,7 +49,7 @@ + self.type = self.file.read(4) + count = struct.unpack('<I', self.file.read(4))[0] + info_offset = struct.unpack('<I', self.file.read(4))[0] +- print "%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset) ++ print("%s, type=%s, count=%i, info_offset=%i" % (self.file_name, self.type, count, info_offset)) + self.lumps = [] + # Read the info table. + self.file.seek(info_offset) +@@ -68,7 +68,7 @@ + self.lumps.append( Lump(info[2], data, info[0]) ) + + def write(self): +- print 'writing', self.file_name ++ print('writing', self.file_name) + self.file.truncate() + self.file.seek(0) + # Type. +@@ -104,17 +104,17 @@ + + def set_type(self, new_type): + if len(new_type) != 4: +- print "'%s' is not a valid type. Must have 4 chars." % new_type ++ print("'%s' is not a valid type. Must have 4 chars." % new_type) + else: +- print 'setting type to %s' % new_type ++ print('setting type to %s' % new_type) + self.type = new_type + + def list(self): + for i in range(len(self.lumps)): + lump = self.lumps[i] +- print "%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, +- len(lump.data)) +- print "%i lumps total." % len(self.lumps) ++ print("%5i -- %-8s (at %8i, %8i bytes)" % (i, lump.name, lump.offset, ++ len(lump.data))) ++ print("%i lumps total." % len(self.lumps)) + + def insert(self, at_lump, names): + # Where to insert? +@@ -128,13 +128,13 @@ + at = i + break + if at == -1: +- print "could not find insert point, aborting" ++ print("could not find insert point, aborting") + return +- print "inserting at index %i..." % at ++ print("inserting at index %i..." % at) + + for name in names: + real, arch = split_name(name) +- print "inserting %s as %s" % (real, valid_lump_name(arch)) ++ print("inserting %s as %s" % (real, valid_lump_name(arch))) + self.lumps.insert(at, Lump(valid_lump_name(arch), + file(real, 'rb').read(), 0)) + +@@ -164,28 +164,28 @@ + break + else: + nice_name += ext +- print "extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name) ++ print("extracting", lump.name, "(%i bytes) as %s" % (len(lump.data), nice_name)) + f = file(nice_name, 'wb') + f.write(lump.data) + f.close() + + + def usage(): +- print 'Usage: %s [command] [wad] [files]' % sys.argv[0] +- print 'command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)' +- print 'Examples:' +- print '%s l some.wad' % sys.argv[0] +- print '%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0] +- print '%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0] +- print '%s a existing.wad LUMP4 LUMP5' % sys.argv[0] +- print '%s x existing.wad (extracts all lumps)' % sys.argv[0] +- print '%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0] +- print '%s t existing.wad IWAD' % sys.argv[0] +- print 'You can specify files as realfilename@LUMPNAME.' ++ print('Usage: %s [command] [wad] [files]' % sys.argv[0]) ++ print('command = l(ist) | c(reate PWAD) | C(reate IWAD) | x(tract) | a(ppend) | i(nsert) | t(ype)') ++ print('Examples:') ++ print('%s l some.wad' % sys.argv[0]) ++ print('%s c new.wad LUMP1 LUMP2 LUMP3' % sys.argv[0]) ++ print('%s i LUMP2 some.wad LUMP5 LUMP6 LUMP7 (at LUMP2)' % sys.argv[0]) ++ print('%s a existing.wad LUMP4 LUMP5' % sys.argv[0]) ++ print('%s x existing.wad (extracts all lumps)' % sys.argv[0]) ++ print('%s x existing.wad LUMP4 (extracts selected lumps)' % sys.argv[0]) ++ print('%s t existing.wad IWAD' % sys.argv[0]) ++ print('You can specify files as realfilename@LUMPNAME.') + + # Call main function. +-print 'WAD Compiler by skyjake@users.sourceforge.net' +-print '$Date$' ++print('WAD Compiler by skyjake@users.sourceforge.net') ++print('$Date$') + + # Check the args. + if len(sys.argv) < 3: +@@ -219,7 +219,7 @@ + try: + wad = Wad(wad_name, mode) + except: +- print 'Failure to open %s.' % wad_name ++ print('Failure to open %s.' % wad_name) + import traceback + traceback.print_exc() + sys.exit(2) +--- ./engine/scripts/makedmt.py (original) ++++ ./engine/scripts/makedmt.py (refactored) +@@ -118,7 +118,7 @@ + # Translate the type into a real C type. + if '_s' in c_type: + c_type = 'struct ' + c_type +- for symbol, real in type_replacements.items(): ++ for symbol, real in list(type_replacements.items()): + c_type = c_type.replace(symbol, real) + + # Add some visual padding to align the members. diff --git a/games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch b/games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch new file mode 100644 index 000000000000..c59c48ac7aef --- /dev/null +++ b/games-fps/doomsday/files/doomsday-1.9.8-openal-link.patch @@ -0,0 +1,158 @@ +--- doomsday/plugins/openal/src/driver_openal.cpp 2012-05-15 06:01:38.000000000 +0200 ++++ doomsday/plugins/openal/src/driver_openal.cpp 2012-05-29 07:37:21.170639342 +0200 +@@ -66,6 +66,7 @@ ALenum(*EAXGet) (const struct _GUID* pro + ALenum(*EAXSet) (const struct _GUID* propertySetID, ALuint prop, ALuint source, ALvoid* value, ALuint size); + #endif + ++extern "C" { + int DS_Init(void); + void DS_Shutdown(void); + void DS_Event(int type); +@@ -83,6 +84,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p + void DS_SFX_Listener(int prop, float value); + void DS_SFX_Listenerv(int prop, float* values); + int DS_SFX_Getv(int prop, void* values); ++} + + #ifdef WIN32 + // EAX 2.0 GUIDs +@@ -134,14 +136,14 @@ static void loadExtensions(void) + #endif + } + +-int DS_Init(void) ++extern "C" int DS_Init(void) + { + // Already initialized? + if(initOk) return true; + + // Open a playback device. + /// @todo Shouldn't we use the system default device? +- device = alcOpenDevice((ALCchar*) "DirectSound3D"); ++ device = alcOpenDevice((ALCchar*) NULL); + if(!device) + { + Con_Message("OpenAL init failed (device: DirectSound3D).\n"); +@@ -167,7 +169,7 @@ int DS_Init(void) + return true; + } + +-void DS_Shutdown(void) ++extern "C" void DS_Shutdown(void) + { + if(!initOk) return; + +@@ -185,12 +187,12 @@ void DS_Event(int /*type*/) + // Not supported. + } + +-int DS_SFX_Init(void) ++extern "C" int DS_SFX_Init(void) + { + return true; + } + +-sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) ++extern "C" sfxbuffer_t* DS_SFX_CreateBuffer(int flags, int bits, int rate) + { + sfxbuffer_t* buf; + ALuint bufName, srcName; +@@ -236,7 +238,7 @@ sfxbuffer_t* DS_SFX_CreateBuffer(int fla + return buf; + } + +-void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) ++extern "C" void DS_SFX_DestroyBuffer(sfxbuffer_t* buf) + { + ALuint srcName, bufName; + +@@ -251,7 +253,7 @@ void DS_SFX_DestroyBuffer(sfxbuffer_t* b + Z_Free(buf); + } + +-void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) ++extern "C" void DS_SFX_Load(sfxbuffer_t* buf, struct sfxsample_s* sample) + { + if(!buf || !sample) return; + +@@ -277,7 +279,7 @@ void DS_SFX_Load(sfxbuffer_t* buf, struc + /** + * Stops the buffer and makes it forget about its sample. + */ +-void DS_SFX_Reset(sfxbuffer_t* buf) ++extern "C" void DS_SFX_Reset(sfxbuffer_t* buf) + { + if(!buf) return; + +@@ -285,7 +287,7 @@ void DS_SFX_Reset(sfxbuffer_t* buf) + buf->sample = NULL; + } + +-void DS_SFX_Play(sfxbuffer_t* buf) ++extern "C" void DS_SFX_Play(sfxbuffer_t* buf) + { + ALuint source; + +@@ -310,7 +312,7 @@ void DS_SFX_Play(sfxbuffer_t* buf) + buf->flags |= SFXBF_PLAYING; + } + +-void DS_SFX_Stop(sfxbuffer_t* buf) ++extern "C" void DS_SFX_Stop(sfxbuffer_t* buf) + { + if(!buf || !buf->sample) return; + +@@ -318,7 +320,7 @@ void DS_SFX_Stop(sfxbuffer_t* buf) + buf->flags &= ~SFXBF_PLAYING; + } + +-void DS_SFX_Refresh(sfxbuffer_t* buf) ++extern "C" void DS_SFX_Refresh(sfxbuffer_t* buf) + { + ALint state; + +@@ -368,7 +370,7 @@ static void setPan(ALuint source, float + alSourcefv(source, AL_POSITION, pos); + } + +-void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) ++extern "C" void DS_SFX_Set(sfxbuffer_t* buf, int prop, float value) + { + ALuint source; + +@@ -411,7 +413,7 @@ void DS_SFX_Set(sfxbuffer_t* buf, int pr + } + } + +-void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) ++extern "C" void DS_SFX_Setv(sfxbuffer_t* buf, int prop, float* values) + { + ALuint source; + +@@ -435,7 +437,7 @@ void DS_SFX_Setv(sfxbuffer_t* buf, int p + } + } + +-void DS_SFX_Listener(int prop, float value) ++extern "C" void DS_SFX_Listener(int prop, float value) + { + switch(prop) + { +@@ -451,7 +453,7 @@ void DS_SFX_Listener(int prop, float val + } + } + +-void DS_SFX_Listenerv(int prop, float* values) ++extern "C" void DS_SFX_Listenerv(int prop, float* values) + { + float ori[6]; + +@@ -489,7 +491,7 @@ void DS_SFX_Listenerv(int prop, float* v + } + } + +-int DS_SFX_Getv(int /*prop*/, void* /*values*/) ++extern "C" int DS_SFX_Getv(int /*prop*/, void* /*values*/) + { + // Stub. + return 0; diff --git a/games-fps/doomsday/metadata.xml b/games-fps/doomsday/metadata.xml index d3c2cc926f0b..1bb8e628bcb1 100644 --- a/games-fps/doomsday/metadata.xml +++ b/games-fps/doomsday/metadata.xml @@ -2,4 +2,13 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>games</herd> +<use> + <flag name="snowberry">Install Snowberry doomsday front-end</flag> + <flag name="doom">Install launcher for jdoom game</flag> + <flag name="demo">Install launcher dor doom1.wad from <pkg>games-fps/doom-data</pkg></flag> + <flag name="freedoom">Install launcher for doom1.wad from <pkg>games-fps/freefoom</pkg></flag> + <flag name="heretic">Install launcher for jheretic game</flag> + <flag name="hexen">Install launcher for jhexen game</flag> + <flag name="resources">Enable support for <pkg>games-fps/doomsday-resources</pkg> in jdoom launcher</flag> +</use> </pkgmetadata> |