[DRE-commits] [SCM] ruby-opengl.git branch, master, updated. upstream/0.60.1-16-g36f639e

Cédric Boutillier cedric.boutillier at gmail.com
Sun Apr 22 22:15:33 UTC 2012


The following commit has been merged in the master branch:
commit b633120039470c4b115b5b08fd560631d736b71d
Author: Cédric Boutillier <cedric.boutillier at gmail.com>
Date:   Sun Apr 22 23:23:37 2012 +0200

    Fix syntax in examples of the Orangebook

diff --git a/debian/patches/0900_fix_orangebook_examples.patch b/debian/patches/0900_fix_orangebook_examples.patch
new file mode 100644
index 0000000..f772244
--- /dev/null
+++ b/debian/patches/0900_fix_orangebook_examples.patch
@@ -0,0 +1,81 @@
+Description: fix syntax in some examples of the OrangeBook
+Author: Cédric Boutillier <cedric.boutillier at gmail.com>
+Forwarded: no
+Last-Update: 2012-04-22
+
+--- ruby-opengl-0.60.1.orig/examples/OrangeBook/brick.rb
++++ ruby-opengl-0.60.1/examples/OrangeBook/brick.rb
+@@ -139,13 +139,13 @@ display = lambda do
+ 	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT)
+ 	
+ 	case $gleModel[0]
+-		when :teapot :
++		when :teapot
+ 			glutSolidTeapot(0.6)
+-		when :torus :
++		when :torus
+ 			glutSolidTorus(0.2, 0.6, 64, 64)
+-		when :sphere :
++		when :sphere
+ 			glutSolidSphere(0.6, 64, 64)
+-		when :cube :
++		when :cube
+ 			drawCube()
+ 	end
+ 	glFlush()
+@@ -257,7 +257,7 @@ end
+ 
+ special = lambda do |key,x,y|
+ 	case key
+-	when GLUT_KEY_HOME:
++	when GLUT_KEY_HOME
+ 		$fXDiff = 0
+ 		$fYDiff = 35
+ 		$fZDiff = 0
+@@ -266,13 +266,13 @@ special = lambda do |key,x,y|
+ 		$fXInertia = -0.5
+ 		$fYInertia = 0
+ 		$fScale = 1.0
+-	when GLUT_KEY_LEFT:
++	when GLUT_KEY_LEFT
+ 		$fXDiff -= 1
+-	when GLUT_KEY_RIGHT:
++	when GLUT_KEY_RIGHT
+ 		$fXDiff += 1
+-	when GLUT_KEY_UP:
++	when GLUT_KEY_UP
+ 		$fYDiff -= 1
+-	when GLUT_KEY_DOWN:
++	when GLUT_KEY_DOWN
+ 		$fYDiff += 1
+ 	end
+ end
+--- ruby-opengl-0.60.1.orig/examples/OrangeBook/particle.rb
++++ ruby-opengl-0.60.1/examples/OrangeBook/particle.rb
+@@ -289,7 +289,7 @@ end
+ 
+ special = lambda do |key,x,y|
+ 	case key
+-	when GLUT_KEY_HOME:
++	when GLUT_KEY_HOME
+ 		$fXDiff = 206
+ 		$fYDiff = 16
+ 		$fZDiff = 10
+@@ -299,13 +299,13 @@ special = lambda do |key,x,y|
+ 		$fYInertia = 0
+ 		$fScale = 0.25
+ 		$particleTime = 0
+-	when GLUT_KEY_LEFT:
++	when GLUT_KEY_LEFT
+ 		$fXDiff -= 1
+-	when GLUT_KEY_RIGHT:
++	when GLUT_KEY_RIGHT
+ 		$fXDiff += 1
+-	when GLUT_KEY_UP:
++	when GLUT_KEY_UP
+ 		$fYDiff -= 1
+-	when GLUT_KEY_DOWN:
++	when GLUT_KEY_DOWN
+ 		$fYDiff += 1
+ 	end
+ end
diff --git a/debian/patches/series b/debian/patches/series
index 3376aaa..312ba5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 0100_remove_rubygems.patch
 0300_fix_STR2CSTR.patch
 0500_fix_metadata_for_extensions.patch
+0900_fix_orangebook_examples.patch

-- 
ruby-opengl.git



More information about the Pkg-ruby-extras-commits mailing list