Merge lp:~mniess/ubuntu/precise/compiz/fix-screenshot into lp:ubuntu/precise/compiz

[Matthias Niess]

fix compiz screenshot plugin by removing the blue tint as a workaround (LP: #771875)

[Didier Roche (didrocks)]

Thanks for this patch and help to make ubuntu better.

For compiz, we try to have all the patches reviewed upstream as they are closed to us. Can you please propose your fix against lp:compiz-core so that it's reviewed by them? Thanks :)

review: Resubmit

Unmerged revisions

263. By Matthias Niess on 2012-04-03

* debian/patches/fix-screenshots.patch:
  - fix compiz screenshot plugin by removing the blue tint as a
    workaround (LP: #771875)

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-26 14:57:30 +0000
+++ debian/changelog	2012-04-03 00:28:19 +0000
@@ -1,3 +1,11 @@
+compiz (1:0.9.7.2-0ubuntu5) precise; urgency=low
+
+  * debian/patches/fix-screenshots.patch:
+    - fix compiz screenshot plugin by removing the blue tint as a
+      workaround (LP: #771875)
+
+ -- Matthias Niess <[e-mail]>  Tue, 03 Apr 2012 02:23:41 +0200
+
 compiz (1:0.9.7.2-0ubuntu4) precise; urgency=low
 
   * No-change upload to the release pocket instead of to -proposed, so we can

=== added file 'debian/patches/fix-screenshots.patch'
--- debian/patches/fix-screenshots.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-screenshots.patch	2012-04-03 00:28:19 +0000
@@ -0,0 +1,17 @@
+## Description: add some description
+## Origin/Author: add some origin or author
+## Bug: bug URL
+=== modified file 'plugins/screenshot/src/screenshot.cpp'
+--- plugins/screenshot/src/screenshot.cpp	2012-02-13 15:28:06 +0000
++++ plugins/screenshot/src/screenshot.cpp	2012-04-02 23:06:36 +0000
+@@ -277,7 +277,8 @@
+ 	    glDisableClientState (GL_TEXTURE_COORD_ARRAY);
+ 	    glEnable (GL_BLEND);
+ 	    glColor4us (0x2fff, 0x2fff, 0x4fff, 0x4fff);
+-	    glRecti (x1, y2, x2, y1);
++	    # workaround remove blue overlay
++	    # glRecti (x1, y2, x2, y1);
+ 	    glColor4us (0x2fff, 0x2fff, 0x4fff, 0x9fff);
+ 	    glBegin (GL_LINE_LOOP);
+ 	    glVertex2i (x1, y1);
+

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-03-26 18:41:09 +0000
+++ debian/patches/series	2012-04-03 00:28:19 +0000
@@ -8,3 +8,4 @@
 exit_1_if_composite_cant_init.patch
 always_replace.patch
 reset_active_plugin_list.patch
+fix-screenshots.patch