Depend on new OpenGLRaw/GLURaw packages. Fixed imports accordingly. Build only for GHC >= 7.8.

Author: svenpanne

.travis.yml

@@ -2,38 +2,6 @@
 # toplevel addons.apt.packages section, so we have to duplicate things below.
 matrix:
   include:
-   - env: CABALVER=1.16 GHCVER=7.0.4
-     addons:
-       apt:
-         sources:
-          - hvr-ghc
-         packages:
-          - cabal-install-1.16
-          - ghc-7.0.4
-   - env: CABALVER=1.16 GHCVER=7.2.2
-     addons:
-       apt:
-         sources:
-          - hvr-ghc
-         packages:
-          - cabal-install-1.16
-          - ghc-7.2.2
-   - env: CABALVER=1.16 GHCVER=7.4.2
-     addons:
-       apt:
-         sources:
-          - hvr-ghc
-         packages:
-          - cabal-install-1.16
-          - ghc-7.4.2
-   - env: CABALVER=1.16 GHCVER=7.6.3
-     addons:
-       apt:
-         sources:
-          - hvr-ghc
-         packages:
-          - cabal-install-1.16
-          - ghc-7.6.3
    - env: CABALVER=1.20 GHCVER=7.8.4
      addons:
        apt:

OpenGL.cabal

@@ -148,15 +148,15 @@ library
   hs-source-dirs: src
   ghc-options: -Wall
   build-depends:
-    base         >= 3     && < 5,
-    bytestring   >= 0.9   && < 0.11,
-    containers   >= 0.3   && < 0.6,
-    text         >= 0.1   && < 1.3,
-    transformers >= 0.2   && < 0.6,
-    ObjectName   >= 1.1   && < 1.2,
-    StateVar     >= 1.1   && < 1.2,
-    OpenGLRaw    >= 2.6.1 && < 2.7,
-    GLURaw       >= 1.3   && < 1.6
+    base         >= 3   && < 5,
+    bytestring   >= 0.9 && < 0.11,
+    containers   >= 0.3 && < 0.6,
+    text         >= 0.1 && < 1.3,
+    transformers >= 0.2 && < 0.6,
+    ObjectName   >= 1.1 && < 1.2,
+    StateVar     >= 1.1 && < 1.2,
+    OpenGLRaw    >= 3.0 && < 3.1,
+    GLURaw       >= 2.0 && < 2.1
   default-language: Haskell2010
   other-extensions:
     CPP

src/Graphics/Rendering/OpenGL/GL.hs

@@ -74,7 +74,7 @@ module Graphics.Rendering.OpenGL.GL (
    module Graphics.Rendering.OpenGL.GL.SavingState
 ) where
 
-import Graphics.Rendering.OpenGL.Raw.Types
+import Graphics.GL.Types
 import Graphics.Rendering.OpenGL.GL.FlushFinish
 import Data.ObjectName
 import Data.StateVar

src/Graphics/Rendering/OpenGL/GL/Antialiasing.hs

@@ -20,7 +20,7 @@ module Graphics.Rendering.OpenGL.GL.Antialiasing (
 import Data.StateVar
 import Graphics.Rendering.OpenGL.GL.Capability
 import Graphics.Rendering.OpenGL.GL.QueryUtils
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/BeginEnd.hs

@@ -28,7 +28,7 @@ import Graphics.Rendering.OpenGL.GL.Exception
 import Graphics.Rendering.OpenGL.GL.PrimitiveMode
 import Graphics.Rendering.OpenGL.GL.PrimitiveModeInternal
 import Graphics.Rendering.OpenGL.GL.QueryUtils
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/Bitmaps.hs

@@ -19,7 +19,7 @@ module Graphics.Rendering.OpenGL.GL.Bitmaps (
 import Foreign.Ptr
 import Graphics.Rendering.OpenGL.GL.CoordTrans
 import Graphics.Rendering.OpenGL.GL.Tensor
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/BlendingFactor.hs

@@ -17,7 +17,7 @@ module Graphics.Rendering.OpenGL.GL.BlendingFactor (
    BlendingFactor(..), marshalBlendingFactor, unmarshalBlendingFactor
 ) where
 
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/BufferMode.hs

@@ -19,7 +19,7 @@ module Graphics.Rendering.OpenGL.GL.BufferMode (
    maxColorAttachments,
 ) where
 
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/BufferObjects.hs

@@ -55,7 +55,7 @@ import Graphics.Rendering.OpenGL.GL.PeekPoke
 import Graphics.Rendering.OpenGL.GL.QueryUtils
 import Graphics.Rendering.OpenGL.GL.VertexArrays
 import Graphics.Rendering.OpenGL.GLU.ErrorsInternal
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 
 --------------------------------------------------------------------------------
 

src/Graphics/Rendering/OpenGL/GL/ByteString.hs

@@ -23,7 +23,7 @@ module Graphics.Rendering.OpenGL.GL.ByteString (
 import Data.StateVar
 import Foreign.Ptr
 import Graphics.Rendering.OpenGL.GL.QueryUtils
-import Graphics.Rendering.OpenGL.Raw
+import Graphics.GL
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Internal as BI
 import qualified Data.ByteString.Unsafe as BU