Hello community, here is the log from the commit of package blockout for openSUSE:Factory checked in at 2012-11-16 13:35:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/blockout (Old) and /work/SRC/openSUSE:Factory/.blockout.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blockout", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-10-22 00:44:18.403455820 +0200 +++ /work/SRC/openSUSE:Factory/.blockout.new/blockout.changes 2012-11-16 13:35:33.000000000 +0100 @@ -0,0 +1,4 @@ +------------------------------------------------------------------- +Sun Mar 25 14:18:38 UTC 2012 - [email protected] + +- Initial package for build.opensuse.org New: ---- automake.diff bl24-src-linux-i586.tar.xz bl2home.diff blockout.changes blockout.spec compilefixes.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ blockout.spec ++++++ # # spec file for package blockout # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: blockout Version: 2.4 Release: 0 Summary: A free clone of the original BlockOut DOS game License: GPL-2.0 Group: Productivity/Networking/System Url: http://blockout.net/ Source: bl24-src-linux-i586.tar.xz Patch1: automake.diff Patch2: compilefixes.diff Patch3: bl2home.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: xz BuildRequires: pkgconfig(SDL_mixer) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(sdl) %description BlockOut II is a free adaptation of the original BlockOut DOS game edited by California Dreams in 1989. BlockOut II has the same features than the original game with few graphic improvements. The game has been designed to reproduce the original game kinematics as accurately as possible. %prep %setup -qn bl24_lin_src %patch -P 1 -P 2 -P 3 -p1 %build autoreconf -fi %configure make %{?_smp_mflags} %install make install DESTDIR="%buildroot"; %files %defattr(-,root,root) %_bindir/blockout %_datadir/%name %changelog ++++++ automake.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2012-03-25 16:12:52.925160061 +0200 --- BlockOut/Makefile.am | 14 ++++++++++++++ ImageLib/src/Makefile.am | 12 ++++++++++++ ImageLib/src/png/hpng.c | 2 +- Makefile.am | 3 +++ configure.ac | 14 ++++++++++++++ 5 files changed, 44 insertions(+), 1 deletion(-) Index: bl24_lin_src/BlockOut/Makefile.am =================================================================== --- /dev/null +++ bl24_lin_src/BlockOut/Makefile.am @@ -0,0 +1,14 @@ +# -*- Makefile -*- + +AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \ + ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS} + +bin_PROGRAMS = blockout +blockout_SOURCES = \ + BlockOut.cpp BotPlayer.cpp EditControl.cpp Game.cpp Http.cpp InitPolyCube.cpp Menu.cpp MenuGraphics.cpp MenuGrid.cpp PageChangeSetup.cpp PageChooseSetup.cpp PageControls.cpp PageCredits.cpp PageGSOptions.cpp PageHallOfFame.cpp PageHallOfFameOnLine.cpp PageHttp.cpp PageMainMenu.cpp PageOptions.cpp PageScoreDetails.cpp PageStartGame.cpp Pit.cpp PolyCube.cpp SetupManager.cpp SoundManager.cpp Sprites.cpp Utils.cpp BlockOut.h BotPlayer.h EditControl.h Game.h Http.h Menu.h MenuGrid.h MenuPage.h Pit.h PolyCube.h SetupManager.h SoundManager.h Sprites.h Types.h GLApp/GLApp.cpp GLApp/GLFont.cpp GLApp/GLMatrix.cpp GLApp/GLSprite.cpp GLApp/GLApp.h GLApp/GLFont.h GLApp/GLMatrix.h GLApp/GLSprite.h +blockout_LDADD = \ + ../ImageLib/src/libimagelib.la \ + ${libGL_LIBS} ${libGLU_LIBS} ${libSDL_LIBS} ${libSDL_mixer_LIBS} + +nobase_pkgdata_DATA = \ + images/allPieces.png images/background.png images/background2.png images/background3.png images/font.png images/gameover.png images/gameovera.png images/marble.png images/marbleg.png images/menuback.png images/menucredits.png images/menufont.png images/menufont2.png images/menupit.png images/online.png images/onlinea.png images/spark.png images/sparka.png images/sprites.png images/spritesa.png images/star_crystal_grid.png sounds/blub.wav sounds/empty.wav sounds/empty2.wav sounds/hit.wav sounds/level.wav sounds/level2.wav sounds/line.wav sounds/line2.wav sounds/music.mp3 sounds/tchh.wav sounds/welldone.wav sounds/welldone2.wav sounds/wozz.wav Index: bl24_lin_src/ImageLib/src/Makefile.am =================================================================== --- /dev/null +++ bl24_lin_src/ImageLib/src/Makefile.am @@ -0,0 +1,12 @@ +# -*- Makefile -*- + +AM_CPPFLAGS = -I. ${libpng_CFLAGS} + +noinst_LTLIBRARIES = libimagelib.la + +libimagelib_la_SOURCES = \ + gif/gif.c gif/gif.h \ + jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp jpg/jpegdecoder.h jpg/main.h \ + png/hpng.c png/hpng.h \ + CImage.cpp CImage.h +libimagelib_la_LIBADD = ${libpng_LIBS} Index: bl24_lin_src/ImageLib/src/png/hpng.c =================================================================== --- bl24_lin_src.orig/ImageLib/src/png/hpng.c +++ bl24_lin_src/ImageLib/src/png/hpng.c @@ -1,6 +1,6 @@ #include <malloc.h> #include <math.h> -#include "png/png.h" +#include <png.h> #include "hpng.h" char PngErrorMessage[1024]; Index: bl24_lin_src/Makefile.am =================================================================== --- /dev/null +++ bl24_lin_src/Makefile.am @@ -0,0 +1,3 @@ +# -*- Makefile -*- + +SUBDIRS = ImageLib/src BlockOut Index: bl24_lin_src/configure.ac =================================================================== --- /dev/null +++ bl24_lin_src/configure.ac @@ -0,0 +1,14 @@ +AC_INIT([blockout], [2.4]) +AC_CONFIG_AUX_DIR([build-aux]) +AM_INIT_AUTOMAKE([-Wall foreign subdir-objects tar-pax no-dist-gzip dist-xz]) +LT_INIT +AC_PROG_CXX +PKG_CHECK_MODULES([libGL], [gl]) +PKG_CHECK_MODULES([libGLU], [glu]) +PKG_CHECK_MODULES([libSDL], [sdl >= 1.2.12]) +PKG_CHECK_MODULES([libSDL_mixer], [SDL_mixer >= 1.2.8]) +PKG_CHECK_MODULES([libpng], [libpng15], [:], [ + PKG_CHECK_MODULES([libpng], [libpng14]) +]) +AC_CONFIG_FILES([Makefile ImageLib/src/Makefile BlockOut/Makefile]) +AC_OUTPUT ++++++ bl2home.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2012-03-25 16:17:03.379573514 +0200 --- BlockOut/Makefile.am | 1 + BlockOut/Utils.cpp | 2 ++ 2 files changed, 3 insertions(+) Index: bl24_lin_src/BlockOut/Makefile.am =================================================================== --- bl24_lin_src.orig/BlockOut/Makefile.am +++ bl24_lin_src/BlockOut/Makefile.am @@ -1,6 +1,7 @@ # -*- Makefile -*- AM_CPPFLAGS = -D_DEBUG -Dlinux -I../ImageLib/src -I. \ + -DBL2_HOME=\"${pkgdatadir}\" \ ${libSDL_CFLAGS} ${libSDL_mixer_CFLAGS} bin_PROGRAMS = blockout Index: bl24_lin_src/BlockOut/Utils.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/Utils.cpp +++ bl24_lin_src/BlockOut/Utils.cpp @@ -163,6 +163,8 @@ BOOL CheckEnv() { } char *blockoutHome = getenv("BL2_HOME"); + if (blockoutHome == NULL) + blockoutHome = BL2_HOME; if( blockoutHome==NULL ) { printf("BL2_HOME environement variable if not defined !\n"); printf("Please set the BL2_HOME to the BlockOut II installation directory (ex: BL2_HOME=/usr/local/bl2).\n"); ++++++ compilefixes.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2012-03-25 16:06:07.551725021 +0200 --- BlockOut/EditControl.cpp | 2 +- BlockOut/EditControl.h | 2 +- BlockOut/GLApp/GLApp.h | 2 +- BlockOut/GLApp/GLFont.cpp | 3 +-- BlockOut/GLApp/GLSprite.cpp | 4 ++-- BlockOut/GLApp/GLSprite.h | 2 +- BlockOut/Menu.h | 4 ++-- BlockOut/MenuGraphics.cpp | 4 ++-- BlockOut/SetupManager.cpp | 2 +- BlockOut/SetupManager.h | 2 +- BlockOut/Types.h | 6 +++--- BlockOut/Utils.cpp | 6 +++--- ImageLib/src/jpg/jpegdecoder.cpp | 6 +++--- ImageLib/src/png/hpng.c | 6 +----- 14 files changed, 23 insertions(+), 28 deletions(-) Index: bl24_lin_src/BlockOut/EditControl.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/EditControl.cpp +++ bl24_lin_src/BlockOut/EditControl.cpp @@ -30,7 +30,7 @@ void EditControl::SetDisplayLength(int l // ------------------------------------------------ -void EditControl::SetMode(char *text,BOOL edit,BYTE *keys) { +void EditControl::SetMode(const char *text,BOOL edit,BYTE *keys) { if( strlen(text)>=255 ) { strncpy(editText,text,255); Index: bl24_lin_src/BlockOut/EditControl.h =================================================================== --- bl24_lin_src.orig/BlockOut/EditControl.h +++ bl24_lin_src/BlockOut/EditControl.h @@ -27,7 +27,7 @@ class EditControl { void SetDisplayLength(int length); // Set edit control mode (keys can be NULL) - void SetMode(char *text,BOOL edit,BYTE *keys); + void SetMode(const char *text,BOOL edit,BYTE *keys); // Get the mode BOOL GetMode(); Index: bl24_lin_src/BlockOut/GLApp/GLApp.h =================================================================== --- bl24_lin_src.orig/BlockOut/GLApp/GLApp.h +++ bl24_lin_src/BlockOut/GLApp/GLApp.h @@ -57,7 +57,7 @@ protected: // Internal variables for the state of the app BOOL m_bWindowed; - char* m_strWindowTitle; + const char *m_strWindowTitle; int m_screenWidth; int m_screenHeight; Index: bl24_lin_src/BlockOut/GLApp/GLFont.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/GLApp/GLFont.cpp +++ bl24_lin_src/BlockOut/GLApp/GLFont.cpp @@ -6,8 +6,7 @@ #include <malloc.h> #include <stdio.h> #include <string.h> - -extern char *LID(char *fileName); +#include "../Types.h" // ------------------------------------------- Index: bl24_lin_src/BlockOut/GLApp/GLSprite.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/GLApp/GLSprite.cpp +++ bl24_lin_src/BlockOut/GLApp/GLSprite.cpp @@ -6,8 +6,8 @@ #include <malloc.h> #include <stdio.h> #include <string.h> +#include "../Types.h" -extern char *LID(char *fileName); // ------------------------------------------- @@ -53,7 +53,7 @@ void Sprite2D::UpdateSprite(int x1,int y // ------------------------------------------- -int Sprite2D::RestoreDeviceObjects(char *diffName,char *alphaName,int scrWidth,int scrHeight) { +int Sprite2D::RestoreDeviceObjects(const char *diffName, const char *alphaName,int scrWidth,int scrHeight) { GLint bpp; GLenum format; Index: bl24_lin_src/BlockOut/GLApp/GLSprite.h =================================================================== --- bl24_lin_src.orig/BlockOut/GLApp/GLSprite.h +++ bl24_lin_src/BlockOut/GLApp/GLSprite.h @@ -15,7 +15,7 @@ public: // Initialise the font // return 1 when success, 0 otherwise - int RestoreDeviceObjects(char *diffName,char *alphaName,int srcWidth,int scrHeight); + int RestoreDeviceObjects(const char *diffName, const char *alphaName,int srcWidth,int scrHeight); // Update sprite mapping and coordinates void UpdateSprite(int x1,int y1,int x2,int y2); Index: bl24_lin_src/BlockOut/Menu.h =================================================================== --- bl24_lin_src.orig/BlockOut/Menu.h +++ bl24_lin_src/BlockOut/Menu.h @@ -60,8 +60,8 @@ class Menu { // Menu page void ToPage(MenuPage *page); void ToPage(MenuPage *page,int iParam,void *wParam); - void RenderText(int x,int y,BOOL selected,char *text); - void RenderTitle(char *title); + void RenderText(int x,int y,BOOL selected, const char *text); + void RenderTitle(const char *title); PageMainMenu mainMenuPage; PageStartGame startGamePage; Index: bl24_lin_src/BlockOut/MenuGraphics.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/MenuGraphics.cpp +++ bl24_lin_src/BlockOut/MenuGraphics.cpp @@ -438,7 +438,7 @@ void Menu::RenderChar(int x,int y,int w, // --------------------------------------------------------------------- -void Menu::RenderTitle(char *title) { +void Menu::RenderTitle(const char *title) { int lgth = strlen(title); int nwFont = fround((float)wFont*1.1f); @@ -454,7 +454,7 @@ void Menu::RenderTitle(char *title) { // --------------------------------------------------------------------- -void Menu::RenderText(int x,int y,BOOL selected,char *text) { +void Menu::RenderText(int x,int y,BOOL selected, const char *text) { float startLine = 0.515f; float startColumn = 0.15f; Index: bl24_lin_src/BlockOut/SetupManager.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/SetupManager.cpp +++ bl24_lin_src/BlockOut/SetupManager.cpp @@ -363,7 +363,7 @@ int SetupManager::GetTimeout() { // ------------------------------------------------ -char *SetupManager::GetName() { +const char *SetupManager::GetName() { static char ret[32]; strcpy(ret,""); Index: bl24_lin_src/BlockOut/SetupManager.h =================================================================== --- bl24_lin_src.orig/BlockOut/SetupManager.h +++ bl24_lin_src/BlockOut/SetupManager.h @@ -49,7 +49,7 @@ class SetupManager { float GetAnimationTime(); /* in seconds */ // Names - char *GetName(); + const char *GetName(); const char *GetBlockSetName(); // Sound Index: bl24_lin_src/BlockOut/Types.h =================================================================== --- bl24_lin_src.orig/BlockOut/Types.h +++ bl24_lin_src/BlockOut/Types.h @@ -160,13 +160,13 @@ extern int fround(float x); extern char *FormatTime(float seconds); extern char *FormatDate(int time); extern char *FormatDateShort(int time); -extern int CreateTexture(int width,int height,char *imgName,GLuint *hmap); +extern int CreateTexture(int width,int height, const char *imgName,GLuint *hmap); extern char GetChar(BYTE *keys); extern void ZeroMemory(void *buff,int size); extern BOOL DirExists(char *dirname); extern BOOL CheckEnv(); -extern char *LID(char *fileName); -extern char *LHD(char *fileName); +extern char *LID(const char *fileName); +extern char *LHD(const char *fileName); #endif /* TYPESH */ Index: bl24_lin_src/BlockOut/Utils.cpp =================================================================== --- bl24_lin_src.orig/BlockOut/Utils.cpp +++ bl24_lin_src/BlockOut/Utils.cpp @@ -191,7 +191,7 @@ BOOL CheckEnv() { // Name: LID() // Desc: Locate file in the installation directory //----------------------------------------------------------------------------- -char *LID(char *fileName) { +char *LID(const char *fileName) { static char ret[512]; sprintf(ret,"%s/%s",bl2Home,fileName); @@ -203,7 +203,7 @@ char *LID(char *fileName) { // Name: LHD() // Desc: Locate file in the home directory //----------------------------------------------------------------------------- -char *LHD(char *fileName) { +char *LHD(const char *fileName) { static char ret[512]; sprintf(ret,"%s/%s",usrHome,fileName); @@ -217,7 +217,7 @@ char *LHD(char *fileName) { // Name: CreateTexture() // Desc: Create a texture (no alpha) //----------------------------------------------------------------------------- -int CreateTexture(int width,int height,char *imgName,GLuint *hmap) { +int CreateTexture(int width,int height, const char *imgName,GLuint *hmap) { *hmap = 0; CImage img; Index: bl24_lin_src/ImageLib/src/jpg/jpegdecoder.cpp =================================================================== --- bl24_lin_src.orig/ImageLib/src/jpg/jpegdecoder.cpp +++ bl24_lin_src/ImageLib/src/jpg/jpegdecoder.cpp @@ -106,7 +106,7 @@ void *jpeg_decoder::alloc(int n) blocks[i] = q; // Round to qword boundry, to avoid misaligned accesses with MMX code - return ((void *)(((uint)q + 7) & ~7)); + return ((void *)(((unsigned long)q + 7) & ~7)); } //------------------------------------------------------------------------------ // Clear buffer to word values. @@ -1884,7 +1884,7 @@ void jpeg_decoder::init_frame(void) q = (uchar *)alloc(max_blocks_per_row * 64 * sizeof(BLOCK_TYPE) + 8); // Align to 8-byte boundry, for MMX code - q = (uchar *)(((uint)q + 7) & ~7); + q = (uchar *)(((unsigned long)q + 7) & ~7); // The block_seg[] array's name dates back to the // 16-bit assembler implementation. "seg" stood for "segment". @@ -1894,7 +1894,7 @@ void jpeg_decoder::init_frame(void) for (i = 0; i < max_blocks_per_row; i++) block_max_zag_set[i] = 64; - Psample_buf = (uchar *)(((uint)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7); + Psample_buf = (uchar *)(((unsigned long)alloc(max_blocks_per_row * 64 + 8) + 7) & ~7); total_lines_left = image_y_size; Index: bl24_lin_src/ImageLib/src/png/hpng.c =================================================================== --- bl24_lin_src.orig/ImageLib/src/png/hpng.c +++ bl24_lin_src/ImageLib/src/png/hpng.c @@ -45,10 +45,6 @@ int LoadPngImage(PNG_IMAGE *d) { // ---------------- Error handling png_set_error_fn(png,NULL,my_png_error,NULL); - if (setjmp(png->jmpbuf)) { - png_destroy_read_struct(&png, &info, &endinfo); - return 0; - } // ----------------- Read the image @@ -154,7 +150,7 @@ char *WritePngImage(char *file_name,unsi { sprintf(PngErrorMessage,"png_create_info_struct() failed"); fclose(fp); - png_destroy_write_struct(&png_ptr, png_infopp_NULL); + png_destroy_write_struct(&png_ptr, NULL); return PngErrorMessage; } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
