gosu 0.7.45 → 0.7.46

data/dependencies/libvorbis/lib/window.h

@@ -0,0 +1,26 @@
+/********************************************************************
+ *                                                                  *
+ * THIS FILE IS PART OF THE OggVorbis SOFTWARE CODEC SOURCE CODE.   *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS     *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING.       *
+ *                                                                  *
+ * THE OggVorbis SOURCE CODE IS (C) COPYRIGHT 1994-2007             *
+ * by the Xiph.Org Foundation http://www.xiph.org/                  *
+ *                                                                  *
+ ********************************************************************
+
+ function: window functions
+ last mod: $Id: window.h 13293 2007-07-24 00:09:47Z xiphmont $
+
+ ********************************************************************/
+
+#ifndef _V_WINDOW_
+#define _V_WINDOW_
+
+extern float *_vorbis_window_get(int n);
+extern void _vorbis_apply_window(float *d,int *winno,long *blocksizes,
+                          int lW,int W,int nW);
+
+
+#endif

data/dependencies/ogg_vorbis.license

@@ -0,0 +1,28 @@
+May contain `ogg', `vorbis' libraries (c) 2002-2008 Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

data/lib/gosu/swig_patches.rb

@@ -27,8 +27,8 @@ class Gosu::Window
   end
   
   def gl(*args, &block)
-    $gosu_blocks ||= []
-    $gosu_blocks << block
+    $gosu_gl_blocks ||= []
+    $gosu_gl_blocks << block
     unsafe_gl(*args, &block)
   end
   

data/linux/extconf.rb

@@ -58,19 +58,32 @@ LINUX_FILES = %w(
   WindowX.cpp
 )
 
+OGG_VORBIS_FILES = Dir['../dependencies/libogg/src/*.c'] +
+                   Dir['../dependencies/libvorbis/lib/vorbisfile.c'] +
+                   %w(analysis bitrate block codebook envelope floor0 floor1
+                      info lookup lpc lsp mapping0 mdct psy registry res0
+                      sharedbook smallft synthesis window).map do |basename|
+                     "../dependencies/libvorbis/lib/#{basename}.c"
+                   end
+
 require 'mkmf'
 require 'fileutils'
 
 $INCFLAGS << " -I../ -I../GosuImpl"
 
 if `uname`.chomp == 'Darwin' then
-  SOURCE_FILES = BASE_FILES + MAC_FILES
+  SOURCE_FILES = BASE_FILES + MAC_FILES + OGG_VORBIS_FILES
   
   # Apple curiously distributes libpng only inside X11
   $INCFLAGS  << " -I/usr/X11/include"
+  # Use included libogg, libvorbis to make Gosu easier to install on OS X
+  $INCFLAGS  << " -I../dependencies/libogg/include"
+  $INCFLAGS  << " -I../dependencies/libvorbis/include"
+  $INCFLAGS  << " -I../dependencies/libvorbis/lib"
   # To make everything work with the Objective C runtime
-  $CFLAGS    << " -x objective-c++ -fobjc-gc -DNDEBUG"
-  $LDFLAGS   << " -L/usr/X11/lib -logg -lvorbis -lvorbisfile -liconv"
+  $CFLAGS    << " -x objective-c -fobjc-gc -DNDEBUG"
+  CONFIG['CXXFLAGS'] =  "#{CONFIG['CXXFLAGS']} -x objective-c++" # cheat a little here
+  $LDFLAGS   << " -L/usr/X11/lib -liconv"
   %w(AudioToolbox IOKit OpenAL OpenGL AppKit ApplicationServices Foundation Carbon).each do |f|
     $LDFLAGS << " -framework #{f}"
   end
@@ -88,6 +101,7 @@ else
   pkg_config("sdl")
   pkg_config("pangoft2")
   pkg_config("x11")
+  pkg_config("xinerama")
   
   pkg_config("gl")
   pkg_config("vorbisfile")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gosu
 version: !ruby/object:Gem::Version 
-  hash: 89
+  hash: 95
   prerelease: 
   segments: 
   - 0
   - 7
-  - 45
-  version: 0.7.45
+  - 46
+  version: 0.7.46
 platform: ruby
 authors: 
 - Julian Raschke
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-07-19 00:00:00 Z
+date: 2013-03-31 00:00:00 Z
 dependencies: []
 
 description: "  2D game development library.\n\n  Gosu features easy to use and game-friendly interfaces to 2D graphics\n  and text (accelerated by 3D hardware), sound samples and music as well as\n  keyboard, mouse and gamepad/joystick input.\n\n  Also includes demos for integration with RMagick, Chipmunk and OpenGL.\n"
@@ -34,9 +34,8 @@ files:
 - Gosu/Audio.hpp
 - Gosu/AutoLink.hpp
 - Gosu/Bitmap.hpp
+- Gosu/Buttons.hpp
 - Gosu/ButtonsMac.hpp
-- Gosu/ButtonsWin.hpp
-- Gosu/ButtonsX.hpp
 - Gosu/Color.hpp
 - Gosu/Directories.hpp
 - Gosu/Font.hpp
@@ -44,28 +43,28 @@ files:
 - Gosu/Gosu.hpp
 - Gosu/Graphics.hpp
 - Gosu/GraphicsBase.hpp
+- Gosu/IO.hpp
 - Gosu/Image.hpp
 - Gosu/ImageData.hpp
 - Gosu/Input.hpp
 - Gosu/Inspection.hpp
-- Gosu/IO.hpp
 - Gosu/Math.hpp
 - Gosu/Platform.hpp
 - Gosu/Sockets.hpp
+- Gosu/TR1.hpp
 - Gosu/Text.hpp
 - Gosu/TextInput.hpp
 - Gosu/Timing.hpp
-- Gosu/TR1.hpp
 - Gosu/Utility.hpp
 - Gosu/Version.hpp
-- Gosu/Window.hpp
 - Gosu/WinUtility.hpp
+- Gosu/Window.hpp
+- lib/gosu.rb
 - lib/gosu/patches.rb
 - lib/gosu/preview.rb
 - lib/gosu/run.rb
 - lib/gosu/swig_patches.rb
 - lib/gosu/zen.rb
-- lib/gosu.rb
 - examples/ChipmunkIntegration.rb
 - examples/CptnRuby.rb
 - examples/GosuZen.rb
@@ -99,7 +98,6 @@ files:
 - GosuImpl/Audio/AudioFile.hpp
 - GosuImpl/Audio/AudioOpenAL.cpp
 - GosuImpl/Audio/AudioOpenAL.mm
-- GosuImpl/Audio/AudioSDL.cpp
 - GosuImpl/Audio/AudioToolboxFile.hpp
 - GosuImpl/Audio/OggFile.hpp
 - GosuImpl/Audio/SndFile.hpp
@@ -137,14 +135,15 @@ files:
 - GosuImpl/Graphics/TexChunk.hpp
 - GosuImpl/Graphics/Text.cpp
 - GosuImpl/Graphics/TextMac.cpp
-- GosuImpl/Graphics/TextTouch.mm
 - GosuImpl/Graphics/TextTTFWin.cpp
+- GosuImpl/Graphics/TextTouch.mm
 - GosuImpl/Graphics/TextUnix.cpp
+- GosuImpl/Graphics/TextWin.cpp
 - GosuImpl/Graphics/Texture.cpp
 - GosuImpl/Graphics/Texture.hpp
-- GosuImpl/Graphics/TextWin.cpp
 - GosuImpl/Graphics/Transform.cpp
 - GosuImpl/Graphics/TransformStack.hpp
+- GosuImpl/IO.cpp
 - GosuImpl/Iconv.hpp
 - GosuImpl/Input/AccelerometerReader.hpp
 - GosuImpl/Input/AccelerometerReader.mm
@@ -153,18 +152,17 @@ files:
 - GosuImpl/InputWin.cpp
 - GosuImpl/InputX.cpp
 - GosuImpl/Inspection.cpp
-- GosuImpl/IO.cpp
 - GosuImpl/MacUtility.hpp
 - GosuImpl/Math.cpp
 - GosuImpl/Orientation.hpp
 - GosuImpl/Orientation.mm
 - GosuImpl/RubyGosu.swg
+- GosuImpl/RubyGosuStub.mm
 - GosuImpl/RubyGosu_SWIG_GC_PATCH.patch
 - GosuImpl/RubyGosu_SWIG_RENAME_PATCH.patch
 - GosuImpl/RubyGosu_SWIG_TYPE_PATCH.patch
 - GosuImpl/RubyGosu_wrap.cxx
 - GosuImpl/RubyGosu_wrap.h
-- GosuImpl/RubyGosuStub.mm
 - GosuImpl/Sockets/CommSocket.cpp
 - GosuImpl/Sockets/ListenerSocket.cpp
 - GosuImpl/Sockets/MessageSocket.cpp
@@ -179,14 +177,95 @@ files:
 - GosuImpl/Utility.cpp
 - GosuImpl/UtilityApple.mm
 - GosuImpl/UtilityWin.cpp
+- GosuImpl/WinMain.cpp
+- GosuImpl/WinUtility.cpp
 - GosuImpl/WindowMac.mm
 - GosuImpl/WindowTouch.mm
 - GosuImpl/WindowWin.cpp
 - GosuImpl/WindowX.cpp
-- GosuImpl/WinMain.cpp
-- GosuImpl/WinUtility.cpp
 - GosuImpl/X11vroot.h
 - linux/extconf.rb
+- dependencies/libogg/AUTHORS
+- dependencies/libogg/CHANGES
+- dependencies/libogg/COPYING
+- dependencies/libogg/include/ogg/ogg.h
+- dependencies/libogg/include/ogg/os_types.h
+- dependencies/libogg/src/bitwise.c
+- dependencies/libogg/src/framing.c
+- dependencies/libvorbis/AUTHORS
+- dependencies/libvorbis/CHANGES
+- dependencies/libvorbis/COPYING
+- dependencies/libvorbis/include/vorbis/codec.h
+- dependencies/libvorbis/include/vorbis/vorbisenc.h
+- dependencies/libvorbis/include/vorbis/vorbisfile.h
+- dependencies/libvorbis/lib/analysis.c
+- dependencies/libvorbis/lib/backends.h
+- dependencies/libvorbis/lib/barkmel.c
+- dependencies/libvorbis/lib/bitrate.c
+- dependencies/libvorbis/lib/bitrate.h
+- dependencies/libvorbis/lib/block.c
+- dependencies/libvorbis/lib/books/coupled/res_books_51.h
+- dependencies/libvorbis/lib/books/coupled/res_books_stereo.h
+- dependencies/libvorbis/lib/books/floor/floor_books.h
+- dependencies/libvorbis/lib/books/uncoupled/res_books_uncoupled.h
+- dependencies/libvorbis/lib/codebook.c
+- dependencies/libvorbis/lib/codebook.h
+- dependencies/libvorbis/lib/codec_internal.h
+- dependencies/libvorbis/lib/envelope.c
+- dependencies/libvorbis/lib/envelope.h
+- dependencies/libvorbis/lib/floor0.c
+- dependencies/libvorbis/lib/floor1.c
+- dependencies/libvorbis/lib/highlevel.h
+- dependencies/libvorbis/lib/info.c
+- dependencies/libvorbis/lib/lookup.c
+- dependencies/libvorbis/lib/lookup.h
+- dependencies/libvorbis/lib/lookup_data.h
+- dependencies/libvorbis/lib/lpc.c
+- dependencies/libvorbis/lib/lpc.h
+- dependencies/libvorbis/lib/lsp.c
+- dependencies/libvorbis/lib/lsp.h
+- dependencies/libvorbis/lib/mapping0.c
+- dependencies/libvorbis/lib/masking.h
+- dependencies/libvorbis/lib/mdct.c
+- dependencies/libvorbis/lib/mdct.h
+- dependencies/libvorbis/lib/misc.h
+- dependencies/libvorbis/lib/modes/floor_all.h
+- dependencies/libvorbis/lib/modes/psych_11.h
+- dependencies/libvorbis/lib/modes/psych_16.h
+- dependencies/libvorbis/lib/modes/psych_44.h
+- dependencies/libvorbis/lib/modes/psych_8.h
+- dependencies/libvorbis/lib/modes/residue_16.h
+- dependencies/libvorbis/lib/modes/residue_44.h
+- dependencies/libvorbis/lib/modes/residue_44p51.h
+- dependencies/libvorbis/lib/modes/residue_44u.h
+- dependencies/libvorbis/lib/modes/residue_8.h
+- dependencies/libvorbis/lib/modes/setup_11.h
+- dependencies/libvorbis/lib/modes/setup_16.h
+- dependencies/libvorbis/lib/modes/setup_22.h
+- dependencies/libvorbis/lib/modes/setup_32.h
+- dependencies/libvorbis/lib/modes/setup_44.h
+- dependencies/libvorbis/lib/modes/setup_44p51.h
+- dependencies/libvorbis/lib/modes/setup_44u.h
+- dependencies/libvorbis/lib/modes/setup_8.h
+- dependencies/libvorbis/lib/modes/setup_X.h
+- dependencies/libvorbis/lib/os.h
+- dependencies/libvorbis/lib/psy.c
+- dependencies/libvorbis/lib/psy.h
+- dependencies/libvorbis/lib/psytune.c
+- dependencies/libvorbis/lib/registry.c
+- dependencies/libvorbis/lib/registry.h
+- dependencies/libvorbis/lib/res0.c
+- dependencies/libvorbis/lib/scales.h
+- dependencies/libvorbis/lib/sharedbook.c
+- dependencies/libvorbis/lib/smallft.c
+- dependencies/libvorbis/lib/smallft.h
+- dependencies/libvorbis/lib/synthesis.c
+- dependencies/libvorbis/lib/tone.c
+- dependencies/libvorbis/lib/vorbisenc.c
+- dependencies/libvorbis/lib/vorbisfile.c
+- dependencies/libvorbis/lib/window.c
+- dependencies/libvorbis/lib/window.h
+- dependencies/ogg_vorbis.license
 homepage: http://www.libgosu.org/
 licenses: []
 

data/Gosu/ButtonsX.hpp

@@ -1,141 +0,0 @@
-#ifndef GOSU_BUTTONSX_HPP
-#define GOSU_BUTTONSX_HPP
-
-namespace Gosu
-{
-    //! List of button ids that can be used with Gosu::Input.
-    //! This enumeration contains ids for keyboard keys (kb*),
-    //! mouse buttons and mouse wheel (ms*) and gamepad buttons (gp*).
-    enum ButtonName
-    {
-        kbRangeBegin = 0x00,
-        kbA = 'a',
-        kbB = 'b',
-        kbC = 'c',
-        kbD = 'd',
-        kbE = 'e',
-        kbF = 'f',
-        kbG = 'g',
-        kbH = 'h',
-        kbI = 'i',
-        kbJ = 'j',
-        kbK = 'k',
-        kbL = 'l',
-        kbM = 'm',
-        kbN = 'n',
-        kbO = 'o',
-        kbP = 'p',
-        kbQ = 'q',
-        kbR = 'r',
-        kbS = 's',
-        kbT = 't',
-        kbU = 'u',
-        kbV = 'v',
-        kbW = 'w',
-        kbX = 'x',
-        kbY = 'y',
-        kbZ = 'z',
-        kbEscape = XK_Escape,
-        kbF1 = XK_F1,
-        kbF2 = XK_F2,
-        kbF3 = XK_F3,
-        kbF4 = XK_F4,
-        kbF5 = XK_F5,
-        kbF6 = XK_F6,
-        kbF7 = XK_F7,
-        kbF8 = XK_F8,
-        kbF9 = XK_F9,
-        kbF10 = XK_F10,
-        kbF11 = XK_F11,
-        kbF12 = XK_F12,
-        kb1 = XK_1,
-        kb2 = XK_2,
-        kb3 = XK_3,
-        kb4 = XK_4,
-        kb5 = XK_5,
-        kb6 = XK_6,
-        kb7 = XK_7,
-        kb8 = XK_8,
-        kb9 = XK_9,
-        kb0 = XK_0,
-        kbTab = XK_Tab,
-        kbReturn = XK_Return,
-        kbSpace = XK_space,
-        kbLeftShift = XK_Shift_L,
-        kbRightShift = XK_Shift_R,
-        kbLeftControl = XK_Control_L,
-        kbRightControl = XK_Control_R,
-        kbLeftAlt = XK_Alt_L,
-        kbRightAlt = XK_Alt_R,
-        kbLeftMeta = XK_Meta_L,
-        kbRightMeta = XK_Meta_R,
-        kbBackspace = XK_BackSpace,
-        kbLeft = XK_Left,
-        kbRight = XK_Right,
-        kbUp = XK_Up,
-        kbDown = XK_Down,
-        kbHome = XK_Home,
-        kbEnd = XK_End,
-        kbInsert = XK_Insert,
-        kbDelete = XK_Delete,
-        kbPageUp = XK_Prior,
-        kbPageDown = XK_Next,
-        kbEnter = XK_KP_Enter,
-        kbNumpad1 = XK_KP_1,
-        kbNumpad2 = XK_KP_2,
-        kbNumpad3 = XK_KP_3,
-        kbNumpad4 = XK_KP_4,
-        kbNumpad5 = XK_KP_5,
-        kbNumpad6 = XK_KP_6,
-        kbNumpad7 = XK_KP_7,
-        kbNumpad8 = XK_KP_8,
-        kbNumpad9 = XK_KP_9,
-        kbNumpad0 = XK_KP_0,
-        kbNumpadAdd = XK_KP_Add,
-        kbNumpadSubtract = XK_KP_Subtract,
-        kbNumpadMultiply = XK_KP_Multiply,
-        kbNumpadDivide = XK_KP_Divide,
-        kbRangeEnd = 0xffff,
-        
-        msRangeBegin,
-        msLeft = msRangeBegin,
-        msRight,
-        msMiddle,
-        msWheelUp,
-        msWheelDown,
-        msRangeEnd,
-        
-        gpRangeBegin,
-        gpLeft = gpRangeBegin,
-        gpRight,
-        gpUp,
-        gpDown,
-        gpButton0,
-        gpButton1,
-        gpButton2,
-        gpButton3,
-        gpButton4,
-        gpButton5,
-        gpButton6,
-        gpButton7,
-        gpButton8,
-        gpButton9,
-        gpButton10,
-        gpButton11,
-        gpButton12,
-        gpButton13,
-        gpButton14,
-        gpButton15,
-        gpRangeEnd = gpButton15,
-        
-        kbNum = kbRangeEnd - kbRangeBegin + 1,
-        msNum = msRangeEnd - msRangeBegin + 1,
-        gpNum = gpRangeEnd - gpRangeBegin + 1,
-        
-        numButtons = gpRangeEnd,
-        noButton = 0xffffffff
-    };
-}
-
-#endif
-