Date: Sat, 21 Jan 2006 16:49:29 +0300 (MSK) From: Igor Pokrovsky <ip@doom.homeunix.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/92096: Update port: multimedia/jahshaka unbreak Message-ID: <200601211349.k0LDnTmn099222@doom.homeunix.org> Resent-Message-ID: <200601211400.k0LE0GZa003439@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 92096
>Category: ports
>Synopsis: Update port: multimedia/jahshaka unbreak
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sat Jan 21 14:00:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Igor Pokrovsky
>Release: FreeBSD 4.11-STABLE i386
>Organization:
>Environment:
System: FreeBSD doom.homeunix.org 4.11-STABLE FreeBSD 4.11-STABLE #0: Thu Dec 15 07:51:52 MSK 2005 root@doom.homeunix.org:/usr/obj/usr/src/sys/KERNEL-p3 i386
>Description:
- Unbreak.
- Patch glew.h to work with recent libglut 6.4.1.
Added files:
files/patch-jah_libraries_glew_glew.h
>How-To-Repeat:
>Fix:
--- jahshaka.diff begins here ---
diff -ruN /usr/ports/multimedia/jahshaka/Makefile jahshaka/Makefile
--- /usr/ports/multimedia/jahshaka/Makefile Wed Jan 18 20:33:54 2006
+++ jahshaka/Makefile Sat Jan 21 16:04:18 2006
@@ -21,8 +21,6 @@
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 -ruN /usr/ports/multimedia/jahshaka/distinfo jahshaka/distinfo
--- /usr/ports/multimedia/jahshaka/distinfo Sun Sep 18 22:20:48 2005
+++ jahshaka/distinfo Sat Jan 21 16:07:44 2006
@@ -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 -ruN /usr/ports/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h jahshaka/files/patch-jah_libraries_glew_glew.h
--- /usr/ports/multimedia/jahshaka/files/patch-jah_libraries_glew_glew.h Thu Jan 1 03:00:00 1970
+++ jahshaka/files/patch-jah_libraries_glew_glew.h Sat Jan 21 16:06:25 2006
@@ -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
--- jahshaka.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200601211349.k0LDnTmn099222>