jengelh/blockout
SHA256
1
0
Fork 0
forked from pool/blockout
Code Pull Requests Activity

Accepting request 157778 from games

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/157778
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/blockout?expand=0&rev=3
This commit is contained in:
Stephan Kulow 2013-03-08 08:07:53 +00:00 committed by Git OBS Bridge
commit 2ac2fb3ce0
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
automake.diff
View File

@ -69,7 +69,7 @@ Index: bl24_lin_src/configure.ac
===================================================================
--- /dev/null
+++ bl24_lin_src/configure.ac
@@ -0,0 +1,14 @@
@@ -0,0 +1,12 @@
+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])
@ -79,8 +79,6 @@ Index: bl24_lin_src/configure.ac
+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])
+])
+PKG_CHECK_MODULES([libpng], [libpng])
+AC_CONFIG_FILES([Makefile ImageLib/src/Makefile BlockOut/Makefile])
+AC_OUTPUT

13
blockout.changes
View File

@ -1,3 +1,16 @@
-------------------------------------------------------------------
Tue Feb 19 14:04:20 UTC 2013 - reddwarf@opensuse.org
- build also against libpng14
* modified automake.diff (look for libpng)
-------------------------------------------------------------------
Tue Feb 19 08:36:08 UTC 2013 - pgajdos@suse.com
- build also against libpng16
* modified compilefixes.diff (#include <string.h> in hpng.c)
* modified automake.diff (look for libpng16 and then for libpng15)
-------------------------------------------------------------------
Sun Mar 25 14:18:38 UTC 2012 - jengelh@medozas.de

2
blockout.spec
View File

@ -1,7 +1,7 @@
#
# spec file for package blockout
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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

12
compilefixes.diff
View File

@ -257,7 +257,15 @@ 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) {
@@ -1,6 +1,7 @@
#include <malloc.h>
#include <math.h>
#include <png.h>
+#include <string.h>
#include "hpng.h"
char PngErrorMessage[1024];
@@ -45,10 +46,6 @@ int LoadPngImage(PNG_IMAGE *d) {
// ---------------- Error handling
png_set_error_fn(png,NULL,my_png_error,NULL);
@ -268,7 +276,7 @@ Index: bl24_lin_src/ImageLib/src/png/hpng.c
// ----------------- Read the image
@@ -154,7 +150,7 @@ char *WritePngImage(char *file_name,unsi
@@ -154,7 +151,7 @@ char *WritePngImage(char *file_name,unsi
{
sprintf(PngErrorMessage,"png_create_info_struct() failed");
fclose(fp);