[SCM] Simple and fast multimedia library for C++ branch, master, updated. upstream/1.6+repack1-123-g8299f07

[Dmitrijs Ledkovs]

The following commit has been merged in the master branch:
commit c477adf1b30946b4934b29ac6798a0112a5f7c06
Author: Dmitrijs Ledkovs <xnox at debian.org>
Date:   Sun May 27 18:20:33 2012 +0100

    Fix FTGFS with libpng-1.5, thanks to Nobuhiro Iwamatsu. (Closes: #650564)

diff --git a/debian/changelog b/debian/changelog
index 8139f16..4fad455 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ libsfml (1.6+dfsg1-3) unstable; urgency=low
 
   * Thanks to Konstantinos Margaritis for NMU.
   * Fix FTBFS with gcc-4.7, thanks to Matthias Klose. (Closes: #672086)
+  * Fix FTGFS with libpng-1.5, thanks to Nobuhiro Iwamatsu. (Closes: #650564)
   
  -- Dmitrijs Ledkovs <xnox at debian.org>  Sun, 27 May 2012 17:46:23 +0100
 
diff --git a/debian/patches/debian/fix-includes.diff b/debian/patches/debian/fix-includes.diff
index a2f5fe2..83ef833 100644
--- a/debian/patches/debian/fix-includes.diff
+++ b/debian/patches/debian/fix-includes.diff
@@ -35,4 +35,4 @@ index dbfcd0d..7bda5f1 100755
  ////////////////////////////////////////////////////////////
  /// Default constructor
 -- 
-tg: (3e3a7f4..) debian/fix-includes (depends on: debian/scriptheader-in-example-makefiles)
+tg: (755caaf..) debian/fix-includes (depends on: debian/scriptheader-in-example-makefiles)
diff --git a/debian/patches/debian/gcc-4.6.diff b/debian/patches/debian/gcc-4.6.diff
index 9b2dad8..f1a5021 100644
--- a/debian/patches/debian/gcc-4.6.diff
+++ b/debian/patches/debian/gcc-4.6.diff
@@ -141,4 +141,4 @@ index 14346fb..8b18fb7 100755
  #include <SFML/Graphics/ImageLoader.hpp>
  #include <SFML/Graphics/RenderWindow.hpp>
 -- 
-tg: (ff6621b..) debian/gcc-4.6 (depends on: master)
+tg: (afb79c7..) debian/gcc-4.6 (depends on: master)
diff --git a/debian/patches/debian/gcc-4.7.diff b/debian/patches/debian/gcc-4.7.diff
index be7182c..c72ab99 100644
--- a/debian/patches/debian/gcc-4.7.diff
+++ b/debian/patches/debian/gcc-4.7.diff
@@ -23,4 +23,4 @@ index 829a741..c2dabf2 100755
  
  namespace sf
 -- 
-tg: (ff6621b..) debian/gcc-4.7 (depends on: master)
+tg: (afb79c7..) debian/gcc-4.7 (depends on: master)
diff --git a/debian/patches/debian/interlinking.diff b/debian/patches/debian/interlinking.diff
index f2f9030..4b19c68 100644
--- a/debian/patches/debian/interlinking.diff
+++ b/debian/patches/debian/interlinking.diff
@@ -75,4 +75,4 @@ index 0dd689c..a05a54b 100755
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
 -- 
-tg: (78d04e9..) debian/interlinking (depends on: debian/destdir-install-symlinks)
+tg: (9b1ef37..) debian/interlinking (depends on: debian/destdir-install-symlinks)
diff --git a/debian/patches/debian/kfreebsd.diff b/debian/patches/debian/kfreebsd.diff
index a4b947b..e22e2a4 100644
--- a/debian/patches/debian/kfreebsd.diff
+++ b/debian/patches/debian/kfreebsd.diff
@@ -24,4 +24,4 @@ index 84ec60f..7db03a9 100755
      // FreeBSD
      #define SFML_SYSTEM_FREEBSD
 -- 
-tg: (e3ae217..) debian/kfreebsd (depends on: master)
+tg: (1a017fb..) debian/kfreebsd (depends on: master)
diff --git a/debian/patches/debian/libpng-1.5.diff b/debian/patches/debian/libpng-1.5.diff
new file mode 100644
index 0000000..48ed743
--- /dev/null
+++ b/debian/patches/debian/libpng-1.5.diff
@@ -0,0 +1,42 @@
+From: Nobuhiro Iwamatsu <iwamatsu at nigauri.org>
+Subject: [PATCH] debian/libpng-1.5
+
+Fix FTBFS libpng-1.5
+
+Signed-off-by: Dmitrijs Ledkovs <xnox at debian.org>
+
+---
+ src/SFML/Graphics/ImageLoader.cpp |   10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/src/SFML/Graphics/ImageLoader.cpp b/src/SFML/Graphics/ImageLoader.cpp
+index a3f83bf..a288482 100755
+--- a/src/SFML/Graphics/ImageLoader.cpp
++++ b/src/SFML/Graphics/ImageLoader.cpp
+@@ -44,7 +44,11 @@ namespace
+     void PngErrorHandler(png_structp Png, png_const_charp Message)
+     {
+         std::cerr << "Failed to write PNG image. Reason : " << Message << std::endl;
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++		longjmp(png_jmpbuf((Png)),1);
++#else
+         longjmp(Png->jmpbuf, 1);
++#endif
+     }
+ }
+ 
+@@ -289,7 +293,11 @@ bool ImageLoader::WritePng(const std::string& Filename, const std::vector<Color>
+     }
+ 
+     // For proper error handling...
+-    if (setjmp(Png->jmpbuf))
++#if PNG_LIBPNG_VER_MAJOR >= 1 && PNG_LIBPNG_VER_MINOR >= 4
++    if (setjmp(png_jmpbuf(Png)))
++#else
++    if ( setjmp(Png->jmpbuf))
++#endif
+     {
+         png_destroy_write_struct(&Png, &PngInfo);
+         return false;
+-- 
+tg: (afb79c7..) debian/libpng-1.5 (depends on: master)
diff --git a/debian/patches/debian/repacking.diff b/debian/patches/debian/repacking.diff
index 5e7cb2e..1fee7f5 100644
--- a/debian/patches/debian/repacking.diff
+++ b/debian/patches/debian/repacking.diff
@@ -129,4 +129,4 @@ index a05a54b..5f9708e 100755
  $(OBJ): %.o: %.cpp
  	$(CPP) -o $@ -c $< $(CFLAGS)
 -- 
-tg: (3bc53c8..) debian/repacking (depends on: debian/interlinking)
+tg: (a419948..) debian/repacking (depends on: debian/interlinking)
diff --git a/debian/patches/debian/scriptheader-in-example-makefiles.diff b/debian/patches/debian/scriptheader-in-example-makefiles.diff
index 14f6930..b3969c7 100644
--- a/debian/patches/debian/scriptheader-in-example-makefiles.diff
+++ b/debian/patches/debian/scriptheader-in-example-makefiles.diff
@@ -154,4 +154,4 @@ index e6586ec..558e565 100755
  OBJ  = Main.o wxSFMLCanvas.o
  
 -- 
-tg: (cae8bed..) debian/scriptheader-in-example-makefiles (depends on: master)
+tg: (6851b4d..) debian/scriptheader-in-example-makefiles (depends on: master)
diff --git a/debian/patches/series b/debian/patches/series
index 6ef1535..227aeaf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,5 +3,6 @@ debian/gcc-4.6.diff -p1
 debian/gcc-4.7.diff -p1
 debian/interlinking.diff -p1
 debian/kfreebsd.diff -p1
+debian/libpng-1.5.diff -p1
 debian/repacking.diff -p1
 debian/scriptheader-in-example-makefiles.diff -p1

-- 
Simple and fast multimedia library for C++