diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown --- a/CHANGELOG.markdown +++ b/CHANGELOG.markdown @@ -1,3 +1,7 @@ +0.7.8 +----- +* Build clean on GHC 8 + 0.7.7 ----- * Added suuport for a new extension: diff --git a/LICENSE b/LICENSE --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2014-2015 Edward A. Kmett and Gabríel Arthúr Pétursson +Copyright (c) 2014-2016 Edward A. Kmett and Gabríel Arthúr Pétursson Copyright (c) 2013 Sven Panne All rights reserved. diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -1,7 +1,7 @@ gl == -[![Build Status](https://secure.travis-ci.org/ekmett/gl.png?branch=master)](http://travis-ci.org/ekmett/gl) +[![Hackage](https://img.shields.io/hackage/v/gl.svg)](https://hackage.haskell.org/package/gl) [![Build Status](https://secure.travis-ci.org/ekmett/gl.png?branch=master)](http://travis-ci.org/ekmett/gl) This package supplies low level bindings to all of the OpenGL specification for Haskell. diff --git a/Utils.hs b/Utils.hs --- a/Utils.hs +++ b/Utils.hs @@ -12,11 +12,19 @@ module Utils (splitOn, strip, replace) where import Data.Char (isSpace) -import Data.List (intercalate) -import Data.List.Split (splitOn) +import Data.List (intercalate, isPrefixOf) strip :: String -> String strip = dropWhile isSpace . reverse . dropWhile isSpace . reverse replace :: Eq a => [a] -> [a] -> [a] -> [a] replace a b = intercalate b . splitOn a + +splitOn :: Eq a => [a] -> [a] -> [[a]] +splitOn _ [] = [] +splitOn xs ys0 = go [] ys0 where + go acc ys + | isPrefixOf xs ys = reverse acc : go [] (drop (length xs) ys) + | otherwise = case ys of + z:zs -> go (z:acc) zs + [] -> [reverse acc] diff --git a/dist/build/autogen/Graphics/GL/Core32.hs b/dist/build/autogen/Graphics/GL/Core32.hs --- a/dist/build/autogen/Graphics/GL/Core32.hs +++ b/dist/build/autogen/Graphics/GL/Core32.hs @@ -389,8 +389,24 @@ , pattern GL_COLOR_ATTACHMENT13 , pattern GL_COLOR_ATTACHMENT14 , pattern GL_COLOR_ATTACHMENT15 + , pattern GL_COLOR_ATTACHMENT16 + , pattern GL_COLOR_ATTACHMENT17 + , pattern GL_COLOR_ATTACHMENT18 + , pattern GL_COLOR_ATTACHMENT19 , pattern GL_COLOR_ATTACHMENT2 + , pattern GL_COLOR_ATTACHMENT20 + , pattern GL_COLOR_ATTACHMENT21 + , pattern GL_COLOR_ATTACHMENT22 + , pattern GL_COLOR_ATTACHMENT23 + , pattern GL_COLOR_ATTACHMENT24 + , pattern GL_COLOR_ATTACHMENT25 + , pattern GL_COLOR_ATTACHMENT26 + , pattern GL_COLOR_ATTACHMENT27 + , pattern GL_COLOR_ATTACHMENT28 + , pattern GL_COLOR_ATTACHMENT29 , pattern GL_COLOR_ATTACHMENT3 + , pattern GL_COLOR_ATTACHMENT30 + , pattern GL_COLOR_ATTACHMENT31 , pattern GL_COLOR_ATTACHMENT4 , pattern GL_COLOR_ATTACHMENT5 , pattern GL_COLOR_ATTACHMENT6 diff --git a/dist/build/autogen/Graphics/GL/Embedded30.hs b/dist/build/autogen/Graphics/GL/Embedded30.hs --- a/dist/build/autogen/Graphics/GL/Embedded30.hs +++ b/dist/build/autogen/Graphics/GL/Embedded30.hs @@ -126,8 +126,24 @@ , pattern GL_COLOR_ATTACHMENT13 , pattern GL_COLOR_ATTACHMENT14 , pattern GL_COLOR_ATTACHMENT15 + , pattern GL_COLOR_ATTACHMENT16 + , pattern GL_COLOR_ATTACHMENT17 + , pattern GL_COLOR_ATTACHMENT18 + , pattern GL_COLOR_ATTACHMENT19 , pattern GL_COLOR_ATTACHMENT2 + , pattern GL_COLOR_ATTACHMENT20 + , pattern GL_COLOR_ATTACHMENT21 + , pattern GL_COLOR_ATTACHMENT22 + , pattern GL_COLOR_ATTACHMENT23 + , pattern GL_COLOR_ATTACHMENT24 + , pattern GL_COLOR_ATTACHMENT25 + , pattern GL_COLOR_ATTACHMENT26 + , pattern GL_COLOR_ATTACHMENT27 + , pattern GL_COLOR_ATTACHMENT28 + , pattern GL_COLOR_ATTACHMENT29 , pattern GL_COLOR_ATTACHMENT3 + , pattern GL_COLOR_ATTACHMENT30 + , pattern GL_COLOR_ATTACHMENT31 , pattern GL_COLOR_ATTACHMENT4 , pattern GL_COLOR_ATTACHMENT5 , pattern GL_COLOR_ATTACHMENT6 diff --git a/dist/build/autogen/Graphics/GL/Internal/Shared.hs b/dist/build/autogen/Graphics/GL/Internal/Shared.hs --- a/dist/build/autogen/Graphics/GL/Internal/Shared.hs +++ b/dist/build/autogen/Graphics/GL/Internal/Shared.hs @@ -11930,9 +11930,41 @@ pattern GL_COLOR_ATTACHMENT15 = 0x8CEF +pattern GL_COLOR_ATTACHMENT16 = 0x8CF0 + +pattern GL_COLOR_ATTACHMENT17 = 0x8CF1 + +pattern GL_COLOR_ATTACHMENT18 = 0x8CF2 + +pattern GL_COLOR_ATTACHMENT19 = 0x8CF3 + pattern GL_COLOR_ATTACHMENT2 = 0x8CE2 +pattern GL_COLOR_ATTACHMENT20 = 0x8CF4 + +pattern GL_COLOR_ATTACHMENT21 = 0x8CF5 + +pattern GL_COLOR_ATTACHMENT22 = 0x8CF6 + +pattern GL_COLOR_ATTACHMENT23 = 0x8CF7 + +pattern GL_COLOR_ATTACHMENT24 = 0x8CF8 + +pattern GL_COLOR_ATTACHMENT25 = 0x8CF9 + +pattern GL_COLOR_ATTACHMENT26 = 0x8CFA + +pattern GL_COLOR_ATTACHMENT27 = 0x8CFB + +pattern GL_COLOR_ATTACHMENT28 = 0x8CFC + +pattern GL_COLOR_ATTACHMENT29 = 0x8CFD + pattern GL_COLOR_ATTACHMENT3 = 0x8CE3 + +pattern GL_COLOR_ATTACHMENT30 = 0x8CFE + +pattern GL_COLOR_ATTACHMENT31 = 0x8CFF pattern GL_COLOR_ATTACHMENT4 = 0x8CE4 diff --git a/dist/build/autogen/Graphics/GL/Standard30.hs b/dist/build/autogen/Graphics/GL/Standard30.hs --- a/dist/build/autogen/Graphics/GL/Standard30.hs +++ b/dist/build/autogen/Graphics/GL/Standard30.hs @@ -113,8 +113,24 @@ , pattern GL_COLOR_ATTACHMENT13 , pattern GL_COLOR_ATTACHMENT14 , pattern GL_COLOR_ATTACHMENT15 + , pattern GL_COLOR_ATTACHMENT16 + , pattern GL_COLOR_ATTACHMENT17 + , pattern GL_COLOR_ATTACHMENT18 + , pattern GL_COLOR_ATTACHMENT19 , pattern GL_COLOR_ATTACHMENT2 + , pattern GL_COLOR_ATTACHMENT20 + , pattern GL_COLOR_ATTACHMENT21 + , pattern GL_COLOR_ATTACHMENT22 + , pattern GL_COLOR_ATTACHMENT23 + , pattern GL_COLOR_ATTACHMENT24 + , pattern GL_COLOR_ATTACHMENT25 + , pattern GL_COLOR_ATTACHMENT26 + , pattern GL_COLOR_ATTACHMENT27 + , pattern GL_COLOR_ATTACHMENT28 + , pattern GL_COLOR_ATTACHMENT29 , pattern GL_COLOR_ATTACHMENT3 + , pattern GL_COLOR_ATTACHMENT30 + , pattern GL_COLOR_ATTACHMENT31 , pattern GL_COLOR_ATTACHMENT4 , pattern GL_COLOR_ATTACHMENT5 , pattern GL_COLOR_ATTACHMENT6 diff --git a/gl.cabal b/gl.cabal --- a/gl.cabal +++ b/gl.cabal @@ -1,13 +1,13 @@ name: gl -version: 0.7.7 +version: 0.7.8 synopsis: Complete OpenGL raw bindings description: Complete OpenGL raw bindings license: BSD3 license-file: LICENSE author: Edward A. Kmett, Gabríel Arthúr Pétursson, Sven Panne maintainer: ekmett@gmail.com -copyright: Copyright © 2014-2015 Edward A. Kmett, - Copyright © 2014-2015 Gabríel Arthúr Pétursson, +copyright: Copyright © 2014-2016 Edward A. Kmett, + Copyright © 2014-2016 Gabríel Arthúr Pétursson, Copyright © 2013 Sven Panne category: Graphics build-type: Custom @@ -40,7 +40,7 @@ , containers == 0.5.* , fixed >= 0.2.1 && < 0.3 , half >= 0.2 && < 0.3 - , transformers >= 0.2 && < 0.5 + , transformers >= 0.2 && < 0.6 -- for Setup.hs build-depends: @@ -50,6 +50,9 @@ , split == 0.2.* default-language: Haskell2010 + + if impl(ghc >= 8) + ghc-options: -fno-warn-missing-pat-syn-sigs if os(windows) && flag(UseNativeWindowsLibraries) if arch(i386) diff --git a/gl.xml b/gl.xml # file too large to diff: gl.xml diff --git a/src/Graphics/GL.hs b/src/Graphics/GL.hs --- a/src/Graphics/GL.hs +++ b/src/Graphics/GL.hs @@ -1,6 +1,6 @@ ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2014-2015 Edward Kmett and Gabríel Arthúr Pétursson +-- Copyright : (C) 2014-2016 Edward Kmett and Gabríel Arthúr Pétursson -- License : BSD-style (see the file LICENSE) -- Maintainer : Edward Kmett -- Stability : experimental diff --git a/src/Graphics/GL/Internal/Proc.hs b/src/Graphics/GL/Internal/Proc.hs --- a/src/Graphics/GL/Internal/Proc.hs +++ b/src/Graphics/GL/Internal/Proc.hs @@ -1,7 +1,7 @@ {-# LANGUAGE ForeignFunctionInterface, CPP #-} -------------------------------------------------------------------------------- -- | --- Copyright : (c) Edward Kmett and Gabríel Arthúr Pétursson 2014-2015, (c) Sven Panne 2013 +-- Copyright : (c) Edward Kmett and Gabríel Arthúr Pétursson 2014-2016, (c) Sven Panne 2013 -- License : BSD3 -- -- Maintainer : Edward Kmett diff --git a/src/Graphics/GL/Types.hs b/src/Graphics/GL/Types.hs --- a/src/Graphics/GL/Types.hs +++ b/src/Graphics/GL/Types.hs @@ -1,7 +1,7 @@ {-# LANGUAGE CPP #-} ----------------------------------------------------------------------------- -- | --- Copyright : (C) 2014-2015 Edward Kmett and Gabríel Arthúr Pétursson +-- Copyright : (C) 2014-2016 Edward Kmett and Gabríel Arthúr Pétursson -- License : BSD-style (see the file LICENSE) -- Maintainer : Edward Kmett -- Stability : experimental