diff options
author | dsainty <dsainty@pkgsrc.org> | 2009-09-11 06:19:20 +0000 |
---|---|---|
committer | dsainty <dsainty@pkgsrc.org> | 2009-09-11 06:19:20 +0000 |
commit | 39ab36e297227be4a893ecc02370a3ed23a9eaa6 (patch) | |
tree | 26d1cdc67a9d382fbcbb839b8909c4853f389cc0 /graphics/glpng | |
parent | 61f5a53cb295afb2ddbb9813e055fe3995424898 (diff) | |
download | pkgsrc-39ab36e297227be4a893ecc02370a3ed23a9eaa6.tar.gz |
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 (limited to 'graphics/glpng')
-rw-r--r-- | graphics/glpng/distinfo | 3 | ||||
-rw-r--r-- | graphics/glpng/patches/patch-aa | 17 |
2 files changed, 19 insertions, 1 deletions
diff --git a/graphics/glpng/distinfo b/graphics/glpng/distinfo index c369e8eda21..d0aef1617ad 100644 --- a/graphics/glpng/distinfo +++ b/graphics/glpng/distinfo @@ -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 --git a/graphics/glpng/patches/patch-aa b/graphics/glpng/patches/patch-aa new file mode 100644 index 00000000000..baece4a8225 --- /dev/null +++ b/graphics/glpng/patches/patch-aa @@ -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") |