glut 8.1.0 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a34676086739fe14428a6bfd66402efdce5120ae
-  data.tar.gz: 162f0fc72bd33d200572af21384ed88c0f81cf8f
+  metadata.gz: 9788722e2d44f88e83148aeff2d385204d7864f6
+  data.tar.gz: 0aeece59c8101debaa2a359f1c403a9ab2a2c9ec
 SHA512:
-  metadata.gz: 63ef01adeee45f68525548847ff474f9da837ad82a50f8877f4f1fa0c509c9057f618b55be8921e7ef505d9eb15160b82043af9d1a9c6b29bcb0d317fe2f0f5b
-  data.tar.gz: b38c761031179108f3de27b726ea67e769c6160677bc08b2e2ac8d55b5d5e9addb821667663f91a3d006b8cfecc58c6eae56a2e41d122e715cb07f0867bcab93
+  metadata.gz: c19d3e8ead5d61ea53e3ca580ec030bbef1a9a022cf05d594786740e501f18712aa7990924617830b1e6e6698e6006468869237a10a82bb0baf41887b6f0988a
+  data.tar.gz: d78436ce4f5064742dd7a40113737ef8eb550f78537b041b195e82c01b5ef34b803aa887e372a787a301a29733bc496ef27bd826cff780eafabefb7e2dea64f8

data/.travis.yml

@@ -0,0 +1,15 @@
+language: ruby
+rvm:
+#   - "1.9.3"
+  - "2.0.0"
+#   - jruby-19mode # JRuby in 1.9 mode
+#   - rbx-19mode
+before_install:
+  - gem install hoe rake-compiler;
+  - sudo apt-get install xpra xserver-xorg-video-dummy freeglut3-dev;
+before_script:
+  - "xpra --xvfb=\"Xorg +extension GLX -config `pwd`/test/dummy.xorg.conf -logfile ${HOME}/.xpra/xorg.log\"  start :9"
+script: "env DISPLAY=:9 rake test"
+after_script:
+  - "xpra stop :9"
+  - "cat ~/.xpra/*"

data/History.rdoc

@@ -1,3 +1,10 @@
-=== 8.1.0
+=== 8.2.0 / 2014-03-14
 
-* Moved glut into a standalone gem.
+* Add x64-mingw platform for cross build and add ruby-2.0.0 to binary gems.
+* Update to freeglut-2.8.1 for cross build.
+* Don't pollute the global namespace. Use GLUT namespace.
+* Replace deprecated rb_thread_blocking_region() by rb_thread_call_with_gvl()
+
+=== 8.1.0 / 2013-03-03
+
+* Moved glut into a standalone gem.

data/Manifest.txt

@@ -1,12 +1,12 @@
 .autotest
 .gemtest
 .gitignore
+.travis.yml
 History.rdoc
 MIT-LICENSE
 Manifest.txt
 README.rdoc
 Rakefile
-Rakefile.cross
 ext/glut/common.h
 ext/glut/extconf.rb
 ext/glut/glut.c

data/README.rdoc

@@ -2,7 +2,7 @@
 
 == Description
 
-Glut bindings for OpenGL. To be used with the opengl gem.
+Glut bindings for OpenGL. To be used with the {opengl}[https://github.com/larskanis/opengl] gem.
 
 == Features and Problems
 
@@ -12,7 +12,7 @@ Glut bindings for OpenGL. To be used with the opengl gem.
 
 * Ruby 1.9.2+
   *  see {0.7}[https://github.com/archSeer/opengl/tree/0.7] for Ruby 1.8.x compatible branch
-* OpenGL, GLU and (free-)GLUT development files installed
+* (free-)GLUT development files installed
 
 == Install
 

data/Rakefile

@@ -1,4 +1,5 @@
-#-*-ruby-*-
+# -*- coding: UTF-8 -*-
+# -*-ruby-*-
 #
 # Copyright (C) 2006 John M. Gabriele <jmg3000@gmail.com>
 # Copyright (C) Eric Hodel <drbrain@segment7.net>
@@ -16,7 +17,6 @@
 
 require 'hoe'
 require 'rake/extensiontask'
-load 'Rakefile.cross'
 
 hoe = Hoe.spec 'glut' do
   developer 'Eric Hodel', 'drbrain@segment7.net'
@@ -43,9 +43,9 @@ Rake::ExtensionTask.new 'glut', hoe.spec do |ext|
   ext.lib_dir = 'lib/glut'
 
   ext.cross_compile = true
-  ext.cross_platform = ['i386-mingw32']
+  ext.cross_platform = ['i386-mingw32', 'x64-mingw32']
   ext.cross_config_options += [
-    "--with-installed-dir=#{STATIC_INSTALLDIR}",
+    "--enable-win32-cross",
   ]
 end
 

data/ext/glut/extconf.rb

@@ -13,10 +13,36 @@ def have_framework(fw, &b)
   end
 end unless respond_to? :have_framework
 
-if ENV['CROSS_COMPILING']
-  dir_config("installed")
+if enable_config('win32-cross')
+  require "mini_portile"
+
+  LIBFREEGLUT_VERSION = ENV['LIBFREEGLUT_VERSION'] || '2.8.1'
+  LIBFREEGLUT_SOURCE_URI = "http://downloads.sourceforge.net/project/freeglut/freeglut/#{LIBFREEGLUT_VERSION}/freeglut-#{LIBFREEGLUT_VERSION}.tar.gz"
+
+  recipe = MiniPortile.new("libglut", LIBFREEGLUT_VERSION)
+  recipe.files = [LIBFREEGLUT_SOURCE_URI]
+  recipe.target = portsdir = File.expand_path('../../../ports', __FILE__)
+  # Prefer host_alias over host in order to use i586-mingw32msvc as
+  # correct compiler prefix for cross build, but use host if not set.
+  recipe.host = RbConfig::CONFIG["host_alias"].empty? ? RbConfig::CONFIG["host"] : RbConfig::CONFIG["host_alias"]
+  recipe.configure_options = [
+    "--enable-static",
+    "--target=#{recipe.host}",
+    "--host=#{recipe.host}",
+  ]
+
+  checkpoint = File.join(portsdir, "#{recipe.name}-#{recipe.version}-#{recipe.host}.installed")
+  unless File.exist?(checkpoint)
+    recipe.cook
+    # --disable-static can not be used since it breaks the freeglut build,
+    # but to enforce static linking, we delete the import lib.
+    FileUtils.rm File.join(recipe.path, "lib", "libglut.dll.a")
+    FileUtils.touch checkpoint
+  end
+  recipe.activate
 
   $defs.push "-DFREEGLUT_EXPORTS"
+  dir_config('freeglut', "#{recipe.path}/include", "#{recipe.path}/lib")
 
   # libfreeglut is linked to gdi32 and winmm
   have_library( 'gdi32', 'CreateDC' ) && append_library( $libs, 'gdi32' )
@@ -24,10 +50,10 @@ if ENV['CROSS_COMPILING']
 end
 
 ok =
-   have_library('glut32.lib',   'gluSolidTeapot') ||
-   have_library('glut', 'glutSolidTeapot') ||
-   have_framework('GLUT') &&
-   have_framework('Cocoa')
+  (have_library('opengl32.lib', 'glVertex3d') && have_library('glut32.lib',   'gluSolidTeapot')) ||
+  (have_library('opengl32') && have_library('glut')) ||
+  (have_library('GL',   'glVertex3d') && have_library('glut', 'glutSolidTeapot')) ||
+  (have_framework('OpenGL') && have_framework('GLUT') && have_framework('Cocoa'))
 
 ok &&=
   have_header('GL/glut.h') ||

data/ext/glut/glut.c

@@ -21,6 +21,8 @@
  */
 
 #include "common.h"
+extern void *rb_thread_call_without_gvl(void *(*func)(void *), void *data1,
+         rb_unblock_function_t *ubf, void *data2);
 
 static VALUE menu_callback = Qnil;
 static ID call_id; /* 'call' method id */
@@ -115,15 +117,15 @@ VALUE obj,arg1,arg2;
 	return Qnil;
 }
 
-VALUE glut_MainLoop0(void *ignored) {
+void *glut_MainLoop0(void *ignored) {
   glutMainLoop();
 
-  return Qnil; /* never reached */
+  return NULL; /* never reached */
 }
 
 static VALUE
 glut_MainLoop(void) {
-  rb_thread_blocking_region(glut_MainLoop0, NULL, NULL, NULL);
+  rb_thread_call_without_gvl(glut_MainLoop0, NULL, NULL, NULL);
 
   return Qnil; /* never reached */
 }

data/ext/glut/glut_ext.c

@@ -16,25 +16,36 @@
 
 #include "common.h"
 
+/*
+ * Process loop function, see freeglut_main.c
+ */
+GLUT_SIMPLE_FUNCTION(MainLoopEvent)
+GLUT_SIMPLE_FUNCTION(LeaveMainLoop)
+GLUT_SIMPLE_FUNCTION(Exit)
+
+/*
+ * Window management functions, see freeglut_window.c
+ */
+GLUT_SIMPLE_FUNCTION(FullScreenToggle)
+GLUT_SIMPLE_FUNCTION(LeaveFullScreen)
+
+/* Initialization functions */
 static VALUE
-glut_InitContextVersion(obj,majorVersion,minorVersion)
-VALUE obj,majorVersion,minorVersion;
+glut_InitContextVersion(VALUE obj, VALUE majorVersion, VALUE minorVersion)
 {
 	glutInitContextVersion(NUM2INT(majorVersion), NUM2INT(minorVersion));
 	return Qnil;
 }
 
 static VALUE
-glut_InitContextFlags(obj,flags)
-VALUE obj,flags;
+glut_InitContextFlags(VALUE obj, VALUE flags)
 {
 	glutInitContextFlags(NUM2INT(flags));
 	return Qnil;
 }
 
 static VALUE
-glut_InitContextProfile(obj,profile)
-VALUE obj,profile;
+glut_InitContextProfile(VALUE obj, VALUE profile)
 {
 	glutInitContextProfile(NUM2INT(profile));
 	return Qnil;
@@ -43,9 +54,19 @@ VALUE obj,profile;
 void Init_glut_ext() {
 	VALUE mGlut = rb_path2class("Glut");
 
+	/* Process loop functions */
+	rb_define_module_function(mGlut, "glutMainLoopEvent", glut_MainLoopEvent, 0);
+	rb_define_module_function(mGlut, "glutLeaveMainLoop", glut_LeaveMainLoop, 0);
+	rb_define_module_function(mGlut, "glutExit", glut_Exit, 0);
+
+	/* Window management functions */
+	rb_define_module_function(mGlut, "glutFullScreenToggle", glut_FullScreenToggle, 0);
+	rb_define_module_function(mGlut, "glutLeaveFullScreen", glut_LeaveFullScreen, 0);
+
+	/* Initialization functions */
 	rb_define_module_function(mGlut, "glutInitContextVersion", glut_InitContextVersion, 2);
 	rb_define_module_function(mGlut, "glutInitContextFlags", glut_InitContextFlags, 1);
-	rb_define_module_function(mGlut, "glutInitContextFlags", glut_InitContextFlags, 1);
+	rb_define_module_function(mGlut, "glutInitContextProfile", glut_InitContextProfile, 1);
 
 	/* Context-related flags */
 	rb_define_const(mGlut, "GLUT_INIT_MAJOR_VERSION", INT2NUM(GLUT_INIT_MAJOR_VERSION));
@@ -60,6 +81,4 @@ void Init_glut_ext() {
 	/* Flags for glutInitContextProfile */
 	rb_define_const(mGlut, "GLUT_CORE_PROFILE", INT2NUM(GLUT_CORE_PROFILE));
 	rb_define_const(mGlut, "GLUT_COMPATIBILITY_PROFILE", INT2NUM(GLUT_COMPATIBILITY_PROFILE));
-
-	
 }

data/lib/glut.rb

@@ -1,6 +1,9 @@
-require 'glut/glut'
-
-include Glut
+begin
+  RUBY_VERSION =~ /(\d+.\d+)/
+  require "glut/#{$1}/glut"
+rescue LoadError
+  require 'glut/glut'
+end
 
 # (Glut.)glutInit -> GLUT.Init
 # (Glut::)GLUT_RGBA -> GLUT::RGBA
@@ -22,5 +25,5 @@ module GLUT
 end
 
 module Glut
-  VERSION = "8.1.0"
+  VERSION = "8.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glut
 version: !ruby/object:Gem::Version
-  version: 8.1.0
+  version: 8.2.0
 platform: ruby
 authors:
 - Eric Hodel
@@ -13,8 +13,29 @@ authors:
 - James Adam
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDLjCCAhagAwIBAgIBAjANBgkqhkiG9w0BAQUFADA9MQ4wDAYDVQQDDAVrYW5p
+  czEXMBUGCgmSJomT8ixkARkWB2NvbWNhcmQxEjAQBgoJkiaJk/IsZAEZFgJkZTAe
+  Fw0xNDAyMjYwOTMzMDBaFw0xNTAyMjYwOTMzMDBaMD0xDjAMBgNVBAMMBWthbmlz
+  MRcwFQYKCZImiZPyLGQBGRYHY29tY2FyZDESMBAGCgmSJomT8ixkARkWAmRlMIIB
+  IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApop+rNmg35bzRugZ21VMGqI6
+  HGzPLO4VHYncWn/xmgPU/ZMcZdfj6MzIaZJ/czXyt4eHpBk1r8QOV3gBXnRXEjVW
+  9xi+EdVOkTV2/AVFKThcbTAQGiF/bT1n2M+B1GTybRzMg6hyhOJeGPqIhLfJEpxn
+  lJi4+ENAVT4MpqHEAGB8yFoPC0GqiOHQsdHxQV3P3c2OZqG+yJey74QtwA2tLcLn
+  Q53c63+VLGsOjODl1yPn/2ejyq8qWu6ahfTxiIlSar2UbwtaQGBDFdb2CXgEufXT
+  L7oaPxlmj+Q2oLOfOnInd2Oxop59HoJCQPsg8f921J43NCQGA8VHK6paxIRDLQID
+  AQABozkwNzAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUvgTdT7fe
+  x17ugO3IOsjEJwW7KP4wDQYJKoZIhvcNAQEFBQADggEBAFmIAhRT0awqLQN9e4Uv
+  ZEk+jUWv4zkb+TWiKFJXlwjPyjGbZY9gVfOwAwMibYOK/t/+57ZzW3d0L12OUwvo
+  on84NVvYtIr1/iskJFWFkMoIquAFCdi9p68stSPMQK2XcrJJuRot29fJtropsZBa
+  2cpaNd/sRYdK4oep2usdKifA1lI0hIkPb3r5nLfwG2lAqBH7WZsUICHcTgR0VEbG
+  z9Ug5qQp9Uz73xC9YdGvGiuOX53LYobHAR4MWi2xxDlHI+ER8mRz0eY2FUuNu/Wj
+  GrqF74zpLl7/KFdHC8VmzwZS18hvDjxeLVuVI2gIGnBInqnlqv05g/l4/1pISh5j
+  dS4=
+  -----END CERTIFICATE-----
+date: 2014-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -22,14 +43,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -56,15 +77,16 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '3.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.5'
-description: Glut bindings for OpenGL. To be used with the opengl gem.
+        version: '3.7'
+description: Glut bindings for OpenGL. To be used with the {opengl}[https://github.com/larskanis/opengl]
+  gem.
 email:
 - drbrain@segment7.net
 - ''
@@ -84,12 +106,12 @@ files:
 - .autotest
 - .gemtest
 - .gitignore
+- .travis.yml
 - History.rdoc
 - MIT-LICENSE
 - Manifest.txt
 - README.rdoc
 - Rakefile
-- Rakefile.cross
 - ext/glut/common.h
 - ext/glut/extconf.rb
 - ext/glut/glut.c
@@ -98,7 +120,8 @@ files:
 - lib/glut.rb
 - lib/glut/dummy.rb
 homepage: 
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options:
@@ -118,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: glut
-rubygems_version: 2.0.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Glut bindings for OpenGL

metadata.gz.sig

@@ -0,0 +1,3 @@
+�)qv^P�+�;g��o&���M�u�h������%pB,
+x#,X:@�%�[���
+<�d3'~�!�>�w`�l��E�x��W��C�U'	s$���w��r04���r�9�)}��5Z-��ig�"�D

data/Rakefile.cross

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-# -*- ruby -*-
-
-require 'rubygems'
-require 'hoe'
-require 'rake/extensiontask'
-require 'rake/extensioncompiler'
-require 'uri'
-require 'rbconfig'
-require 'pathname'
-
-ENV['RUBY_CC_VERSION'] ||= '1.9.3'
-
-# Cross-compilation constants
-COMPILE_HOME               = Pathname( "build" ).expand_path
-STATIC_SOURCESDIR          = COMPILE_HOME + 'sources'
-STATIC_BUILDDIR            = COMPILE_HOME + 'builds'
-STATIC_INSTALLDIR          = COMPILE_HOME + 'install'
-RUBY_BUILD                 = RbConfig::CONFIG["host"]
-CROSS_PREFIX = begin
-  Rake::ExtensionCompiler.mingw_host
-rescue => err
-  $stderr.puts "Cross-compilation disabled -- %s" % [ err.message ]
-  'unknown'
-end
-
-NUM_CPUS = if File.exist?('/proc/cpuinfo')
-    File.read('/proc/cpuinfo').scan('processor').length
-elsif RUBY_PLATFORM.include?( 'darwin' )
-    `system_profiler SPHardwareDataType | grep 'Cores' | awk '{print $5}'`.chomp
-else
-    1
-end
-
-
-# Fetch libfreeglut tarball
-LIBFREEGLUT_VERSION            = ENV['LIBFREEGLUT_VERSION'] || '2.8.0'
-LIBFREEGLUT_SOURCE_URI         = URI( "http://downloads.sourceforge.net/project/freeglut/freeglut/#{LIBFREEGLUT_VERSION}/freeglut-#{LIBFREEGLUT_VERSION}.tar.gz" )
-LIBFREEGLUT_TARBALL            = STATIC_SOURCESDIR + File.basename( LIBFREEGLUT_SOURCE_URI.path )
-STATIC_LIBFREEGLUT_BUILDDIR    = STATIC_BUILDDIR + LIBFREEGLUT_TARBALL.basename(".tar.gz")
-LIBFREEGLUT_MAKEFILE           = STATIC_LIBFREEGLUT_BUILDDIR + 'Makefile'
-LIBFREEGLUT_A                  = STATIC_INSTALLDIR + 'lib' + 'libglut.a'
-
-
-# clean intermediate files and folders
-CLEAN.include( STATIC_BUILDDIR.to_s )
-
-#####################################################################
-### C R O S S - C O M P I L A T I O N - T A S K S
-#####################################################################
-
-
-directory STATIC_SOURCESDIR.to_s
-
-#
-# Static libfreeglut build tasks
-#
-directory STATIC_LIBFREEGLUT_BUILDDIR.to_s
-
-# libfreeglut source file should be stored there
-file LIBFREEGLUT_TARBALL => STATIC_SOURCESDIR do |t|
-  # download the source file using wget or curl
-  chdir File.dirname(t.name) do
-    sh "wget '#{LIBFREEGLUT_SOURCE_URI}' -O #{LIBFREEGLUT_TARBALL}"
-  end
-end
-
-# Extract the libfreeglut builds
-file STATIC_LIBFREEGLUT_BUILDDIR => LIBFREEGLUT_TARBALL do |t|
-  sh 'tar', '-xzf', LIBFREEGLUT_TARBALL.to_s, '-C', STATIC_LIBFREEGLUT_BUILDDIR.parent.to_s
-end
-
-LIBFREEGLUT_ENV = [
-  "'CPPFLAGS=-I#{STATIC_INSTALLDIR}/include'",
-  "'LDFLAGS=-L#{STATIC_INSTALLDIR}/lib'",
-]
-# generate the makefile in a clean build location
-file LIBFREEGLUT_MAKEFILE => [STATIC_LIBFREEGLUT_BUILDDIR] do |t|
-  Dir.chdir( STATIC_LIBFREEGLUT_BUILDDIR ) do
-    options = [
-      "--target=#{CROSS_PREFIX}",
-      "--host=#{CROSS_PREFIX}",
-      "--build=#{RUBY_BUILD}",
-      "--prefix=#{STATIC_INSTALLDIR}",
-      "--enable-static",
-    ]
-
-    configure_path = STATIC_LIBFREEGLUT_BUILDDIR + 'configure'
-    sh "env #{[LIBFREEGLUT_ENV, configure_path.to_s, *options].join(" ")}"
-  end
-end
-
-# generate the makefile in a clean build location
-task LIBFREEGLUT_A => [LIBFREEGLUT_MAKEFILE] do |t|
-  Dir.chdir( STATIC_LIBFREEGLUT_BUILDDIR ) do
-    sh "make -j#{NUM_CPUS} install"
-    (STATIC_INSTALLDIR + "lib" + "libglut.dll.a").unlink
-  end
-end
-
-desc "compile static libraries"
-task :static_libs => [ LIBFREEGLUT_A ]
-
-desc 'cross compile required libs for win32'
-task :cross => [ :static_libs ] do
-  ENV['CROSS_COMPILING'] = 'yes'
-end