debian/0000775000000000000000000000000012255503660007174 5ustar debian/rules0000775000000000000000000000435212255502741010257 0ustar #!/usr/bin/make -f # Sample debian/rules that uses debhelper. # GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 # These are used for cross-compiling and for saving the configure script # from having to guess our platform (since we know it already) DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) CFLAGS = -Wall -g ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CFLAGS += -O0 else CFLAGS += -O2 endif ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) INSTALL_PROGRAM += -s endif config.status: configure.in dh_testdir dh_autoreconf CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" ./configure \ --host=$(DEB_HOST_GNU_TYPE) \ --build=$(DEB_BUILD_GNU_TYPE) \ --prefix=/usr --bindir=\$${prefix}/games \ --datadir=\$${prefix}/share/games --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info --enable-network \ --enable-warn=no build: build-stamp build-stamp: config.status dh_testdir $(MAKE) touch build-stamp clean: dh_testdir dh_testroot rm -f build-stamp rm -f config.log # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean dh_autoreconf_clean dh_clean install: build dh_testdir dh_testroot dh_clean dh_installdirs # Add here commands to install the package into debian/gltron. $(MAKE) DESTDIR=$(CURDIR)/debian/gltron install #fix bad perms upstream cp debian/gltron.xpm $(CURDIR)/debian/gltron/usr/share/pixmaps/ #install desktop file install -d $(CURDIR)/debian/gltron/usr/share/applications install -m 644 debian/gltron.desktop $(CURDIR)/debian/gltron/usr/share/applications/ # Build architecture-independent files here. binary-indep: build install # We have nothing to do by default. # Build architecture-dependent files here. binary-arch: build install dh_testdir dh_testroot dh_installdocs dh_installexamples dh_installmenu dh_installcron dh_installman debian/gltron.6 dh_installchangelogs ChangeLog dh_link dh_strip dh_compress dh_fixperms dh_installdeb dh_shlibdeps dh_gencontrol dh_md5sums dh_builddeb binary: binary-indep binary-arch .PHONY: build clean binary-indep binary-arch binary install debian/watch0000664000000000000000000000013412255502715010223 0ustar version=3 http://people.debian.org/~lolando/sfdlr.php?project=gltron gltron-([\d.]*).tar.gz debian/gltron.60000664000000000000000000000325412255502715010574 0ustar .TH GLTRON 6 2001-06-10 .SH NAME gltron \- a tron-like 3D lightcycle game .SH SYNOPSIS .B gltron .RB [\| [\| \-FftwbghcCsk1234simo ] .SH DESCRIPTION .P glTron is a tron-like lightcycle game with a nice 3D perspective 3D acceleration is recommended. .P More information can be found at the gltron web site http://www.gltron.org/ .SH PROBLEMS .P If the game refuses to start up, check your hardware settings and that the necessary libraries are installed. .P If the options are messed up, remove ~/.gltronrc and try again. .P Anything else check TODO, known bugs on the website, and lastly ask in #gltron on irc.freenode.net. .SH OPTIONS Valid command line options: .TP .B \-O enable software optimizations, useful if your card doesn't have OpenGL acceleration. For best results combine with -t and -1. .TP .B \-f fast finish after human has crashed .TP .B \-F don't display FPS counter .TP .B \-t don't display floor texture, use lines instead (huge speed gain) .TP .B \-w don't display walls (speed gain) .TP .B \-x don't show crash texture (speed gain) .TP .B \-g don't show glows (small speed gain) .TP .B \-c don't show ai status .TP .B \-C show ai status (default: on) .TP .B \-1 set resolution to 320x240 .TP .B \-2 set resolution to 640x480 (default) .TP .B \-3 set resolution to 800x600 .TP .B \-4 set resolution to 1024x768 .TP .B \-s don't play sound .TP .B \-h help .SH AUTHOR Updated with .B PROBLEMS section by Countersync before submission to upstream source. .P This manual page was written by Jeronimo Pellegrini , based on the information in the package by Raphael Bossek, for the Debian GNU/Linux system (but may be used by others). debian/changelog0000664000000000000000000002123012255503643011045 0ustar gltron (0.70final-12ubuntu1) trusty; urgency=medium * Merge from Debian unstable. Remaining changes: - debian/copyright: Clean up. - debian/gltron.desktop: New file. - debian/rules: + Disable -Werror to fix an Ubuntu-only FTBFS (fread is still marked as warn_unused_result). + Install desktop file. + Delete commented-out debhelper command calls. - debian/watch: New file. * Drop debian-changes-0.70final-9ubuntu1. -- Logan Rosen Sun, 22 Dec 2013 01:28:24 -0500 gltron (0.70final-12) unstable; urgency=low * debian/patches/cflags.patch: - Fix FTBFS, thanks to Andreas Moog -- Ari Pollak Sun, 18 Aug 2013 09:33:51 -0400 gltron (0.70final-11) unstable; urgency=low [ Ari Pollak ] * debian/patches/fix-clang-build.patch: - Apply patch from Cyril Roelandt to fix FTBFS with clang (Closes: #686540) * debian/patches/automake-error.patch: - Fix error when running recent version of automake [ Andreas Moog ] * Run dh_autoreconf to fix build with newer GCC versions. (Closes: #701289) - Add dh-autoreconf to build-depends for this. * debian/patches/fix-prototypes.patch: Match function calls with the prototype declarations. -- Ari Pollak Sat, 17 Aug 2013 11:41:39 -0500 gltron (0.70final-10ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining changes: - debian/rules: Delete commented-out debhelper command calls. - debian/watch: New file. - debian/copyright: Clean up. - debian/gltron.desktop: New file. - Disable -Werror in debian/rules to fix an Ubuntu-only FTBFS (fread is still marked as warn_unused_result). - Update nebu/scripting/scripting.c to match the header. -- Logan Rosen Tue, 04 Dec 2012 17:29:16 -0500 gltron (0.70final-10) unstable; urgency=low [ Ari Pollak ] * Fix config.{sub,guess} overwriting so it doesn't get included in the patch * Group patches into their own files - remove patch on src/video/video.c since I couldn't track down its purpose * Bump standards-version to 3.8.4 * Add ${misc:Depends} [ gregor herrmann ] * Fix "ftbfs with gcc-4.6 -Werror": add patch gcc-4.6.patch from peter green(removes unused variables). (Closes: #625343) -- Ari Pollak Thu, 15 Dec 2011 17:45:02 -0500 gltron (0.70final-9ubuntu1) maverick; urgency=low * Re-sync with Debian. (LP: #585223) Kept changes: * debian/rules: Delete commented out debhelper command calls * debian/watch: New file * debian/copyright: Clean up * Loic Pefferkorn Sat, 3 Sep 2005 16:25:11 +0200 * debian/gltron.desktop: New file * Disable -Werror in debian/rules to fix an Ubuntu-only FTBFS (fread is still marked as warn_unused_result). * Update nebu/scripting/scripting.c to match the header. -- Brian Thomason Mon, 24 May 2010 21:16:37 -0400 gltron (0.70final-9) unstable; urgency=low * Change build-depends on xlibmesa-gl-dev to libgl1-mesa-dev (Closes: #575655) * Switch to source format 3.0 (quilt) * Upgrade to debhelper v7 * Remove unneeded build-depends; add autotools-dev -- Ari Pollak Thu, 01 Apr 2010 20:05:15 -0400 gltron (0.70final-8ubuntu3) karmic; urgency=low * Disable -Werror in debian/rules to fix an Ubuntu-only FTBFS (fread is still marked as warn_unused_result). * Also update nebu/scripting/scripting.c to match the header. -- Stefan Potyra Sat, 26 Sep 2009 01:02:39 +0200 gltron (0.70final-8ubuntu2) intrepid; urgency=low * Update Maintainer field to match the DebianMaintainerField specification (LP: #230350) -- David Futcher Wed, 21 May 2008 15:56:10 +0100 gltron (0.70final-8ubuntu1) feisty; urgency=low * Re-sync with Debian. Kept changes: * debian/menu: added missing quotes * debian/rules: delete commented out debhelper command calls * debian/watch: new file * debian/copyright: clean up * Loic Pefferkorn Sat, 3 Sep 2005 16:25:11 +0200 * New changes: * debian/gltron.desktop: New file * debian/control: Update debhelper version (5) and standards (3.7.2) * debian/compat: Bump to 5 -- Barry deFreese Thu, 1 Feb 2007 16:02:39 -0500 gltron (0.70final-8) unstable; urgency=low * Make configure & Makefiles use CFLAGS/CXXFLAGS correctly * Remove broken --enable-optimize flag from configure, since it was overriding our CFLAGS * Fix an extraneous #define that was causing an error with the new CFLAGS * Disable changing the screen resolution in-game, since it didn't work (Closes: #408695) -- Ari Pollak Sun, 23 Oct 2005 22:12:16 -0400 gltron (0.70final-7) unstable; urgency=low * Update build-depends to prefer building with xlibmesa-gl-dev, and get rid of xlibs-dev dependency -- Ari Pollak Thu, 13 Oct 2005 08:50:20 -0400 gltron (0.70final-6) unstable; urgency=low * Bump build-depends on libsmpeg-dev for new C++ ABI transition -- Ari Pollak Thu, 21 Jul 2005 18:42:34 +0000 gltron (0.70final-5) unstable; urgency=low * Apply modified fix by Andreas Jochens to fix build on amd64/gcc-4.0 (Closes: #286782) -- Ari Pollak Wed, 22 Dec 2004 10:32:39 -0500 gltron (0.70final-4) unstable; urgency=low * Explicitly build-dep on mesag-dev | libgl-dev so we don't depend on a virtual package * Hopefully eliminate a problem on 64-bit systems (Closes: #255765) -- Ari Pollak Wed, 23 Jun 2004 14:28:01 -0400 gltron (0.70final-3) unstable; urgency=low * Include .orig.tar.gz as well -- Ari Pollak Tue, 27 Jan 2004 09:28:47 -0500 gltron (0.70final-2) unstable; urgency=low * Updating revision so this can be updated. I'm not sure why this got held up, but hopefully this should fix it. -- Ari Pollak Tue, 27 Jan 2004 00:33:15 -0500 gltron (0.70final-1) unstable; urgency=low * New upstream release * Enable experimental network code for those who dare try it -- Ari Pollak Sun, 14 Dec 2003 13:37:44 -0500 gltron (0.70beta1-1) experimental; urgency=low * New upstream release * Update build-deps for new sound support * Bring back our local manpage because upstream got rid of it for some reason -- Ari Pollak Mon, 13 Oct 2003 01:28:16 -0400 gltron (0.62-1) unstable; urgency=low * New upstream release (Closes: #195432, #156116, #135503) * Adopted package (Closes: #190816) * Our manpage has been adopted upstream; use that instead * Bump standards-version to 3.6.1, make necessary changes * Use debian/compat * Update debian/rules to be more sane -- Ari Pollak Mon, 13 Oct 2003 00:25:18 -0400 gltron (0.61-3) unstable; urgency=low * fixed potential problems when compiling gltron with gcc-3.0 -- Gregory J. Oschwald Fri, 28 Dec 2001 10:07:32 -0600 gltron (0.61-2) unstable; urgency=low * the "double check your numbers" release (closes: #100469) * SDL is used instead of libmikmod2 (closes: #93361) * More maintainable diff against gltron source files -- Gregory J. Oschwald Tue, 25 Dec 2001 19:14:39 -0600 gltron (0.61-1) unstable; urgency=low * New maintainer (closes: #123503, #89991) * New upstream release (closes: #64831, #110293) * Included manpage from Jeronimo Pellegrini (closes: #100496) * Fixed spelling errors (closes: #124678) * New menu icon thanks to Robert Cleaver Ancell (closes: #75812) -- Gregory J. Oschwald Sun, 23 Dec 2001 10:14:13 -0600 gltron (0.53-1.1) unstable; urgency=low * Bugsquash party NMU. * Make configure script executable before running it (closes: #58377, #58405). * Updated to policy version 3.5.2: no changes required. * Added build dependencies. * gltron doesn't actually need svgalib itself, but the old dpkg-shlibdeps pulled in a dependency on it due to using ldd. Build-depend on a version of dpkg-dev that uses objdump instead (closes: #63121, #71933). * Rebuilt with newer libmikmod2, build-depending on it to be safe. I believe this fixes the segfault in MikMod_InfoDriver, and I don't experience this (closes: #80598); please reopen the bug if it's still a problem. * Removed obsolete dh_suidregister call. * Don't include installation instructions in the binary package. -- Colin Watson Sat, 17 Mar 2001 12:02:23 +0000 gltron (0.53-1) unstable; urgency=low * New upstream version. * Added GNU build environment. -- Raphael Bossek Mon, 10 Jan 2000 03:49:04 +0100 debian/compat0000664000000000000000000000000212255502715010372 0ustar 7 debian/gltron.xpm0000664000000000000000000001040312255502715011225 0ustar /* XPM */ static char * gltron_icon_xpm[] = { "32 32 106 2", " c None", ". c #000000", "+ c #3E3E00", "@ c #555500", "# c #686800", "$ c #D1D100", "% c #F0F000", "& c #EAEA00", "* c #232300", "= c #4A4A00", "- c #515100", "; c #7F7F00", "> c #969600", ", c #BEBE00", "' c #E8E800", ") c #F4F400", "! c #FBFB00", "~ c #F6F600", "{ c #F2F200", "] c #F7F700", "^ c #F9F900", "/ c #F3F300", "( c #EEEE00", "_ c #B9B900", ": c #FAFA00", "< c #F5F500", "[ c #FDFD00", "} c #FFFF00", "| c #F8F800", "1 c #EFEF00", "2 c #808000", "3 c #E6E600", "4 c #FEFE00", "5 c #F4F407", "6 c #BDBD81", "7 c #9B9BCE", "8 c #F8F80F", "9 c #C4C47B", "0 c #9696D9", "a c #8484FF", "b c #8C8CEC", "c c #EBEB00", "d c #CECE00", "e c #ACAC00", "f c #8E8E00", "g c #9B9B00", "h c #F0F019", "i c #CCCC43", "j c #858572", "k c #4D4D95", "l c #56569E", "m c #363600", "n c #3B3B00", "o c #D7D700", "p c #D6D600", "q c #BDBD00", "r c #0F0F00", "s c #030300", "t c #8F8F00", "u c #CDCD21", "v c #ACACA1", "w c #D7D752", "x c #FFFF01", "y c #E4E400", "z c #DEDE00", "A c #0B0B00", "B c #F1F100", "C c #070700", "D c #989800", "E c #BEBE38", "F c #8585FC", "G c #8F8FE8", "H c #C7C773", "I c #F3F319", "J c #292900", "K c #060600", "L c #DCDC00", "M c #ABAB00", "N c #121200", "O c #B7B700", "P c #C2C217", "Q c #8585FA", "R c #8989F4", "S c #9090E6", "T c #C3C37D", "U c #C8C800", "V c #050500", "W c #ADAD00", "X c #B0B000", "Y c #020200", "Z c #A6A600", "` c #D9D904", " . c #9A99A2", ".. c #8989DE", "+. c #8C8BDD", "@. c #9A99B3", "#. c #A3A3A5", "$. c #AAAAA4", "%. c #9796D7", "&. c #949400", "*. c #C1C100", "=. c #FCFC00", "-. c #ECEC00", ";. c #E5E500", ">. c #E3E300", ",. c #E2E200", " ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " . + @ # $ % & ", " * = - ; > , ' ) ! ~ ) { ] ! ^ / ( & ", " _ : ~ % ) % / < / : [ } } [ | ~ ~ ~ < ~ / 1 ", " 2 3 : ) : 4 } } } } } } } } } } } } } } 4 ^ 5 6 7 ", " _ ] % ! } } } } } } } } } } } } } } } } } 8 9 0 a b & & c ", " d e f f f g & h } } } } } } } } } } } } i j k l m n o 1 ", " p q r . . . s t u v w x } } } } } } } } y z _ A . . . . = B ", " 3 - . . . . . C D E F G H I } } } } } } y ! J . . . . . K L ~ ", ") ~ M C . . . . N O P Q a a R S S S S T } } U V . . . C W : ", " ^ ! X C . . Y Z ` ...+.@.#.$.%. } , &.&.&.*.=. ", " =.4 -.;.>.,.( } } } } } ", " 4 =.: | ~ { ", " ", " ", " ", " ", " ", " ", " ", " ", " ", " "}; debian/copyright0000664000000000000000000000200112255502715011120 0ustar This is the Debian GNU/Linux packaged version of the program gltron. It was downloaded from: http://www.gltron.org Copyright (C) 1999 Andreas Umbach License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this package; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL-2'. debian/source/0000775000000000000000000000000012255503657010502 5ustar debian/source/format0000664000000000000000000000001412255502715011702 0ustar 3.0 (quilt) debian/menu0000664000000000000000000000021512255502715010061 0ustar ?package(gltron):needs="X11" section="Games/Action" \ title="glTron" command="/usr/games/gltron" \ icon="/usr/share/pixmaps/gltron.xpm" debian/gltron.desktop0000664000000000000000000000024512255502715012075 0ustar [Desktop Entry] Encoding=UTF-8 Name=glTron Type=Application Comment=Play a Tron-like light cycle game Exec=gltron Path= Icon=gltron.xpm Categories=Game;ArcadeGame; debian/control0000664000000000000000000000114012255502741010572 0ustar Source: gltron Section: games Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Ari Pollak Standards-Version: 3.8.4 Build-Depends: debhelper (>= 7), autotools-dev, dh-autoreconf, zlib1g-dev, libpng12-dev, libgl1-mesa-dev | libgl-dev, libsdl-sound1.2-dev, libsdl1.2-dev, libx11-dev Package: gltron Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: 3D lightcycle game glTron is a tron-like lightcycle game with a nice 3D perspective. 3D acceleration is recommended. Homepage: http://www.gltron.org debian/docs0000664000000000000000000000000712255502715010044 0ustar README debian/dirs0000664000000000000000000000002212255502715010052 0ustar usr/share/pixmaps debian/patches/0000775000000000000000000000000012255503657010631 5ustar debian/patches/fix-prototypes.patch0000664000000000000000000000255012255502741014661 0ustar Description: The parameters for some prototypes are defined as const so the functions should use that too. Author: Andreas Moog Bug-Debian: http://bugs.debian.org/701289 Index: gltron/nebu/scripting/scripting.c =================================================================== --- gltron.orig/nebu/scripting/scripting.c 2013-08-11 13:26:14.895792715 +0000 +++ gltron/nebu/scripting/scripting.c 2013-08-11 13:26:14.887792716 +0000 @@ -168,16 +168,16 @@ return status; } -void scripting_RunFile(char *name) { +void scripting_RunFile(const char *name) { lua_dofile(L, name); } -void scripting_Run(char *command) { +void scripting_Run(const char *command) { /* fprintf(stderr, "[command] %s\n", command); */ lua_dostring(L, command); } -void scripting_RunFormat(char *format, ... ) { +void scripting_RunFormat(const char *format, ... ) { char buf[4096]; va_list ap; va_start(ap, format); Index: gltron/src/gltron.c =================================================================== --- gltron.orig/src/gltron.c 2013-08-11 13:26:11.543792589 +0000 +++ gltron/src/gltron.c 2013-08-11 13:26:29.863793144 +0000 @@ -9,7 +9,7 @@ #include "base/util.h" #include "SDL.h" -int main(int argc, char *argv[] ) { +int main(int argc, const char *argv[] ) { initSubsystems(argc, argv); runScript(PATH_SCRIPTS, "main.lua"); return 0; debian/patches/gcc-4.6.patch0000664000000000000000000000631012255502715012705 0ustar Description: Fix build issues with gcc 4.6 Author: Peter Green (plugwash@p10link.net) Bug-Debian: http://bugs.debian.org/625343 --- gltron-0.70final.orig/src/game/computer.c +++ gltron-0.70final/src/game/computer.c @@ -27,11 +27,10 @@ AI_Parameters ai_params = { void doComputerSimple(int player, int target, AI_Distances *distances) { AI *ai; Data *data; - Player *me, *him; + Player *me; int level; me = &(game->player[ player ]); - him = &(game->player[ target ]); if(me->ai == NULL) { printf("This player has no AI data!\n"); return; --- gltron-0.70final.orig/src/game/init_sdl.c +++ gltron-0.70final/src/game/init_sdl.c @@ -27,7 +27,6 @@ void inputInit(void) { /* joystick */ if(SDL_Init(SDL_INIT_JOYSTICK) >= 0) { int i; - SDL_Joystick *joy; int joysticks = SDL_NumJoysticks(); /* FIXME: why only two joysticks? */ @@ -36,7 +35,7 @@ void inputInit(void) { joysticks = 2; for(i = 0; i < joysticks; i++) { - joy = SDL_JoystickOpen(i); + SDL_JoystickOpen(i); } if(i) SDL_JoystickEventState(SDL_ENABLE); --- gltron-0.70final.orig/src/video/trail.c +++ gltron-0.70final/src/video/trail.c @@ -81,8 +81,6 @@ void drawTrailLines(Player *p, PlayerVis float height; float *normal; - float dist; - float alpha; Data *data; Camera *cam; @@ -113,8 +111,8 @@ void drawTrailLines(Player *p, PlayerVis while(s != data->trails + data->trailOffset) { /* the current line is not drawn */ /* compute distance from line to eye point */ - dist = getDist(s, cam->cam); - alpha = (game2->rules.grid_size - dist / 2) / game2->rules.grid_size; + getDist(s, cam->cam); +// alpha = (game2->rules.grid_size - dist / 2) / game2->rules.grid_size; // trail_top[3] = alpha; glColor4fv(trail_top); @@ -133,8 +131,8 @@ void drawTrailLines(Player *p, PlayerVis glEnd(); /* compute distance from line to eye point */ - dist = getDist(s, cam->cam); - alpha = (game2->rules.grid_size - dist / 2) / game2->rules.grid_size; + getDist(s, cam->cam); + //alpha = (game2->rules.grid_size - dist / 2) / game2->rules.grid_size; // trail_top[3] = alpha; glColor4fv(trail_top); --- gltron-0.70final.orig/nebu/scripting/scripting.c +++ gltron-0.70final/nebu/scripting/scripting.c @@ -156,11 +156,10 @@ int scripting_GetStringResult(char **s) int scripting_CopyStringResult(char *s, int len) { int status; if(lua_isstring(L, -1)) { - int size, copy; + int size; status = 0; size = lua_strlen(L, -1) + 1; - if(size > len) { copy = len; status = 2; } - else copy = size; + if(size > len) { status = 2; } memcpy( s, lua_tostring(L, -1), size ); } else status = 1; --- gltron-0.70final.orig/nebu/video/video_system.c +++ gltron-0.70final/nebu/video/video_system.c @@ -19,7 +19,7 @@ void SystemInitWindow(int x, int y, int } void SystemInitDisplayMode(int f, unsigned char full) { - int bitdepth, zdepth; + int zdepth; flags = f; fullscreen = full; @@ -34,10 +34,8 @@ void SystemInitDisplayMode(int f, unsign if(flags & SYSTEM_32_BIT) { zdepth = 24; - bitdepth = 32; } else { zdepth = 16; - bitdepth = 16; } if(flags & SYSTEM_DEPTH) SDL_GL_SetAttribute( SDL_GL_DEPTH_SIZE, zdepth); debian/patches/fix-clang-build.patch0000664000000000000000000000146512255502741014616 0ustar --- gltron-0.70final.orig/src/game/event.c 2012-08-29 19:55:48.852871626 +0200 +++ gltron-0.70final/src/game/event.c 2012-08-29 19:56:33.108872005 +0200 @@ -389,7 +389,7 @@ l = doMovement(1, t); /* this can generate new events */ if(l != NULL) { for(p = l; p->next != NULL; p = p->next) { - if(processEvent((GameEvent*) p->data)); + (void) processEvent((GameEvent*) p->data); } } --- gltron-0.70final.orig/src/game/timedemo.c 2012-08-29 19:55:48.852871626 +0200 +++ gltron-0.70final/src/game/timedemo.c 2012-08-29 19:58:45.300873115 +0200 @@ -45,7 +45,7 @@ l = doMovement(1, t); /* this can generate new events */ if(l != NULL) { for(p = l; p->next != NULL; p = p->next) { - if(processEvent((GameEvent*) p->data)); + (void) processEvent((GameEvent*) p->data); } } debian/patches/gcc30.patch0000664000000000000000000000052212255502715012542 0ustar Description: fix compile error on gcc 3.0+ --- gltron-0.70final.orig/lua/src/lib/liolib.c +++ gltron-0.70final/lua/src/lib/liolib.c @@ -8,7 +8,7 @@ #include #include -#define __USE_MISC /* for mkstemp() */ +/*#define __USE_MISC */ /* for mkstemp() */ #include #include #include debian/patches/series0000664000000000000000000000026712255503204012037 0ustar amd64-ai.patch amd64-gcc40.patch cflags.patch debian-datapath.patch disable-screenmenu.patch gcc30.patch gcc-4.6.patch fix-clang-build.patch fix-prototypes.patch automake-error.patch debian/patches/amd64-ai.patch0000664000000000000000000000060212255502715013144 0ustar Bug-Debian: http://bugs.debian.org/255765 Description: Fix dumb artificial intelligence on amd64 --- gltron-0.70final.orig/src/include/game/game_data.h +++ gltron-0.70final/src/include/game/game_data.h @@ -71,7 +71,7 @@ typedef struct Data { typedef struct AI { int active; int tdiff; - long lasttime; + unsigned int lasttime; segment2 left, right, front, backleft; } AI; debian/patches/disable-screenmenu.patch0000664000000000000000000000064612255502715015417 0ustar Bug-Debian: http://bugs.debian.org/408695 Description: Disable changing the screen resolution in-game, since it was crashing anyway --- gltron-0.70final.orig/scripts/menu.lua +++ gltron-0.70final/scripts/menu.lua @@ -557,7 +557,7 @@ Menu.Player4_KeyMenu.items = { Menu.VideoMenu.items = { "Artpack", "DetailsMenu", - "ScreenMenu" --, "TimeDemo" + --"ScreenMenu" --, "TimeDemo" } Menu.DetailsMenu.items = { debian/patches/amd64-gcc40.patch0000664000000000000000000000155312255502715013461 0ustar Bug-Debian: http://bugs.debian.org/286782 Author: Andreas Jochens Description: Fix a compile problem on amd64 with gcc 4.0+. --- gltron-0.70final.orig/src/video/trail.c +++ gltron-0.70final/src/video/trail.c @@ -19,7 +19,7 @@ float getDist(segment2 *s, float* eye) { n[1] = s->vStart.v[1] - s->vDirection.v[0]; tmp[0] = eye[0] - s->vStart.v[0]; tmp[1] = eye[1] - s->vStart.v[1]; - if(n[0] == n[1] == 0) return length(tmp); + if(n[0] == 0 && n[1] == 0) return length(tmp); return abs(scalarprod2(n, tmp) / length(n)); } --- gltron-0.70final.orig/src/include/video/fonttex.h +++ gltron-0.70final/src/include/video/fonttex.h @@ -10,7 +10,7 @@ typedef struct { int lower; /* lowest ascii character (normally: 32) */ int upper; /* highest ascii character (normally: 126) */ - int *texID; + unsigned int *texID; char *fontname; char *bitmapname; debian/patches/automake-error.patch0000664000000000000000000000106612255502741014603 0ustar Description: Fixes error when running a recent version of automake Index: gltron-0.70final/nebu/scripting/Makefile.am =================================================================== --- gltron-0.70final.orig/nebu/scripting/Makefile.am +++ gltron-0.70final/nebu/scripting/Makefile.am @@ -6,8 +6,6 @@ libscripting_a_SOURCES= \ libscripting_a_LIBADD= \ $(top_builddir)/lua/src/liblua.a \ $(top_builddir)/lua/src/lib/liblualib.a - # @top_srcdir@/lua/src/liblua.a \ - # @top_srcdir@/lua/src/lib/liblualib.a AM_CFLAGS = \ -I$(top_srcdir)/nebu/include/base \ debian/patches/debian-datapath.patch0000664000000000000000000000422712255502715014657 0ustar Description: Finds the installed data correctly on a Debian system without going through a complicated process. --- gltron-0.70final.orig/nebu/filesystem/findpath.c +++ gltron-0.70final/nebu/filesystem/findpath.c @@ -39,66 +39,7 @@ #if !defined(WIN32) && !defined(macintosh) && !defined(__APPLE__) void goto_installpath(const char *argv0) { - char temppath[PATH_MAX]; - char datapath[PATH_MAX]; - char *home; - - home = getenv("HOME"); - if ( ! home ) { - home = "."; - } - - strncpy(temppath, argv0, PATH_MAX); - if ( ! strrchr(temppath, '/') ) { - char *path; - char *last; - int found; - - found = 0; - path = getenv("PATH"); - do { - /* Initialize our filename variable */ - temppath[0] = '\0'; - - /* Get next entry from path variable */ - last = strchr(path, ':'); - if ( ! last ) - last = path+strlen(path); - - /* Perform tilde expansion */ - if ( *path == '~' ) { - strcpy(temppath, home); - ++path; - } - - /* Fill in the rest of the filename */ - if ( last > (path+1) ) { - strncat(temppath, path, (last-path)); - strcat(temppath, "/"); - } - strcat(temppath, "./"); - strcat(temppath, argv0); - - /* See if it exists, and update path */ - if (access(temppath, X_OK) == 0) { - ++found; - } - path = last+1; - - } while ( *last && !found ); - - } else { - /* Increment argv0 to the basename */ - argv0 = strrchr(argv0, '/')+1; - } - - /* Now canonicalize it to a full pathname for the data path */ - datapath[0] = '\0'; - if ( realpath(temppath, datapath) ) { - /* There should always be '/' in the path */ - *(strrchr(datapath, '/')) = '\0'; - } - if ( ! *datapath || (chdir(datapath) < 0) ) { + if (chdir("/usr/share/games/gltron") < 0) { fprintf(stderr, "Couldn't change to install directory\n"); exit(1); /* OK: critical, installation corrupt */ } debian/patches/cflags.patch0000664000000000000000000000500012255502741013075 0ustar Description: Make configure & Makefiles use CFLAGS/CXXFLAGS correctly Remove broken --enable-optimize flag from configure, since it was overriding our CFLAGS. Also update configure.in to work with newer autoconf without NEWS/AUTHORS. Index: gltron-0.70final/configure.in =================================================================== --- gltron-0.70final.orig/configure.in +++ gltron-0.70final/configure.in @@ -1,10 +1,11 @@ dnl Process this file with autoconf to produce a configure script. dnl initialisation -AC_INIT(src/gltron.c) +AC_INIT([gltron], [0.70]) +AC_CONFIG_SRCDIR([src/gltron.c]) AC_CANONICAL_HOST AC_CANONICAL_TARGET -AM_INIT_AUTOMAKE(gltron, 0.70) +AM_INIT_AUTOMAKE([foreign]) AC_PREFIX_DEFAULT("/usr/local") @@ -16,11 +17,7 @@ AC_PROG_CXX AC_PROG_CPP AC_PROG_RANLIB -dnl CFLAGS set-up -CFLAGS="-DSEPARATOR=\"'/'\"" -dnl CFLAGS="-ansi -pedantic" -dnl CXXFLAGS="" -dnl CPPFLAGS="" +CFLAGS="$CFLAGS -DSEPARATOR=\"'/'\"" AC_ARG_ENABLE(warn, AC_HELP_STRING([--enable-warn],[Enable compiler warnings @<:@default=on@:>@]), @@ -48,15 +45,6 @@ if test "x$enable_profile" = xyes; then fi fi -AC_ARG_ENABLE(optimize, -AC_HELP_STRING([--enable-optimize=@<:@level@:>@],[Enable optimization @<:@default=s@:>@]), - enable_optmize=$enableval, enable_optimize=s) -dnl this is always true -if test "x$enable_optimize" ; then - CFLAGS="$CFLAGS -O$enable_optimize" - CXXFLAGS="$CXXFLAGS -O$enable_optimize" -fi - dnl library checks AM_PATH_SDL(1.1.0, CFLAGS="$CFLAGS $SDL_CFLAGS"; CXXFLAGS="$CXXFLAGS $SDL_CFLAGS"; LIBS="$LIBS $SDL_LIBS", AC_MSG_ERROR(SDL is not installed)) Index: gltron-0.70final/Makefile.am =================================================================== --- gltron-0.70final.orig/Makefile.am +++ gltron-0.70final/Makefile.am @@ -4,7 +4,7 @@ bin_PROGRAMS = gltron gltron_SOURCES = @top_srcdir@/src/gltron.c -gltron_LINK = $(CXX) -o $@ +gltron_LINK = $(CXX) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@ gltron_LDADD = \ src/game/libgame.a \ src/input/libinput.a \ Index: gltron-0.70final/lua/src/lib/Makefile.am =================================================================== --- gltron-0.70final.orig/lua/src/lib/Makefile.am +++ gltron-0.70final/lua/src/lib/Makefile.am @@ -1,9 +1,6 @@ noinst_LIBRARIES=liblualib.a -DEFS= -CPPFLAGS= -CFLAGS=-ansi -pedantic -Wall -I$(srcdir)/.. -I$(top_srcdir)/lua/include -LDFLAGS= +AM_CFLAGS=-ansi -pedantic -Wall -I$(srcdir)/.. -I$(top_srcdir)/lua/include LIBS=-lm liblualib_a_SOURCES=lauxlib.c lbaselib.c ldblib.c liolib.c lmathlib.c lstrlib.c