glpng: bump version, remove obselete bep file (#1786)

This commit is contained in:
Schrijvers Luc
2017-11-12 13:55:52 +01:00
committed by Jérôme Duval
parent 9582f4a9b2
commit 9ad91d267d
3 changed files with 62 additions and 87 deletions

View File

@@ -1,22 +0,0 @@
DESCRIPTION="glpng"
HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
SOURCE_URI="http://mirror.amdmi3.ru/distfiles/glpng.zip"
CHECKSUM_MD5="bed59efb699a51e6de7434580df41395"
REVISION="1"
STATUS_HAIKU="stable"
DEPEND=""
BUILD()
{
cd src
make -f Makefile.HAIKU
}
INSTALL()
{
cd src
make install -f Makefile.HAIKU
}
LICENSE="Zlib"
COPYRIGHT="1999-2000 Ben Wyatt"

View File

@@ -0,0 +1,62 @@
SUMMARY="Load PNG graphics files for OpenGL"
DESCRIPTION="This is a library for OpenGL to load PNG graphics files \
as an OpenGL texture as easily as possible. It also has a number of \
options for generating the alpha channel and mipmaps. It is implemented \
using modified versions of the LibPNG 1.0.2 and ZLib 1.1.3 libraries."
HOMEPAGE="http://www.fifi.org/doc/libglpng-dev/glpng.html"
COPYRIGHT="1999-2014 Ben Wyatt"
LICENSE="Zlib"
REVISION="1"
SOURCE_URI="ftp://ftp.mirrorservice.org/sites/distfiles.gentoo.org/distfiles/glpng-1.46.tar.gz"
CHECKSUM_SHA256="4a3e489deca733524780470c4fb89806e354515b541efb58d44f2e11936dc39e"
SOURCE_DIR="glpng"
ARCHITECTURES="x86_gcc2 x86_64"
PROVIDES="
glpng = $portVersion
lib:libglpng = 1.46 compat >= 1
"
REQUIRES="
haiku
lib:libGL
lib:libpng16
"
PROVIDES_devel="
glpng_devel
devel:libglpng = 1.46 compat >= 1
"
REQUIRES_devel="
glpng == $portVersion base
"
BUILD_REQUIRES="
haiku_devel
devel:libGL
devel:libpng16
"
BUILD_PREREQUIRES="
cmd:gcc
cmd:make
"
BUILD()
{
make DESTDIR=$prefix DOCDIR=$docDir
}
INSTALL()
{
mkdir -p $includeDir
make install DESTDIR=$prefix DOCDIR=$docDir
mv $prefix/include/* $includeDir
rm -r $prefix/include
prepareInstalledDevelLib libglpng
packageEntries devel \
$developDir
}

View File

@@ -1,65 +0,0 @@
diff -Naurb src/Makefile.HAIKU glpng-1.4.5-haiku/src/Makefile.HAIKU
--- src/Makefile.HAIKU 1970-01-01 00:00:00.000000000 +0000
+++ src/Makefile.HAIKU 2010-07-05 02:35:34.000000000 +0000
@@ -0,0 +1,31 @@
+LDFLAGS=-lpng -lGL
+SHAREDLIBFLAGS=-shared -fPIC
+LIBDIR:=$(shell finddir B_COMMON_LIB_DIRECTORY)
+GLINCLUDEDIR:=$(shell finddir B_COMMON_DEVELOP_DIRECTORY)/headers/os/opengl/GL
+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
+ install -p -m 644 ../include/GL/glpng.h $(DESTDIR)$(GLINCLUDEDIR)
+ gcc $(CFLAGS) -c $<
+
+clean:
+ rm glpng.o libglpng.*
+
+install:
+ for i in include ../include/GL $(LIBDIR); do \
+ install -m 755 -d $(DESTDIR)/$$i; \
+ done
+ mkdir -p $(DESTDIR)$(GLINCLUDEDIR)
+ mkdir -p $(DESTDIR)$(LIBDIR)
+ install -p -m 644 ../include/GL/glpng.h $(DESTDIR)$(GLINCLUDEDIR)
+ install -m 755 libglpng.* $(DESTDIR)$(LIBDIR)
+ ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so.1
+ ln -s -f libglpng.so.1.45 $(DESTDIR)$(LIBDIR)/libglpng.so
diff -Naurb src/glpng.c glpng-1.4.5-haiku/src/glpng.c
--- src/glpng.c 2000-07-10 21:27:10.026738688 +0000
+++ src/glpng.c 2010-07-05 02:47:05.069992448 +0000
@@ -29,7 +29,7 @@
#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,7 +269,7 @@
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,7 +373,7 @@
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);