Hello community,
here is the log from the commit of package blockout for openSUSE:Factory checked in at 2013-03-08 09:07:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/blockout (Old)
and /work/SRC/openSUSE:Factory/.blockout.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "blockout", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/blockout/blockout.changes 2012-11-16 13:35:33.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.blockout.new/blockout.changes 2013-03-08 09:07:54.000000000 +0100
@@ -1,0 +2,13 @@
+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 in hpng.c)
+ * modified automake.diff (look for libpng16 and then for libpng15)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ blockout.spec ++++++
--- /var/tmp/diff_new_pack.qJmdiP/_old 2013-03-08 09:07:56.000000000 +0100
+++ /var/tmp/diff_new_pack.qJmdiP/_new 2013-03-08 09:07:56.000000000 +0100
@@ -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
++++++ automake.diff ++++++
--- /var/tmp/diff_new_pack.qJmdiP/_old 2013-03-08 09:07:56.000000000 +0100
+++ /var/tmp/diff_new_pack.qJmdiP/_new 2013-03-08 09:07:56.000000000 +0100
@@ -69,7 +69,7 @@
===================================================================
--- /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 @@
+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
++++++ compilefixes.diff ++++++
--- /var/tmp/diff_new_pack.qJmdiP/_old 2013-03-08 09:07:56.000000000 +0100
+++ /var/tmp/diff_new_pack.qJmdiP/_new 2013-03-08 09:07:56.000000000 +0100
@@ -257,7 +257,15 @@
===================================================================
--- 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
+ #include
+ #include
++#include
+ #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 @@
// ----------------- 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);
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org