glut 8.2.1-x86-mingw32 → 8.2.2-x86-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d38450de1d55a3da92c0e1fc0fcbbc915222ab
-  data.tar.gz: f9c68700d51b35d0b85c039186419062708fd308
+  metadata.gz: a33888ebf86c43b5f01c4fd20f16c39d70f531e4
+  data.tar.gz: 391b599490ba64824935bc57ff49ebaccc1301d9
 SHA512:
-  metadata.gz: 13352b1d6bcd90f1f863059fa197398106d6992fc8598510cc156c61bb6fe60b4b2b5d4ce1b4e6c6c8ca694fc5c3ce04c884c789e178063fe76cd28ff4a9158e
-  data.tar.gz: 87e6de78a787457f3b9be7940e1d674c2863060b58ff6755ba9353c6f02562d7bd894bb187cf578846fb2d18483b8c2a6c9c71f191f77792ec601e29c9d111df
+  metadata.gz: 7a0a2f40d3236765488aa83cf406d8f8b3af1a70cf2a0d8828759c356f020087f252a33158826ef870772b6cc1e5f052823c6f28eb4d809f63d54b75aef6c1ff
+  data.tar.gz: ea70f47c39240dae2f0cf510984a68cbd43d948c91cc8ff11b6deb4f408e803185a9d090ff436b498c6e71ecb760795a90d119cac42476bd7bed7fb0f331cc0c

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 8.2.2 / 2016-01-21
+
+* Add ruby-2.2 and 2.3 to binary windows gems.
+* Fix compilation on OS-X. Github #2
+
 === 8.2.1 / 2014-10-06
 
 * Add ruby-2.1 to binary windows gems.

data/Rakefile

@@ -32,6 +32,8 @@ hoe = Hoe.spec 'glut' do
   self.extra_rdoc_files = FileList['*.rdoc']
 
   extra_dev_deps << ['rake-compiler', '~> 0.9', '>= 0.9.1']
+  extra_dev_deps << ['rake-compiler-dock', '~> 0.5.0']
+  extra_dev_deps << ['mini_portile2', '~> 2.1']
 
   self.spec_extras = {
     :extensions            => %w[ext/glut/extconf.rb],
@@ -61,4 +63,12 @@ ENV['RUBY_CC_VERSION'].to_s.split(':').each do |ruby_version|
   end
 end
 
+desc "Build windows binary gems per rake-compiler-dock."
+task "gem:windows" do
+  require "rake_compiler_dock"
+  RakeCompilerDock.sh <<-EOT
+    rake cross native gem MAKE='nice make -j`nproc`' RUBY_CC_VERSION=2.3.0:2.2.2:2.1.6:2.0.0:1.9.3
+  EOT
+end
+
 task :test => :compile

data/ext/glut/common.h

@@ -25,12 +25,16 @@
 #include <ruby.h>
 #include "extconf.h"
 
-#ifdef HAVE_GLUT_GLUT_H
-#include <GLUT/freeglut.h>
+#ifdef HAVE_GL_FREEGLUT_H
+#include <GL/freeglut.h>
 #endif
 
 #ifdef HAVE_GL_GLUT_H
-#include <GL/freeglut.h>
+#include <GL/glut.h>
+#endif
+
+#ifdef HAVE_GLUT_GLUT_H
+#include <GLUT/glut.h>
 #endif
 
 #ifndef GLUTCALLBACK

data/ext/glut/extconf.rb

@@ -14,7 +14,9 @@ def have_framework(fw, &b)
 end unless respond_to? :have_framework
 
 if enable_config('win32-cross')
-  require "mini_portile"
+  require "rubygems"
+  gem "mini_portile2", "~> 2.0"
+  require "mini_portile2"
 
   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"
@@ -56,6 +58,7 @@ ok =
   (have_framework('OpenGL') && have_framework('GLUT') && have_framework('Cocoa'))
 
 ok &&=
+  have_header('GL/freeglut.h') ||
   have_header('GL/glut.h') ||
   have_header('GLUT/glut.h') # OS X
 

data/ext/glut/glut_ext.c

@@ -69,16 +69,32 @@ void Init_glut_ext() {
 	rb_define_module_function(mGlut, "glutInitContextProfile", glut_InitContextProfile, 1);
 
 	/* Context-related flags */
+#ifdef GLUT_INIT_MAJOR_VERSION
 	rb_define_const(mGlut, "GLUT_INIT_MAJOR_VERSION", INT2NUM(GLUT_INIT_MAJOR_VERSION));
+#endif
+#ifdef GLUT_INIT_MINOR_VERSION
 	rb_define_const(mGlut, "GLUT_INIT_MINOR_VERSION", INT2NUM(GLUT_INIT_MINOR_VERSION));
+#endif
+#ifdef GLUT_INIT_FLAGS
 	rb_define_const(mGlut, "GLUT_INIT_FLAGS", INT2NUM(GLUT_INIT_FLAGS));
+#endif
+#ifdef GLUT_INIT_PROFILE
 	rb_define_const(mGlut, "GLUT_INIT_PROFILE", INT2NUM(GLUT_INIT_PROFILE));
+#endif
 
 	/* Flags for glutInitContextFlags */
+#ifdef GLUT_FORWARD_COMPATIBLE
 	rb_define_const(mGlut, "GLUT_FORWARD_COMPATIBLE", INT2NUM(GLUT_FORWARD_COMPATIBLE));
+#endif
+#ifdef GLUT_DEBUG
 	rb_define_const(mGlut, "GLUT_DEBUG", INT2NUM(GLUT_DEBUG));
+#endif
 
 	/* Flags for glutInitContextProfile */
+#ifdef GLUT_CORE_PROFILE
 	rb_define_const(mGlut, "GLUT_CORE_PROFILE", INT2NUM(GLUT_CORE_PROFILE));
+#endif
+#ifdef GLUT_COMPATIBILITY_PROFILE
 	rb_define_const(mGlut, "GLUT_COMPATIBILITY_PROFILE", INT2NUM(GLUT_COMPATIBILITY_PROFILE));
+#endif
 }

data/lib/glut.rb

@@ -25,5 +25,5 @@ module GLUT
 end
 
 module Glut
-  VERSION = "8.2.1"
+  VERSION = "8.2.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glut
 version: !ruby/object:Gem::Version
-  version: 8.2.1
+  version: 8.2.2
 platform: x86-mingw32
 authors:
 - Eric Hodel
@@ -13,29 +13,8 @@ authors:
 - James Adam
 autorequire: 
 bindir: bin
-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-10-06 00:00:00.000000000 Z
+cert_chain: []
+date: 2016-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -71,20 +50,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.1
+- !ruby/object:Gem::Dependency
+  name: rake-compiler-dock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+- !ruby/object:Gem::Dependency
+  name: mini_portile2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: Glut bindings for OpenGL. To be used with the {opengl}[https://github.com/larskanis/opengl]
   gem.
 email:
@@ -120,6 +127,8 @@ files:
 - lib/glut/1.9/glut.so
 - lib/glut/2.0/glut.so
 - lib/glut/2.1/glut.so
+- lib/glut/2.2/glut.so
+- lib/glut/2.3/glut.so
 - lib/glut/dummy.rb
 homepage: 
 licenses:
@@ -143,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Glut bindings for OpenGL