summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs/glpng/files/glpng-1.45-libpng15.patch')
-rw-r--r--media-libs/glpng/files/glpng-1.45-libpng15.patch40
1 files changed, 40 insertions, 0 deletions
diff --git a/media-libs/glpng/files/glpng-1.45-libpng15.patch b/media-libs/glpng/files/glpng-1.45-libpng15.patch
new file mode 100644
index 000000000000..06a3e9e0f508
--- /dev/null
+++ b/media-libs/glpng/files/glpng-1.45-libpng15.patch
@@ -0,0 +1,40 @@
+--- include/GL/glpng.h
++++ include/GL/glpng.h
+@@ -57,7 +57,7 @@
+ #define PNG_SIMPLEMIPMAP PNG_SIMPLEMIPMAPS
+
+ /* Transparency parameters */
+-#define PNG_CALLBACK -3 /* Call the callback function to generate alpha */
++#define PNG_CALLBACKT -3 /* Call the callback function to generate alpha */
+ #define PNG_ALPHA -2 /* Use alpha channel in PNG file, if there is one */
+ #define PNG_SOLID -1 /* No transparency */
+ #define PNG_STENCIL 0 /* Sets alpha to 0 for r=g=b=0, 1 otherwise */
+--- src/glpng.c
++++ src/glpng.c
+@@ -276,7 +276,7 @@
+ endinfo = png_create_info_struct(png);
+
+ // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -380,7 +380,7 @@
+ endinfo = png_create_info_struct(png);
+
+ // DH: added following lines
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ {
+ png_destroy_read_struct(&png, &info, &endinfo);
+ return 0;
+@@ -559,7 +559,7 @@
+ #define ALPHA *q
+
+ switch (trans) {
+- case PNG_CALLBACK:
++ case PNG_CALLBACKT:
+ FORSTART
+ ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
+ FOREND