aboutsummaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorSergey Matveychuk <sem@FreeBSD.org>2006-01-21 16:57:59 +0000
committerSergey Matveychuk <sem@FreeBSD.org>2006-01-21 16:57:59 +0000
commit9e2b1e3f86641570fe84bb14c92bb326fef975e7 (patch)
tree83bc5d11229bf34e87651447bc8c6140cb0bc451 /multimedia
parent3aaea2c0d1e813573782abebe9722b6bffe0418c (diff)
downloadports-9e2b1e3f86641570fe84bb14c92bb326fef975e7.tar.gz
ports-9e2b1e3f86641570fe84bb14c92bb326fef975e7.zip
- Unbreak. Fix build with libglut 6.4.1.
PR: ports/92096 Submitted by: maintainer
Notes
Notes: svn path=/head/; revision=154063
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/jahshaka/Makefile2
-rw-r--r--multimedia/jahshaka/distinfo1
-rw-r--r--multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h18
3 files changed, 19 insertions, 2 deletions
diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile
index 5854970f2bdf..7b6501287eb4 100644
--- a/multimedia/jahshaka/Makefile
+++ b/multimedia/jahshaka/Makefile
@@ -21,8 +21,6 @@ LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \
freetype.9:${PORTSDIR}/print/freetype2 \
jpeg.9:${PORTSDIR}/graphics/jpeg
-BROKEN= "Broken with libglut 6.4.1"
-
USE_REINPLACE= yes
USE_GL= yes
USE_X_PREFIX= yes
diff --git a/multimedia/jahshaka/distinfo b/multimedia/jahshaka/distinfo
index d21e8db28281..ec33c8dd472a 100644
--- a/multimedia/jahshaka/distinfo
+++ b/multimedia/jahshaka/distinfo
@@ -1,2 +1,3 @@
MD5 (jahshaka_1.9a9.tar.gz) = 1da413be5ab509b417cc8d56c74cdbf3
+SHA256 (jahshaka_1.9a9.tar.gz) = c88cbdf71a23753f36a2ddb4b65019f58de8ddb9a762617b76ee361f7f2ca713
SIZE (jahshaka_1.9a9.tar.gz) = 4538582
diff --git a/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h b/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h
new file mode 100644
index 000000000000..d0ce781b9858
--- /dev/null
+++ b/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h
@@ -0,0 +1,18 @@
+--- jah/libraries/glew/glew.h.orig
++++ jah/libraries/glew/glew.h
+@@ -8945,11 +8945,15 @@
+ }
+ #endif
+
++/* Do not undef GLAPIENTRY here. This is a quick hack to avoid
++ undefined symbols when including glut.h just after glew.h */
++/*
+ #ifdef GLEW_APIENTRY_DEFINED
+ #undef GLEW_APIENTRY_DEFINED
+ #undef APIENTRY
+ #undef GLAPIENTRY
+ #endif
++*/
+
+ #ifdef GLEW_CALLBACK_DEFINED
+ #undef GLEW_CALLBACK_DEFINED