[Pkg-cli-libs-commits] [SCM] monogame branch, master, updated. debian/2.5.1+dfsg-3

[Jo Shields]

The following commit has been merged in the master branch:
commit adebf3dc030291e79e7f60c9a356ac4fabda9ac8
Author: Jo Shields <directhex at apebox.org>
Date:   Sat Jun 30 14:07:50 2012 +0100

    Patch from upstream to prevent exception in graphics initialization code with older versions of OpenTK.

diff --git a/debian/patches/dont_call_glTexEnv.patch b/debian/patches/dont_call_glTexEnv.patch
new file mode 100644
index 0000000..9dccf6d
--- /dev/null
+++ b/debian/patches/dont_call_glTexEnv.patch
@@ -0,0 +1,36 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ monogame (2.5.1+dfsg-2~dhx1~precise1) precise; urgency=low
+ .
+   * Upload to badgerports/precise.
+Author: Jo Shields <directhex at apebox.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- monogame-2.5.1+dfsg.orig/MonoGame.Framework/Linux/Graphics/SpriteBatch.cs
++++ monogame-2.5.1+dfsg/MonoGame.Framework/Linux/Graphics/SpriteBatch.cs
+@@ -165,7 +165,7 @@ namespace Microsoft.Xna.Framework.Graphi
+ 
+ 			// Initialize OpenGL states (ideally move this to initialize somewhere else)	
+ 			GL.Disable (EnableCap.DepthTest);
+-			GL.TexEnv (TextureEnvTarget.TextureEnv, TextureEnvParameter.TextureEnvMode, (int)All.BlendSrc);
++			//GL.TexEnv (TextureEnvTarget.TextureEnv, TextureEnvParameter.TextureEnvMode, (int)All.BlendSrc);
+ 			GL.Enable (EnableCap.Texture2D);
+ 			GL.EnableClientState (ArrayCap.VertexArray);
+ 			GL.EnableClientState (ArrayCap.ColorArray);
diff --git a/debian/patches/series b/debian/patches/series
index 9604f07..51593c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+dont_call_glTexEnv.patch
 force_unicode_build
 build_xml_documentation

-- 
monogame