summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjk7744.park <jk7744.park@samsung.com>2015-09-08 22:59:46 +0900
committerjk7744.park <jk7744.park@samsung.com>2015-09-08 22:59:46 +0900
commit1ff72675f05c611933b029ef256c331992603889 (patch)
tree1ca04abc308655b23a92678520ec6c74adc6f4aa
parent5240d9476d43d403025b807a20c07386f8f3f75c (diff)
downloadx11proto-composite-tizen_2.4.tar.gz
x11proto-composite-tizen_2.4.tar.bz2
x11proto-composite-tizen_2.4.zip
tizen 2.3.1 releasetizen_2.4_mobile_releasetizen_2.3.1_releasesubmit/tizen_2.4/20151028.065351submit/tizen_2.3.1/20150915.083726accepted/tizen/2.4/mobile/20151029.025809tizen_2.4tizen_2.3.1accepted/tizen_2.4_mobile
Diffstat
-rwxr-xr-xcomposite.h6
-rwxr-xr-xcompositeproto.h32
-rw-r--r--debian/AUTHORS1
-rwxr-xr-xdebian/COPYING41
-rwxr-xr-xdebian/ChangeLog360
-rwxr-xr-xdebian/Makefile.am43
-rw-r--r--debian/README33
-rw-r--r--debian/README.source73
-rwxr-xr-xdebian/autogen.sh12
-rwxr-xr-xdebian/changelog139
-rw-r--r--debian/compat1
-rwxr-xr-xdebian/composite.h71
-rwxr-xr-xdebian/compositeproto.h192
-rw-r--r--debian/compositeproto.pc.in9
-rw-r--r--debian/compositeproto.txt339
-rwxr-xr-xdebian/configure.ac38
-rwxr-xr-xdebian/control22
-rw-r--r--debian/copyright42
-rwxr-xr-xdebian/rules97
-rw-r--r--debian/x11proto-composite-dev.install2
-rw-r--r--debian/xsfbs/repack.sh32
-rw-r--r--debian/xsfbs/xsfbs.mk276
-rw-r--r--debian/xsfbs/xsfbs.sh622
-rw-r--r--packaging/xorg-x11-proto-composite.spec11
24 files changed, 43 insertions, 2451 deletions
diff --git a/composite.h b/composite.h
index e460118..5dfb96e 100755
--- a/composite.h
+++ b/composite.h
@@ -63,9 +63,13 @@
#define X_CompositeNameWindowPixmap 6
#define X_CompositeGetOverlayWindow 7
#define X_CompositeReleaseOverlayWindow 8
+#ifdef _F_INPUT_REDIRECTION_
+#define X_CompositeSetCoordinateTransform 9
+#define CompositeNumberRequests (X_CompositeSetCoordinateTransform + 1)
+#else //_F_INPUT_REDIRECTION_
#define CompositeNumberRequests (X_CompositeReleaseOverlayWindow + 1)
-
+#endif //_F_INPUT_REDIRECTION_
#define CompositeNumberEvents 0
#endif /* _COMPOSITE_H_ */
diff --git a/compositeproto.h b/compositeproto.h
index 0417f2c..f9ff11b 100755
--- a/compositeproto.h
+++ b/compositeproto.h
@@ -52,7 +52,7 @@
#define Region CARD32
#define Pixmap CARD32
-/*
+/*
* requests and replies
*/
typedef struct {
@@ -185,6 +185,36 @@ typedef struct {
#define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq)
+#ifdef _F_INPUT_REDIRECTION_
+#define Fixed INT32
+/*
+ * This can't use an array because 32-bit values may be in bitfields
+ */
+typedef struct {
+ Fixed matrix11 B32;
+ Fixed matrix12 B32;
+ Fixed matrix13 B32;
+ Fixed matrix21 B32;
+ Fixed matrix22 B32;
+ Fixed matrix23 B32;
+ Fixed matrix31 B32;
+ Fixed matrix32 B32;
+ Fixed matrix33 B32;
+} xCompTransform;
+
+#define sz_xCompTransform 36
+
+typedef struct {
+ CARD8 reqType;
+ CARD8 compositeReqType;
+ CARD16 length;
+ Window window B32;
+ xCompTransform transform;
+} xCompositeSetCoordinateTransformReq;
+
+#define sz_xCompositeSetCoordinateTransformReq 44
+#endif //_F_INPUT_REDIRECTION_
+
#undef Window
#undef Region
#undef Pixmap
diff --git a/debian/AUTHORS b/debian/AUTHORS
deleted file mode 100644
index 8e18f9b..0000000
--- a/debian/AUTHORS
+++ /dev/null
@@ -1 +0,0 @@
-Keith Packard, HP
diff --git a/debian/COPYING b/debian/COPYING
deleted file mode 100755
index b541db8..0000000
--- a/debian/COPYING
+++ /dev/null
@@ -1,41 +0,0 @@
-Copyright (c) 2006, Oracle and/or its affiliates. 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 (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 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.
-
-Copyright © 2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Keith Packard makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
diff --git a/debian/ChangeLog b/debian/ChangeLog
deleted file mode 100755
index afb677d..0000000
--- a/debian/ChangeLog
+++ /dev/null
@@ -1,360 +0,0 @@
-commit d358d6290af3d9cedb7b6d7e16058370e4779508
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri Oct 29 20:27:55 2010 -0700
-
- compositeproto 0.4.2
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-commit 6eece824c1cb40bdfc1007b26ce765803d110712
-Author: Alan Coopersmith <alan.coopersmith@oracle.com>
-Date: Fri Oct 29 20:26:29 2010 -0700
-
- Sun's copyrights now belong to Oracle
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
-
-commit 68ff97cd30c709439c088bfea2c33a4f9632ed38
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Mar 28 19:00:30 2010 -0400
-
- config: remove the pkgconfig pc.in file from EXTRA_DIST
-
- Automake always includes it in the tarball.
- autogen.sh is also not required in any GNU package.
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit 1a48a0d70e00fd11521e436864a8ec0705e58285
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Jan 15 13:34:49 2010 -0800
-
- Update Sun license notices to current X.Org standard form
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit e827d7b875a6b16e9e7208af3407cb96cd1e91ed
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Jan 15 13:36:08 2010 -0800
-
- Purge CVS/RCS $Id$ tags
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 843e916e15b117c1142ab78d35b9ea722bdc7a0b
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Mon Nov 16 11:47:44 2009 -0500
-
- COPYING: add Copyright from SUN Microsystems
-
- The COPYING file contains all Copyright notices from source code.
- Refer to composite.h.
-
- Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
-
-commit fdf8d73a27cd0cadae5a14e7a88870121ae113aa
-Author: Rémi Cardona <remi@gentoo.org>
-Date: Thu Dec 17 08:32:20 2009 +0100
-
- Use $(docdir) for compositeproto.txt install path
-
- Signed-off-by: Rémi Cardona <remi@gentoo.org>
- Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
- Reviewed-by: Alan Coopersmith <alan.coopersmith@sun.com>
- Reviewed-by: Dan Nicholson <dbn.lists@gmail.com>
-
-commit 5ecb066e04595d300a0faad0f95c859a709ff857
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Nov 22 19:24:47 2009 -0500
-
- Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
-
- Now that the INSTALL file is generated.
- Allows running make maintainer-clean.
-
-commit 330cbabbbf73b310b237e6745185f338d7d33998
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed Nov 18 19:00:34 2009 -0500
-
- INSTALL: file is missing or incorrect #24206
-
- The standard GNU file on building/installing tarball is copied
- using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
-
-commit 260cc8eadd89b3fc9f59e505e34dcb5bc09018bd
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Nov 15 20:25:50 2009 -0500
-
- NEWS: remove empty file #24206
-
-commit 55f6f1eec2a0baca0f6c7738cc2e54e7098b3652
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Nov 15 19:45:26 2009 -0500
-
- 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 ad60112eb2eacb50954bf9cd461b9e90d6f64a63
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Nov 15 18:31:28 2009 -0500
-
- Makefile.am: INSTALL file is missing or incorrect #24206
-
- The standard GNU file on building/installing tarball is copied
- using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
- Add INSTALL target
-
-commit 8a7c2c629635510a0728d5ab086b0f4b600b0e49
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sun Nov 15 18:11:36 2009 -0500
-
- configure.ac: 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 00dc749894784dc6f1b749903ef872572f678c3c
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Sat Nov 14 18:26:46 2009 -0500
-
- .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 39612a7153ac3e800c5dbb11a7f760c53797bf73
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Oct 2 18:59:54 2009 -0700
-
- compositeproto 0.4.1
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit ad173235db562b7f788ad82e5b4849c1519bd0b5
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Oct 2 18:57:51 2009 -0700
-
- Migrate to xorg macros 1.3 & XORG_DEFAULT_OPTIONS
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit bbdc2ae4f4115332337460631911857cbadaf603
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Fri Oct 2 18:52:44 2009 -0700
-
- Add pointers to mailing list, git repo, and wiki to README
-
- Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-
-commit 961dbcda7fcfd15a3e60bfb905f05286ba33508f
-Author: Gaetan Nadon <memsize@videotron.ca>
-Date: Wed Jul 8 10:03:40 2009 -0400
-
- compositeproto: 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>
-
-commit 2ffb32d61cbed1452d67abb2028ac13910550392
-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
-
-commit 5ac473a9375fa43896e379da96d1955653960350
-Author: Jeremy C. Reed <reed@glacier.reedmedia.net>
-Date: Thu Aug 16 11:28:30 2007 -0500
-
- Temporarily define Pixmap (just like Window and Region). (From pkgsrc.)
-
-commit 25e8047e25652be388dc66d85c180dcc4ccea4f6
-Author: Keith Packard <keithp@neko.keithp.com>
-Date: Tue Jul 3 14:11:10 2007 -0700
-
- Bump version in configure.ac to 0.4
-
-commit 1838412121d0bac8ce443d362e75439d58a93a4d
-Author: Keith Packard <keithp@neko.keithp.com>
-Date: Tue Jul 3 14:09:41 2007 -0700
-
- Define new manual-redirect clipping semantics and bump version to 0.4.
-
- Manual-redirect windows no longer clip their parents, nor do they affect
- expose event computation. This makes it possible to create application-level
- composited windows which can be damaged by other window manipulations.
-
- This patch also removes the coordinate transformation stuff which was never
- released.
-
-commit bca9592612d60142e3c624b90649475b561b8eda
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Tue Apr 17 20:48:18 2007 -0700
-
- Add *~ to .gitignore to skip emacs/patch droppings
-
-commit 6acacb52efd6f0927c9b82fe864f17623e7dc8c2
-Author: Alan Coopersmith <alan.coopersmith@sun.com>
-Date: Tue Apr 17 20:47:50 2007 -0700
-
- Protocol spec nit cleanups
-
- Fix versioning from 0.3/0.4 merge
- Update description of RedirectWindow to match names in protocol diagrams
-
-commit dd2133540f8dd0f0f66ecf24e01113184045af83
-Author: Eric Anholt <eric@anholt.net>
-Date: Tue Jan 9 10:42:31 2007 -0800
-
- Update protocol spec for 0.3 -> 0.4 rename and new 0.3 request.
-
- The original overlay window text was from Deron Johnson, but I moved it
- around to be where I understand the pieces of the description were meant to go.
-
-commit ea2c1d120e58e3eb5f2d8eedb3c32b2cfa052366
-Author: Eric Anholt <eric@anholt.net>
-Date: Tue Jan 9 09:46:31 2007 -0800
-
- Move composite protocol description to the new canonical location/name.
-
-commit 34251361a60c9e0c0f3c51416985e067c2aa255a
-Author: Aaron Plattner <aplattner@nvidia.com>
-Date: Tue Dec 5 12:39:15 2006 -0800
-
- Have NameWindowPixmap return a Match error on unrealized windows.
-
-commit 5ecbf06cb7786009e8e1547f4bc2b0640599f655
-Author: root <root@explosivo.(none)>
-Date: Tue Aug 15 14:30:32 2006 -0700
-
- Correct the spelling of compositedocdir_DATA. Otherwise automake complains.
-
-commit ba9ca99638fac157b126a2d9a3e57385bad32998
-Author: Deron <dj4236@chiru.it.sfbay.sun.com>
-Date: Fri Mar 31 03:29:42 2006 -0800
-
- Sync'd with modular proto/Composite (Version 0.3 definitions).
- Also changed CTR definitions to Version 0.4 and increased the
- request numbers to be above those of Version 0.3.
-
-commit 565c0bcc569f5ab9114314185316fe2129aa5a3e
-Author: Keith Packard <keithp@evo.keithp.com>
-Date: Fri Feb 24 02:55:19 2006 +0100
-
- Add coordinate transform redirect protocol bits
-
-commit 8e0790045d33525ec182afd3997014b46ef77b66
-Author: Keith Packard <keithp@evo.keithp.com>
-Date: Fri Feb 24 02:06:13 2006 +0100
-
- Clean up mistakes integrating xorg changes
-
-commit 1d43eaf21b32fef4aba8a58dee323344b7f48d16
-Author: Keith Packard <keithp@evo.keithp.com>
-Date: Fri Feb 24 02:03:25 2006 +0100
-
- Remove .cvsignore
-
-commit 694da3931be9bb03e23e4fbaf54d331c2202b2fc
-Author: Keith Packard <keithp@evo.keithp.com>
-Date: Fri Feb 24 02:01:54 2006 +0100
-
- Add .gitignore
-
-commit 369d28141b1b296abeb4365b5c57846d72faeb82
-Author: Keith Packard <keithp@evo.keithp.com>
-Date: Fri Feb 24 02:01:10 2006 +0100
-
- Paste Xorg changes on top of historical xlibs repository
-
-commit 7388d4f6dd9e0c71d79c33905135622be15ccd13
-Author: Keith Packard <keithp@keithp.com>
-Date: Mon Feb 20 18:41:15 2006 +0000
-
- Update to include CTR
-
-commit 90d453e5ab0cd140e936c71c118e442f6f6563f7
-Author: Daniel Stone <daniel@fooishbar.org>
-Date: Mon Jan 3 05:16:04 2005 +0000
-
- New autogen.sh from Thomas Fitzsimmons that works with srcdir != objdir.
-
-commit 734331f433e1d853aba942e17b3ed3efb0d972ab
-Author: Keith Packard <keithp@keithp.com>
-Date: Thu Jul 8 07:20:55 2004 +0000
-
- Add NameWindowPixmap request. Bump protocol to 0.2
-
-commit 19bb2c38370f5ef9296d451970f93e570b5a8546
-Author: Eric Anholt <anholt@freebsd.org>
-Date: Sun Jun 27 07:23:56 2004 +0000
-
- Fix some apostrophe issues.
-
-commit 47c46ad42a57d1dc8f2cf2e9e5d8b1478e75cd3b
-Author: Jim Gettys <jg@freedesktop.org>
-Date: Tue Feb 3 20:42:46 2004 +0000
-
- Add author's information
-
-commit cad37f16480f8f3f51e5dd9d3b3314ec8f73cee9
-Author: Daniel Stone <daniel@fooishbar.org>
-Date: Thu Jan 15 03:42:08 2004 +0000
-
- Tag release 2.0 for first freedesktop.org clientside release.
-
-commit 0acceb62100f3acb3a00615c51bfd8e3f57e3ff9
-Author: Carl Worth <cworth@cworth.org>
-Date: Tue Nov 11 18:34:48 2003 +0000
-
- Updated .cvsignore
-
-commit 35a9c80252b35720c1afc5dc53153228e2084b10
-Author: Keith Packard <keithp@keithp.com>
-Date: Sun Nov 9 07:07:21 2003 +0000
-
- Note that Manual Subwindows mode disables background painting.
-
-commit 11105d870631fe5f858291fbf167f1da400d7fa9
-Author: Keith Packard <keithp@keithp.com>
-Date: Fri Nov 7 04:21:01 2003 +0000
-
- Add update mode to Unredirect requests so clients can redirect multiple times (and then unredirect) Add CompositeNumberRequests Fix some typeos
-
-commit 0b7b69d3b678f584062ca352f60382325057d9f1
-Author: Keith Packard <keithp@keithp.com>
-Date: Wed Nov 5 05:39:58 2003 +0000
-
- Change name from Apportion to Composite Clarify that root cannot be redirected. Add more error values.
-
-commit 5113df7e49393afb5d9199f030b6f4e025a54039
-Author: Keith Packard <keithp@keithp.com>
-Date: Thu Oct 30 04:31:19 2003 +0000
-
- autofoo Add protocol headers Use enum for update mode instead of bool
-
-commit 00b320e307a997677e74c73f9c856e7b08bc20e2
-Author: Keith Packard <keithp@keithp.com>
-Date: Wed Oct 29 23:48:40 2003 +0000
-
- Define clipping while redirected
-
-commit 7cc591f9ffac4a01f7801d924beace89ed3460bb
-Author: Keith Packard <keithp@keithp.com>
-Date: Tue Oct 28 20:43:27 2003 +0000
-
- spelling mistake
-
-commit faa486b819f8b3088201923541a1c0a71efa249a
-Author: Keith Packard <keithp@keithp.com>
-Date: Fri Oct 24 23:05:41 2003 +0000
-
- Initial revision
diff --git a/debian/Makefile.am b/debian/Makefile.am
deleted file mode 100755
index 5a14884..0000000
--- a/debian/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# Copyright © 2003 Keith Packard, Noah Levitt
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of Keith Packard not be used in
-# advertising or publicity pertaining to distribution of the software without
-# specific, written prior permission. Keith Packard makes no
-# representations about the suitability of this software for any purpose. It
-# is provided "as is" without express or implied warranty.
-#
-# KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-# EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-# PERFORMANCE OF THIS SOFTWARE.
-
-compositedir = $(includedir)/X11/extensions
-composite_HEADERS = \
- composite.h \
- compositeproto.h
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = compositeproto.pc
-
-dist_doc_DATA = compositeproto.txt
-
-
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-
-.PHONY: ChangeLog INSTALL
-
-INSTALL:
- $(INSTALL_CMD)
-
-ChangeLog:
- $(CHANGELOG_CMD)
-
-dist-hook: ChangeLog INSTALL
diff --git a/debian/README b/debian/README
deleted file mode 100644
index 66b40a4..0000000
--- a/debian/README
+++ /dev/null
@@ -1,33 +0,0 @@
- Composite Extension
- Version 0.1
- 2003-11-04
-
-This package contains header files and documentation for the composite
-extension. Library and server implementations are separate.
-
-Keith Packard
-keithp@keithp.com
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-Please submit bug reports to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/proto/compositeproto
-
- http://cgit.freedesktop.org/xorg/proto/compositeproto
-
-For patch submission instructions, see:
-
- http://www.x.org/wiki/Development/Documentation/SubmittingPatches
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
-
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index 34ab4bf..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,73 +0,0 @@
-------------------------------------------------------
-Quick Guide To Patching This Package For The Impatient
-------------------------------------------------------
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit"
- (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to
-debian/patches and add the name of the patch to debian/patches/series.
-
-------------------------------------
-Guide To The X Strike Force Packages
-------------------------------------
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-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
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as their own independent packages would have created too many Debian
-packages. For this reason, some X.org applications have been grouped
-into larger packages: xutils, xutils-dev, x11-apps, x11-session-utils,
-x11-utils, x11-xfs-utils, x11-xkb-utils, x11-xserver-utils.
-Most packages, including the X.org server itself and all libraries
-and drivers are, however maintained independently.
-
-The Debian packaging is added by creating the "debian-*" git branch
-which contains the aforementioned "upstream-*" branch plus the debian/
-repository files.
-When a patch has to be applied to the Debian package, two solutions
-are involved:
-* If the patch is available in one of the upstream branches, it
- may be git'cherry-picked into the Debian repository. In this
- case, it appears directly in the .diff.gz.
-* Otherwise, the patch is added to debian/patches/ which is managed
- with quilt as documented in /usr/share/doc/quilt/README.source.
-
-quilt is actually invoked by the Debian X packaging through a larger
-set of scripts called XSFBS. XSFBS brings some other X specific
-features such as managing dependencies and conflicts due to the video
-and input driver ABIs.
-XSFBS itself is maintained in a separate repository at
- git://git.debian.org/pkg-xorg/xsfbs.git
-and it is pulled inside the other Debian X repositories when needed.
-
-The XSFBS patching system requires a build dependency on quilt. Also
-a dependency on $(STAMP_DIR)/patch has to be added to debian/rules
-so that the XSFBS patching occurs before the actual build. So the
-very first target of the build (likely the one running autoreconf)
-should depend on $(STAMP_DIR)/patch. It should also not depend on
-anything so that parallel builds are correctly supported (nothing
-should probably run while patching is being done). And finally, the
-clean target should depend on the xsfclean target so that patches
-are unapplied on clean.
-
-When the upstream sources contain some DFSG-nonfree files, they are
-listed in text files in debian/prune/ in the "debian-*" branch of
-the Debian repository. XSFBS' scripts then take care of removing
-these listed files during the build so as to generate a modified
-DFSG-free .orig.tar.gz tarball.
diff --git a/debian/autogen.sh b/debian/autogen.sh
deleted file mode 100755
index 904cd67..0000000
--- a/debian/autogen.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/sh
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-ORIGDIR=`pwd`
-cd $srcdir
-
-autoreconf -v --install || exit 1
-cd $ORIGDIR || exit $?
-
-$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100755
index 42c76e7..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,139 +0,0 @@
-x11proto-composite (1:0.4.2-1slp2) unstable; urgency=low
-
- * [X11R7.6] upgrade package
- * Git: 165.213.180.234:slp/pkgs/xorg/proto/x11proto-composite
- * Tag: x11proto-composite_0.4.2-1slp2
-
- -- SooChan Lim <sc1.lim@samsung.com> Thu, 06 Jan 2011 16:42:01 +0900
-
-x11proto-composite (1:0.4.1-4slp2) unstable; urgency=low
-
- * change maintainer
- * Git: 165.213.180.234:/git/slp/pkgs/xorg/proto/x11proto-composite
- * Tag: x11proto-composite_0.4.1-4slp2
-
- -- SooChan Lim <sc1.lim@samsung.com> Thu, 02 Dec 2010 13:25:27 +0900
-
-x11proto-composite (1:0.4.1-3slp2) unstable; urgency=low
-
- * update maintainer
- * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
- * Tag: x11proto-composite_0.4.1-3slp2
-
- -- Sung-Jin Park <sj76.park@samsung.com> Wed, 21 Apr 2010 11:02:36 +0900
-
-x11proto-composite (1:0.4.1-2slp2) unstable; urgency=low
-
- * Changed package name as a pure open souroce code.
-
- -- YoungHoon Jung <yhoon.jung@samsung.com> Thu, 25 Mar 2010 16:58:13 +0900
-
-x11proto-composite (1:0.4.1-1) unstable; urgency=low
-
- * Initial Release
-
- -- Sungjin Park <sj76.park@samsung.com> Sat, 21 Nov 2009 12:07:25 +0100
-
-x11proto-composite (1:0.4.1-1) unstable; urgency=low
-
- [ Julien Cristau ]
- * Run autoreconf at build time.
- * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
- * Remove Conflicts/Replaces on old libxcomposite-dev, and Pre-Depends on
- x11-common, which were needed for upgrades from sarge.
- * Drop the XS- prefix from Vcs-* control fields.
- * Bump Standards-Version to 3.8.3.
-
- [ Timo Aaltonen ]
- * New upstream release 0.4.1.
- * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-
- -- Julien Cristau <jcristau@debian.org> Sat, 21 Nov 2009 12:07:25 +0100
-
-x11proto-composite (1:0.4-2) unstable; urgency=low
-
- * Upload to unstable.
- * Add myself to Uploaders, and remove Branden with his permission.
-
- -- Brice Goglin <bgoglin@debian.org> Fri, 14 Sep 2007 22:24:44 +0200
-
-x11proto-composite (1:0.4-1) experimental; urgency=low
-
- [ Timo Aaltonen ]
- * Bump the epoch so that this can be synced to Ubuntu in the future.
-
- [ Julien Cristau ]
- * Update debian/copyright.
- * Install the protocol description and the upstream ChangeLog.
- * Add XS-Vcs-*; drop obsolete CVS info from the description.
- * Remove Fabio from Uploaders, with his permission.
-
- [ David Nusinow ]
- * New upstream release
-
- [ Brice Goglin ]
- * Update the long description.
- * Add URL in debian/copyright.
-
- -- Brice Goglin <bgoglin@debian.org> Tue, 14 Aug 2007 00:05:45 +0200
-
-x11proto-composite (0.3.1-2) unstable; urgency=low
-
- [ Andres Salomon ]
- * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
- idempotency fix.
-
- [ David Nusinow ]
- * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org> Mon, 21 Aug 2006 20:53:54 +0000
-
-x11proto-composite (0.3.1-1) experimental; urgency=low
-
- * New upstream release
- * Put debhelper in build-depends rather than build-depends-indep because we
- use dh_clean in the clean target
- * Bump x11-common pre-dep to 1:7.0.0 to match debian versioning and shut
- lintian up
- * Remove duplicate dependency on x11-common
- * Bump debhelper compat to 5
- * Run dh_install with --list-missing
-
- -- David Nusinow <dnusinow@debian.org> Sat, 1 Jul 2006 21:41:04 -0400
-
-x11proto-composite (0.3-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 21:35:57 -0500
-
-x11proto-composite (0.3-1) experimental; urgency=low
-
- * New upstream release
-
- -- David Nusinow <dnusinow@debian.org> Tue, 21 Mar 2006 21:17:43 -0500
-
-x11proto-composite (0.2.2-2) experimental; urgency=low
-
- * Add epoch to versioned Pre-Depends on x11-common to make upgrades
- from monolithic x11-common work (Closes: #351779).
-
- -- Michel Dänzer <daenzer@debian.org> Thu, 9 Feb 2006 16:40:55 +0100
-
-x11proto-composite (0.2.2-1) experimental; urgency=low
-
- * First release for Debian
-
- -- David Nusinow <dnusinow@debian.org> Fri, 30 Dec 2005 14:35:17 -0500
-
-x11proto-composite (6.8.99.7-2) breezy; urgency=low
-
- * Add dependencies on x11proto-{core,fixes}-dev.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 11 Jul 2005 19:13:27 +1000
-
-x11proto-composite (6.8.99.7-1) breezy; urgency=low
-
- * First x11proto-composite release.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Mon, 16 May 2005 22:10:17 +1000
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index 7ed6ff8..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-5
diff --git a/debian/composite.h b/debian/composite.h
deleted file mode 100755
index e460118..0000000
--- a/debian/composite.h
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. 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 (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 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.
- */
-/*
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _COMPOSITE_H_
-#define _COMPOSITE_H_
-
-#include <X11/extensions/xfixeswire.h>
-
-#define COMPOSITE_NAME "Composite"
-#define COMPOSITE_MAJOR 0
-#define COMPOSITE_MINOR 4
-
-#define CompositeRedirectAutomatic 0
-#define CompositeRedirectManual 1
-
-#define X_CompositeQueryVersion 0
-#define X_CompositeRedirectWindow 1
-#define X_CompositeRedirectSubwindows 2
-#define X_CompositeUnredirectWindow 3
-#define X_CompositeUnredirectSubwindows 4
-#define X_CompositeCreateRegionFromBorderClip 5
-#define X_CompositeNameWindowPixmap 6
-#define X_CompositeGetOverlayWindow 7
-#define X_CompositeReleaseOverlayWindow 8
-
-#define CompositeNumberRequests (X_CompositeReleaseOverlayWindow + 1)
-
-#define CompositeNumberEvents 0
-
-#endif /* _COMPOSITE_H_ */
diff --git a/debian/compositeproto.h b/debian/compositeproto.h
deleted file mode 100755
index 0417f2c..0000000
--- a/debian/compositeproto.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright (c) 2006, Oracle and/or its affiliates. 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 (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 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.
- */
-/*
- * Copyright © 2003 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission. Keith Packard makes no
- * representations about the suitability of this software for any purpose. It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _COMPOSITEPROTO_H_
-#define _COMPOSITEPROTO_H_
-
-#include <X11/Xmd.h>
-#include <X11/extensions/composite.h>
-
-#define Window CARD32
-#define Region CARD32
-#define Pixmap CARD32
-
-/*
- * requests and replies
- */
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
-} xCompositeQueryVersionReq;
-
-#define sz_xCompositeQueryVersionReq 12
-
-typedef struct {
- BYTE type; /* X_Reply */
- BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 majorVersion B32;
- CARD32 minorVersion B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
-} xCompositeQueryVersionReply;
-
-#define sz_xCompositeQueryVersionReply 32
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
- CARD8 update;
- CARD8 pad1;
- CARD16 pad2 B16;
-} xCompositeRedirectWindowReq;
-
-#define sz_xCompositeRedirectWindowReq 12
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
- CARD8 update;
- CARD8 pad1;
- CARD16 pad2 B16;
-} xCompositeRedirectSubwindowsReq;
-
-#define sz_xCompositeRedirectSubwindowsReq 12
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
- CARD8 update;
- CARD8 pad1;
- CARD16 pad2 B16;
-} xCompositeUnredirectWindowReq;
-
-#define sz_xCompositeUnredirectWindowReq 12
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
- CARD8 update;
- CARD8 pad1;
- CARD16 pad2 B16;
-} xCompositeUnredirectSubwindowsReq;
-
-#define sz_xCompositeUnredirectSubwindowsReq 12
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Region region B32;
- Window window B32;
-} xCompositeCreateRegionFromBorderClipReq;
-
-#define sz_xCompositeCreateRegionFromBorderClipReq 12
-
-/* Version 0.2 additions */
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length;
- Window window B32;
- Pixmap pixmap B32;
-} xCompositeNameWindowPixmapReq;
-
-#define sz_xCompositeNameWindowPixmapReq 12
-
-/* Version 0.3 additions */
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
-} xCompositeGetOverlayWindowReq;
-
-#define sz_xCompositeGetOverlayWindowReq sizeof(xCompositeGetOverlayWindowReq)
-
-typedef struct {
- BYTE type; /* X_Reply */
- BYTE pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- Window overlayWin B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xCompositeGetOverlayWindowReply;
-
-#define sz_xCompositeGetOverlayWindowReply sizeof(xCompositeGetOverlayWindowReply)
-
-typedef struct {
- CARD8 reqType;
- CARD8 compositeReqType;
- CARD16 length B16;
- Window window B32;
-} xCompositeReleaseOverlayWindowReq;
-
-#define sz_xCompositeReleaseOverlayWindowReq sizeof(xCompositeReleaseOverlayWindowReq)
-
-#undef Window
-#undef Region
-#undef Pixmap
-
-#endif /* _COMPOSITEPROTO_H_ */
diff --git a/debian/compositeproto.pc.in b/debian/compositeproto.pc.in
deleted file mode 100644
index 6348022..0000000
--- a/debian/compositeproto.pc.in
+++ /dev/null
@@ -1,9 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: CompositeExt
-Description: Composite extension headers
-Version: @PACKAGE_VERSION@
-Cflags: -I${includedir}
diff --git a/debian/compositeproto.txt b/debian/compositeproto.txt
deleted file mode 100644
index 4b86621..0000000
--- a/debian/compositeproto.txt
+++ /dev/null
@@ -1,339 +0,0 @@
- Composite Extension
- Version 0.4
- 2007-7-3
- Keith Packard
- keithp@keithp.com
- Deron Johnson
- deron.johnson@sun.com
-
-1. Introduction
-
-Many user interface operations would benefit from having pixel contents of
-window hierarchies available without respect to sibling and antecedent
-clipping. In addition, placing control over the composition of these pixel
-contents into a final screen image in an external application will enable
-a flexible system for dynamic application content presentation.
-
-2. Acknowledgements
-
-This small extension has been brewing for several years, contributors to
-both early prototypes and the final design include:
-
- + Bill Haneman for motivating the ability to magnify occluded windows
- with his work on accessibility
-
- + Carsten Haitzler for Enlightenment, the original eye-candy window
- manager which demonstrated that clever hacks are an awfully
- close substitute for changes in the underlying system.
-
- + Jim Gettys for key insights into the relationship between damage
- events and per-window pixmap usage
-
- + Mike Harris and Owen Taylor for figuring out what to call it.
-
- + Deron Johnson for the Looking Glass implementation and
- a prototype of the coordinate transformation mechanism.
-
- + Ryan Lortie for helping figure out reasonable parent clipping
- semantics in the presense of manual redirected children.
-
-3. Architecture
-
-The composite extension provides three related mechanisms:
-
- 1. Per-hierarchy storage. The rendering of an entire hierarchy of windows
- is redirected to off-screen storage. The pixels of that hierarchy
- are available whenever it is viewable. Storage is automatically
- reallocated when the top level window changes size. Contents beyond
- the geometry of the top window are not preserved.
-
- 2. Automatic shadow update. When a hierarchy is rendered off-screen,
- the X server provides an automatic mechanism for presenting those
- contents within the parent window. The implementation is free to
- make this update lag behind actual rendering operations by an
- unspecified amount of time. This automatic update mechanism may
- be disabled so that the parent window contents can be completely
- determined by an external application.
-
- 3. External parent - child pointer coordinate transformation.
- When a hierarchy is under manual compositing, the relationship
- of coordinates within the parent to those in the child may
- not be known within the X server. This mechanism provides
- for redirection of these transformations through a client.
-
-Per-hierarchy storage may be created for individual windows or for all
-children of a window. Manual shadow update may be selected by only a single
-application for each window; manual update may also be selected on a
-per-window basis or for each child of a window. Detecting when to update
-may be done with the Damage extension.
-
-The off-screen storage includes the window contents, its borders and the
-contents of all descendants.
-
-3.1 NameWindowPixmap
-
-Version 0.2 of the protocol introduces a mechanism for associating an XID
-with the off-screen pixmap used to store these contents. This can be used
-to hold onto window contents after the window is unmapped (and hence animate
-it's disappearance), and also to access the border of the window, which is
-not reachable through the Window ID itself. A new pixmap is created each
-time the window is mapped or resized; as these events are nicely signalled
-with existing events, no additional notification is needed. The old pixmap
-will remain allocated as long as the Pixmap ID is left valid, it is
-important that the client use the FreePixmap request when it is done with
-the contents and to create a new name for the newly allocated pixmap.
-
-In automatic update mode, the X server is itself responsible for presenting
-the child window contents within the parent. It seems reasonable, then, for
-rendering to the parent window to be clipped so as not to interfere with any
-child window content. In an environment with a mixure of manual and
-automatic updating windows, rendering to the parent in the area nominally
-occupied by a manual update window should be able to affect parent pixel
-values in those areas, but such rendering should be clipped to automatic
-update windows, and presumably to other manual update windows managed by
-other applications. In any of these cases, it should be easy to ensure that
-rendering has no effect on any non-redirected windows.
-
-Instead of attempting to define new clipping modes for rendering, the
-Composite extension instead defines ClipByChildren rendering to the parent
-to exclude regions occupied by redirected windows (either automatic or
-manual). The CreateRegionFromBorderClip request can be used along with
-IncludeInferiors clipping modes to restrict manual shadow updates to the
-apporpriate region of the screen. Bracketing operations with
-GrabServer/UngrabServer will permit atomic sequences that can update the
-screen without artifact. As all of these operations are asynchronous,
-network latency should not adversely affect update latency.
-
-3.2 Composite Overlay Window
-
-Version 0.3 of the protocol adds the Composite Overlay Window, which
-provides compositing managers with a surface on which to draw without
-interference. This window is always above normal windows and is always
-below the screen saver window. It is an InputOutput window whose width
-and height are the screen dimensions. Its visual is the root visual
-and its border width is zero. Attempts to redirect it using the
-composite extension are ignored. This window does not appear in the
-reply of the QueryTree request. It is also an override redirect window.
-These last two features make it invisible to window managers and other X11
-clients. The only way to access the XID of this window is via the
-CompositeGetOverlayWindow request. Initially, the Composite Overlay
-Window is unmapped.
-
-CompositeGetOverlayWindow returns the XID of the Composite Overlay
-Window. If the window has not yet been mapped, it is mapped by this
-request. When all clients who have called this request have terminated
-their X11 connections the window is unmapped.
-
-Composite managers may render directly to the Composite Overlay
-Window, or they may reparent other windows to be children of this
-window and render to these. Multiple clients may render to the
-Composite Overlay Window, create child windows of it, reshape it, and
-redefine its input region, but the specific arbitration rules followed
-by these clients is not defined by this specification; these policies
-should be defined by the clients themselves.
-
-3.3 Clipping semantics redefined
-
-Version 0.4 of the protocol changes the semantics of clipping in the
-presense of manual redirect children. In version 0.3, a parent was always
-clipped to child windows, independent of the kind of redirection going on.
-With version 0.4, the parent is no longer clipped to child windows which are
-manually redirected. This means the parent can draw in the child region without using
-IncludeInferiors mode, and (perhaps more importantly), it will receive
-expose events in those regions caused by other actions. This new behaviour
-is not selectable.
-
-4. Errors
-
-The composite extension does not define any new errors.
-
-5. Types
-
- UPDATETYPE { Automatic, Manual }
-
- CompositeCoordinate
- child: Window
- x, y: CARD16
-
-7. Extension Initialization
-
-The client must negotiate the version of the extension before executing
-extension requests. Otherwise, the server will return BadRequest for any
-operations other than QueryVersion.
-
- QueryVersion
-
- client-major-version: CARD32
- client-minor-version: CARD32
-
- ->
-
- major-version: CARD32
- minor-version: CARD32
-
- The client sends the highest supported version to the server and
- the server sends the highest version it supports, but no higher than
- the requested version. Major versions changes can introduce
- incompatibilities in existing functionality, minor version
- changes introduce only backward compatible changes. It is
- the client's responsibility to ensure that the server supports
- a version which is compatible with its expectations. Servers
- are encouraged to support multiple versions of the extension.
-
-8. Hierarchy Redirection
-
- RedirectWindow
-
- window: Window
- update: UPDATETYPE
-
- errors: Window, Access, Match
-
- The hierarchy starting at 'window' is directed to off-screen
- storage. 'update' specifies whether the contents are mirrored to
- the parent window automatically or not. Only one client may specify
- an update type of Manual, another attempt will result in an
- Access error. When all clients enabling redirection terminate,
- the redirection will automatically be disabled.
-
- The root window may not be redirected. Doing so results in a Match
- error.
-
- RedirectSubwindows
-
- window: Window
- update UPDATETYPE
-
- errors: Window, Access
-
- Hierarchies starting at all current and future children of window
- will be redirected as in RedirectWindow. If update is Manual,
- then painting of the window background during window manipulation
- and ClearArea requests is inhibited.
-
- UnredirectWindow:
-
- window: Window
-
- errors: Window, Value
-
- Redirection of the specified window will be terminated. If
- the specified window was not selected for redirection by the
- current client, a 'Value' error results.
-
- UnredirectWindows:
-
- window: Window
-
- errors: Window, Value
-
- Redirection of all children of window will be terminated. If
- the specified window was not selected for sub-redirection by the
- current client, a 'Value' error results.
-
-9. Clip lists
-
- CreateRegionFromBorderClip
-
- region: Region
- window: Window
-
- errors: Window, IDChoice
-
- This request creates a region containing the "usual" border clip
- value; that is the area of the window clipped against siblings and
- the parent. This region can be used to restrict rendering to
- suitable areas while updating only a single window. The region
- is copied at the moment the request is executed; future changes
- to the window hierarchy will not be reflected in this region.
-
-10. Associating a Pixmap ID with the off-screen storage (0.2 and later)
-
- NameWindowPixmap
-
- window: Window
- pixmap: Pixmap
-
- errors: Window, Match, IDChoice
-
- This request makes 'pixmap' a reference to the off-screen storage
- for 'window'. This pixmap will remain allocated until freed, even
- if 'window' is unmapped, reconfigured or destroyed. However,
- 'window' will get a new pixmap allocated each time it is
- mapped or resized, so this request will need to be reinvoked for
- the client to continue to refer to the storage holding the current
- window contents. Generates a 'Match' error if 'window' is not
- redirected or is not visible.
-
-11. Composite Overlay Window (0.3 and later)
-
- CompositeGetOverlayWindow
-
- window: Window
-
- ->
-
- overlayWin: Window
-
- This request returns the XID of the Composite Overlay Window for
- the screen specified by the argument 'window'. This request
- indicates that the client wishes to use the Composite Overlay
- Window of this screen. If this Composite Overlay Window has not
- yet been mapped, it is mapped by this request.
-
- The Composite Overlay Window for a particular screen will be
- unmapped when all clients who have invoked this request have
- also invoked CompositeReleaseOverlayWindow for that screen. Also,
- CompositeReleaseOverlayWindow for a screen will be implicitly
- called when a client using the Composite Overlay Window on that
- screen terminates its X11 connection.
-
-
- CompositeReleaseOverlayWindow
-
- window: Window
-
- This request specifies that the client is no longer using the
- Composite Overlay Window on the screen specified by the
- argument 'window'. A screen's Composite Overlay Window is
- unmapped when there are no longer any clients using it.
-
-12. External coordinate transformation (0.4 and later)
-
- RedirectCoordinate
-
- window: Window
- redirect: BOOL
-
- errors: Window, Access
-
- If 'redirect' is TRUE, the requesting client is placed in charge of
- coordinate transformations between 'window' and its children. If
- 'redirect' is FALSE, any such redirection is disabled. Any
- transformations needed by the server will be delivered to the
- requesting client in TransformCoordinateNotify events and the
- requesting client must reply with matching TransformCoordinate
- requests for the server to continue with the operation.
-
- Generates an 'Access' error if another client has
- redirected coordinates for 'window'.
-
- TransformCoordinate
-
- window: Window
- serialNumber: CARD32
- x, y: INT16
- coordinates: LISTofCompositeCoordinate
-
- This provides the transformation data needed by the server for a
- single TransformCoordinateNotify event. 'serialNumber' must match
- the serial number delivered in the event. 'x' and 'y' represent the
- coordinate from the event relative to the 'window'. 'coordinates'
- represent the coordinate from the event relative to each child
- listed. Any children not listed in 'coordinates' are given the
- default transformation using the child window position within the
- parent as a simple translation.
-
- The result of this is that any pointer data seen by means of
- the protocol will appear to reflect the transformation
- performed by this request.
diff --git a/debian/configure.ac b/debian/configure.ac
deleted file mode 100755
index d83be2f..0000000
--- a/debian/configure.ac
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl
-dnl Copyright © 2003 Keith Packard, Noah Levitt
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Keith Packard not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Keith Packard makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
-AC_PREREQ([2.60])
-AC_INIT([CompositeProto], [0.4.2],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
-AM_MAINTAINER_MODE
-
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
-m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
-XORG_DEFAULT_OPTIONS
-
-AC_OUTPUT([Makefile
- compositeproto.pc])
-
diff --git a/debian/control b/debian/control
deleted file mode 100755
index eadbef3..0000000
--- a/debian/control
+++ /dev/null
@@ -1,22 +0,0 @@
-Source: x11proto-composite
-Section: x11
-Priority: optional
-Maintainer: SooChan Lim <sc1.lim@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: SooChan Lim <sc1.lim@samsung.com>, David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>, YoungHoon Jung <yhoon.jung@samsung.com>
-Build-Depends: debhelper (>= 5.0.0), automake, xutils-dev (>= 1:7.3~1)
-Standards-Version: 3.8.3
-
-Package: x11proto-composite-dev
-Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, x11proto-core-dev, x11proto-fixes-dev
-Description: X11 Composite extension wire protocol
- This package provides development headers describing the wire protocol
- for the Composite extension, used to let arbitrary client programs control
- drawing of the final image.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- <URL:http://xorg.freedesktop.org>
- <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
- .
- This package is built from the X.org compositeproto proto module.
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index f592565..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,42 +0,0 @@
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/proto/
-
-Copyright © 2003 Keith Packard
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Keith Packard not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Keith Packard makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
-
-Copyright © 2006 Sun Microsystems
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of Sun Microsystems not be used in
-advertising or publicity pertaining to distribution of the software without
-specific, written prior permission. Sun Microsystems makes no
-representations about the suitability of this software for any purpose. It
-is provided "as is" without express or implied warranty.
-
-SUN MICROSYSTEMS DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-EVENT SHALL SUN MICROSYSTEMS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-PERFORMANCE OF THIS SOFTWARE.
diff --git a/debian/rules b/debian/rules
deleted file mode 100755
index 6acff5f..0000000
--- a/debian/rules
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/usr/bin/make -f
-# debian/rules for the Debian x11proto-composite-dev package.
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>
-# Copyright © 2005 Daniel Stone <daniel@fooishbar.org>
-# Copyright © 2005 David Nusinow <dnusinow@debian.org>
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-PACKAGE = x11proto-composite-dev
-
-include debian/xsfbs/xsfbs.mk
-
-CFLAGS = -Wall -g
-ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
- CFLAGS += -O0
-else
- CFLAGS += -O2
-endif
-ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
- MAKEFLAGS += -j$(NUMJOBS)
-endif
-
-DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
- confflags += --build=$(DEB_HOST_GNU_TYPE)
-else
- confflags += --build=$(DEB_HOST_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-# confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
-endif
-
-
-build: build-stamp
-build-stamp:
- dh_testdir
- autoreconf -vfi
- mkdir -p obj-$(DEB_BUILD_GNU_TYPE)
- cd obj-$(DEB_BUILD_GNU_TYPE) && \
- ../configure --prefix=/usr --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info --disable-shared \
- $(confflags) CFLAGS="$(CFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
-
- touch build-stamp
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- rm -f config.cache config.log config.status config.guess config.sub
- rm -f */config.cache */config.log */config.status */config.guess */config.sub
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
- rm -f aclocal.m4 configure install-sh missing
- find -name Makefile.in -exec rm -rf {} \;
- #find -name Makefile.in -delete
-
- dh_clean
-
-install: build
- dh_testdir
- dh_testroot
- dh_clean -k
- dh_installdirs
-
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
-
-# Build architecture-independent files here.
-binary-indep: build install
- dh_testdir
- dh_testroot
-
-# dh_installdocs compositeproto.txt
-# dh_installman
- dh_install --sourcedir=debian/tmp --list-missing
-# dh_installchangelogs ChangeLog
- dh_link
- dh_strip
- dh_compress
- dh_fixperms
- dh_installdeb
- dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-dependent files here.
-binary-arch: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
diff --git a/debian/x11proto-composite-dev.install b/debian/x11proto-composite-dev.install
deleted file mode 100644
index 8bf21f5..0000000
--- a/debian/x11proto-composite-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/include/X11/extensions/*
-usr/lib/pkgconfig/compositeproto.pc
diff --git a/debian/xsfbs/repack.sh b/debian/xsfbs/repack.sh
deleted file mode 100644
index 5935cc9..0000000
--- a/debian/xsfbs/repack.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if ! [ -d debian/prune ]; then
- exit 0
-fi
-
-if [ "x$1" != x--upstream-version ]; then
- exit 1
-fi
-
-version="$2"
-filename="$3"
-
-if [ -z "$version" ] || ! [ -f "$filename" ]; then
- exit 1
-fi
-
-dir="$(pwd)"
-tempdir="$(mktemp -d)"
-
-cd "$tempdir"
-tar xf "$dir/$filename"
-cat "$dir"/debian/prune/* | while read file; do rm -f */$file; done
-
-tar czf "$dir/$filename" *
-cd "$dir"
-rm -rf "$tempdir"
-echo "Done pruning upstream tarball"
-
-exit 0
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
deleted file mode 100644
index 5e16b10..0000000
--- a/debian/xsfbs/xsfbs.mk
+++ /dev/null
@@ -1,276 +0,0 @@
-#!/usr/bin/make -f
-
-# Debian X Strike Force Build System (XSFBS): Make portion
-
-# Copyright 1996 Stephen Early
-# Copyright 1997 Mark Eichin
-# Copyright 1998-2005, 2007 Branden Robinson
-# Copyright 2005 David Nusinow
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# Originally by Stephen Early <sde1000@debian.org>
-# Modified by Mark W. Eichin <eichin@kitten.gen.ma.us>
-# Modified by Adam Heath <doogie@debian.org>
-# Modified by Branden Robinson <branden@debian.org>
-# Modified by Fabio Massimo Di Nitto <fabbione@fabbione.net>
-# Modified by David Nusinow <dnusinow@debian.org>
-# Acknowledgements to Manoj Srivastava.
-
-# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
-export DH_OPTIONS
-
-# force quilt to not use ~/.quiltrc and to use debian/patches
-QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
-
-# Set up parameters for the upstream build environment.
-
-# Determine (source) package name from Debian changelog.
-SOURCE_NAME:=$(shell dpkg-parsechangelog -ldebian/changelog \
- | grep '^Source:' | awk '{print $$2}')
-
-# Determine package version from Debian changelog.
-SOURCE_VERSION:=$(shell dpkg-parsechangelog -ldebian/changelog \
- | grep '^Version:' | awk '{print $$2}')
-
-# Determine upstream version number.
-UPSTREAM_VERSION:=$(shell echo $(SOURCE_VERSION) | sed 's/-.*//')
-
-# Determine the source version without the epoch for make-orig-tar-gz
-NO_EPOCH_VER:=$(shell echo $(UPSTREAM_VERSION) | sed 's/^.://')
-
-# Figure out who's building this package.
-BUILDER:=$(shell echo $${DEBEMAIL:-$${EMAIL:-$$(echo $$LOGNAME@$$(cat /etc/mailname 2>/dev/null))}})
-
-# Find out if this is an official build; an official build has nothing but
-# digits, dots, and/or the codename of a release in the Debian part of the
-# version number. Anything else indicates an unofficial build.
-OFFICIAL_BUILD:=$(shell VERSION=$(SOURCE_VERSION); if ! expr "$$(echo $${VERSION\#\#*-} | sed 's/\(woody\|sarge\|etch\|lenny\)//g')" : ".*[^0-9.].*" >/dev/null 2>&1; then echo yes; fi)
-
-# Set up parameters for the Debian build environment.
-
-# Determine our architecture.
-BUILD_ARCH:=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
-# Work around some old-time dpkg braindamage.
-BUILD_ARCH:=$(subst i486,i386,$(BUILD_ARCH))
-# The DEB_HOST_ARCH variable may be set per the Debian cross-compilation policy.
-ifdef DEB_HOST_ARCH
- ARCH:=$(DEB_HOST_ARCH)
-else
- # dpkg-cross sets the ARCH environment variable; if set, use it.
- ifdef ARCH
- ARCH:=$(ARCH)
- else
- ARCH:=$(BUILD_ARCH)
- endif
-endif
-
-# $(STAMP_DIR) houses stamp files for complex targets.
-STAMP_DIR:=stampdir
-
-# $(DEBTREEDIR) is where all install rules are told (via $(DESTDIR)) to place
-# their files.
-DEBTREEDIR:=$(CURDIR)/debian/tmp
-
-# All "important" targets have four lines:
-# 1) A target name that is invoked by a package-building tool or the user.
-# This consists of a dependency on a "$(STAMP_DIR)/"-prefixed counterpart.
-# 2) A line delcaring 1) as a phony target (".PHONY:").
-# 3) A "$(STAMP_DIR)/"-prefixed target which does the actual work, and may
-# depend on other targets.
-# 4) A line declaring 3) as a member of the $(stampdir_targets) variable; the
-# "$(STAMP_DIR)/" prefix is omitted.
-#
-# This indirection is needed so that the "stamp" files that signify when a rule
-# is done can be located in a separate "stampdir". Recall that make has no way
-# to know when a goal has been met for a phony target (like "build" or
-# "install").
-#
-# At the end of each "$(STAMP_DIR)/" target, be sure to run the command ">$@"
-# so that the target will not be run again. Removing the file will make Make
-# run the target over.
-
-# All phony targets should be declared as dependencies of .PHONY, even if they
-# do not have "($STAMP_DIR)/"-prefixed counterparts.
-
-# Define a harmless default rule to keep things from going nuts by accident.
-.PHONY: default
-default:
-
-# Set up the $(STAMP_DIR) directory.
-.PHONY: stampdir
-stampdir_targets+=stampdir
-stampdir: $(STAMP_DIR)/stampdir
-$(STAMP_DIR)/stampdir:
- mkdir $(STAMP_DIR)
- >$@
-
-# Set up the package build directory as quilt expects to find it.
-.PHONY: prepare
-stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/prepare
-$(STAMP_DIR)/prepare: $(STAMP_DIR)/log $(STAMP_DIR)/genscripts
- >$@
-
-.PHONY: log
-stampdir_targets+=log
-log: $(STAMP_DIR)/log
-$(STAMP_DIR)/log: $(STAMP_DIR)/stampdir
- mkdir -p $(STAMP_DIR)/log
-
-# Apply all patches to the upstream source.
-.PHONY: patch
-stampdir_targets+=patch
-patch: $(STAMP_DIR)/patch
-$(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
- if ! [ `which quilt` ]; then \
- echo "Couldn't find quilt. Please install it or add it to the build-depends for this package."; \
- exit 1; \
- fi; \
- if $(QUILT) next >/dev/null 2>&1; then \
- echo -n "Applying patches..."; \
- if $(QUILT) push -a -v >$(STAMP_DIR)/log/patch 2>&1; then \
- cat $(STAMP_DIR)/log/patch; \
- echo "successful."; \
- else \
- cat $(STAMP_DIR)/log/patch; \
- echo "failed! (check $(STAMP_DIR)/log/patch for details)"; \
- exit 1; \
- fi; \
- else \
- echo "No patches to apply"; \
- fi; \
- >$@
-
-# Revert all patches to the upstream source.
-.PHONY: unpatch
-unpatch: $(STAMP_DIR)/log
- rm -f $(STAMP_DIR)/patch
- @echo -n "Unapplying patches..."; \
- if $(QUILT) applied >/dev/null 2>/dev/null; then \
- if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
- cat $(STAMP_DIR)/log/unpatch; \
- echo "successful."; \
- else \
- cat $(STAMP_DIR)/log/unpatch; \
- echo "failed! (check $(STAMP_DIR)/log/unpatch for details)"; \
- exit 1; \
- fi; \
- else \
- echo "nothing to do."; \
- fi
-
-# Clean the generated maintainer scripts.
-.PHONY: cleanscripts
-cleanscripts:
- rm -f $(STAMP_DIR)/genscripts
- rm -f debian/*.config \
- debian/*.postinst \
- debian/*.postrm \
- debian/*.preinst \
- debian/*.prerm
-
-# Clean the package build tree.
-.PHONY: xsfclean
-xsfclean: cleanscripts unpatch
- dh_testdir
- rm -rf .pc
- rm -rf $(STAMP_DIR)
- dh_clean
-
-# Remove files from the upstream source tree that we don't need, or which have
-# licensing problems. It must be run before creating the .orig.tar.gz.
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-.PHONY: prune-upstream-tree
-prune-upstream-tree:
- # Ensure we're in the correct directory.
- dh_testdir
- grep -rvh '^#' debian/prune/ | xargs --no-run-if-empty rm -rf
-
-# Verify that there are no offsets or fuzz in the patches we apply.
-#
-# Note: This rule is for Debian package maintainers' convenience, and is not
-# needed for conventional build scenarios.
-.PHONY: patch-audit
-patch-audit: prepare unpatch
- @echo -n "Auditing patches..."; \
- >$(STAMP_DIR)/log/patch; \
- FUZZY=; \
- while [ -n "$$($(QUILT) next)" ]; do \
- RESULT=$$($(QUILT) push -v | tee -a $(STAMP_DIR)/log/patch | grep ^Hunk | sed 's/^Hunk.*\(succeeded\|FAILED\).*/\1/');\
- case "$$RESULT" in \
- succeeded) \
- echo "fuzzy patch: $$($(QUILT) top)" \
- | tee -a $(STAMP_DIR)/log/$$($(QUILT) top); \
- FUZZY=yes; \
- ;; \
- FAILED) \
- echo "broken patch: $$($(QUILT) next)" \
- | tee -a $(STAMP_DIR)/log/$$($(QUILT) next); \
- exit 1; \
- ;; \
- esac; \
- done; \
- if [ -n "$$FUZZY" ]; then \
- echo "there were fuzzy patches; please fix."; \
- exit 1; \
- else \
- echo "done."; \
- fi
-
-# Generate the maintainer scripts.
-.PHONY: genscripts
-stampdir_targets+=genscripts
-genscripts: $(STAMP_DIR)/genscripts
-$(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
- for FILE in debian/*.config.in \
- debian/*.postinst.in \
- debian/*.postrm.in \
- debian/*.preinst.in \
- debian/*.prerm.in; do \
- if [ -e "$$FILE" ]; then \
- MAINTSCRIPT=$$(echo $$FILE | sed 's/.in$$//'); \
- sed -n '1,/^#INCLUDE_SHELL_LIB#$$/p' <$$FILE \
- | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >$$MAINTSCRIPT.tmp; \
- cat debian/xsfbs/xsfbs.sh >>$$MAINTSCRIPT.tmp; \
- sed -n '/^#INCLUDE_SHELL_LIB#$$/,$$p' <$$FILE \
- | sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
- sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
- -e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- <$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
- rm $$MAINTSCRIPT.tmp; \
- fi; \
- done
- # Validate syntax of generated shell scripts.
- #sh debian/scripts/validate-posix-sh debian/*.config \
- # debian/*.postinst \
- # debian/*.postrm \
- # debian/*.preinst \
- # debian/*.prerm
- >$@
-
-SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
-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
- @exit 1
-else
- echo "xserver:Depends=$(SERVER_DEPENDS)" >> debian/$(PACKAGE).substvars
- echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
- echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
-endif
-
-# vim:set noet ai sts=8 sw=8 tw=0:
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
deleted file mode 100644
index 813fd8d..0000000
--- a/debian/xsfbs/xsfbs.sh
+++ /dev/null
@@ -1,622 +0,0 @@
-# This is the X Strike Force shell library for X Window System package
-# maintainer scripts. It serves to define shell functions commonly used by
-# such packages, and performs some error checking necessary for proper operation
-# of those functions. By itself, it does not "do" much; the maintainer scripts
-# invoke the functions defined here to accomplish package installation and
-# removal tasks.
-
-# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
-# skip past this library by scanning forward in this file to the string
-# "GOBSTOPPER".
-
-SOURCE_VERSION=@SOURCE_VERSION@
-OFFICIAL_BUILD=@OFFICIAL_BUILD@
-
-# Use special abnormal exit codes so that problems with this library are more
-# easily tracked down.
-SHELL_LIB_INTERNAL_ERROR=86
-SHELL_LIB_THROWN_ERROR=74
-SHELL_LIB_USAGE_ERROR=99
-
-# old -> new variable names
-if [ -z "$DEBUG_XORG_PACKAGE" ] && [ -n "$DEBUG_XFREE86_PACKAGE" ]; then
- DEBUG_XORG_PACKAGE="$DEBUG_XFREE86_PACKAGE"
-fi
-if [ -z "$DEBUG_XORG_DEBCONF" ] && [ -n "$DEBUG_XFREE86_DEBCONF" ]; then
- DEBUG_XORG_DEBCONF="$DEBUG_XFREE86_DEBCONF"
-fi
-
-# initial sanity checks
-if [ -z "$THIS_PACKAGE" ]; then
- cat >&2 <<EOF
-Error: package maintainer script attempted to use shell library without
-definining \$THIS_PACKAGE shell variable. Please report the package name,
-version, and the text of this error message to the Debian Bug Tracking System.
-Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
-instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
-"doc-debian" package, or install the "reportbug" package and use the command of
-the same name to file a report against version $SOURCE_VERSION of this package.
-EOF
- exit $SHELL_LIB_USAGE_ERROR
-fi
-
-if [ -z "$THIS_SCRIPT" ]; then
- cat >&2 <<EOF
-Error: package maintainer script attempted to use shell library without
-definining \$THIS_SCRIPT shell variable. Please report the package name,
-version, and the text of this error message to the Debian Bug Tracking System.
-Visit <http://www.debian.org/Bugs/Reporting> on the World Wide Web for
-instructions, read the file /usr/share/doc/debian/bug-reporting.txt from the
-"doc-debian" package, or install the "reportbug" package and use the command of
-the same name to file a report against version $SOURCE_VERSION of the
-"$THIS_PACKAGE" package.
-EOF
- exit $SHELL_LIB_USAGE_ERROR
-fi
-
-if [ "$1" = "reconfigure" ] || [ -n "$DEBCONF_RECONFIGURE" ]; then
- RECONFIGURE="true"
-else
- RECONFIGURE=
-fi
-
-if ([ "$1" = "install" ] || [ "$1" = "configure" ]) && [ -z "$2" ]; then
- FIRSTINST="yes"
-fi
-
-if [ -z "$RECONFIGURE" ] && [ -z "$FIRSTINST" ]; then
- UPGRADE="yes"
-fi
-
-trap "message;\
- message \"Received signal. Aborting $THIS_PACKAGE package $THIS_SCRIPT script.\";\
- message;\
- exit 1" HUP INT QUIT TERM
-
-reject_nondigits () {
- # syntax: reject_nondigits [ operand ... ]
- #
- # scan operands (typically shell variables whose values cannot be trusted) for
- # characters other than decimal digits and barf if any are found
- while [ -n "$1" ]; do
- # does the operand contain anything but digits?
- if ! expr "$1" : "[[:digit:]]\+$" > /dev/null 2>&1; then
- # can't use die(), because it wraps message() which wraps this function
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_nondigits() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- shift
- done
-}
-
-reject_unlikely_path_chars () {
- # syntax: reject_unlikely_path_chars [ operand ... ]
- #
- # scan operands (typically shell variables whose values cannot be trusted) for
- # characters unlikely to be seen in a path and which the shell might
- # interpret and barf if any are found
- while [ -n "$1" ]; do
- # does the operand contain any funny characters?
- if expr "$1" : '.*[!$&()*;<>?|].*' > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_unlikely_path_chars()" \
- "encountered possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- shift
- done
-}
-
-# Query the terminal to establish a default number of columns to use for
-# displaying messages to the user. This is used only as a fallback in the
-# event the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while
-# the script is running, and this cannot, only being calculated once.)
-DEFCOLUMNS=$(stty size 2> /dev/null | awk '{print $2}') || true
-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" > /dev/null 2>&1; then
- DEFCOLUMNS=80
-fi
-
-message () {
- # pretty-print messages of arbitrary length
- reject_nondigits "$COLUMNS"
- echo "$*" | fmt -t -w ${COLUMNS:-$DEFCOLUMNS} >&2
-}
-
-observe () {
- # syntax: observe message ...
- #
- # issue observational message suitable for logging someday when support for
- # it exists in dpkg
- if [ -n "$DEBUG_XORG_PACKAGE" ]; then
- message "$THIS_PACKAGE $THIS_SCRIPT note: $*"
- fi
-}
-
-warn () {
- # syntax: warn message ...
- #
- # issue warning message suitable for logging someday when support for
- # it exists in dpkg; also send to standard error
- message "$THIS_PACKAGE $THIS_SCRIPT warning: $*"
-}
-
-die () {
- # syntax: die message ...
- #
- # exit script with error message
- message "$THIS_PACKAGE $THIS_SCRIPT error: $*"
- exit $SHELL_LIB_THROWN_ERROR
-}
-
-internal_error () {
- # exit script with error; essentially a "THIS SHOULD NEVER HAPPEN" message
- message "internal error: $*"
- if [ -n "$OFFICIAL_BUILD" ]; then
- message "Please report a bug in the $THIS_SCRIPT script of the" \
- "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
- "Tracking System. Include all messages above that mention the" \
- "$THIS_PACKAGE package. Visit " \
- "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
- "instructions, read the file" \
- "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
- "package, or install the reportbug package and use the command of" \
- "the same name to file a report."
- fi
- exit $SHELL_LIB_INTERNAL_ERROR
-}
-
-usage_error () {
- message "usage error: $*"
- message "Please report a bug in the $THIS_SCRIPT script of the" \
- "$THIS_PACKAGE package, version $SOURCE_VERSION to the Debian Bug" \
- "Tracking System. Include all messages above that mention the" \
- "$THIS_PACKAGE package. Visit " \
- "<http://www.debian.org/Bugs/Reporting> on the World Wide Web for" \
- "instructions, read the file" \
- "/usr/share/doc/debian/bug-reporting.txt from the doc-debian" \
- "package, or install the reportbug package and use the command of" \
- "the same name to file a report."
- exit $SHELL_LIB_USAGE_ERROR
-}
-
-font_update () {
- # run $UPDATECMDS in $FONTDIRS
-
- local dir cmd shortcmd x_font_dir_prefix
-
- x_font_dir_prefix="/usr/share/fonts/X11"
-
- if [ -z "$UPDATECMDS" ]; then
- usage_error "font_update() called but \$UPDATECMDS not set"
- fi
- if [ -z "$FONTDIRS" ]; then
- usage_error "font_update() called but \$FONTDIRS not set"
- fi
-
- reject_unlikely_path_chars "$UPDATECMDS"
- reject_unlikely_path_chars "$FONTDIRS"
-
- for dir in $FONTDIRS; do
- if [ -d "$x_font_dir_prefix/$dir" ]; then
- for cmd in $UPDATECMDS; do
- if which "$cmd" > /dev/null 2>&1; then
- shortcmd=${cmd##*/}
- observe "running $shortcmd in $dir font directory"
- cmd_opts=
- if [ "$shortcmd" = "update-fonts-alias" ]; then
- cmd_opts=--x11r7-layout
- fi
- if [ "$shortcmd" = "update-fonts-dir" ]; then
- cmd_opts=--x11r7-layout
- fi
- if [ "$shortcmd" = "update-fonts-scale" ]; then
- cmd_opts=--x11r7-layout
- fi
- $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \
- "failed; font directory data may not" \
- "be up to date"
- else
- warn "$cmd not found; not updating corresponding $dir font" \
- "directory data"
- fi
- done
- else
- warn "$dir is not a directory; not updating font directory data"
- fi
- done
-}
-
-remove_conffile_prepare () {
- # syntax: remove_conffile_prepare filename official_md5sum ...
- #
- # Check a conffile "filename" against a list of canonical MD5 checksums.
- # If the file's current MD5 checksum matches one of the "official_md5sum"
- # operands provided, then prepare the conffile for removal from the system.
- # We defer actual deletion until the package is configured so that we can
- # roll this operation back if package installation fails.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install" and verify $2 to ensure the package is being upgraded from a
- # version (or installed over a version removed-but-not-purged) prior to the
- # one in which the conffile was obsoleted.
-
- local conffile current_checksum
-
- # validate arguments
- if [ $# -lt 2 ]; then
- usage_error "remove_conffile_prepare() called with wrong number of" \
- "arguments; expected at least 2, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- conffile="$1"
- shift
-
- # does the conffile even exist?
- if [ -e "$conffile" ]; then
- # calculate its checksum
- current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
- # compare it to each supplied checksum
- while [ -n "$1" ]; do
- if [ "$current_checksum" = "$1" ]; then
- # we found a match; move the confffile and stop looking
- observe "preparing obsolete conffile $conffile for removal"
- mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
- break
- fi
- shift
- done
- fi
-}
-
-remove_conffile_lookup () {
- # syntax: remove_conffile_lookup package filename
- #
- # Lookup the md5sum of a conffile in dpkg's database, and prepare for removal
- # if it matches the actual file's md5sum.
- #
- # Call this function when you would call remove_conffile_prepare but only
- # want to check against dpkg's status database instead of known checksums.
-
- local package conffile old_md5sum
-
- # validate arguments
- if [ $# -ne 2 ]; then
- usage_error "remove_conffile_lookup() called with wrong number of" \
- "arguments; expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- package="$1"
- conffile="$2"
-
- if ! [ -e "$conffile" ]; then
- return
- fi
- old_md5sum="$(dpkg-query -W -f='${Conffiles}' "$package" | \
- awk '{ if (match($0, "^ '"$conffile"' ")) print $2}')"
- if [ -n "$old_md5sum" ]; then
- remove_conffile_prepare "$conffile" "$old_md5sum"
- fi
-}
-
-remove_conffile_commit () {
- # syntax: remove_conffile_commit filename
- #
- # Complete the removal of a conffile "filename" that has become obsolete.
- #
- # Call this function from a postinst script after having used
- # remove_conffile_prepare() in the preinst.
-
- local conffile
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "remove_conffile_commit() called with wrong number of" \
- "arguments; expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- conffile="$1"
-
- # if the temporary file created by remove_conffile_prepare() exists, remove it
- if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
- observe "committing removal of obsolete conffile $conffile"
- rm "$conffile.$THIS_PACKAGE-tmp"
- fi
-}
-
-remove_conffile_rollback () {
- # syntax: remove_conffile_rollback filename
- #
- # Roll back the removal of a conffile "filename".
- #
- # Call this function from a postrm script in the event $1 is "abort-upgrade"
- # or "abort-install" is after having used remove_conffile_prepare() in the
- # preinst.
-
- local conffile
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "remove_conffile_rollback() called with wrong number of" \
- "arguments; expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- conffile="$1"
-
- # if the temporary file created by remove_conffile_prepare() exists, move it
- # back
- if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
- observe "rolling back removal of obsolete conffile $conffile"
- mv "$conffile.$THIS_PACKAGE-tmp" "$conffile"
- fi
-}
-
-replace_conffile_with_symlink_prepare () {
- # syntax: replace_conffile_with_symlink_prepare oldfilename newfilename \
- # official_md5sum ...
- #
- # Check a conffile "oldfilename" against a list of canonical MD5 checksums.
- # If the file's current MD5 checksum matches one of the "official_md5sum"
- # operands provided, then prepare the conffile for removal from the system.
- # We defer actual deletion until the package is configured so that we can
- # roll this operation back if package installation fails. Otherwise copy it
- # to newfilename and let dpkg handle it through conffiles mechanism.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install" and verify $2 to ensure the package is being upgraded from a
- # version (or installed over a version removed-but-not-purged) prior to the
- # one in which the conffile was obsoleted.
-
- local conffile current_checksum
-
- # validate arguments
- if [ $# -lt 3 ]; then
- usage_error "replace_conffile_with_symlink_prepare() called with wrong" \
- " number of arguments; expected at least 3, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- oldconffile="$1"
- shift
- newconffile="$1"
- shift
-
- remove_conffile_prepare "$_oldconffile" "$@"
- # If $oldconffile still exists, then md5sums didn't match.
- # Copy it to new one.
- if [ -f "$oldconffile" ]; then
- cp "$oldconffile" "$newconffile"
- fi
-
-}
-
-replace_conffile_with_symlink_commit () {
- # syntax: replace_conffile_with_symlink_commit oldfilename
- #
- # Complete the removal of a conffile "oldfilename" that has been
- # replaced by a symlink.
- #
- # Call this function from a postinst script after having used
- # replace_conffile_with_symlink_prepare() in the preinst.
-
- local conffile
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "replace_conffile_with_symlink_commit() called with wrong" \
- "number of arguments; expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- conffile="$1"
-
- remove_conffile_commit "$conffile"
-}
-
-replace_conffile_with_symlink_rollback () {
- # syntax: replace_conffile_with_symlink_rollback oldfilename newfilename
- #
- # Roll back the replacing of a conffile "oldfilename" with symlink to
- # "newfilename".
- #
- # Call this function from a postrm script in the event $1 is "abort-upgrade"
- # or "abort-install" and verify $2 to ensure the package failed to upgrade
- # from a version (or install over a version removed-but-not-purged) prior
- # to the one in which the conffile was obsoleted.
- # You should have used replace_conffile_with_symlink_prepare() in the
- # preinst.
-
- local conffile
-
- # validate arguments
- if [ $# -ne 2 ]; then
- usage_error "replace_conffile_with_symlink_rollback() called with wrong" \
- "number of arguments; expected 2, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- oldconffile="$1"
- newconffile="$2"
-
- remove_conffile_rollback "$_oldconffile"
- if [ -f "$newconffile" ]; then
- rm "$newconffile"
- fi
-}
-
-run () {
- # syntax: run command [ argument ... ]
- #
- # Run specified command with optional arguments and report its exit status.
- # Useful for commands whose exit status may be nonzero, but still acceptable,
- # or commands whose failure is not fatal to us.
- #
- # NOTE: Do *not* use this function with db_get or db_metaget commands; in
- # those cases the return value of the debconf command *must* be checked
- # before the string returned by debconf is used for anything.
-
- local retval
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "run() called with wrong number of arguments; expected at" \
- "least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- "$@" || retval=$?
-
- if [ ${retval:-0} -ne 0 ]; then
- observe "command \"$*\" exited with status $retval"
- fi
-}
-
-make_symlink_sane () {
- # syntax: make_symlink_sane symlink target
- #
- # Ensure that the symbolic link symlink exists, and points to target.
- #
- # If symlink does not exist, create it and point it at target.
- #
- # If symlink exists but is not a symbolic link, back it up.
- #
- # If symlink exists, is a symbolic link, but points to the wrong location, fix
- # it.
- #
- # If symlink exists, is a symbolic link, and already points to target, do
- # nothing.
- #
- # This function wouldn't be needed if ln had an -I, --idempotent option.
-
- # Validate arguments.
- if [ $# -ne 2 ]; then
- usage_error "make_symlink_sane() called with wrong number of arguments;" \
- "expected 2, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- # We could just use the positional parameters as-is, but that makes things
- # harder to follow.
- local symlink target
-
- symlink="$1"
- target="$2"
-
- if [ -L "$symlink" ] && [ "$(readlink "$symlink")" = "$target" ]; then
- observe "link from $symlink to $target already exists"
- else
- observe "creating symbolic link from $symlink to $target"
- mkdir -p "${target%/*}" "${symlink%/*}"
- ln -s -b -S ".dpkg-old" "$target" "$symlink"
- fi
-}
-
-migrate_dir_to_symlink () {
- # syntax: migrate_dir_to_symlink old_location new_location
- #
- # Per Debian Policy section 6.5.4, "A directory will never be replaced by a
- # symbolic link to a directory or vice versa; instead, the existing state
- # (symlink or not) will be left alone and dpkg will follow the symlink if
- # there is one."
- #
- # We have to do it ourselves.
- #
- # This function moves the contents of old_location, a directory, into
- # new_location, a directory, then makes old_location a symbolic link to
- # new_location.
- #
- # old_location need not exist, but if it does, it must be a directory (or a
- # symlink to a directory). If it is not, it is backed up. If new_location
- # exists already and is not a directory, it is backed up.
- #
- # This function should be called from a package's preinst so that other
- # packages unpacked after this one --- but before this package's postinst runs
- # --- are unpacked into new_location even if their payloads contain
- # old_location filespecs.
-
- # Validate arguments.
- if [ $# -ne 2 ]; then
- usage_error "migrate_dir_to_symlink() called with wrong number of"
- "arguments; expected 2, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- # We could just use the positional parameters as-is, but that makes things
- # harder to follow.
- local new old
-
- old="$1"
- new="$2"
-
- # Is old location a symlink?
- if [ -L "$old" ]; then
- # Does it already point to new location?
- if [ "$(readlink "$old")" = "$new" ]; then
- # Nothing to do; migration has already been done.
- observe "migration of $old to $new already done"
- return 0
- else
- # Back it up.
- warn "backing up symbolic link $old as $old.dpkg-old"
- mv -b "$old" "$old.dpkg-old"
- fi
- fi
-
- # Does old location exist, but is not a directory?
- if [ -e "$old" ] && ! [ -d "$old" ]; then
- # Back it up.
- warn "backing up non-directory $old as $old.dpkg-old"
- mv -b "$old" "$old.dpkg-old"
- fi
-
- observe "migrating $old to $new"
-
- # Is new location a symlink?
- if [ -L "$new" ]; then
- # Does it point the wrong way, i.e., back to where we're migrating from?
- if [ "$(readlink "$new")" = "$old" ]; then
- # Get rid of it.
- observe "removing symbolic link $new which points to $old"
- rm "$new"
- else
- # Back it up.
- warn "backing up symbolic link $new as $new.dpkg-old"
- mv -b "$new" "$new.dpkg-old"
- fi
- fi
-
- # Does new location exist, but is not a directory?
- if [ -e "$new" ] && ! [ -d "$new" ]; then
- warn "backing up non-directory $new as $new.dpkg-old"
- mv -b "$new" "$new.dpkg-old"
- fi
-
- # Create new directory if it does not yet exist.
- if ! [ -e "$new" ]; then
- observe "creating $new"
- mkdir -p "$new"
- fi
-
- # Copy files in old location to new location. Back up any filenames that
- # already exist in the new location with the extension ".dpkg-old".
- observe "copying files from $old to $new"
- if ! (cd "$old" && cp -a -b -S ".dpkg-old" . "$new"); then
- die "error(s) encountered while copying files from $old to $new"
- fi
-
- # Remove files at old location.
- observe "removing $old"
- rm -r "$old"
-
- # Create symlink from old location to new location.
- make_symlink_sane "$old" "$new"
-}
-
-# vim:set ai et sw=2 ts=2 tw=80:
-
-# GOBSTOPPER: The X Strike Force shell library ends here.
diff --git a/packaging/xorg-x11-proto-composite.spec b/packaging/xorg-x11-proto-composite.spec
index dc6b818..9004bcc 100644
--- a/packaging/xorg-x11-proto-composite.spec
+++ b/packaging/xorg-x11-proto-composite.spec
@@ -1,7 +1,7 @@
Name: xorg-x11-proto-composite
Summary: X.Org X11 Protocol compositeproto
-Version: 0.4.2
-Release: 1
+Version: 0.4.3
+Release: 2
Group: Development/System
License: MIT
URL: http://www.x.org
@@ -25,7 +25,11 @@ Description: %{summary}
./autogen.sh
%reconfigure --disable-static \
--libdir=%{_datadir} \
- --without-xmlto
+ --without-xmlto \
+ CFLAGS="${CFLAGS} \
+ -Wall -g \
+ -D_F_INPUT_REDIRECTION_ \
+ "
# Call make instruction with smp support
make %{?jobs:-j%jobs}
@@ -43,4 +47,3 @@ rm -rf %{buildroot}
%defattr(-,root,root,-)
%{_includedir}/X11/extensions/*
%{_datadir}/pkgconfig/*
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 15:26:01 +0000