Update glpng to 1.46, from its "new" home at http://repo.or.cz/w/glpng.git.

Changes:
- Documentation fixes
- Appease newer compilers
- Fix build with png-1.5
- Fix CVE-2010-1519
- Add memory reading functions
- Add luminance alpha support

7 files changed, 12 insertions, 80 deletions

diff --git a/graphics/glpng/DESCR b/graphics/glpng/DESCR
index 74a3bc4f0b6..e4bca42abd6 100644
--- a/graphics/glpng/DESCR
+++ b/graphics/glpng/DESCR
@@ -2,4 +2,4 @@ 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.
 
-This package is based on the freedesktop-games repository.
+This package is based on the repository at http://repo.or.cz/w/glpng.git
diff --git a/graphics/glpng/Makefile b/graphics/glpng/Makefile
index bf411f84df1..930495565c4 100644
--- a/graphics/glpng/Makefile
+++ b/graphics/glpng/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2013/02/16 11:18:13 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.6 2015/02/03 22:26:50 snj Exp $
 
-DISTNAME=	glpng-1.45.20081203
-PKGREVISION=	3
+DISTNAME=	1079563a36edfe10a5f5d79ad38fe465425b989e
 CATEGORIES=	graphics
-MASTER_SITES=	#
+MASTER_SITES=	http://repo.or.cz/w/glpng.git/snapshot/
+PKGNAME=	glpng-1.46
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Load PNG images directly as OpenGL textures
diff --git a/graphics/glpng/PLIST b/graphics/glpng/PLIST
index 257113f40a4..40a284f793b 100644
--- a/graphics/glpng/PLIST
+++ b/graphics/glpng/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/02/03 22:26:50 snj Exp $
 include/GL/glpng.h
 lib/libglpng.a
 lib/libglpng.so
 lib/libglpng.so.1
-lib/libglpng.so.1.45
+lib/libglpng.so.1.46
+share/cmake/Modules/FindGLPNG.cmake
 share/doc/glpng/glpng.htm
diff --git a/graphics/glpng/distinfo b/graphics/glpng/distinfo
index ee2797a9288..6e3501cce18 100644
--- a/graphics/glpng/distinfo
+++ b/graphics/glpng/distinfo
@@ -1,8 +1,5 @@
-$NetBSD: distinfo,v 1.3 2011/04/03 16:38:41 wiz Exp $
+$NetBSD: distinfo,v 1.4 2015/02/03 22:26:50 snj Exp $
 
-SHA1 (glpng-1.45.20081203.tar.gz) = c2515ab3395f84cbedf49a246c091ad4078ef43b
-RMD160 (glpng-1.45.20081203.tar.gz) = 14753b471d7b3192a06559a178807db30414cebd
-Size (glpng-1.45.20081203.tar.gz) = 40141 bytes
-SHA1 (patch-aa) = d9c7353907ac15b305292e167107ed64d1c6f54c
-SHA1 (patch-include_GL_glpng.h) = 3510c6b290e48d87040a126a900acfd6801a8c4c
-SHA1 (patch-src_glpng.c) = a1226af2ebe3d93168eb9a91f98c65b674a9931c
+SHA1 (1079563a36edfe10a5f5d79ad38fe465425b989e.tar.gz) = c11e23715761f8be4e5f09d2061163b610f85258
+RMD160 (1079563a36edfe10a5f5d79ad38fe465425b989e.tar.gz) = 414a5606bdb73c106e529321ce4afa5455280da0
+Size (1079563a36edfe10a5f5d79ad38fe465425b989e.tar.gz) = 41024 bytes
diff --git a/graphics/glpng/patches/patch-aa b/graphics/glpng/patches/patch-aa
deleted file mode 100644
index baece4a8225..00000000000
--- a/graphics/glpng/patches/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2009/09/11 06:19:21 dsainty Exp $
-
-The cmake utility recommends using OPENGL_gl_LIBRARY if GLU is not required.
-This also fixes the build in some circumstances: if cmake finds an installed
-libGLU the build will fail, because we don't buildlink it.
-
---- src/CMakeLists.txt.orig	2009-09-11 18:03:37.198417478 +1200
-+++ src/CMakeLists.txt	2009-09-11 18:03:47.708888770 +1200
-@@ -5,7 +5,7 @@
- INCLUDE_DIRECTORIES ( ${ZLIB_INCLUDE_DIR} ${PNG_INCLUDE_DIR}
- 		${OPENGL_INCLUDE_DIR}  ${CMAKE_SOURCE_DIR}/include/ )
- LINK_LIBRARIES ( ${CMAKE_DL_LIBS} ${ZLIB_LIBRARIES} ${PNG_LIBRARY}
--		${OPENGL_LIBRARIES} )
-+		${OPENGL_gl_LIBRARY} )
- SET ( SRCS ${APPNAME}.c
- )
- SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC")
diff --git a/graphics/glpng/patches/patch-include_GL_glpng.h b/graphics/glpng/patches/patch-include_GL_glpng.h
deleted file mode 100644
index 78cf8fdb5ad..00000000000
--- a/graphics/glpng/patches/patch-include_GL_glpng.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-include_GL_glpng.h,v 1.1 2011/04/03 16:38:41 wiz Exp $
-
-Fix build with png-1.5.
-
---- include/GL/glpng.h.orig	2009-05-04 18:51:48.000000000 +0000
-+++ include/GL/glpng.h
-@@ -57,7 +57,7 @@ extern "C" {
- #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       */
diff --git a/graphics/glpng/patches/patch-src_glpng.c b/graphics/glpng/patches/patch-src_glpng.c
deleted file mode 100644
index 19a403d8fff..00000000000
--- a/graphics/glpng/patches/patch-src_glpng.c
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-src_glpng.c,v 1.1 2011/04/03 16:38:41 wiz Exp $
-
-Fix build with png-1.5.
-
---- src/glpng.c.orig	2009-05-04 18:51:48.000000000 +0000
-+++ src/glpng.c
-@@ -278,7 +278,7 @@ int APIENTRY pngLoadRawF(FILE *fp, pngRa
- 	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;
-@@ -382,7 +382,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipm
- 	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;
-@@ -561,7 +561,7 @@ int APIENTRY pngLoadF(FILE *fp, int mipm
- 			#define ALPHA *q
- 
- 			switch (trans) {
--				case PNG_CALLBACK:
-+				case PNG_CALLBACKT:
- 					FORSTART
- 						ALPHA = AlphaCallback((unsigned char) r, (unsigned char) g, (unsigned char) b);
- 					FOREND