debian/changelog | 7 ++++-
debian/patches/16-xaa-fbcomposite-fix-negative-size.diff | 21 ++-------------
2 files changed, 10 insertions(+), 18 deletions(-)
New commits:
commit b170ec774f67f714509f229980e5f47ece659fb2
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Fri Jun 4 14:18:44 2010 +1000
Drop mi/miarc.c hunk from 16-xaa-fbcomposite-fix-negative-size.diff; merged
upstream
diff --git a/debian/changelog b/debian/changelog
index 71ca0f3..40f9a3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
xorg-server (2:1.8.1.901-1) UNRELEASED; urgency=low
+ [ Julien Cristau ]
* New upstream release
* Merge changes from 2:1.7.7-1.
- -- Julien Cristau <jcris...@debian.org> Thu, 03 Jun 2010 18:29:42 +0200
+ [ Christopher James Halse Rogers ]
+ * 16-xaa-fbcomposite-fix-negative-size.diff:
+ - mi hunk merged upstream. Update to keep just the fbpict.c hunk.
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Fri, 04 Jun 2010
14:16:14 +1000
xorg-server (2:1.8.1-1) experimental; urgency=low
diff --git a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
index 39c1d87..0cd0431 100644
--- a/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
+++ b/debian/patches/16-xaa-fbcomposite-fix-negative-size.diff
@@ -1,7 +1,7 @@
-diff --git a/fb/fbpict.c b/fb/fbpict.c
-index c046bae..7c06a64 100644
---- a/fb/fbpict.c
-+++ b/fb/fbpict.c
+Index: xorg-server/fb/fbpict.c
+===================================================================
+--- xorg-server.orig/fb/fbpict.c 2010-06-04 13:54:10.000000000 +1000
++++ xorg-server/fb/fbpict.c 2010-06-04 13:57:34.657009716 +1000
@@ -37,7 +37,7 @@
#include "mipict.h"
#include "fbpict.h"
@@ -11,16 +11,3 @@ index c046bae..7c06a64 100644
void
fbWalkCompositeRegion (CARD8 op,
-diff --git a/mi/miarc.c b/mi/miarc.c
-index a3e2580..54fd743 100644
---- a/mi/miarc.c
-+++ b/mi/miarc.c
-@@ -1524,7 +1524,7 @@ miRoundCap(
-
- # define Dsin(d) ((d) == 0.0 ? 0.0 : ((d) == 90.0 ? 1.0 :
sin(d*M_PI/180.0)))
- # define Dcos(d) ((d) == 0.0 ? 1.0 : ((d) == 90.0 ? 0.0 :
cos(d*M_PI/180.0)))
--# define mod(a,b) ((a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-+# define mod(a,b) ((a) >= 0 ? (a) % (b) : (b) - (-(a)) % (b))
-
- static double
- miDcos (double a)
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1okono-0006wf...@alioth.debian.org
