pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/freeglut Use upstream patch to fix glut.h ins...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/ffce775dbd6c
branches:  trunk
changeset: 361689:ffce775dbd6c
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue Apr 25 11:27:00 2017 +0000

description:
Use upstream patch to fix glut.h installation.

No change to binary package.

diffstat:

 graphics/freeglut/Makefile                     |   6 +-----
 graphics/freeglut/distinfo                     |   3 ++-
 graphics/freeglut/patches/patch-CMakeLists.txt |  20 ++++++++++++++++++++
 3 files changed, 23 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r e7724201a0d3 -r ffce775dbd6c graphics/freeglut/Makefile
--- a/graphics/freeglut/Makefile        Tue Apr 25 10:37:26 2017 +0000
+++ b/graphics/freeglut/Makefile        Tue Apr 25 11:27:00 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2016/10/01 07:52:57 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2017/04/25 11:27:00 wiz Exp $
 
 DISTNAME=      freeglut-3.0.0
 CATEGORIES=    graphics
@@ -17,10 +17,6 @@
 
 PKGCONFIG_OVERRIDE=    freeglut.pc.in
 
-# https://sourceforge.net/p/freeglut/bugs/232/
-post-install:
-       ${RM} ${DESTDIR}${PREFIX}/include/GL/glut.h
-
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/glu/buildlink3.mk"
 .include "../../x11/libXi/buildlink3.mk"
diff -r e7724201a0d3 -r ffce775dbd6c graphics/freeglut/distinfo
--- a/graphics/freeglut/distinfo        Tue Apr 25 10:37:26 2017 +0000
+++ b/graphics/freeglut/distinfo        Tue Apr 25 11:27:00 2017 +0000
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2016/10/01 07:47:04 wiz Exp $
+$NetBSD: distinfo,v 1.8 2017/04/25 11:27:00 wiz Exp $
 
 SHA1 (freeglut-3.0.0.tar.gz) = fca52242f9344627a30f11487ee42002e6b0dacd
 RMD160 (freeglut-3.0.0.tar.gz) = ce4129a22199516ecf24491f0ed026f40c3f5dae
 SHA512 (freeglut-3.0.0.tar.gz) = 9c45d5b203b26a7ff92331b3e080a48e806c92fbbe7c65d9262dd18c39cd6efdad8a795a80f499a2d23df84b4909dbd7c1bab20d7dd3555d3d88782ce9dd15b0
 Size (freeglut-3.0.0.tar.gz) = 419095 bytes
+SHA1 (patch-CMakeLists.txt) = bb53c67d35870ed077c757f39abf78cbc23b700f
 SHA1 (patch-src_freeglut__joystick.c) = a3f52010378afd1218ba12328a2b4626b758d483
 SHA1 (patch-src_x11_fg__joystick__x11.c) = ccd79599939d936e4364c6e8d91a8ce0e058db78
diff -r e7724201a0d3 -r ffce775dbd6c graphics/freeglut/patches/patch-CMakeLists.txt
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/freeglut/patches/patch-CMakeLists.txt    Tue Apr 25 11:27:00 2017 +0000
@@ -0,0 +1,20 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2017/04/25 11:27:00 wiz Exp $
+
+https://github.com/dcnieho/FreeGLUT/commit/a0b77bba49573dab3564ce22a503024098664f04
+
+--- CMakeLists.txt.orig        2015-02-18 04:59:57.000000000 +0000
++++ CMakeLists.txt
+@@ -62,8 +62,12 @@ SET(FREEGLUT_HEADERS
+     include/GL/freeglut.h
+     include/GL/freeglut_ext.h
+     include/GL/freeglut_std.h
+-    include/GL/glut.h
+ )
++IF(FREEGLUT_REPLACE_GLUT)
++    LIST(APPEND FREEGLUT_SRCS
++        include/GL/glut.h
++    )
++ENDIF()
+ SET(FREEGLUT_SRCS
+     ${FREEGLUT_HEADERS}
+     src/fg_callbacks.c



Home | Main Index | Thread Index | Old Index