Author: megabajt Date: Thu Feb 11 19:14:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- fixes build with libpng 1.4
---- Files affected:
packages/scorched3d:
scorched3d-libpng.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/scorched3d/scorched3d-libpng.patch
diff -u /dev/null packages/scorched3d/scorched3d-libpng.patch:1.1
--- /dev/null Thu Feb 11 20:14:55 2010
+++ packages/scorched3d/scorched3d-libpng.patch Thu Feb 11 20:14:50 2010
@@ -0,0 +1,39 @@
+diff -urN scorched/src/common/image/ImagePng.cpp
scorched.new/src/common/image/ImagePng.cpp
+--- scorched/src/common/image/ImagePng.cpp 2009-02-23 04:14:20.000000000
+0100
++++ scorched.new/src/common/image/ImagePng.cpp 2010-02-11 18:24:59.393380825
+0100
+@@ -189,7 +189,7 @@
+ info_ptr = png_create_info_struct(png_ptr);
+ if (info_ptr == NULL)
+ {
+- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, NULL, NULL);
+ return false;
+ }
+
+@@ -200,7 +200,7 @@
+ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ /* Free all of the memory associated with the png_ptr and info_ptr */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ /* If we get here, we had a problem reading the file */
+ return false;
+ }
+@@ -258,7 +258,7 @@
+ }
+ else
+ {
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ Logger::log(S3D::formatStringBuffer(
+ "Invalid PNG format.\n"
+@@ -272,7 +272,7 @@
+ // END NEW CODE
+
+ /* clean up after the read, and free any memory allocated - REQUIRED */
+- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+
+ /* that's it */
+ return true;
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
