Ticket #373: glpng-1.4.5.patch

src/Makefile.HAIKU

@@ +1 @@
+LDFLAGS=-lpng -lGL
+SHAREDLIBFLAGS=-shared -fPIC
+DESTDIR=/boot/common
+LIB=lib
+INCPATH =       -I../include
+
+all: libglpng.a libglpng.so.1.45
+
+libglpng.a: glpng.o
+        ar rv $@ $<
+
+libglpng.so.1.45: glpng.o
+        gcc $(CFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname=libglpng.so.1 -Wl $< -Wl $(LDFLAGS) -o $@ -lGL -lpng -lz
+
+glpng.o: glpng.c
+        gcc $(CFLAGS) -c $<
+
+clean:
+        rm glpng.o libglpng.*
+
+install:
+        for i in include ../include/GL $(LIB); do \
+                install -m 755 -d $(DESTDIR)/$$i; \
+        done
+        install -p -m 644 ../include/GL/glpng.h $(DESTDIR)/include/GL
+        install -m 755 libglpng.* $(DESTDIR)/$(LIB)
+        ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so.1
+        ln -s libglpng.so.1.45 $(DESTDIR)/$(LIB)/libglpng.so

src/glpng.c

@@ -29 +29 @@
 #include <GL/gl.h>
 #include <stdlib.h>
 #include <math.h>
-#include "png/png.h"
+#include <png.h>
 
 /* Used to decide if GL/gl.h supports the paletted extension */
 #ifdef GL_COLOR_INDEX1_EXT
@@ -269 +269 @@
         if (pinfo == NULL) return 0;
 
         fread(header, 1, 8, fp);
-        if (!png_check_sig(header, 8)) return 0;
+        if (png_sig_cmp(header, 0, 8)) return 0;
 
         png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
         info = png_create_info_struct(png);
@@ -373 +373 @@
         png_uint_32 i;
 
         fread(header, 1, 8, fp);
-        if (!png_check_sig(header, 8)) return 0;
+        if (png_sig_cmp(header, 0, 8)) return 0;
 
         png = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
         info = png_create_info_struct(png);