hallon-openal 0.0.2 → 0.0.3

data/.gitignore

@@ -19,3 +19,5 @@ tmp
 *.bundle
 Makefile
 mkmf.log
+.vagrant
+*.so

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.3
+- Check for headers in multiple locations: OpenAL/ and AL/
+- Link against openal on non-OSX platforms
+
 # v0.0.2
 - Update dependency information; Hallon v0.12 or higher is required.
 

data/LICENSE.txt

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -14,4 +14,4 @@ I’d be happy to discuss any and all of these with you. Feel free to [create an
 
 ## License
 
-X11 license. See LICENSE.txt for details.
+2-clause (simplified) BSD license. See LICENSE.txt for details.

data/ext/hallon/extconf.rb

@@ -1,15 +1,31 @@
 require 'mkmf'
 
+# Miscellaneous
 def error(message)
   abort "[ERROR] #{message}"
 end
 
 $CFLAGS << ' -ggdb -O0 -Wextra'
 
+# Check for headers
+
 error 'Missing ruby header' unless have_header 'ruby.h'
-error 'Missing OpenAL/alc.h' unless have_header 'OpenAL/alc.h'
-error 'Missing OpenAL/al.h' unless have_header 'OpenAL/al.h'
 
-with_ldflags('-framework OpenAL') { RUBY_PLATFORM =~ /darwin/ }
+if have_header('OpenAL/alc.h')
+  # yay, probably mac os!
+elsif have_header('AL/alc.h')
+  # woot, probably everybody else!
+else
+  error 'Missing openal headers'
+end
+
+# Add library
+if RUBY_PLATFORM =~ /darwin/
+  $LDFLAGS << ' -framework OpenAL '
+elsif have_library('openal', 'alSourceQueueBuffers')
+  $LDFLAGS << ' -lopenal '
+else
+  error 'Missing openal library'
+end
 
 create_makefile('openal_ext')

data/ext/hallon/openal_ext.c

@@ -1,8 +1,14 @@
 #include <ruby.h>
-#include <OpenAL/alc.h>
-#include <OpenAL/al.h>
 #include <unistd.h>
 
+#ifdef HAVE_AL_ALC_H
+#  include <AL/alc.h>
+#  include <AL/al.h>
+#elif HAVE_OPENAL_ALC_H
+#  include <OpenAL/alc.h>
+#  include <OpenAL/al.h>
+#endif
+
 #if DEBUG_H
 #  define DEBUG printf
 #else

data/lib/hallon/openal/version.rb

@@ -1,5 +1,5 @@
 module Hallon
   class OpenAL
-    VERSION = '0.0.2'
+    VERSION = '0.0.3'
   end
 end

data/spec/hallon_openal_spec.rb

@@ -4,17 +4,11 @@ require 'hallon/openal'
 describe Hallon::OpenAL do
   let(:klass)  { described_class }
   let(:format) { Hash.new }
-  subject { klass.new(format) }
+  subject { klass.new }
 
-  describe "#initialize" do
-    it "should raise an error if not given a format" do
-      expect { klass.new {} }.to raise_error(ArgumentError)
-    end
-  end
-
-  describe "#start" do
+  describe "#play" do
     it "should not raise an error" do
-      expect { subject.start }.to_not raise_error
+      expect { subject.play }.to_not raise_error
     end
   end
 
@@ -38,9 +32,7 @@ describe Hallon::OpenAL do
 
   describe "#format" do
     it "should be settable and gettable" do
-      format = { channels: 1, rate: 44100 }
-
-      subject.format.should == {}
+      subject.format.should be_nil
       subject.format = format
       subject.format.should eq format
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallon-openal
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-04 00:00:00.000000000 Z
+date: 2012-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hallon
-  requirement: &70281050669480 !ruby/object:Gem::Requirement
+  requirement: &70277904130900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.13'
   type: :runtime
   prerelease: false
-  version_requirements: *70281050669480
+  version_requirements: *70277904130900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70281050668320 !ruby/object:Gem::Requirement
+  requirement: &70277904130280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,7 +32,7 @@ dependencies:
         version: '2.7'
   type: :development
   prerelease: false
-  version_requirements: *70281050668320
+  version_requirements: *70277904130280
 description: 
 email:
 - kim@burgestrand.se
@@ -76,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: ! 'OpenAL audio drivers for Hallon: http://rubygems.org/gems/hallon'