.gitignore | 74 +++++++-- COPYING | 33 +--- ChangeLog | 163 +++++++++++++++++++++ Makefile.am | 10 - configure.ac | 15 - debian/README.source | 2 debian/changelog | 10 + debian/control | 13 + debian/copyright | 33 +--- debian/patches/01_Don-t-export-xgeExtRegister.diff | 26 --- debian/patches/series | 1 debian/rules | 2 debian/xsfbs/xsfbs.mk | 35 ++-- include/X11/extensions/XShm.h | 2 include/X11/extensions/dpms.h | 2 include/X11/extensions/sync.h | 6 man/.gitignore | 2 man/DPMSCapable.man | 35 +--- man/DPMSDisable.man | 35 +--- man/DPMSEnable.man | 35 +--- man/DPMSForceLevel.man | 35 +--- man/DPMSGetTimeouts.man | 35 +--- man/DPMSGetVersion.man | 35 +--- man/DPMSInfo.man | 35 +--- man/DPMSQueryExtension.man | 35 +--- man/DPMSSetTimeouts.man | 35 +--- man/XShm.man | 33 +--- man/XcupGetReservedColormapEntries.man | 35 +--- man/XcupQueryVersion.man | 35 +--- man/XcupStoreColors.man | 35 +--- src/Makefile.am | 4 src/Xdbe.c | 5 src/extutil.c | 2 33 files changed, 518 insertions(+), 375 deletions(-)
New commits: commit 1656a5b7aba3ef70605d3a0881c3a757826e1566 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:15:58 2010 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index a5eaeb2..efd7a50 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -libxext (2:1.1.2-1) UNRELEASED; urgency=low +libxext (2:1.1.2-1) unstable; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. @@ -6,7 +6,7 @@ libxext (2:1.1.2-1) UNRELEASED; urgency=low * Drop patch included upstream, disable patch system. * Bump Standards-Version to 3.9.0. - -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 14:15:51 +0100 libxext (2:1.1.1-3) unstable; urgency=low commit a8232aedbaa011bb16697d81bab7ed0f9ad5dd0a Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:15:18 2010 +0100 Bump Standards-Version to 3.9.0. diff --git a/debian/changelog b/debian/changelog index 29c3c3b..a5eaeb2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ libxext (2:1.1.2-1) UNRELEASED; urgency=low * Update debian/copyright from upstream COPYING. * Bump xutils-dev build-dep for xorg-macros 1.4. * Drop patch included upstream, disable patch system. + * Bump Standards-Version to 3.9.0. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 diff --git a/debian/control b/debian/control index 7ca483e..322b1d9 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+1), -Standards-Version: 3.8.4 +Standards-Version: 3.9.0 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxext Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxext.git commit 7d382825870eda45d52b1203f665283fb003e8ec Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:13:13 2010 +0100 Wrap libxext-dev's Depends field diff --git a/debian/control b/debian/control index c679cd9..7ca483e 100644 --- a/debian/control +++ b/debian/control @@ -103,7 +103,13 @@ Description: X11 miscellaneous extensions library (debug package) Package: libxext-dev Section: libdevel Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libxext6 (= ${binary:Version}), x11proto-core-dev, x11proto-xext-dev (>= 7.0.99.2), libx11-dev +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + libxext6 (= ${binary:Version}), + x11proto-core-dev, + x11proto-xext-dev (>= 7.0.99.2), + libx11-dev Replaces: x11proto-xext-dev (<< 7.0.99.2) Description: X11 miscellaneous extensions library (development headers) commit 8acc6c69074211f7eb1dafb7ab6b513327686fc9 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:03:26 2010 +0100 Drop patch included upstream, disable patch system. diff --git a/debian/changelog b/debian/changelog index ec0d24b..29c3c3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ libxext (2:1.1.2-1) UNRELEASED; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. * Bump xutils-dev build-dep for xorg-macros 1.4. + * Drop patch included upstream, disable patch system. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 diff --git a/debian/control b/debian/control index dcac102..c679cd9 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,6 @@ Build-Depends: automake, libtool, xutils-dev (>= 1:7.5+1), - quilt, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxext Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxext.git diff --git a/debian/patches/01_Don-t-export-xgeExtRegister.diff b/debian/patches/01_Don-t-export-xgeExtRegister.diff deleted file mode 100644 index c70f7c6..0000000 --- a/debian/patches/01_Don-t-export-xgeExtRegister.diff +++ /dev/null @@ -1,26 +0,0 @@ -From 5b63f1c71ac6ae05490fbe242bc0ee675fa09253 Mon Sep 17 00:00:00 2001 -From: Julien Cristau <[email protected]> -Date: Sat, 28 Nov 2009 15:30:43 +0100 -Subject: [PATCH] Don't export xgeExtRegister - -Its only caller is XextAddDisplay() ---- - src/Xge.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/Xge.c b/src/Xge.c -index 7a583e5..2ea5d27 100644 ---- a/src/Xge.c -+++ b/src/Xge.c -@@ -294,7 +294,7 @@ _xgeEventToWire(Display* dpy, XEvent* re, xEvent* event) - /* - * Extensions need to register callbacks for their events. - */ --Bool -+_X_HIDDEN Bool - xgeExtRegister(Display* dpy, int offset, XExtensionHooks* callbacks) - { - XGEExtNode* newExt; --- -1.6.5 - diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 817efd2..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -01_Don-t-export-xgeExtRegister.diff diff --git a/debian/rules b/debian/rules index 65204da..c3d30d3 100755 --- a/debian/rules +++ b/debian/rules @@ -34,7 +34,7 @@ endif build: build-stamp -build-stamp: $(STAMP_DIR)/patch +build-stamp: dh_testdir autoreconf -vfi mkdir -p build commit 85dd54b537904ed267795933aaef731c82a469a4 Author: Julien Cristau <[email protected]> Date: Sun Jul 11 14:00:50 2010 +0100 Bump xutils-dev build-dep for xorg-macros 1.4. diff --git a/debian/changelog b/debian/changelog index d9087ec..ec0d24b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ libxext (2:1.1.2-1) UNRELEASED; urgency=low * New upstream release. * Update debian/copyright from upstream COPYING. + * Bump xutils-dev build-dep for xorg-macros 1.4. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 diff --git a/debian/control b/debian/control index daafecf..dcac102 100644 --- a/debian/control +++ b/debian/control @@ -11,8 +11,8 @@ Build-Depends: pkg-config, automake, libtool, - xutils-dev (>= 1:7.5~1), - quilt + xutils-dev (>= 1:7.5+1), + quilt, Standards-Version: 3.8.4 Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxext Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxext.git commit 408daceeb999bd85d59b7eb6d87b72669f7ad39a Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:59:53 2010 +0100 Update debian/copyright from upstream COPYING. diff --git a/debian/changelog b/debian/changelog index 060b222..d9087ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ libxext (2:1.1.2-1) UNRELEASED; urgency=low * New upstream release. + * Update debian/copyright from upstream COPYING. -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 diff --git a/debian/copyright b/debian/copyright index 18f3091..4b160be 100644 --- a/debian/copyright +++ b/debian/copyright @@ -163,28 +163,23 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided ``as is'' without express or implied warranty. -Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All Rights Reserved +Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, subject to the following -conditions: +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the names of the copyright holders -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -from said copyright holders. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. commit 7bb48e7e182672a883b4b98d9ea169f77815cefd Author: Julien Cristau <[email protected]> Date: Sun Jul 11 13:57:04 2010 +0100 Bump changelogs diff --git a/ChangeLog b/ChangeLog index bc5b412..237286f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,166 @@ +commit ce440c7d68fa06763f8413859c25ae3a8a22c81b +Author: Alan Coopersmith <[email protected]> +Date: Thu Jun 3 17:19:30 2010 -0700 + + libXext 1.1.2 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 904f71cda5ef818b53171888efb6b0dd0f929565 +Author: Jamey Sharp <[email protected]> +Date: Fri Apr 9 17:30:06 2010 -0700 + + XAllocID must only be called with the Display lock held. + + This patch makes XdbeAllocateBackBufferName follow the same XID allocation + pattern used in other stubs. + + Signed-off-by: Jamey Sharp <[email protected]> + +commit b403e38d7d0994d223984c11f26f5b8749851522 +Author: Gaetan Nadon <[email protected]> +Date: Mon Apr 5 19:58:03 2010 -0400 + + config: update AC_PREREQ statement to 2.60 + + Unrelated to the previous patches, the new value simply reflects + the reality that the minimum level for autoconf to configure + all x.org modules is 2.60 dated June 2006. + + ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 048e97e3948dd0caf886f3cb789899f63dc9d1bf +Author: Gaetan Nadon <[email protected]> +Date: Mon Mar 29 14:53:48 2010 -0400 + + config: remove the pkgconfig pc.in file from EXTRA_DIST + + Automake always includes it in the tarball. + + Signed-off-by: Gaetan Nadon <[email protected]> + +commit 658574bb531f342947f484f9903e30032afce070 +Author: Julien Cristau <[email protected]> +Date: Fri Feb 5 13:58:33 2010 +0100 + + Revert "Don't smash the event_vec if num_events differs between lib and server." + + That commit created a single ext_handlers[] array to check for + non-overlapping extension events, but the event codes need to be + per-display, so checking them globally is wrong. + + This reverts commit 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287. + + Signed-off-by: Julien Cristau <[email protected]> + Cc: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit 1ed7492638d6d6fb7c06da64017df6b7877d9780 +Author: Alan Coopersmith <[email protected]> +Date: Thu Jan 14 20:36:51 2010 -0800 + + Update Sun license notices to current X.Org standard form + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287 +Author: Peter Hutterer <[email protected]> +Date: Thu Nov 26 09:38:31 2009 +1000 + + Don't smash the event_vec if num_events differs between lib and server. + + If the library extension thinks there's more events to an extension than the + server actually has, the event_vec for the overlapping range can get + overwritten. This depends on the initialization order of the libraries. + + Reported-by: Nathan Kidd + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Julien Cristau <[email protected]> + +commit 9632775f2195e3448fcc402a3743f3368a8a1c9c +Author: Julien Cristau <[email protected]> +Date: Mon Nov 30 00:07:22 2009 +0100 + + Don't export xgeExtRegister + + Its only caller is XextAddDisplay() + + Acked-by: Peter Hutterer <[email protected]> + Signed-off-by: Julien Cristau <[email protected]> + +commit db2a28e540f9eb7cbfeffc771ce7cdf414231aa7 +Author: Gaetan Nadon <[email protected]> +Date: Fri Nov 27 20:56:04 2009 -0500 + + Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES + + Now that the INSTALL file is generated. + Allows running make maintainer-clean. + +commit 6ede21305688873a34fcbd2b0d9f7480679f02ee +Author: Gaetan Nadon <[email protected]> +Date: Wed Oct 28 14:09:10 2009 -0400 + + INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206 + + Add missing INSTALL file. Use standard GNU file on building tarball + README may have been updated + Remove AUTHORS file as it is empty and no content available yet. + Remove NEWS file as it is empty and no content available yet. + +commit 42aef4da8ab2b75bbfc3c27a430f43847ab5a0f6 +Author: Gaetan Nadon <[email protected]> +Date: Tue Oct 27 15:07:25 2009 -0400 + + Deploy the new XORG_DEFAULT_OPTIONS #24242 + + This macro aggregate a number of existing macros that sets commmon + X.Org components configuration options. It shields the configuration file from + future changes. + +commit 28049a6d210913f8bf4b9d82382076718c9c3f1e +Author: Gaetan Nadon <[email protected]> +Date: Mon Oct 26 22:08:43 2009 -0400 + + Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432 + + ChangeLog filename is known to Automake and requires no further + coding in the makefile. + +commit 49957bedce40cc706bdb71edc3e827212a4d586c +Author: Gaetan Nadon <[email protected]> +Date: Thu Oct 22 12:34:19 2009 -0400 + + .gitignore: use common defaults with custom section # 24239 + + Using common defaults will reduce errors and maintenance. + Only the very small or inexistent custom section need periodic maintenance + when the structure of the component changes. Do not edit defaults. + +commit 28d16f8ce9dd6ed681e6bc149878002b093c976f +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 2 16:34:14 2009 -0800 + + Fix CFLAGS/CPPFLAGS so lint works properly + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 9f94bf9de7607c11ab82667a73a4160d705e355c +Author: Keith Packard <[email protected]> +Date: Tue Nov 3 14:42:35 2009 -0800 + + Make library headers compatible with old server builds + + Old servers (1.6 and before) included the extension library headers + instead of using separate server header files. This patch makes the + library headers compatibile with the server by hiding the library + definitions from the server build. + + Signed-off-by: Keith Packard <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + commit ed7bbe65222286828fa42f3c264ed5c4190fe58c Author: Alan Coopersmith <[email protected]> Date: Wed Oct 21 20:13:24 2009 -0700 diff --git a/debian/changelog b/debian/changelog index 6654927..060b222 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libxext (2:1.1.2-1) UNRELEASED; urgency=low + + * New upstream release. + + -- Julien Cristau <[email protected]> Sun, 11 Jul 2010 13:56:57 +0100 + libxext (2:1.1.1-3) unstable; urgency=low [ Julien Cristau ] commit ce440c7d68fa06763f8413859c25ae3a8a22c81b Author: Alan Coopersmith <[email protected]> Date: Thu Jun 3 17:19:30 2010 -0700 libXext 1.1.2 Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/configure.ac b/configure.ac index cde461b..d5d631c 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_PREREQ([2.60]) AC_INIT([libXext], - [1.1.1], + [1.1.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXext]) commit 81fc271788605b52e85c2d11635a0371fb44605e Author: Cyril Brulebois <[email protected]> Date: Sun May 2 02:14:45 2010 +0200 Add xorg-driver-{video,input} to Provides. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 77c4a39..3c59c20 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -261,8 +261,8 @@ INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) # these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) -INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) +VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video +INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) commit b045afbd8277ad0c44e29d7c45802053c4335ccd Author: Julien Cristau <[email protected]> Date: Fri Apr 16 22:14:46 2010 +0200 Update serverabi rule for xserver 1.7.6.901 Add new variables ${xviddriver:Depends} and ${xinpdriver:Depends} for drivers. The ${xserver:Depends} variable is deprecated. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 351fea5..77c4a39 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -253,25 +253,33 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir # debian/*.prerm >$@ -SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null) +# Compute dependencies for drivers +# +VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null) +INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null) + +# these two can be removed post-squeeze VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null) INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null) -SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS)) VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI) INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI) + ifeq ($(PACKAGE),) PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control) endif .PHONY: serverabi serverabi: install -ifeq ($(SERVERMINVERS),) - @echo error: xserver-xorg-dev needs to be installed +ifeq ($(VIDEODEP),) + @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed' @exit 1 else - echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars + echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars + echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars + # the following is there for compatibility... echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars + echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars endif # vim:set noet ai sts=8 sw=8 tw=0: commit 8bd2e9b523da35493db1bd781d4ef6bfbbeb2eff Author: Julien Cristau <[email protected]> Date: Tue Apr 13 14:06:33 2010 +0200 xsfbs.mk: don't use a directory as a make target The timestamp on the directory gets updated each time a file is added in it, which causes useless rebuilds. diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk index 5e16b10..351fea5 100755 --- a/debian/xsfbs/xsfbs.mk +++ b/debian/xsfbs/xsfbs.mk @@ -110,14 +110,15 @@ $(STAMP_DIR)/stampdir: .PHONY: prepare stampdir_targets+=prepare prepare: $(STAMP_DIR)/prepare -$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts +$(STAMP_DIR)/prepare: $(STAMP_DIR)/logdir $(STAMP_DIR)/genscripts >$@ -.PHONY: log -stampdir_targets+=log -log: $(STAMP_DIR)/log -$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir +.PHONY: logdir +stampdir_targets+=logdir +logdir: $(STAMP_DIR)/logdir +$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir mkdir -p $(STAMP_DIR)/log + >$@ # Apply all patches to the upstream source. .PHONY: patch @@ -145,7 +146,7 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare # Revert all patches to the upstream source. .PHONY: unpatch -unpatch: $(STAMP_DIR)/log +unpatch: $(STAMP_DIR)/logdir rm -f $(STAMP_DIR)/patch @echo -n "Unapplying patches..."; \ if $(QUILT) applied >/dev/null 2>/dev/null; then \ commit 904f71cda5ef818b53171888efb6b0dd0f929565 Author: Jamey Sharp <[email protected]> Date: Fri Apr 9 17:30:06 2010 -0700 XAllocID must only be called with the Display lock held. This patch makes XdbeAllocateBackBufferName follow the same XID allocation pattern used in other stubs. Signed-off-by: Jamey Sharp <[email protected]> diff --git a/src/Xdbe.c b/src/Xdbe.c index 77344b4..7b5244d 100644 --- a/src/Xdbe.c +++ b/src/Xdbe.c @@ -184,14 +184,11 @@ XdbeBackBuffer XdbeAllocateBackBufferName( */ DbeCheckExtension (dpy, info, (XdbeBackBuffer)0); - /* allocate the id */ - buffer = XAllocID (dpy); - LockDisplay(dpy); DbeGetReq(DbeAllocateBackBufferName, req, info); req->window = window; req->swapAction = (unsigned char)swap_action; - req->buffer = buffer; + req->buffer = buffer = XAllocID (dpy); UnlockDisplay (dpy); SyncHandle (); commit b403e38d7d0994d223984c11f26f5b8749851522 Author: Gaetan Nadon <[email protected]> Date: Mon Apr 5 19:58:03 2010 -0400 config: update AC_PREREQ statement to 2.60 Unrelated to the previous patches, the new value simply reflects the reality that the minimum level for autoconf to configure all x.org modules is 2.60 dated June 2006. ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/configure.ac b/configure.ac index 25df2ad..cde461b 100644 --- a/configure.ac +++ b/configure.ac @@ -1,11 +1,11 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_PREREQ(2.57) +AC_PREREQ([2.60]) AC_INIT([libXext], - 1.1.1, + [1.1.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], - libXext) + [libXext]) AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) commit 734e3b2d1dcfe5db07cb19902617fd1212c0c186 Author: Cyril Brulebois <[email protected]> Date: Thu Apr 1 20:49:15 2010 +0200 Fix typo. diff --git a/debian/README.source b/debian/README.source index 34ab4bf..b09a1ab 100644 --- a/debian/README.source +++ b/debian/README.source @@ -25,7 +25,7 @@ just need to be pulled into git.debian.org in a "upstream-*" branch. Otherwise, the upstream sources are manually installed in the Debian git repository. -The .orig.tar.gz upstream source file could be generated this +The .orig.tar.gz upstream source file could be generated using this "upstream-*" branch in the Debian git repository but it is actually copied from upstream tarballs directly. commit 048e97e3948dd0caf886f3cb789899f63dc9d1bf Author: Gaetan Nadon <[email protected]> Date: Mon Mar 29 14:53:48 2010 -0400 config: remove the pkgconfig pc.in file from EXTRA_DIST Automake always includes it in the tarball. Signed-off-by: Gaetan Nadon <[email protected]> diff --git a/Makefile.am b/Makefile.am index 9bc56ee..2eb82b5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,6 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = xext.pc MAINTAINERCLEANFILES = ChangeLog INSTALL -EXTRA_DIST=xext.pc.in .PHONY: ChangeLog INSTALL commit 658574bb531f342947f484f9903e30032afce070 Author: Julien Cristau <[email protected]> Date: Fri Feb 5 13:58:33 2010 +0100 Revert "Don't smash the event_vec if num_events differs between lib and server." That commit created a single ext_handlers[] array to check for non-overlapping extension events, but the event codes need to be per-display, so checking them globally is wrong. This reverts commit 83fdb27df4ddc2fb088ddf2ec65f0db6b7c57287. Signed-off-by: Julien Cristau <[email protected]> Cc: Peter Hutterer <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> diff --git a/src/extutil.c b/src/extutil.c index a8f4d5d..8f4923a 100644 --- a/src/extutil.c +++ b/src/extutil.c @@ -103,7 +103,6 @@ XExtDisplayInfo *XextAddDisplay ( int nevents, XPointer data) { - static unsigned char ext_handlers[64] = {0}; XExtDisplayInfo *dpyinfo; dpyinfo = (XExtDisplayInfo *) Xmalloc (sizeof (XExtDisplayInfo)); @@ -118,54 +117,10 @@ XExtDisplayInfo *XextAddDisplay ( */ if (dpyinfo->codes) { int i, j; - int idx = dpyinfo->codes->first_event & 0x3f; - - - /* Xlib extensions use compiled in event numbers. A new library - * against an older server may thus expect a different (higher) - * number of events than the server will send. We have no way of - * knowing the number of events for an extension, the server won't - * tell us. - * - * Depending on the extension initialization order, this smashes the - * event_vec[type] for anything after the extension with the - * different number of events. - * - * e.g. server with inputproto 1.3 expects 15 events, libXi with - * inputproto 2.0 expects 17 events. - * base code is 80, events [80,96] are handled by libXi. events [95, - * 96] belong to the next extension already though. - * This requires XI to be initialized after the extension occupying - * the next range of event codes. - * - * To avoid this, we have a zeroed out array of extension handlers. - * If an extension handler for an event type is already set, and the - * previous event code (before base_code) is the same extension, we - * have the nevents conflict. Unset all those handlers and allow - * overwriting them with the new handlers. - * - * If a handler for a (base + n) event is already set, stop - * registering this extension for the event codes. - * - * event_codes are subtracted by 64 since we don't need to worry - * about core. - */ - - if (idx && ext_handlers[idx - 1] == ext_handlers[idx]) { - for (i = idx; i < 64; i++) { - if (ext_handlers[idx - 1] == ext_handlers[i]) - ext_handlers[i] = 0; - else - break; - } - } - for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++, idx++) { - if (ext_handlers[idx]) /* don't smash the following extension */ - break; + for (i = 0, j = dpyinfo->codes->first_event; i < nevents; i++, j++) { XESetWireToEvent (dpy, j, hooks->wire_to_event); XESetEventToWire (dpy, j, hooks->event_to_wire); - ext_handlers[idx] = dpyinfo->codes->first_event & 0x3f; } /* register extension for XGE */ commit 1ed7492638d6d6fb7c06da64017df6b7877d9780 Author: Alan Coopersmith <[email protected]> Date: Thu Jan 14 20:36:51 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith <[email protected]> diff --git a/COPYING b/COPYING index 443e63a..b8c9d54 100644 --- a/COPYING +++ b/COPYING @@ -160,28 +160,23 @@ makes no representations about the suitability for any purpose of the information in this document. This documentation is provided ``as is'' without express or implied warranty. -Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All Rights Reserved +Copyright 1999, 2005, 2006 Sun Microsystems, Inc. All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, -sublicense, and/or sell copies of the Software, and to permit persons -to whom the Software is furnished to do so, subject to the following -conditions: +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: -The above copyright notice and this permission notice shall be -included in all copies or substantial portions of the Software. +The above copyright notice and this permission notice (including the next +paragraph) shall be included in all copies or substantial portions of the +Software. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -Except as contained in this notice, the names of the copyright holders -shall not be used in advertising or otherwise to promote the sale, use -or other dealings in this Software without prior written authorization -from said copyright holders. +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/man/DPMSCapable.man b/man/DPMSCapable.man index f21a8a8..2b75add 100644 --- a/man/DPMSCapable.man +++ b/man/DPMSCapable.man @@ -10,31 +10,26 @@ .\" of the information in this document. This documentation is .\" provided ``as is'' without express or implied warranty. .\" -.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved -.\" +.\" Copyright 1999, 2005 Sun Microsystems, Inc. All rights reserved. +.\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), .\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, -.\" sublicense, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, subject to the following -.\" conditions: -.\" -.\" The above copyright notice and this permission notice shall be -.\" included in all copies or substantial portions of the Software. +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the names of the copyright holders -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" from said copyright holders. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .\" X Window System is a trademark of The Open Group. .\" diff --git a/man/DPMSDisable.man b/man/DPMSDisable.man index f68177d..c97ecb3 100644 --- a/man/DPMSDisable.man +++ b/man/DPMSDisable.man @@ -10,31 +10,26 @@ .\" of the information in this document. This documentation is .\" provided ``as is'' without express or implied warranty. .\" -.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved -.\" +.\" Copyright 1999, 2005 Sun Microsystems, Inc. All rights reserved. +.\" .\" Permission is hereby granted, free of charge, to any person obtaining a .\" copy of this software and associated documentation files (the "Software"), .\" to deal in the Software without restriction, including without limitation -.\" the rights to use, copy, modify, merge, publish, distribute, -.\" sublicense, and/or sell copies of the Software, and to permit persons -.\" to whom the Software is furnished to do so, subject to the following -.\" conditions: -.\" -.\" The above copyright notice and this permission notice shall be -.\" included in all copies or substantial portions of the Software. +.\" the rights to use, copy, modify, merge, publish, distribute, sublicense, +.\" and/or sell copies of the Software, and to permit persons to whom the +.\" Software is furnished to do so, subject to the following conditions: .\" -.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -.\" EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -.\" MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -.\" IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -.\" DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -.\" OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -.\" THE USE OR OTHER DEALINGS IN THE SOFTWARE. +.\" The above copyright notice and this permission notice (including the next +.\" paragraph) shall be included in all copies or substantial portions of the +.\" Software. .\" -.\" Except as contained in this notice, the names of the copyright holders -.\" shall not be used in advertising or otherwise to promote the sale, use -.\" or other dealings in this Software without prior written authorization -.\" from said copyright holders. +.\" THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +.\" IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +.\" FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +.\" THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +.\" LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +.\" FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +.\" DEALINGS IN THE SOFTWARE. .\" .\" X Window System is a trademark of The Open Group. .\" diff --git a/man/DPMSEnable.man b/man/DPMSEnable.man index d52902c..c06d5eb 100644 --- a/man/DPMSEnable.man +++ b/man/DPMSEnable.man @@ -10,31 +10,26 @@ .\" of the information in this document. This documentation is .\" provided ``as is'' without express or implied warranty. .\" -.\" Copyright 1999, 2005 Sun Microsystems, Inc. All Rights Reserved -.\" +.\" Copyright 1999, 2005 Sun Microsystems, Inc. All rights reserved. +.\" .\" Permission is hereby granted, free of charge, to any person obtaining a -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
