x11proto-damage: Changes to 'upstream-unstable'
.gitignore | 1 +
ChangeLog | 39 ---------------------------------------
Makefile.am | 12 ++++++++++--
configure.ac | 9 ++++++---
damageproto.h | 2 --
damageproto.txt | 11 ++++++-----
damagewire.h | 2 --
7 files changed, 23 insertions(+), 53 deletions(-)
New commits:
commit 1950869c1640590b2ce7a96e2a97746b308093f8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Aug 27 15:43:27 2009 +1000
damageproto 1.2.0
diff --git a/configure.ac b/configure.ac
index 59ab45b..fa48ad5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@ dnl
dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT([DamageProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([DamageProto], [1.2.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit d25f083ba38d796e9a91de468fc8bec33545e400
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Tue Aug 25 17:48:20 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index ca4a917..0206524 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,4 @@
#
-# $Id: Makefile.am,v 1.1 2003-10-24 06:16:46 keithp Exp $
-#
# Copyright © 2003 Keith Packard, Noah Levitt
#
# Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/configure.ac b/configure.ac
index d394029..59ab45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,4 @@
dnl
-dnl $Id: configure.ac,v 1.3 2005-01-16 17:30:53 pb Exp $
-dnl
dnl Copyright © 2003 Keith Packard, Noah Levitt
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
diff --git a/damageproto.h b/damageproto.h
index d3bb045..107e192 100644
--- a/damageproto.h
+++ b/damageproto.h
@@ -1,6 +1,4 @@
/*
- * $Id: damageproto.h,v 1.1 2003-10-24 06:16:46 keithp Exp $
- *
* Copyright © 2003 Keith Packard
* Copyright © 2007 Eric Anholt
*
diff --git a/damagewire.h b/damagewire.h
index 466f0d0..d90a0dd 100644
--- a/damagewire.h
+++ b/damagewire.h
@@ -1,6 +1,4 @@
/*
- * $Id: damagewire.h,v 1.1 2003-10-24 06:16:46 keithp Exp $
- *
* Copyright © 2003 Keith Packard
*
* Permission to use, copy, modify, distribute, and sell this software and its
commit 12b708a2fe5cb538c87239b35822ccc318f98b12
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Jul 8 10:11:26 2009 -0400
damageproto: use XORG_CHANGELOG macro to create ChangeLog. #22611
Build break: Makefile.am: command not found: git-log
Adding the macro in configure.ac and use it in Makefile.am
Refer to: https://bugs.freedesktop.org/show_bug.cgi?id=22611
Tested: running autogen.sh, make and 'make dist'
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/Makefile.am b/Makefile.am
index 32fcf84..ca4a917 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -41,6 +41,6 @@ MAINTAINERCLEANFILES = ChangeLog
.PHONY: ChangeLog
ChangeLog:
- (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index dfbb1a9..d394029 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,7 +28,12 @@ AC_INIT([DamageProto], [1.1.0], [https://bugs.freedesktop.org/enter_bug.cgi?prod
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Require xorg-macros: XORG_RELEASE_VERSION XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
damageproto.pc])
commit c25bdf1cce48ad1b2bb33ba45969572e6e4d385f
Author: Owen Taylor <otaylor@fishsoup.net>
Date: Fri Sep 19 09:52:07 2008 -0400
Document that 'parts' may be None for DamageSubtract
The server code has handled parts == None since at least 2004.
diff --git a/damageproto.txt b/damageproto.txt
index 54910ad..1f254d4 100644
--- a/damageproto.txt
+++ b/damageproto.txt
@@ -191,20 +191,21 @@ DamageSubtract
damage: DAMAGE
repair: Region or None
- parts: Region
+ parts: Region or None
Synchronously modifies the regions in the following manner:
If repair is None:
- 1) parts = damage
+ 1) if parts is not None, parts = damage
2) damage = <empty>
Otherwise:
- 1) parts = damage INTERSECT repair
- 2) damage = damage - parts
- 3) Generate DamageNotify for remaining damage areas
+ 1) tmp = damage INTERSECT repair
+ 2) damage = damage - tmp
+ 3) if parts is not None, parts = tmp
+ 4) Generate DamageNotify for remaining damage areas
DamageAdd
commit ad1a35b351012a347c49246f986655e3a91431df
Author: James Cloos <cloos@jhcloos.com>
Date: Thu Dec 6 16:38:57 2007 -0500
Replace static ChangeLog with dist-hook to generate from git log
diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index 7f7620c..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,39 +0,0 @@
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
-
- * configure.ac:
- Update package version for X11R7 release.
-
-2005-01-16 Chris Larson <kergoth@handhelds.org>
-
- * configure.ac: Fix to work with automake 1.9.x.
-
-2004-02-03 Jim Gettys <jg@freedesktop.org>
-
- * AUTHORS: Add AUTHORS to file
-
-2004-01-15 Daniel Stone <daniel@fooishbar.org>
- * Tag release 1.0 for first freedesktop.org clientside lib release.
-
-2003-11-03 Keith Packard <keithp@keithp.com>
-
- * protocol:
- Mark document revision
- Credit Havoc the Tolerant for his earlier design and implementation
-
-2003-10-23 Keith Packard <keithp@keithp.com>
-
- * COPYING:
- * INSTALL:
- * Makefile.am:
- * README:
- * autogen.sh:
- * configure.ac:
- * damageext.pc.in:
- * damageproto.h:
- * damagewire.h:
- * protocol:
- Initial working version -- added DamageDestroy and damage objects
-
-2003-10-18 Keith Packard <keithp@keithp.com
-
- Initial protocol description added
diff --git a/Makefile.am b/Makefile.am
index b5ef4bb..32fcf84 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,3 +34,13 @@ damagedoc_DATA = damageproto.txt
EXTRA_DIST = autogen.sh damageproto.pc.in $(damagedoc_DATA)
+
+EXTRA_DIST += ChangeLog
+MAINTAINERCLEANFILES = ChangeLog
+
+.PHONY: ChangeLog
+
+ChangeLog:
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+
+dist-hook: ChangeLog
commit 63881a6b3f5571ba4c4b3614ea9346c733eb471b
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 05:54:00 2007 -0400
Add *~ to .gitignore to skip patch/emacs droppings
diff --git a/.gitignore b/.gitignore
index bb84fd1..313e4f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ damageproto.pc
install-sh
missing
mkinstalldirs
+*~
Reply to: