[pkgsrc/trunk]: pkgsrc/graphics/glpng The cmake utility recommends using OPEN...

[dsainty <dsainty%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/199924fd021f
branches:  trunk
changeset: 398905:199924fd021f
user:      dsainty <dsainty%pkgsrc.org@localhost>
date:      Fri Sep 11 06:19:20 2009 +0000

description:
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.

diffstat:

 graphics/glpng/distinfo         |   3 ++-
 graphics/glpng/patches/patch-aa |  17 +++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletions(-)

diffs (32 lines):

diff -r 6cfa2b324b56 -r 199924fd021f graphics/glpng/distinfo
--- a/graphics/glpng/distinfo   Fri Sep 11 00:10:54 2009 +0000
+++ b/graphics/glpng/distinfo   Fri Sep 11 06:19:20 2009 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/09/01 21:07:37 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/09/11 06:19:20 dsainty 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
diff -r 6cfa2b324b56 -r 199924fd021f graphics/glpng/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/glpng/patches/patch-aa   Fri Sep 11 06:19:20 2009 +0000
@@ -0,0 +1,17 @@
+$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")