svn commit: r363232 - in head/emulators/higan: . files

[John Marino]

Author: marino
Date: Mon Jul 28 19:14:36 2014
New Revision: 363232
URL: http://svnweb.freebsd.org/changeset/ports/363232
QAT: https://qat.redports.org/buildarchive/r363232/

Log:
  emulators/higan: Fix GLX support
  
  PR:		190308
  Reported by:	aksyom (gmail)
  Fixed by:	maintainer (Naram Qashat)

Added:
  head/emulators/higan/files/patch-ruby__video__glx.cpp   (contents, props changed)
Modified:
  head/emulators/higan/Makefile

Modified: head/emulators/higan/Makefile
==============================================================================
--- head/emulators/higan/Makefile	Mon Jul 28 19:11:35 2014	(r363231)
+++ head/emulators/higan/Makefile	Mon Jul 28 19:14:36 2014	(r363232)
@@ -3,7 +3,7 @@
 
 PORTNAME=	higan
 PORTVERSION=	0.94
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	http://byuu.org/files/ \
 		http://www.cyberbotx.com/higan/

Added: head/emulators/higan/files/patch-ruby__video__glx.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/emulators/higan/files/patch-ruby__video__glx.cpp	Mon Jul 28 19:14:36 2014	(r363232)
@@ -0,0 +1,31 @@
+--- ./ruby/video/glx.cpp.orig	2014-01-20 01:37:14.000000000 -0500
++++ ./ruby/video/glx.cpp	2014-06-02 23:32:39.000000000 -0400
+@@ -128,6 +128,28 @@
+     //require GLX 1.2+ API
+     if(glx.version_major < 1 || (glx.version_major == 1 && glx.version_minor < 2)) return false;
+ 
++    int major, minor;
++    const char *version = (const char *) glGetString (GL_VERSION);
++    const char *dot = version == NULL ? NULL : strchr (version, '.');
++    const char *major_start = dot;
++
++    /* Sanity check */
++    if (dot == NULL || dot == version || *(dot + 1) == '\0') {
++        major = 0;
++        minor = 0;
++    } else {
++    /* Find the start of the major version in the string */
++    while (major_start > version && *major_start != ' ')
++           --major_start;
++        major = strtol (major_start, NULL, 10);
++        minor = strtol (dot + 1, NULL, 0);
++    }
++
++    if(major < 3 || (major == 3 && minor < 2)) {
++        printf("Error: OpenGL 3.2 is not available. Select another video driver on the Advanced Configuration tab and restart higan.\n");
++        return false;
++    }
++
+     XWindowAttributes window_attributes;
+     XGetWindowAttributes(display, settings.handle, &window_attributes);
+