sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Update to 1.46

Browse source
This commit is contained in:
Dmitry Marakasov 2017-03-29 06:51:02 +00:00
parent 9cba0ef67a
commit 4d5821c260
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=437183
4 changed files with 14 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
graphics/glpng/Makefile
View file

@ -2,12 +2,11 @@
# $FreeBSD$
PORTNAME= glpng
PORTVERSION= 1.45
PORTREVISION= 8
PORTVERSION= 1.46
CATEGORIES= graphics
MASTER_SITES= http://www.wyatt100.freeserve.co.uk/ \
http://mirror.amdmi3.ru/distfiles/
DISTNAME= glpng
MASTER_SITES= http://repo.or.cz/glpng.git/snapshot/
DISTNAME= 1079563a36edfe10a5f5d79ad38fe465425b989e
DIST_SUBDIR= glpng
MAINTAINER= amdmi3@FreeBSD.org
COMMENT= Library to easily load PNG files as an OpenGL textures
@ -16,25 +15,11 @@ LICENSE= ZLIB
LIB_DEPENDS= libpng.so:graphics/png
WRKSRC= ${WRKDIR}/glpng-1079563
USE_GL= gl
USES= dos2unix zip
USE_LDCONFIG= yes
DOS2UNIX_FILES= glpng.c
USES= cmake zip
AR?= /usr/bin/ar
WRKSRC= ${WRKDIR}/src
do-build:
${CC} ${CFLAGS} -fPIC -I${LOCALBASE}/include -I${WRKDIR}/include -c -o ${WRKSRC}/libglpng.o ${WRKSRC}/glpng.c
${CC} ${CFLAGS} -fPIC -L${LOCALBASE}/lib -shared -Wl,-soname,libglpng.so.1 -lGL -lpng -lz -lm -o ${WRKSRC}/libglpng.so.1 ${WRKSRC}/libglpng.o
${AR} cqs ${WRKSRC}/libglpng.a ${WRKSRC}/libglpng.o
do-install:
${INSTALL_LIB} ${WRKSRC}/libglpng.so.1 ${STAGEDIR}${PREFIX}/lib
${INSTALL_DATA} ${WRKSRC}/libglpng.a ${STAGEDIR}${PREFIX}/lib
${LN} -sf libglpng.so.1 ${STAGEDIR}${PREFIX}/lib/libglpng.so
${MKDIR} ${STAGEDIR}${PREFIX}/include/GL/
${INSTALL_DATA} ${WRKDIR}/include/GL/glpng.h ${STAGEDIR}${PREFIX}/include/GL/
OPTIONS_DEFINE= DOCS
.include <bsd.port.mk>

5
graphics/glpng/distinfo
View file

@ -1,2 +1,3 @@
SHA256 (glpng.zip) = 5f7c785acb00de6f7bcf53b1c2c94ddc07de3ef1b1f85c5bfc6483e89fa22223
SIZE (glpng.zip) = 309337
TIMESTAMP = 1490723030
SHA256 (glpng/1079563a36edfe10a5f5d79ad38fe465425b989e.zip) = 074dda02baf27b274c211adf368e5d8b69ffa6b8501ab8976872c8825ceb7786
SIZE (glpng/1079563a36edfe10a5f5d79ad38fe465425b989e.zip) = 43828

49
graphics/glpng/files/patch-glpng.c
View file

@ -1,49 +0,0 @@
--- glpng.c.orig 2000-07-10 21:27:10.000000000 +0200
+++ glpng.c 2012-04-27 08:58:12.000000000 +0200
@@ -25,11 +25,11 @@
#include <windows.h>
#endif
+#include "png.h"
#include <GL/glpng.h>
#include <GL/gl.h>
#include <stdlib.h>
#include <math.h>
-#include "png/png.h"
/* Used to decide if GL/gl.h supports the paletted extension */
#ifdef GL_COLOR_INDEX1_EXT
@@ -269,14 +269,14 @@
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);
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;
@@ -373,14 +373,14 @@
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);
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;

3
graphics/glpng/pkg-plist
View file

@ -2,3 +2,6 @@ include/GL/glpng.h
lib/libglpng.a
lib/libglpng.so
lib/libglpng.so.1
lib/libglpng.so.1.46
share/cmake/Modules/FindGLPNG.cmake
%%PORTDOCS%%%%DOCSDIR%%/glpng.htm