ruby-opengl2 0.60.5 → 0.60.6

data/Rakefile

@@ -60,14 +60,14 @@ task :test_all => [:test]
 # common specification for source and binary gems
 spec = Gem::Specification.new do |s|
     s.name              = "ruby-opengl2"
-    s.version           = "0.60.5"
+    s.version           = "0.60.6"
     s.authors           = [ "Alain Hoang", "Jan Dvorak", "Minh Thu Vo", "James Adam", "Paolo Bosetti" ]
     s.homepage          = "http://github.com/pbosetti/ruby-opengl"
     s.email             = "p4010@me.com"
     s.rubyforge_project = 'ruby-opengl2'
     s.platform          = Gem::Platform::RUBY
     s.summary           = "OpenGL Interface for Ruby"
-    s.description       = "This is a modernization of the glorious but unmaintained ruby-opengl version, aimed at making it compatible with ruby 1.9.x series. At the moment, it successfully compiles on OS X Lion and Debian 6.0.3"
+    s.description       = "This is a modernization of the glorious but unmaintained ruby-opengl version, aimed at making it compatible with ruby 1.9.x series. At the moment, it successfully compiles on OS X Mountain Lion and Debian 6.0.3"
     s.require_path      = "lib"
     s.has_rdoc          = false
     s.files             = FileList.new("{lib,ext,examples,test}/**/*") do |fl|
@@ -81,11 +81,14 @@ spec = Gem::Specification.new do |s|
 
       if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
         s.add_runtime_dependency(%q<mkrf>, [">= 0.2.3"])
+        s.add_runtime_dependency(%q<rake>, [">= 10.0"])
       else
         s.add_dependency(%q<mkrf>, [">= 0.2.3"])
+        s.add_dependency(%q<rake>, [">= 10.0"])
       end
     else
       s.add_dependency(%q<mkrf>, [">= 0.2.3"])
+      s.add_dependency(%q<rake>, [">= 10.0"])
     end
 end
 

data/ext/common/common.h

@@ -27,6 +27,7 @@
 #include <ctype.h>
 
 #ifdef __APPLE__
+#include <dlfcn.h>
 #include <OpenGL/gl.h>
 #include <OpenGL/glu.h>
 #include <GLUT/glut.h>
@@ -357,27 +358,14 @@ static inline void *load_gl_function(const char *name,int raise)
 	void *func_ptr = NULL;
 
 #if defined(__APPLE__)
-	static const struct mach_header* library = NULL;
-	char* symbolName;
-	NSSymbol symbol;
-	if (library == NULL)
-		library = NSAddImage("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL",NSADDIMAGE_OPTION_RETURN_ON_ERROR);
-
-	if (library == NULL)
-		rb_raise(rb_eRuntimeError,"Can't load OpenGL library for dynamic loading");
-		
+	void* theImage = dlopen("/System/Library/Frameworks/OpenGL.framework/Versions/Current/OpenGL", RTLD_LAZY);
 	/*  prepend a '_' for the Unix C symbol mangling convention  */
+	char * symbolName;
 	symbolName = ALLOC_N(char,strlen(name) + 2);
 	symbolName[0] = '_';
 	strcpy(symbolName+1, name);
-
-	symbol = NSLookupSymbolInImage(library,symbolName,NSLOOKUPSYMBOLINIMAGE_OPTION_BIND | NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR);
+	func_ptr = dlsym(theImage, &(symbolName[1]));
 	xfree(symbolName);
-
-	if (symbol == NULL)
-		func_ptr = NULL;
-	else
-		func_ptr = NSAddressOfSymbol(symbol);
 #elif defined(WIN32) || defined(_WIN32)
 	func_ptr = wglGetProcAddress((LPCSTR)name);
 #elif defined(GLX_VERSION_1_4)

data/ext/common/conv.h

@@ -155,7 +155,7 @@ ARY2CTYPE(double,NUM2DBL)
 
 /* Converts either array or object responding to #to_a to C-style array */
 #define ARY2CMAT(_type_) \
-static inline void ary2cmat##_type_(rary, cary, cols, rows, count) \
+static inline void ary2cmat##_type_(rary, cary, cols, rows) \
 VALUE rary; \
 _type_ cary[]; \
 int cols,rows; \

data/ext/common/funcdef.h

@@ -222,10 +222,9 @@ static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 #define GL_FUNC_GENOBJECTS(_name_) \
 static VALUE gl_##_name_(VALUE obj,VALUE arg1) \
 { \
-	GLsizei n; \
+	GLsizei i, n; \
 	GLuint *objects; \
 	VALUE ret; \
-	unsigned int i; \
 	n = CONV_GLsizei(arg1); \
 	objects = ALLOC_N(GLuint, n); \
 	gl##_name_(n,objects); \

data/ext/gl/mkrf.log

@@ -1,3 +1,5 @@
-# Logfile created on 2012-08-03 16:02:49 +0200 by logger.rb/31641
-I, [2012-08-03T16:02:49.356924 #22495]  INFO -- : Rakefile written
-I, [2012-08-21T11:15:29.294819 #19765]  INFO -- : Rakefile written
+# Logfile created on 2012-11-27 00:58:33 +0100 by logger.rb/31641
+I, [2012-11-27T00:58:33.139438 #16076]  INFO -- : Checking for library: GL
+I, [2012-11-27T00:58:33.194372 #16076]  INFO -- : Function found: glVertex3d()
+I, [2012-11-27T00:58:33.194481 #16076]  INFO -- : Library found: GL
+I, [2012-11-27T00:58:33.194697 #16076]  INFO -- : Rakefile written

data/ext/gl/mkrf_conf.rb

@@ -22,7 +22,7 @@ RUBYVER = " -DRUBY_VERSION=" + RUBY_VERSION.split(".").join
 Mkrf::Generator.new( 'gl' ) do |g|
   puts "*" * 10
   #Config::CONFIG["CC"] = `which gcc`.chomp
-  p RbConfig::CONFIG
+  #p RbConfig::CONFIG
   puts "*" * 10
 	case RUBY_PLATFORM
 	when /darwin/

data/ext/glu/mkrf.log

@@ -1,2 +1,8 @@
-# Logfile created on 2012-08-03 17:30:27 +0200 by logger.rb/31641
-I, [2012-08-03T17:30:27.827119 #23428]  INFO -- : Rakefile written
+# Logfile created on 2012-11-27 00:58:40 +0100 by logger.rb/31641
+I, [2012-11-27T00:58:40.773695 #16156]  INFO -- : Checking for library: GLU
+I, [2012-11-27T00:58:40.837804 #16156]  INFO -- : Function found: gluLookAt()
+I, [2012-11-27T00:58:40.837912 #16156]  INFO -- : Library found: GLU
+I, [2012-11-27T00:58:40.837966 #16156]  INFO -- : Checking for library: GL
+I, [2012-11-27T00:58:40.915023 #16156]  INFO -- : Function found: glVertex3d()
+I, [2012-11-27T00:58:40.915145 #16156]  INFO -- : Library found: GL
+I, [2012-11-27T00:58:40.915380 #16156]  INFO -- : Rakefile written

data/ext/glut/glut.c

@@ -521,9 +521,7 @@ int width, height;
 
 
 static void GLUTCALLBACK
-glut_KeyboardFuncCallback(key, x, y)
-unsigned char key;
-int x,y;
+glut_KeyboardFuncCallback(unsigned char key, int x, int y)
 {
 	VALUE func;
 	func = rb_ary_entry(KeyboardFunc, glutGetWindow());
@@ -806,9 +804,7 @@ int x,y,z;
 }
 
 static void GLUTCALLBACK
-glut_KeyboardUpFuncCallback(key,x,y)
-unsigned char key;
-int x,y;
+glut_KeyboardUpFuncCallback(unsigned char key, int x, int y)
 {
 	VALUE func;
 	func = rb_ary_entry(KeyboardUpFunc, glutGetWindow());

data/ext/glut/mkrf.log

@@ -1,2 +1,11 @@
-# Logfile created on 2012-08-03 17:33:19 +0200 by logger.rb/31641
-I, [2012-08-03T17:33:19.280315 #23473]  INFO -- : Rakefile written
+# Logfile created on 2012-11-27 00:58:41 +0100 by logger.rb/31641
+I, [2012-11-27T00:58:41.773496 #16186]  INFO -- : Checking for library: glut
+I, [2012-11-27T00:58:41.819402 #16186]  INFO -- : Function found: glutSolidTeapot()
+I, [2012-11-27T00:58:41.819505 #16186]  INFO -- : Library found: glut
+I, [2012-11-27T00:58:41.819558 #16186]  INFO -- : Checking for library: GLU
+I, [2012-11-27T00:58:41.900479 #16186]  INFO -- : Function found: gluLookAt()
+I, [2012-11-27T00:58:41.900581 #16186]  INFO -- : Library found: GLU
+I, [2012-11-27T00:58:41.900634 #16186]  INFO -- : Checking for library: GL
+I, [2012-11-27T00:58:41.969228 #16186]  INFO -- : Function found: glVertex3d()
+I, [2012-11-27T00:58:41.969330 #16186]  INFO -- : Library found: GL
+I, [2012-11-27T00:58:41.969598 #16186]  INFO -- : Rakefile written

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-opengl2
 version: !ruby/object:Gem::Version
-  version: 0.60.5
+  version: 0.60.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mkrf
@@ -31,82 +31,31 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.2.3
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '10.0'
 description: This is a modernization of the glorious but unmaintained ruby-opengl
   version, aimed at making it compatible with ruby 1.9.x series. At the moment, it
-  successfully compiles on OS X Lion and Debian 6.0.3
+  successfully compiles on OS X Mountain Lion and Debian 6.0.3
 email: p4010@me.com
 executables: []
 extensions:
 - Rakefile
 extra_rdoc_files: []
 files:
-- lib/gl.bundle
-- lib/glu.bundle
-- lib/glut.bundle
-- lib/opengl.rb
-- ext/common/common.h
-- ext/common/conv.h
-- ext/common/funcdef.h
-- ext/common/gl-enums.h
-- ext/common/gl-error.h
-- ext/common/gl-types.h
-- ext/common/glu-enums.h
-- ext/gl/gl-1.0-1.1.c
-- ext/gl/gl-1.0-1.1.o
-- ext/gl/gl-1.2.c
-- ext/gl/gl-1.2.o
-- ext/gl/gl-1.3.c
-- ext/gl/gl-1.3.o
-- ext/gl/gl-1.4.c
-- ext/gl/gl-1.4.o
-- ext/gl/gl-1.5.c
-- ext/gl/gl-1.5.o
-- ext/gl/gl-2.0.c
-- ext/gl/gl-2.0.o
-- ext/gl/gl-2.1.c
-- ext/gl/gl-2.1.o
-- ext/gl/gl-enums.c
-- ext/gl/gl-enums.o
-- ext/gl/gl-error.c
-- ext/gl/gl-error.o
-- ext/gl/gl-ext-3dfx.c
-- ext/gl/gl-ext-3dfx.o
-- ext/gl/gl-ext-arb.c
-- ext/gl/gl-ext-arb.o
-- ext/gl/gl-ext-ati.c
-- ext/gl/gl-ext-ati.o
-- ext/gl/gl-ext-ext.c
-- ext/gl/gl-ext-ext.o
-- ext/gl/gl-ext-gremedy.c
-- ext/gl/gl-ext-gremedy.o
-- ext/gl/gl-ext-nv.c
-- ext/gl/gl-ext-nv.o
-- ext/gl/gl.bundle
-- ext/gl/gl.c
-- ext/gl/gl.o
-- ext/gl/mkrf.log
-- ext/gl/mkrf_conf.rb
-- ext/glu/glu-enums.c
-- ext/glu/glu-enums.o
-- ext/glu/glu.bundle
-- ext/glu/glu.c
-- ext/glu/glu.o
-- ext/glu/mkrf.log
-- ext/glu/mkrf_conf.rb
-- ext/glut/glut.bundle
-- ext/glut/glut.c
-- ext/glut/glut.o
-- ext/glut/mkrf.log
-- ext/glut/mkrf_conf.rb
-- examples/misc/anisotropic.rb
-- examples/misc/fbo_test.rb
-- examples/misc/font-glut.rb
-- examples/misc/glfwtest.rb
-- examples/misc/OGLBench.rb
-- examples/misc/plane.rb
-- examples/misc/readpixel.rb
-- examples/misc/sdltest.rb
-- examples/misc/trislam.rb
 - examples/NeHe/nehe_lesson02.rb
 - examples/NeHe/nehe_lesson03.rb
 - examples/NeHe/nehe_lesson04.rb
@@ -165,6 +114,73 @@ files:
 - examples/RedBook/texturesurf.rb
 - examples/RedBook/varray.rb
 - examples/RedBook/wrap.rb
+- examples/misc/OGLBench.rb
+- examples/misc/anisotropic.rb
+- examples/misc/fbo_test.rb
+- examples/misc/font-glut.rb
+- examples/misc/glfwtest.rb
+- examples/misc/plane.rb
+- examples/misc/readpixel.rb
+- examples/misc/sdltest.rb
+- examples/misc/trislam.rb
+- ext/common/common.h
+- ext/common/conv.h
+- ext/common/funcdef.h
+- ext/common/gl-enums.h
+- ext/common/gl-error.h
+- ext/common/gl-types.h
+- ext/common/glu-enums.h
+- ext/gl/gl-1.0-1.1.c
+- ext/gl/gl-1.0-1.1.o
+- ext/gl/gl-1.2.c
+- ext/gl/gl-1.2.o
+- ext/gl/gl-1.3.c
+- ext/gl/gl-1.3.o
+- ext/gl/gl-1.4.c
+- ext/gl/gl-1.4.o
+- ext/gl/gl-1.5.c
+- ext/gl/gl-1.5.o
+- ext/gl/gl-2.0.c
+- ext/gl/gl-2.0.o
+- ext/gl/gl-2.1.c
+- ext/gl/gl-2.1.o
+- ext/gl/gl-enums.c
+- ext/gl/gl-enums.o
+- ext/gl/gl-error.c
+- ext/gl/gl-error.o
+- ext/gl/gl-ext-3dfx.c
+- ext/gl/gl-ext-3dfx.o
+- ext/gl/gl-ext-arb.c
+- ext/gl/gl-ext-arb.o
+- ext/gl/gl-ext-ati.c
+- ext/gl/gl-ext-ati.o
+- ext/gl/gl-ext-ext.c
+- ext/gl/gl-ext-ext.o
+- ext/gl/gl-ext-gremedy.c
+- ext/gl/gl-ext-gremedy.o
+- ext/gl/gl-ext-nv.c
+- ext/gl/gl-ext-nv.o
+- ext/gl/gl.c
+- ext/gl/gl.o
+- ext/gl/gl.so
+- ext/gl/mkrf.log
+- ext/gl/mkrf_conf.rb
+- ext/glu/glu-enums.c
+- ext/glu/glu-enums.o
+- ext/glu/glu.c
+- ext/glu/glu.o
+- ext/glu/glu.so
+- ext/glu/mkrf.log
+- ext/glu/mkrf_conf.rb
+- ext/glut/glut.c
+- ext/glut/glut.o
+- ext/glut/glut.so
+- ext/glut/mkrf.log
+- ext/glut/mkrf_conf.rb
+- lib/gl.so
+- lib/glu.so
+- lib/glut.so
+- lib/opengl.rb
 - test/README
 - test/tc_common.rb
 - test/tc_ext_arb.rb