Package: open-invaders Version: 0.3-3.2 Severity: normal Tags: patch Dear Maintainer,
open-invaders uses the macro ALLEGRO_LINUX, where ALLEGRO_UNIX should be used. ALLEGRO_LINUX specifies if the Linux console mode is available. Since we want to deactivate the console mode in the forthcoming Allegro 4.4 package, this will lead to a broken open-invaders package. Please include the attached patch in the package and forward it upstream. Once the allegro4.4 package is uploaded, open-invaders will also have to build-depend on liballegro4-dev instead of liballegro4.2-dev. Best regards, Tobias Hansen
Description: Don't use the ALLEGRO_LINUX macro This macro specifies if the Linux console mode is enabled, not if the platform is Linux. Use ALLEGRO_UNIX instead. Author: Tobias Hansen <[email protected]> --- a/headers/declare.h +++ b/headers/declare.h @@ -74,7 +74,7 @@ #define ENDING_SONG PACKAGE_DATA_DIR"/"PACKAGE"/endsong.mod" #define HISCORE_SONG PACKAGE_DATA_DIR"/"PACKAGE"/hiscore.mod" -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX #include "headers/pmask.h" #else #include "../include/pmask.h" --- a/src/collision.cc +++ b/src/collision.cc @@ -24,14 +24,14 @@ #include <allegro.h> -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX #include "config.h" #include "headers/pmask.h" #include "headers/declare.h" #include "headers/logic.h" #endif -#ifndef ALLEGRO_LINUX +#ifndef ALLEGRO_UNIX #include "../include/pmask.h" #include "../include/declare.h" #endif --- a/src/init.cc +++ b/src/init.cc @@ -176,7 +176,7 @@ ostringstream filepath; int checksum; - #ifndef ALLEGRO_LINUX + #ifndef ALLEGRO_UNIX filepath << "./data/hiscore.dat"; #else filepath << getenv("HOME") << "/.openinvaders/hiscore"; @@ -297,7 +297,7 @@ int checksum = (totalhiscore*239)-686; //simple, I know! - #ifndef ALLEGRO_LINUX + #ifndef ALLEGRO_UNIX filepath << "./data/hiscore.dat"; #else filepath << getenv("HOME") << "/.openinvaders"; @@ -330,7 +330,7 @@ { ostringstream filepath; - #ifndef ALLEGRO_LINUX + #ifndef ALLEGRO_UNIX filepath << "./data/config.dat"; #else filepath << getenv("HOME") << "/.openinvaders"; @@ -479,7 +479,7 @@ { ostringstream filepath; - #ifndef ALLEGRO_LINUX + #ifndef ALLEGRO_UNIX filepath << "./data/config.dat"; #else filepath << getenv("HOME") << "/.openinvaders"; @@ -625,7 +625,7 @@ loaded_graphic=load_bitmap(filenamebuffer.str().c_str(),NULL); -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX if(!loaded_graphic) { loaded_graphic=load_bitmap(defsymbol.c_str(), NULL); @@ -651,7 +651,7 @@ loaded_sound=load_wav(filenamebuffer.str().c_str()); -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX if(!loaded_sound) { loaded_sound=load_wav(defsymbol.c_str()); --- a/src/ending.cc +++ b/src/ending.cc @@ -187,7 +187,7 @@ endingsong=dumb_load_mod_quick("./data/endsong.mod"); - #ifdef ALLEGRO_LINUX + #ifdef ALLEGRO_UNIX if(!endingsong) { endingsong=dumb_load_mod_quick(ENDING_SONG); --- a/src/input.cc +++ b/src/input.cc @@ -55,11 +55,11 @@ int result; static bool keyreleased=true; - #ifdef ALLEGRO_LINUX + #ifdef ALLEGRO_UNIX string filepath=getenv("HOME"); #endif - #ifndef ALLEGRO_LINUX + #ifndef ALLEGRO_UNIX string filepath='.'; #endif --- a/src/interrupt.cc +++ b/src/interrupt.cc @@ -24,12 +24,12 @@ #include <allegro.h> -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX #include "config.h" #include "headers/declare.h" #endif -#ifndef ALLEGRO_LINUX +#ifndef ALLEGRO_UNIX #include "../include/declare.h" #endif --- a/src/intro.cc +++ b/src/intro.cc @@ -110,7 +110,7 @@ allegro=load_pcx("./data/allegro_logo.pcx", NULL); linuxlogo=load_pcx("./data/linux.pcx", NULL); -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX if(!jamyskis) { jamyskis=load_pcx(JAMYSKIS_LOGO, NULL); @@ -217,7 +217,7 @@ big_hiscore_font=load_font("./data/arcade_font_big.pcx",NULL,NULL); gamefont_trans=load_font("./data/arcade_font.pcx",NULL,NULL); -#ifdef ALLEGRO_LINUX +#ifdef ALLEGRO_UNIX if(!titlesong) { titlesong=dumb_load_mod_quick(TITLE_SONG);
