[BlockOutII] New upstream release 2.5
Hans de Goede
jwrdegoede at fedoraproject.org
Mon Oct 27 13:23:43 UTC 2014
commit dcd18d3214ce1ca2ac5a56742e88701c9521227c
Author: Hans de Goede <hdegoede at redhat.com>
Date: Mon Oct 27 14:23:37 2014 +0100
New upstream release 2.5
- Include a larger (128x128) icon (rhbz#1157498)
.gitignore | 2 +
BlockOutII-2.3-64bit.patch | 30 --------------
BlockOutII-2.3-bl2Home.patch | 28 +++++++-------
BlockOutII-2.3-format-security.patch | 25 ++++++++---
BlockOutII-2.3-libpng15.patch | 2 +-
BlockOutII-2.3-localtime-null.patch | 47 ----------------------
BlockOutII-2.3-music.patch | 12 ------
BlockOutII-2.3-restore-resolution.patch | 44 ++++++++------------
BlockOutII-2.3-syslibs.patch | 4 +-
BlockOutII.png | Bin 313 -> 22179 bytes
BlockOutII.spec | 65 +++++++++++++++----------------
sources | 5 +-
12 files changed, 88 insertions(+), 176 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e243091..8633fe5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ BlockOutII-2.3.tar.bz2
/bl24-src-linux-i586.tar.gz
/music.ogg
/README.txt
+/bl25-src.tar.gz
+/bl25-linux-x86.tar.gz
diff --git a/BlockOutII-2.3-bl2Home.patch b/BlockOutII-2.3-bl2Home.patch
index 4901606..ac59306 100644
--- a/BlockOutII-2.3-bl2Home.patch
+++ b/BlockOutII-2.3-bl2Home.patch
@@ -2,17 +2,17 @@ diff -up BlockOutII-2.3/BlockOut_GL/Utils.cpp~ BlockOutII-2.3/BlockOut_GL/Utils.
--- BlockOutII-2.3/BlockOut/Utils.cpp~ 2007-11-25 23:01:12.000000000 +0100
+++ BlockOutII-2.3/BlockOut/Utils.cpp 2007-11-25 23:01:12.000000000 +0100
@@ -162,13 +162,7 @@ BOOL CheckEnv() {
- return FALSE;
- }
-
-- char *blockoutHome = getenv("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");
-- return FALSE;
-- }
-- strcpy( bl2Home , blockoutHome );
-+ strcpy( bl2Home , "/usr/share/BlockOutII" );
-
- char bl2Dir[512];
- sprintf(bl2Dir,"%s/.bl2",homePath);
+ return FALSE;
+ }
+
+- char *blockoutHome = getenv("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");
+- return FALSE;
+- }
+- strcpy( bl2Home , blockoutHome );
++ strcpy( bl2Home , "/usr/share/BlockOutII" );
+
+ char bl2Dir[512];
+ sprintf(bl2Dir,"%s/.bl2",homePath);
diff --git a/BlockOutII-2.3-format-security.patch b/BlockOutII-2.3-format-security.patch
index e8c8e7d..239aebf 100644
--- a/BlockOutII-2.3-format-security.patch
+++ b/BlockOutII-2.3-format-security.patch
@@ -1,13 +1,24 @@
-diff --git a/BlockOut/PageHallOfFameOnLine.cpp b/BlockOut/PageHallOfFameOnLine.cpp
-index a91ed50..af6e2c9 100644
---- a/BlockOut/PageHallOfFameOnLine.cpp
-+++ b/BlockOut/PageHallOfFameOnLine.cpp
-@@ -60,7 +60,7 @@ void PageHallOfFameOnLine::DownloadScore() {
+diff -up BL_SRC/BlockOut/GLApp/GLApp.cpp~ BL_SRC/BlockOut/GLApp/GLApp.cpp
+--- BL_SRC/BlockOut/GLApp/GLApp.cpp~ 2014-10-27 13:40:46.000000000 +0100
++++ BL_SRC/BlockOut/GLApp/GLApp.cpp 2014-10-27 13:49:14.518436819 +0100
+@@ -274,7 +274,7 @@ void GLApplication::printGlError() {
+ #ifdef WINDOWS
+ MessageBox(NULL, message, "Error", MB_OK | MB_ICONERROR);
+ #else
+- printf(message);
++ printf("%s\n", message);
+ #endif
+
+ }
+diff -up BL_SRC/BlockOut/PageHallOfFameOnLine.cpp~ BL_SRC/BlockOut/PageHallOfFameOnLine.cpp
+--- BL_SRC/BlockOut/PageHallOfFameOnLine.cpp~ 2014-05-06 11:47:54.000000000 +0200
++++ BL_SRC/BlockOut/PageHallOfFameOnLine.cpp 2014-10-27 13:51:51.157271001 +0100
+@@ -60,7 +59,7 @@ void PageHallOfFameOnLine::DownloadScore
if( page==NULL ) {
downloadState = -1;
-- sprintf(errMsg,mParent->GetHttp()->GetError());
-+ sprintf(errMsg,"%s",mParent->GetHttp()->GetError());
+- strcpy(errMsg,mParent->GetHttp()->GetError());
++ snprintf(errMsg, sizeof(errMsg), "%s", mParent->GetHttp()->GetError());
} else {
diff --git a/BlockOutII-2.3-libpng15.patch b/BlockOutII-2.3-libpng15.patch
index 0524716..8693dee 100644
--- a/BlockOutII-2.3-libpng15.patch
+++ b/BlockOutII-2.3-libpng15.patch
@@ -15,7 +15,7 @@ diff -up BlockOutII-2.3/contrib/ImageLib/src/png/hpng.c~ BlockOutII-2.3/contrib/
sprintf(PngErrorMessage,"png_create_info_struct() failed");
fclose(fp);
- png_destroy_write_struct(&png_ptr, png_infopp_NULL);
-+ png_destroy_write_struct(&png_ptr, info_ptr);
++ png_destroy_write_struct(&png_ptr, &info_ptr);
return PngErrorMessage;
}
diff --git a/BlockOutII-2.3-restore-resolution.patch b/BlockOutII-2.3-restore-resolution.patch
index d554d02..5ebda2b 100644
--- a/BlockOutII-2.3-restore-resolution.patch
+++ b/BlockOutII-2.3-restore-resolution.patch
@@ -1,7 +1,7 @@
-diff -up BlockOutII-2.3/BlockOut_GL/GLApp/GLApp.cpp.fs BlockOutII-2.3/BlockOut_GL/GLApp/GLApp.cpp
---- BlockOutII-2.3/BlockOut/GLApp/GLApp.cpp.fs 2007-08-02 15:44:10.000000000 +0200
-+++ BlockOutII-2.3/BlockOut/GLApp/GLApp.cpp 2007-11-30 20:46:53.000000000 +0100
-@@ -20,30 +20,8 @@ GLApplication::GLApplication() {
+diff -up BL_SRC/BlockOut/GLApp/GLApp.cpp~ BL_SRC/BlockOut/GLApp/GLApp.cpp
+--- BL_SRC/BlockOut/GLApp/GLApp.cpp~ 2014-05-06 11:47:55.000000000 +0200
++++ BL_SRC/BlockOut/GLApp/GLApp.cpp 2014-10-27 13:26:09.726477105 +0100
+@@ -63,22 +63,8 @@ int GLApplication::SetVideoMode() {
int GLApplication::ToggleFullscreen() {
@@ -11,42 +11,34 @@ diff -up BlockOutII-2.3/BlockOut_GL/GLApp/GLApp.cpp.fs BlockOutII-2.3/BlockOut_G
-
- m_bWindowed = !m_bWindowed;
-
-- Uint32 flags;
-- if( m_bWindowed ) flags = SDL_OPENGL;
-- else flags = SDL_OPENGL | SDL_FULLSCREEN;
--
-- if( SDL_SetVideoMode( m_screenWidth, m_screenHeight, 0, flags ) == NULL )
-- {
-- printf("SDL_SetVideoMode() failed.\n");
-- return GL_FAIL;
-- }
+- if( !SetVideoMode() ) return GL_FAIL;
-
- SDL_Surface *vSurf = SDL_GetVideoSurface();
- m_bitsPerPixel = vSurf->format->BitsPerPixel;
-
- errCode = RestoreDeviceObjects();
-- if( !errCode ) {
-- printGlError();
-- exit(1);
-- }
+- if( !errCode ) {
+- printGlError();
+- exit(1);
+- }
+ if (SDL_WM_ToggleFullScreen(SDL_GetVideoSurface()))
+ m_bWindowed = !m_bWindowed;
return GL_OK;
-@@ -69,6 +47,8 @@ int GLApplication::Create(int width, int
- printf("SDL_Init() failed : %s\n" , SDL_GetError() );
- return GL_FAIL;
+@@ -114,6 +100,8 @@ int GLApplication::Create(int width, int
+ return GL_FAIL;
}
-+
+
+ atexit(SDL_Quit);
++
+ SDL_WM_SetCaption(m_strWindowTitle, NULL);
//SDL_GL_SetAttribute(SDL_GL_SWAP_CONTROL, 0);
- SDL_EnableUNICODE( 1 );
-diff -up bl24_lin_src/BlockOut/BlockOut.cpp~ bl24_lin_src/BlockOut/BlockOut.cpp
---- bl24_lin_src/BlockOut/BlockOut.cpp~ 2008-01-09 19:29:06.000000000 +0100
-+++ bl24_lin_src/BlockOut/BlockOut.cpp 2011-12-14 11:28:44.430028964 +0100
-@@ -128,12 +128,7 @@ int BlockOut::FrameMove()
+diff -up BL_SRC/BlockOut/BlockOut.cpp~ BL_SRC/BlockOut/BlockOut.cpp
+--- BL_SRC/BlockOut/BlockOut.cpp~ 2014-05-06 11:47:54.000000000 +0200
++++ BL_SRC/BlockOut/BlockOut.cpp 2014-10-27 13:23:44.333304949 +0100
+@@ -145,12 +145,7 @@ int BlockOut::FrameMove()
break;
case 100: // Exit
InvalidateDeviceObjects();
diff --git a/BlockOutII-2.3-syslibs.patch b/BlockOutII-2.3-syslibs.patch
index 128e7d6..3085914 100644
--- a/BlockOutII-2.3-syslibs.patch
+++ b/BlockOutII-2.3-syslibs.patch
@@ -5,7 +5,7 @@ diff -up BlockOutII-2.3/contrib/ImageLib/src/Makefile~ BlockOutII-2.3/contrib/Im
# All source files needed for the library
#
--SRC = gif/gif.c CImage.cpp png/zlib/adler32.c png/zlib/compress.c \
+-SRC = gif/gif.cpp CImage.cpp png/zlib/adler32.c png/zlib/compress.c \
- png/zlib/crc32.c png/zlib/deflate.c png/zlib/gzio.c png/zlib/infback.c \
- png/zlib/inffast.c png/zlib/inflate.c png/zlib/inftrees.c png/zlib/trees.c \
- png/zlib/uncompr.c png/zlib/zutil.c png/png/png.c png/png/pngerror.c \
@@ -13,7 +13,7 @@ diff -up BlockOutII-2.3/contrib/ImageLib/src/Makefile~ BlockOutII-2.3/contrib/Im
- png/png/pngread.c png/png/pngrio.c png/png/pngrtran.c png/png/pngrutil.c \
- png/png/pngset.c png/png/pngtrans.c png/png/pngvcrd.c png/png/pngwio.c \
- png/png/pngwrite.c png/png/pngwtran.c png/png/pngwutil.c png/hpng.c \
-+SRC = gif/gif.c CImage.cpp png/hpng.c \
++SRC = gif/gif.cpp CImage.cpp png/hpng.c \
jpg/H2v2.cpp jpg/idct.cpp jpg/jpegdecoder.cpp jpg/jpegdecodermain.cpp
diff --git a/BlockOutII.png b/BlockOutII.png
index 58b0bc2..a4555ea 100644
Binary files a/BlockOutII.png and b/BlockOutII.png differ
diff --git a/BlockOutII.spec b/BlockOutII.spec
index 4e655d9..d6b64fb 100644
--- a/BlockOutII.spec
+++ b/BlockOutII.spec
@@ -4,29 +4,22 @@
# package are under the same license as the package itself.
Name: BlockOutII
-Version: 2.4
-Release: 10%{?dist}
+Version: 2.5
+Release: 1%{?dist}
Summary: A free adaptation of the original BlockOut DOS game
Group: Amusements/Games
License: GPLv2+
URL: http://www.blockout.net/blockout2/
-Source0: http://downloads.sourceforge.net/blockout/bl24-src-linux-i586.tar.gz
-# From: http://downloads.sourceforge.net/blockout/bl24-bin-linux-i586.tar.gz
-Source1: README.txt
-# This is music.mp3 from Source0 converted to ogg format using mp32ogg
-Source2: music.ogg
-Source3: %{name}.desktop
-Source4: %{name}.png
+Source0: http://downloads.sourceforge.net/blockout/bl25-src.tar.gz
+Source1: http://downloads.sourceforge.net/blockout/bl25-linux-x86.tar.gz
+Source2: %{name}.desktop
+Source3: %{name}.png
Patch0: BlockOutII-2.3-syslibs.patch
-Patch1: BlockOutII-2.3-64bit.patch
-Patch2: BlockOutII-2.3-bl2Home.patch
-Patch3: BlockOutII-2.3-music.patch
-Patch4: BlockOutII-2.3-restore-resolution.patch
-Patch5: BlockOutII-2.3-libpng15.patch
+Patch1: BlockOutII-2.3-bl2Home.patch
+Patch2: BlockOutII-2.3-restore-resolution.patch
+Patch3: BlockOutII-2.3-libpng15.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1037001
-Patch6: BlockOutII-2.3-format-security.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=1154305
-Patch7: BlockOutII-2.3-localtime-null.patch
+Patch4: BlockOutII-2.3-format-security.patch
BuildRequires: SDL_mixer-devel libpng-devel desktop-file-utils
Requires: hicolor-icon-theme opengl-games-utils
@@ -44,26 +37,22 @@ used by permission for the BlockOut II application by Jean-Luc
Pons.
%prep
-%setup -q -n bl24_lin_src
+%setup -q -n BL_SRC -a 1
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# Convert the README and put it somewhere we can use it from %%doc
-iconv -f ISO8859-1 -t UTF8 %{SOURCE1} > t; mv t BlockOut/README.txt
-touch -r %{SOURCE1} BlockOut/README.txt
+iconv -f ISO8859-1 -t UTF8 BlockOut/README.txt > t;
+sed -i 's/\r//' t
+touch -r BlockOut/README.txt t
+mv t BlockOut/README.txt
# Remove bundled png library
rm -r ImageLib/src/png/png ImageLib/src/png/zlib
-# Replace music.mp3 with music.ogg
-rm BlockOut/sounds/music.mp3
-cp -a %{SOURCE2} BlockOut/sounds
%build
pushd ImageLib/src
@@ -74,9 +63,10 @@ popd
pushd BlockOut
make %{?_smp_mflags} \
CXXFLAGS="$RPM_OPT_FLAGS -Dlinux `sdl-config --cflags` -I../ImageLib/src -c" \
- LIBS="-L../ImageLib/src -lpng -lz"
+ ADD_LIBS="-L../ImageLib/src -limagelib -lpng -lz"
popd
+
%install
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/images
@@ -84,14 +74,15 @@ mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
install -m 755 BlockOut/blockout $RPM_BUILD_ROOT%{_bindir}/%{name}
ln -s opengl-game-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/%{name}-wrapper
-install -p -m 644 BlockOut/images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
-install -p -m 644 BlockOut/sounds/* $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
+install -p -m 644 blockout/images/* $RPM_BUILD_ROOT%{_datadir}/%{name}/images
+install -p -m 644 blockout/sounds/* $RPM_BUILD_ROOT%{_datadir}/%{name}/sounds
mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE3}
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
-install -p -m 644 %{SOURCE4} \
- $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/32x32/apps
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications %{SOURCE2}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+install -p -m 644 %{SOURCE3} \
+ $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/128x128/apps
+
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
@@ -105,14 +96,20 @@ fi
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
%files
%doc BlockOut/README.txt
%{_bindir}/%{name}*
%{_datadir}/%{name}
%{_datadir}/applications/%{name}.desktop
-%{_datadir}/icons/hicolor/32x32/apps/%{name}.png
+%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
+
%changelog
+* Mon Oct 27 2014 Hans de Goede <hdegoede at redhat.com> - 2.5-1
+- New upstream release 2.5
+- Include a larger (128x128) icon (rhbz#1157498)
+
* Wed Oct 22 2014 Hans de Goede <hdegoede at redhat.com> - 2.4-10
- Fix crash when showing the highscore screen (rhbz#1154305)
diff --git a/sources b/sources
index 302b88a..cc8f313 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-40f899491c38edfbbd984ba732417d7d bl24-src-linux-i586.tar.gz
-ca2e9c44ae209874b0168ab3d816d710 music.ogg
-d6cb81853ab99d65a9f4f4c9ceff9058 README.txt
+c68a6d6f1f42aa61dbce84b100f19351 bl25-src.tar.gz
+6e29242d76cd5bbf8caee62127f02e19 bl25-linux-x86.tar.gz
More information about the scm-commits
mailing list