diff --git a/ALUT.cabal b/ALUT.cabal --- a/ALUT.cabal +++ b/ALUT.cabal @@ -1,5 +1,5 @@ name: ALUT -version: 2.1.0.2 +version: 2.2.0.0 license: BSD3 license-file: LICENSE maintainer: Sven Panne @@ -39,5 +39,6 @@ include-dirs: include includes: HsALUT.h install-includes: HsALUT.h -build-depends: base, OpenGL, OpenAL +ghc-options: -Wall +build-depends: base >= 3 && < 5, StateVar, OpenAL extensions: CPP, ForeignFunctionInterface diff --git a/Sound/ALUT.hs b/Sound/ALUT.hs --- a/Sound/ALUT.hs +++ b/Sound/ALUT.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -- A Haskell binding for the OpenAL Utility Toolkit, which makes managing of diff --git a/Sound/ALUT/Config.hs b/Sound/ALUT/Config.hs --- a/Sound/ALUT/Config.hs +++ b/Sound/ALUT/Config.hs @@ -3,10 +3,10 @@ -- | -- Module : Sound.ALUT.Config -- Copyright : (c) Sven Panne 2006 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -- This purely internal module defines the platform-specific stuff which has diff --git a/Sound/ALUT/Constants.hs b/Sound/ALUT/Constants.hs --- a/Sound/ALUT/Constants.hs +++ b/Sound/ALUT/Constants.hs @@ -2,11 +2,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Constants --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- diff --git a/Sound/ALUT/Errors.hs b/Sound/ALUT/Errors.hs --- a/Sound/ALUT/Errors.hs +++ b/Sound/ALUT/Errors.hs @@ -2,11 +2,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Errors --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- diff --git a/Sound/ALUT/Initialization.hs b/Sound/ALUT/Initialization.hs --- a/Sound/ALUT/Initialization.hs +++ b/Sound/ALUT/Initialization.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Initialization --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- diff --git a/Sound/ALUT/Loaders.hs b/Sound/ALUT/Loaders.hs --- a/Sound/ALUT/Loaders.hs +++ b/Sound/ALUT/Loaders.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Loaders --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- @@ -16,12 +16,11 @@ bufferMIMETypes, bufferDataMIMETypes ) where +import Data.StateVar import Foreign.C.String ( peekCString, withCString ) import Foreign.Marshal.Alloc ( alloca ) import Foreign.Storable ( Storable(peek) ) import Foreign.Ptr ( Ptr ) -import Graphics.Rendering.OpenGL.GL.StateVar ( - GettableStateVar, makeGettableStateVar ) import Sound.ALUT.Config ( alut_CreateBufferFromFile, alut_CreateBufferFromFileImage, alut_CreateBufferHelloWorld, alut_CreateBufferWaveform, diff --git a/Sound/ALUT/Sleep.hs b/Sound/ALUT/Sleep.hs --- a/Sound/ALUT/Sleep.hs +++ b/Sound/ALUT/Sleep.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Sleep --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- diff --git a/Sound/ALUT/Version.hs b/Sound/ALUT/Version.hs --- a/Sound/ALUT/Version.hs +++ b/Sound/ALUT/Version.hs @@ -1,11 +1,11 @@ -------------------------------------------------------------------------------- -- | -- Module : Sound.ALUT.Version --- Copyright : (c) Sven Panne 2005 --- License : BSD-style (see the file libraries/ALUT/LICENSE) +-- Copyright : (c) Sven Panne 2005-2009 +-- License : BSD-style (see the file LICENSE) -- -- Maintainer : sven.panne@aedion.de --- Stability : provisional +-- Stability : stable -- Portability : portable -- -------------------------------------------------------------------------------- @@ -15,8 +15,7 @@ ) where import Control.Monad ( liftM2 ) -import Graphics.Rendering.OpenGL.GL.StateVar ( - GettableStateVar, makeGettableStateVar ) +import Data.StateVar import Sound.OpenAL.AL.BasicTypes ( ALint ) import Sound.ALUT.Config ( alut_GetMajorVersion, alut_GetMinorVersion ) import Sound.ALUT.Constants ( alut_API_MAJOR_VERSION, alut_API_MINOR_VERSION ) diff --git a/examples/Basic/HelloWorld.hs b/examples/Basic/HelloWorld.hs --- a/examples/Basic/HelloWorld.hs +++ b/examples/Basic/HelloWorld.hs @@ -1,6 +1,6 @@ {- HelloWorld.hs (adapted from hello_world.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/Basic/OpenALInfo.hs b/examples/Basic/OpenALInfo.hs --- a/examples/Basic/OpenALInfo.hs +++ b/examples/Basic/OpenALInfo.hs @@ -1,6 +1,6 @@ {- OpenALInfo.hs (modeled after OpenGL's glxinfo) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/Basic/PlayFile.hs b/examples/Basic/PlayFile.hs --- a/examples/Basic/PlayFile.hs +++ b/examples/Basic/PlayFile.hs @@ -1,6 +1,6 @@ {- PlayFile.hs (adapted from playfile.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/TestSuite/TestErrorStuff.hs b/examples/TestSuite/TestErrorStuff.hs --- a/examples/TestSuite/TestErrorStuff.hs +++ b/examples/TestSuite/TestErrorStuff.hs @@ -1,6 +1,6 @@ {- TestErrorStuff.hs (adapted from test_errorstuff.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/TestSuite/TestFileLoader.hs b/examples/TestSuite/TestFileLoader.hs --- a/examples/TestSuite/TestFileLoader.hs +++ b/examples/TestSuite/TestFileLoader.hs @@ -1,6 +1,6 @@ {- TestFileLoader.hs (adapted from test_fileloader.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/TestSuite/TestMemoryLoader.hs b/examples/TestSuite/TestMemoryLoader.hs --- a/examples/TestSuite/TestMemoryLoader.hs +++ b/examples/TestSuite/TestMemoryLoader.hs @@ -1,6 +1,6 @@ {- TestMemoryLoader.hs (adapted from test_memoryloader.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/TestSuite/TestVersion.hs b/examples/TestSuite/TestVersion.hs --- a/examples/TestSuite/TestVersion.hs +++ b/examples/TestSuite/TestVersion.hs @@ -1,6 +1,6 @@ {- TestVersion.hs (adapted from test_version.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/examples/TestSuite/TestWaveforms.hs b/examples/TestSuite/TestWaveforms.hs --- a/examples/TestSuite/TestWaveforms.hs +++ b/examples/TestSuite/TestWaveforms.hs @@ -1,6 +1,6 @@ {- TestWaveforms.hs (adapted from test_waveforms.c in freealut) - Copyright (c) Sven Panne 2005 + Copyright (c) Sven Panne 2005-2009 This file is part of the ALUT package & distributed under a BSD-style license See the file libraries/ALUT/LICENSE -} diff --git a/include/HsALUT.h b/include/HsALUT.h --- a/include/HsALUT.h +++ b/include/HsALUT.h @@ -2,7 +2,7 @@ /* ----------------------------------------------------------------------------- * * Module : C support for Sound.ALUT - * Copyright : (c) Sven Panne 2005 + * Copyright : (c) Sven Panne 2005-2009 * License : BSD-style (see the file libraries/ALUT/LICENSE) * * Maintainer : sven.panne@aedion.de diff --git a/include/HsALUT.h.in b/include/HsALUT.h.in --- a/include/HsALUT.h.in +++ b/include/HsALUT.h.in @@ -1,7 +1,7 @@ /* ----------------------------------------------------------------------------- * * Module : C support for Sound.ALUT - * Copyright : (c) Sven Panne 2005 + * Copyright : (c) Sven Panne 2005-2009 * License : BSD-style (see the file libraries/ALUT/LICENSE) * * Maintainer : sven.panne@aedion.de