Hello community, here is the log from the commit of package ghc-OpenGL for openSUSE:Factory checked in at 2017-06-04 01:51:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ghc-OpenGL (Old) and /work/SRC/openSUSE:Factory/.ghc-OpenGL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-OpenGL" Sun Jun 4 01:51:23 2017 rev:16 rq:494133 version:3.0.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/ghc-OpenGL/ghc-OpenGL.changes 2016-07-20 09:28:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ghc-OpenGL.new/ghc-OpenGL.changes 2017-06-04 01:51:27.451163602 +0200 @@ -1,0 +2,5 @@ +Wed May 3 08:14:07 UTC 2017 - [email protected] + +- Update to version 3.0.2.0 with cabal2obs. + +------------------------------------------------------------------- Old: ---- OpenGL-3.0.1.0.tar.gz New: ---- OpenGL-3.0.2.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ghc-OpenGL.spec ++++++ --- /var/tmp/diff_new_pack.AflI50/_old 2017-06-04 01:51:27.967090708 +0200 +++ /var/tmp/diff_new_pack.AflI50/_new 2017-06-04 01:51:27.971090143 +0200 @@ -1,7 +1,7 @@ # # spec file for package ghc-OpenGL # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,15 +18,14 @@ %global pkg_name OpenGL Name: ghc-%{pkg_name} -Version: 3.0.1.0 +Version: 3.0.2.0 Release: 0 Summary: A binding for the OpenGL graphics system License: BSD-3-Clause -Group: System/Libraries +Group: Development/Languages/Other Url: https://hackage.haskell.org/package/%{pkg_name} Source0: https://hackage.haskell.org/package/%{pkg_name}-%{version}/%{pkg_name}-%{version}.tar.gz BuildRequires: ghc-Cabal-devel -# Begin cabal-rpm deps: BuildRequires: ghc-GLURaw-devel BuildRequires: ghc-ObjectName-devel BuildRequires: ghc-OpenGLRaw-devel @@ -37,7 +36,6 @@ BuildRequires: ghc-text-devel BuildRequires: ghc-transformers-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build -# End cabal-rpm deps %description A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its @@ -63,15 +61,12 @@ %prep %setup -q -n %{pkg_name}-%{version} - %build %ghc_lib_build - %install %ghc_lib_install - %post devel %ghc_pkg_recache ++++++ OpenGL-3.0.1.0.tar.gz -> OpenGL-3.0.2.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/CHANGELOG.md new/OpenGL-3.0.2.0/CHANGELOG.md --- old/OpenGL-3.0.1.0/CHANGELOG.md 2016-05-11 14:20:57.000000000 +0200 +++ new/OpenGL-3.0.2.0/CHANGELOG.md 2017-04-26 11:57:34.000000000 +0200 @@ -1,3 +1,7 @@ +3.0.2.0 +------- +* Added support for S3_s3tc, EXT_texture_compression_s3tc, ARB_texture_float, and EXT_packed_depth_stencil extensions. + 3.0.1.0 ------- * Added `Uniform` instances for `GLmatrix`, `Vertex1`, `Vector1`, `Vector2`, `Vector3`, and `Vector4`. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/OpenGL.cabal new/OpenGL-3.0.2.0/OpenGL.cabal --- old/OpenGL-3.0.1.0/OpenGL.cabal 2016-05-11 14:20:57.000000000 +0200 +++ new/OpenGL-3.0.2.0/OpenGL.cabal 2017-04-26 10:59:44.000000000 +0200 @@ -1,5 +1,5 @@ name: OpenGL -version: 3.0.1.0 +version: 3.0.2.0 synopsis: A binding for the OpenGL graphics system description: A Haskell binding for the OpenGL graphics system (GL, version 4.5) and its @@ -23,8 +23,9 @@ tested-with: GHC == 7.8.4 GHC == 7.10.3 - GHC == 8.0.1 - GHC == 8.1 + GHC == 8.0.2 + GHC == 8.2.1 + GHC == 8.3 cabal-version: >= 1.10 extra-source-files: CHANGELOG.md diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/README.md new/OpenGL-3.0.2.0/README.md --- old/OpenGL-3.0.1.0/README.md 2016-01-04 08:30:21.000000000 +0100 +++ new/OpenGL-3.0.2.0/README.md 2016-08-24 09:10:57.000000000 +0200 @@ -1 +1,4 @@ -[](https://hackage.haskell.org/package/OpenGL) [](https://travis-ci.org/haskell-opengl/OpenGL) +[](https://hackage.haskell.org/package/OpenGL) +[](https://www.stackage.org/lts/package/OpenGL) +[](https://www.stackage.org/nightly/package/OpenGL) +[](https://travis-ci.org/haskell-opengl/OpenGL) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/DataType.hs new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/DataType.hs --- old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/DataType.hs 2016-01-04 08:30:21.000000000 +0100 +++ new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/DataType.hs 2017-04-26 10:46:42.000000000 +0200 @@ -15,7 +15,7 @@ module Graphics.Rendering.OpenGL.GL.DataType ( DataType(..), marshalDataType, unmarshalDataType, - DataTypeType(..), marshalDataTypeType, unmarshalDataTypeType + DataRepresentation(..), unmarshalDataRepresentation ) where import Graphics.GL @@ -126,29 +126,20 @@ | x == GL_4_BYTES = FourBytes | otherwise = error ("unmarshalDataType: illegal value " ++ show x) -data DataTypeType - = TNone - | TSignedNormalized - | TUnsignedNormalized - | TFloat - | TInt - | TUnsignedInt - -marshalDataTypeType :: DataTypeType -> GLenum -marshalDataTypeType x = case x of - TNone -> GL_NONE - TSignedNormalized -> GL_SIGNED_NORMALIZED - TUnsignedNormalized -> GL_UNSIGNED_NORMALIZED - TFloat -> GL_FLOAT - TInt -> GL_INT - TUnsignedInt -> GL_UNSIGNED_INT - -unmarshalDataTypeType :: GLenum -> DataTypeType -unmarshalDataTypeType x - | x == GL_NONE = TNone - | x == GL_SIGNED_NORMALIZED = TSignedNormalized - | x == GL_UNSIGNED_NORMALIZED = TUnsignedNormalized - | x == GL_FLOAT = TFloat - | x == GL_INT = TInt - | x == GL_UNSIGNED_INT = TUnsignedInt - | otherwise = error $ "unmarshalDataTypeType: illegal value " ++ show x +data DataRepresentation + = SignedNormalizedRepresentation + | UnsignedNormalizedRepresentation + | FloatRepresentation + | IntRepresentation + | UnsignedIntRepresentation + deriving ( Eq, Ord, Show ) + +unmarshalDataRepresentation :: GLenum -> Maybe DataRepresentation +unmarshalDataRepresentation x + | x == GL_SIGNED_NORMALIZED = Just SignedNormalizedRepresentation + | x == GL_UNSIGNED_NORMALIZED = Just UnsignedNormalizedRepresentation + | x == GL_FLOAT = Just FloatRepresentation + | x == GL_INT = Just IntRepresentation + | x == GL_UNSIGNED_INT = Just UnsignedIntRepresentation + | x == GL_NONE = Nothing + | otherwise = error $ "unmarshalDataRepresentation: illegal value " ++ show x diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hs new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hs --- old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hs 2016-01-04 08:30:21.000000000 +0100 +++ new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/Texturing/PixelInternalFormat.hs 2017-04-26 10:46:42.000000000 +0200 @@ -133,6 +133,25 @@ | StencilIndex4 | StencilIndex8 | StencilIndex16 + | RGBS3TC + | RGB4S3TC + | RGBAS3TC + | RGBA4S3TC + | RGBADXT5S3TC + | RGBA4DXT5S3TC + | CompressedRGBAS3TCDXT1 + | CompressedRGBAS3TCDXT3 + | CompressedRGBAS3TCDXT5 + | CompressedRGBS3TCDXT1 + | Alpha32F + | Intensity32F + | Luminance32F + | LuminanceAlpha32F + | Alpha16F + | Intensity16F + | Luminance16F + | LuminanceAlpha16F + | Depth24Stencil8 deriving ( Eq, Ord, Show ) marshalPixelInternalFormat :: PixelInternalFormat -> GLint @@ -247,6 +266,25 @@ StencilIndex4 -> GL_STENCIL_INDEX4 StencilIndex8 -> GL_STENCIL_INDEX8 StencilIndex16 -> GL_STENCIL_INDEX16 + RGBS3TC -> GL_RGB_S3TC + RGB4S3TC -> GL_RGB4_S3TC + RGBAS3TC -> GL_RGBA_S3TC + RGBA4S3TC -> GL_RGBA4_S3TC + RGBADXT5S3TC -> GL_RGBA_DXT5_S3TC + RGBA4DXT5S3TC -> GL_RGBA4_DXT5_S3TC + CompressedRGBAS3TCDXT1 -> GL_COMPRESSED_RGBA_S3TC_DXT1_EXT + CompressedRGBAS3TCDXT3 -> GL_COMPRESSED_RGBA_S3TC_DXT3_EXT + CompressedRGBAS3TCDXT5 -> GL_COMPRESSED_RGBA_S3TC_DXT5_EXT + CompressedRGBS3TCDXT1 -> GL_COMPRESSED_RGB_S3TC_DXT1_EXT + Alpha32F -> GL_ALPHA32F_ARB + Intensity32F -> GL_INTENSITY32F_ARB + Luminance32F -> GL_LUMINANCE32F_ARB + LuminanceAlpha32F -> GL_LUMINANCE_ALPHA32F_ARB + Alpha16F -> GL_ALPHA16F_ARB + Intensity16F -> GL_INTENSITY16F_ARB + Luminance16F -> GL_LUMINANCE16F_ARB + LuminanceAlpha16F -> GL_LUMINANCE_ALPHA16F_ARB + Depth24Stencil8 -> GL_DEPTH24_STENCIL8_EXT -- *sigh* The OpenGL API is sometimes a bit creative in its usage of types... marshalPixelInternalFormat' :: PixelInternalFormat -> GLenum @@ -359,6 +397,25 @@ | y == GL_STENCIL_INDEX4 = StencilIndex4 | y == GL_STENCIL_INDEX8 = StencilIndex8 | y == GL_STENCIL_INDEX16 = StencilIndex16 + | y == GL_RGB_S3TC = RGBS3TC + | y == GL_RGB4_S3TC = RGB4S3TC + | y == GL_RGBA_S3TC = RGBAS3TC + | y == GL_RGBA4_S3TC = RGBA4S3TC + | y == GL_RGBA_DXT5_S3TC = RGBADXT5S3TC + | y == GL_RGBA4_DXT5_S3TC = RGBA4DXT5S3TC + | y == GL_COMPRESSED_RGBA_S3TC_DXT1_EXT = CompressedRGBAS3TCDXT1 + | y == GL_COMPRESSED_RGBA_S3TC_DXT3_EXT = CompressedRGBAS3TCDXT3 + | y == GL_COMPRESSED_RGBA_S3TC_DXT5_EXT = CompressedRGBAS3TCDXT5 + | y == GL_COMPRESSED_RGB_S3TC_DXT1_EXT = CompressedRGBS3TCDXT1 + | y == GL_ALPHA32F_ARB = Alpha32F + | y == GL_INTENSITY32F_ARB = Intensity32F + | y == GL_LUMINANCE32F_ARB = Luminance32F + | y == GL_LUMINANCE_ALPHA32F_ARB = LuminanceAlpha32F + | y == GL_ALPHA16F_ARB = Alpha16F + | y == GL_INTENSITY16F_ARB = Intensity16F + | y == GL_LUMINANCE16F_ARB = Luminance16F + | y == GL_LUMINANCE_ALPHA16F_ARB = LuminanceAlpha16F + | y == GL_DEPTH24_STENCIL8_EXT = Depth24Stencil8 -- legacy values | y == 1 = Luminance' | y == 2 = LuminanceAlpha' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs --- old/OpenGL-3.0.1.0/src/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs 2016-01-04 08:30:21.000000000 +0100 +++ new/OpenGL-3.0.2.0/src/Graphics/Rendering/OpenGL/GL/Texturing/Queries.hs 2017-04-26 11:59:58.000000000 +0200 @@ -16,12 +16,15 @@ TextureQuery, textureInternalFormat, textureSize1D, textureSize2D, textureSize3D, textureBorder, textureRGBASizes, textureSharedSize, textureIntensitySize, textureLuminanceSize, textureIndexSize, - textureDepthBits, textureCompressedImageSize, textureProxyOK + textureDepthBits, textureCompressedImageSize, textureProxyOK, + DataRepresentation(..), textureRGBATypes, textureIntensityType, + textureLuminanceType, textureDepthType ) where import Control.Monad import Data.StateVar import Foreign.Marshal.Utils +import Graphics.Rendering.OpenGL.GL.DataType import Graphics.Rendering.OpenGL.GL.GLboolean import Graphics.Rendering.OpenGL.GL.PeekPoke import Graphics.Rendering.OpenGL.GL.PixelRectangles @@ -50,6 +53,13 @@ | TextureCompressedImageSize | TextureCompressed | TextureSharedSize + | TextureRedType + | TextureGreenType + | TextureBlueType + | TextureAlphaType + | TextureLuminanceType + | TextureIntensityType + | TextureDepthType marshalTexLevelParameter :: TexLevelParameter -> GLenum marshalTexLevelParameter x = case x of @@ -69,6 +79,13 @@ TextureCompressedImageSize -> GL_TEXTURE_COMPRESSED_IMAGE_SIZE TextureCompressed -> GL_TEXTURE_COMPRESSED TextureSharedSize -> GL_TEXTURE_SHARED_SIZE + TextureRedType -> GL_TEXTURE_RED_TYPE_ARB + TextureGreenType -> GL_TEXTURE_GREEN_TYPE_ARB + TextureBlueType -> GL_TEXTURE_BLUE_TYPE_ARB + TextureAlphaType -> GL_TEXTURE_ALPHA_TYPE_ARB + TextureLuminanceType -> GL_TEXTURE_LUMINANCE_TYPE_ARB + TextureIntensityType -> GL_TEXTURE_INTENSITY_TYPE_ARB + TextureDepthType -> GL_TEXTURE_DEPTH_TYPE_ARB -------------------------------------------------------------------------------- @@ -152,6 +169,27 @@ makeGettableStateVar $ getTexLevelParameteri unmarshalGLboolean (marshalParameterizedTextureTargetProxy t) level TextureWidth +textureRGBATypes :: QueryableTextureTarget t => TextureQuery t (Color4 (Maybe DataRepresentation)) +textureRGBATypes t level = + makeGettableStateVar $ + liftM4 Color4 + (getDataRepr t level TextureRedType ) + (getDataRepr t level TextureGreenType) + (getDataRepr t level TextureBlueType ) + (getDataRepr t level TextureAlphaType) + +getDataRepr :: QueryableTextureTarget t => t -> Level -> TexLevelParameter -> IO (Maybe DataRepresentation) +getDataRepr = getTexLevelParameteriNoProxy (unmarshalDataRepresentation . fromIntegral) + +textureIntensityType :: QueryableTextureTarget t => TextureQuery t (Maybe DataRepresentation) +textureIntensityType t level = makeGettableStateVar $ getDataRepr t level TextureIntensityType + +textureLuminanceType :: QueryableTextureTarget t => TextureQuery t (Maybe DataRepresentation) +textureLuminanceType t level = makeGettableStateVar $ getDataRepr t level TextureLuminanceType + +textureDepthType :: QueryableTextureTarget t => TextureQuery t (Maybe DataRepresentation) +textureDepthType t level = makeGettableStateVar $ getDataRepr t level TextureDepthType + getTexLevelParameteriNoProxy :: QueryableTextureTarget t => (GLint -> a) -> t -> Level -> TexLevelParameter -> IO a getTexLevelParameteriNoProxy f = getTexLevelParameteri f . marshalQueryableTextureTarget
