IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
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
+OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+commit bf1aa4e05997ab97be4413ccdb6d0d1eb45aeefe
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Mar 7 20:46:50 2012 -0800
+
+ libXrender 0.9.7
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit bb6568cbec24ae2c84bb5d9fe418f0021291a0af
+Author: Emanuele Giaquinta <emanuele.giaquinta@gmail.com>
+Date: Mon Jan 2 19:58:15 2012 +0000
+
+ Fix alpha premultiplication in XRenderParseColor.
+
+ Due to C arithmetic conversion rules we must use an unsigned constant (or a
+ cast) to perform the multiplication using unsigned arithmetic.
+
+ Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
+
+commit b3cfeecf2bddbbb120a9c796a4c9fb8fd08e15fc
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:51:39 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit eaae07c9c9690228e16ab8dc537a8a0c2ae175bf
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Sun May 22 12:47:10 2011 -0700
+
+ Make DEPTH_MASK generate unsigned ints
+
+ Clears Sun compiler warning:
+ "Xrender.c", line 127: warning: integer overflow detected: op "<<"
+ since 1 << 31 overflows a signed 32-bit int.
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1025ca2d9a00bc60639689fba177d186dace5483
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:44 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+ Remove redundant AC_SUBST(*_CFLAGS) and/or *_LIBS
+ Update minimum version of util-macros to at least 1.8.
+ No functional configuration changes
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit d3258bb910de98836f01be320ff59bb841eef825
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit ba0036d984787dc2da74ef3d8ffb9b81ca13c19c
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 27 18:50:15 2011 -0500
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit 5fb74888fd77843c81de038365791f29c799bbec
+Author: Aaron Plattner <aplattner@nvidia.com>
+Date: Thu Nov 4 09:13:49 2010 -0700
+
+ Fix some minor typos
+
+ Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+
+commit b1c60edb6b6a965e58fed3b613c266364a5ec0ce
+Author: Fernando Carrijo <fcarrijo@yahoo.com.br>
+Date: Thu Jul 1 07:02:41 2010 -0300
+
+ Purge macros NEED_EVENTS and NEED_REPLIES
+
+ Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
+ Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
commit d3d20437ceee1c225cd189fdeb6378552e206337
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue Jun 8 19:23:04 2010 -0700
Replace static ChangeLog with dist-hook to generate from git log
commit e10d5cbe4c5ed98ae1856e20a0e9d31321330d53
-Merge: 497dda5... 9d3f9fd...
+Merge: 497dda5 9d3f9fd
Author: Eric Anholt <eric@anholt.net>
Date: Wed Sep 5 08:25:12 2007 -0700
-#
+#
# 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
# 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
+++ /dev/null
-#! /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 "$@"
-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.
+#
+# 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.
+#
+# Initialize Autoconf
AC_PREREQ([2.60])
+#
+# Version should match the current Render version. XRenderQueryVersion
+# returns the version from render.h, NOT the version we set here. But we
+# try to keep these the same. Note that the library has an extra
+# digit in the version number to track changes which don't affect the
+# protocol, so Xrender version l.n.m corresponds to protocol version l.n
+#
+AC_INIT(libXrender, [0.9.7],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXrender])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-dnl
-dnl Version should match the current Render version. XRenderQueryVersion
-dnl returns the version from render.h, NOT the version we set here. But we
-dnl try to keep these the same. Note that the library has an extra
-dnl digit in the version number to track changes which don't affect the
-dnl protocol, so Xrender version l.n.m corresponds to protocol version l.n
-dnl
-AC_INIT(libXrender,
- 0.9.6,
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXrender)
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros: XORG_DEFAULT_OPTIONS
+# Initialize libtool
+AC_PROG_LIBTOOL
+
+# Require X.Org macros 1.8 or later for AC_PROG_INSTALL
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.3)
+ [m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
-
-# Check for progs
-AC_PROG_CC
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
# Check render configuration, strip extra digits from package version to
# find the required protocol version
-
if test "$VERSION" = "" ; then
VERSION=$PACKAGE_VERSION;
fi
RENDER_VERSION=[`echo $VERSION | sed 's/^\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'`]
AC_SUBST(RENDER_VERSION)
-PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION)
-AC_SUBST(RENDER_CFLAGS)
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- xrender.pc])
+# Obtain compiler/linker options for depedencies
+PKG_CHECK_MODULES(RENDER, x11 renderproto >= $RENDER_VERSION)
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ xrender.pc])
+AC_OUTPUT
+++ /dev/null
-------------------------------------------------------
-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 using 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.
+++ /dev/null
-libxrender (1:0.9.6-2slp2) unstable; urgency=low
-
- * [X11R7.6] upgrade package
- * Git: 165.213.180.234:slp/pkgs/xorg/lib/libxrender
- * Tag: libxrender_0.9.6-2slp2
-
- -- SooChan Lim <sc1.lim@samsung.com> Wed, 05 Jan 2011 17:56:18 +0900
-
-libxrender (1:0.9.6-1) unstable; urgency=low
-
- * New upstream release.
- * Update debian/copyright from upstream COPYING.
- * Bump Standards-Version to 3.9.0.
-
- -- Julien Cristau <jcristau@debian.org> Sun, 11 Jul 2010 13:26:35 +0100
-
-libxrender (1:0.9.5-2) unstable; urgency=low
-
- [ Julien Cristau ]
- * Rename the build directory to not include DEB_BUILD_GNU_TYPE for no
- good reason. Thanks, Colin Watson!
- * Remove myself from Uploaders
-
- [ Cyril Brulebois ]
- * Add udeb needed for the graphical installer: libxrender1-udeb.
- * Bump the B-D on libx11-dev to ensure libxrender1-udeb gets a
- dependency on libx11-6-udeb.
- * Bump Standards-Version from 3.8.3 to 3.8.4 (no changes needed).
- * Add ${misc:Depends} to non-udeb binaries, and wrap Depends.
- * Add myself to Uploaders.
-
- -- Cyril Brulebois <kibi@debian.org> Thu, 11 Mar 2010 02:02:29 +0100
-
-libxrender (1:0.9.5-1) unstable; urgency=low
-
- [ Timo Aaltonen ]
- * New upstream release.
- * Run autoreconf on build. Add build-deps on automake, libtool
- and xutils-dev.
- * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
- * Bump Standards-Version to 3.8.3.
- * Move -dbg package to section debug.
- * Drop pre-dependency on x11-common from libxrender-dev. This was needed
- for upgrades from sarge.
-
- [ Julien Cristau ]
- * Install the libXrender doc in libxrender-dev.
-
- -- Julien Cristau <jcristau@debian.org> Wed, 25 Nov 2009 19:38:16 +0100
-
-ibxrender (1:0.9.5-6slp2) unstable; urgency=low
-
- * Add --as-needed
- * Git: 165.213.180.234:/git/slp/pkgs/xorg/lib/libxrender
- * Tag: libxrender_0.9.5-6slp2
-
- -- SooChan Lim <sc1.lim@samsung.com> Sat, 20 Nov 2010 15:54:18 +0900
-
-libxrender (1:0.9.5-5slp2) unstable; urgency=low
-
- * Update maintainer
- * Git: 165.213.180.234:/git/slp2.0/slp2.0-pkgs/X11
- * Tag: libxrender_0.9.5-5slp2
-
- -- Sung-Jin Park <sj76.park@samsung.com> Wed, 21 Apr 2010 14:02:53 +0900
-
-libxrender (1:0.9.5-4slp2) unstable; urgency=low
-
- * modify the package name
-
- -- SooChan Lim <sc1.lim@samsung.com> Thu, 25 Mar 2010 17:58:30 +0900
-
-libxrender (1:0.9.5-3) unstable; urgency=low
-
- * Import debian package
- * Install .la files
-
- -- Sung-Jin Park <sj76.park@samsung.com> Mon, 07 Dec 2009 10:30:21 +0900
-
-libxrender (1:0.9.5-2) unstable; urgency=low
-
- * Modify install file to install .la
-
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 01 Dec 2009 20:16:33 +0900
-
-libxrender (1:0.9.5-1) unstable; urgency=low
-
- * New upstream release.
- * Run autoreconf on build. Add build-deps on automake and xutils-dev.
- * Parse space-separated DEB_BUILD_OPTIONS, and handle parallel=N.
- * Bump Standards-Version to 3.8.3.
-
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 23 Nov 2009 15:09:49 +0200
-
-libxrender (1:0.9.4-2) unstable; urgency=low
-
- * Pull upstream master up to commit f6f784c0.
- * Fix typo in long descriptions, thanks Justin Pryzby, closes: #459819.
- * Add a link to www.X.org and a reference to the upstream module
- in the long description.
- * Bump Standards-Version to 3.7.3 (no changes).
- * Drop the XS- prefix from Vcs-Git and Vcs-Browser fields in debian/control.
- * Drop CVS header from debian/copyright.
-
- -- Brice Goglin <bgoglin@debian.org> Fri, 13 Jun 2008 18:55:08 +0200
-
-libxrender (1:0.9.4-1) unstable; urgency=low
-
- * New upstream release.
- + Fix for renderproto 0.9.3, include Xlib.h before render.h in Xrender.h
- (closes: #442824).
- * Add myself to Uploaders.
-
- -- Julien Cristau <jcristau@debian.org> Mon, 17 Sep 2007 09:57:00 +0200
-
-libxrender (1:0.9.3-1) unstable; urgency=low
-
- * New upstream release.
- * Add myself to Uploaders, and remove Branden and Fabio with their
- permission.
- * Replace ${Source-Version}) with ${binary:Version}.
- * Add upstream URL to debian/copyright.
-
- -- Brice Goglin <bgoglin@debian.org> Sat, 25 Aug 2007 11:41:18 +0200
-
-libxrender (1:0.9.2-1) unstable; urgency=low
-
- * New upstream release.
- * Drop obsolete CVS info from the descriptions, and add XS-Vcs-*.
- * Install the upstream changelog.
-
- -- Julien Cristau <jcristau@debian.org> Thu, 12 Apr 2007 14:00:20 +0200
-
-libxrender (1:0.9.1-3) unstable; urgency=low
-
- * Actually upload to unstable. Thanks Drew for catching this.
-
- -- David Nusinow <dnusinow@debian.org> Wed, 30 Aug 2006 20:20:16 -0400
-
-libxrender (1:0.9.1-2) experimental; urgency=low
-
- * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org> Wed, 30 Aug 2006 18:18:04 -0400
-
-libxrender (1:0.9.1-1) experimental; urgency=low
-
- * New upstream release.
- * Autoreconf w/ an updated xutils-dev so that manpages have the 'x'
- extension dropped.
- * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
- idempotency fi.
- * Run dh_install w/ --list-missing.
- * Bump standards version to 3.7.2.0.
- * Version x11-common pre-dep in -dev package to 1:7.0.0 to match
- the rest of Debian.
- * Bump debhelper compat to 5.
- * Fix dh_strip call to skip the -dbg package.
- * Format changelog to not trigger lintian errors.
-
- -- Andres Salomon <dilinger@debian.org> Sat, 29 Jul 2006 16:27:07 -0400
-
-libxrender (1:0.9.0.2-4) unstable; urgency=low
-
- * Reorder makeshlib command in rules file so that ldconfig is run
- properly. Thanks Drew Parsons and Steve Langasek.
-
- -- David Nusinow <dnusinow@debian.org> Tue, 18 Apr 2006 21:50:00 -0400
-
-libxrender (1:0.9.0.2-3) unstable; urgency=low
-
- * Have libxrender-dev depend on libx11-dev (>= 2:1.0.0). Thanks Sebastien
- Bacher. (closes: #362513)
-
- -- David Nusinow <dnusinow@debian.org> Thu, 13 Apr 2006 19:11:10 -0400
-
-libxrender (1:0.9.0.2-2) unstable; urgency=low
-
- * Upload to unstable
-
- -- David Nusinow <dnusinow@debian.org> Thu, 23 Mar 2006 22:45:16 -0500
-
-libxrender (1:0.9.0.2-1) experimental; urgency=low
-
- * First upload to Debian
-
- -- David Nusinow <dnusinow@debian.org> Thu, 29 Dec 2005 20:54:46 -0500
-
-libxrender (1:0.9.0-1) breezy; urgency=low
-
- * Play the epoch-for-epoch madness game.
- * Grab this one from xorg/lib, not xlibs; hence the change in package name.
- * Remove libxrender-dev.links.
- * Clean up Depends lines.
- * Remove horrendous hacks only needed for upgrades from no-longer-supported
- versions.
- * In accordance with all other X libraries, stop shipping Libtool .la file.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Tue, 12 Jul 2005 18:39:47 +1000
-
-xrender (0.9.0-0ubuntu5) breezy; urgency=low
-
- * Add Pre-Depends on x-common (>= 0.99) to get the /usr transition.
- * Move files from /usr/X11R6 to /usr.
-
- -- Daniel Stone <daniel.stone@ubuntu.com> Wed, 18 May 2005 01:43:18 +1000
-
-xrender (0.9.0-0ubuntu4) hoary; urgency=low
-
- * Set includedir to be /usr/X11R6 with autoconf, not by moving it around, so
- the pkgconfig file and the libtool library no longer lie.
- * Make libxrender-dev Depend (not B-D) on render-dev >= 0.9.
-
- -- Daniel Stone <daniel.stone@canonical.com> Thu, 2 Dec 2004 11:10:51 +0000
-
-xrender (0.9.0-0ubuntu3) hoary; urgency=low
-
- * Force versioned build-depend on render >= 0.9
- * The next question will be: "how many times before we get it right?"
-
- -- Fabio M. Di Nitto <fabbione@fabbione.net> Mon, 01 Nov 2004 21:24:44 +0100
-
-xrender (0.9.0-0ubuntu2) hoary; urgency=low
-
- * Force versioned build-depend on render >= 0.9.0
-
- -- Fabio M. Di Nitto <fabbione@fabbione.net> Mon, 01 Nov 2004 20:58:21 +0100
-
-xrender (0.9.0-0ubuntu1) unstable; urgency=low
-
- * New upstream version, including new trapezoid code.
- + Reapply AC_PATH_XTRA_CORRECTED stuff, and re-run autoreconf. Far less
- invasive than the 0.8.x iterations of this, since it was run on the same
- machine as the upstream tarballs were generated from. I'm not applying
- this upstream, since it has no business here. If anything should be
- patched, it should be autoconf.
-
- -- Daniel Stone <daniel.stone@canonical.com> Mon, 1 Nov 2004 18:48:52 +0100
-
-xrender (0.8.3-7) unstable; urgency=medium
-
- * Urgency due to fix for FTBFS.
-
- * Define and use AC_PATH_XTRA_CORRECTED autoconf macro instead of
- AC_PATH_XTRA, which does not know how to find X libraries or headers when
- only x-dev and libx11-dev are installed (which are the only XFree86
- packages that Xrender needs to actually build). Re-run aclocal &&
- automake --foreign && autoconf to resynchronize with change to
- configure.ac. Fixes FTBFS; thanks to Jurij Smakov for this patch.
- (Closes: #233969)
- - acinclude.m4: define AC_PATH_XTRA_CORRECTED macro
- - configure.ac: use AC_PATH_XTRA_CORRECTED macro
- - Makefile.in, aclocal.m4, configure: regenerate
-
- -- Branden Robinson <branden@debian.org> Tue, 9 Mar 2004 23:56:21 -0500
-
-xrender (0.8.3-6) unstable; urgency=low
-
- * Make package compatible with the XFree86 4.3.0 package reorganization.
- - debian/control:
- + package build-depends on x-dev and libx11-dev instead of xlibs-dev
- + libxrender-dev depends on x-dev and libx11-dev instead of xlibs-dev
- + increased versioned conflict of libxrender1 on xlibs to (<< 4.3.0)
- due to (now undiverted) file overlaps
- + increased versioned conflict of libxrender1-dbg on xlibs-dbg to (<<
- 4.3.0) due to (now undiverted) file overlaps
- + increased versioned conflict of libxrender-dev on xlibs-dev to (<<
- 4.3.0) due to (now undiverted) file overlaps
- - debian/{libxrender1,libxrender1-dbg,libxrender-dev}.preinst: remove
- diversions made by previous versions of package if present
- - debian/{libxrender1,libxrender1-dbg,libxrender-dev}.postrm: deleted
-
- * Removal of the package diversions eliminates several related problems.
- (Closes: #227867,#230803,#233812)
-
- * Previous changelog entry corrected. (Closes: #225450)
-
- -- Branden Robinson <branden@debian.org> Thu, 19 Feb 2004 22:07:24 -0500
-
-xrender (0.8.3-5) unstable; urgency=high
-
- * Urgency due to fix for grave bug.
-
- * Each of libxrender1, libxrender1-dbg, and libxrender-dev now conflict with
- their xlibs counterparts versioned less than 4.2.1, because the Xrender
- shared objects and related files in xlibs 4.1.0 are named
- "libXrender.so.1.0", not "libXrender.so.1.1" as the dpkg-divert commands
- in the xrender package's maintainer scripts expect. This prevents
- libxrender1 from being removed. We also can't add conditionals to handle
- this because the user might upgrade xlibs to 4.2.1 in the meantime.
- (Closes: #222343)
- - debian/control
-
- -- Branden Robinson <branden@debian.org> Thu, 4 Dec 2003 23:45:32 -0500
-
-xrender (0.8.3-4) unstable; urgency=medium
-
- * Urgency due to fix for serious bug.
-
- * Add build-dependency on pkg-config. (Closes: #216029)
- - debian/control
-
- -- Branden Robinson <branden@debian.org> Thu, 16 Oct 2003 00:05:55 -0500
-
-xrender (0.8.3-3) unstable; urgency=low
-
- * Clean up package's build-dependencies and dependencies.
- - debian/control:
- + drop versioning of build-dependency on xlibs-dev; all that is needed
- is libX11.so.6, and any version of xlibs-dev provides that
- + drop libxrender1's dependency on xlibs (>> 4.2.1); dpkg-shlibdeps adds
- an adequate dependency on xlibs
- + drop libxrender1-dbg's dependency on xlibs-dbg (>> 4.2.1); this isn't
- a true dependency, so let's get rid of it
- + drop versioning of libxrender-dev's dependency on xlibs-dev; all that
- is needed is libX11.so.6, and any version of xlibs-dev provides that
- + and dependency of libxrender-dev on render-dev
-
- * Clarify wording in packages' extended descriptions.
- - debian/control:
- + Remove redundant-through-implication sentence from libxrender1's
- description.
- + Simplify the message to non-programmers in libxrender1-dbg's
- description.
- + Simplify the wording regarding what is provided by the libxrender-dev
- package.
-
- * Stop using DEB_CONFIGURE_EXTRA_FLAGS entirely in the rules file;
- AC_PATH_XTRA does indeed seem to work adequately.
- - debian/rules
-
- * Stop using DEB_DH_MAKESHLIBS_ARGS_ALL entirely in the rules file; since
- libXrender has retained forward-compatibility since its first package
- release, it's fine to let dh_makeshlibs operate in its default manner.
- - debian/rules
-
- * Change maintainer to Debian X Strike Force, and add uploaders field to
- include myself.
- - debian/control
-
- * Steal patch from upstream CVS that works around breakage in the Xinerama
- implementation in the XFree86 X server, which only reports depths with an
- associated visual, when it should return all available depths. Thanks to
- Marc Wilson for help tracking down the problem and the solution, and Nate
- Turner for confirming the fix. (Closes: #215845)
- - Xrender.c
-
- -- Branden Robinson <branden@debian.org> Wed, 15 Oct 2003 13:56:07 -0500
-
-xrender (0.8.3-2) unstable; urgency=medium
-
- * Urgency medium because the problem fixed by this release bites a lot of
- KDE users who are using XFree86 4.2.0 or 4.2.1 Debian packages.
-
- * Add new diversion of the actual old libXrender shared object (as opposed
- to diverting only the symlinks). This is necessary because ldconfig will
- recreate the libXrender.so.1 symbolic link in /usr/X11R6/lib, which causes
- major confusion (and possibly errors from the dynamic loader) for anything
- that searches /usr/X11R6/lib before /usr/lib.
- /usr/X11R6/lib/libXrender.so.1.1 is now being diverted to
- /usr/X11R6/lib/xlibs.libXrender-1.1.so.1.1. The diversion's name has to
- have "xlibs." preprended because ldconfig will attempt to operate on
- any plain file matching "lib*.so*".
- - debian/libxrender1.preinst
- - debian/libxrender1.postrm
-
- * Under duress, ship a symlink from /usr/X11R6/lib/libXrender.la to
- /usr/lib/libXrender.la. There appears to be a bug in libtool that that
- compels it to place absolute paths to .la files in other .la files.
- This symlink should allow a transition to a non-broken libtool (or the
- eventual recompilation of all libraries that transitively depend on
- libXrender, which is a lot of them) and will be removed in the future.
- - debian/libxrender-dev.links
-
- * Set AM_MAINTAINER_MODE because we do not want automake running during
- Debian package builds.
- - configure.ac
-
- * Run aclocal && automake --foreign && autoconf to resynchronize with
- change to configure.ac.
- - Makefile.in
- - aclocal.m4
- - configure
-
- * Bump standards version to 3.6.1; no changes necessary.
- - debian/control
-
- -- Branden Robinson <branden@debian.org> Wed, 8 Oct 2003 21:05:28 -0500
-
-xrender (0.8.3-1) unstable; urgency=low
-
- * new upstream release
-
- * Migrate from CBS to CDBS.
- - debian/control: add build-dependency on cdbs (>= 0.4.12)
- - debian/rules: translated to CDBS-speak
- - debian/*.install: update to be correct with the way CDBS uses dh_install
-
- * Move files from /usr/X11R6 to /usr where possible. (The only exception is
- the Xrender.h, which is expected to be found in
- <X11/extensions/Xrender.h>, so has to be shipped in
- /usr/X11R6/include/X11/extensions.)
- - debian/*.install: update paths
- - debian/rules: stop passing --includedir and --libdir to configure
- - debian/control: update instructions for using LD_LIBRARY_PATH
-
- -- Branden Robinson <branden@debian.org> Mon, 6 Oct 2003 23:33:00 -0500
-
-xrender (0.8.2-2) unstable; urgency=low
-
- * debian/control: sync with overrides file; libxrender1-dbg is priority
- "extra"
-
- -- Branden Robinson <branden@debian.org> Tue, 13 May 2003 15:12:00 -0500
-
-xrender (0.8.2-1) unstable; urgency=low
-
- * new upstream release
- + Check in Debian packaging infrastructure per Keith's request.
- + Remove bogus Xext.h include. Fix Render version comparison.
-
- * ChangeLog: grab more recent, but still pre-0.8.2 tag changelog entries
- from HEAD
- * {Makefile.in,aclocal.m4}: update using GNU automake 1.7.4
-
- -- Branden Robinson <branden@debian.org> Tue, 13 May 2003 13:35:40 -0500
-
-xrender (0.8.1-1) unstable; urgency=low
-
- * initial release
- + fix bad length computation in
- XRenderCompositeString16()/XRenderCompositeString32() that caused
- application crashes with BadValue X protocol errors, particularly in
- gnome-terminal and mozilla-xft (Closes: #181815)
-
- * {Makefile.am,xrender.pc.in}: Upstream hasn't quite gotten rid of its
- libXext dependency yet; Xrenderint.h still makes reference to
- XMissingExtension(). Therefore, Xrender itself, and objects that link
- against libXrender, should also link against libXext.
- * {Makefile.in,aclocal.m4,config.guess,config.sub,configure}: regenerated
- with automake 1.7.4 and friends
-
- * Until XFree86 4.3.0 is released to Debian unstable:
- - the libxrender1 package will depend on xlibs (>> 4.2.1) and dpkg-divert
- its libXrender.so.1 symlink
- - the libxrender1-dbg package will depend on xlibs-dbg (>> 4.2.1) and
- dpkg-divert its libXrender.so.1 symlink
- - the libxrender-dev package will depend on xlibs-dev (>> 4.2.1) and
- dpkg-divert its libXrender.a file, libXrender.so symlink, and Xrender.h
- file
-
- -- Branden Robinson <branden@debian.org> Sun, 4 May 2003 13:14:54 -0500
-
-vim:set ai tw=78 et sw=2 sts=2:
+++ /dev/null
-Source: libxrender
-Section: x11
-Priority: optional
-Maintainer: Sung-Jin Park <sj76.park@samsung.com>, Sangjin Lee <lsj119@samsung.com>, Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Sung-Jin Park <sj76.park@samsung.com>, David Nusinow <dnusinow@debian.org>, Andres Salomon <dilinger@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, libx11-dev (>= 2:1.3.3-2), x11proto-render-dev, x11proto-core-dev, automake, libtool, xutils-dev (>= 1:7.5-1slp2)
-Standards-Version: 3.9.0
-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxrender
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxrender.git
-
-Package: libxrender1
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends},
-Description: X Rendering Extension client library
- The X Rendering Extension (Render) introduces digital image composition as
- the foundation of a new rendering model within the X Window System.
- Rendering geometric figures is accomplished by client-side tessellation into
- either triangles or trapezoids. Text is drawn by loading glyphs into the
- server and rendering sets of them. The Xrender library exposes this
- extension to X clients.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXrender
-
-#Package: libxrender1-udeb
-#XC-Package-Type: udeb
-#Section: debian-installer
-#Architecture: any
-#Depends:
-# ${shlibs:Depends},
-#Description: X Rendering Extension client library
-# This is a udeb, or a microdeb, for the debian-installer.
-
-Package: libxrender1-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: libxrender1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends},
-Description: X Rendering Extension client library (unstripped)
- The X Rendering Extension (Render) introduces digital image composition as
- the foundation of a new rendering model within the X Window System.
- Rendering geometric figures is accomplished by client-side tessellation into
- either triangles or trapezoids. Text is drawn by loading glyphs into the
- server and rendering sets of them. The Xrender library exposes this
- extension to X clients.
- .
- This package provides an unstripped shared object with debugging symbols,
- useful to provide a backtrace with symbol names in a debugger; this
- facilitates interpretation of core dumps, and aids in finding logic errors in
- programs using this library (or the library itself). The library is
- installed in /usr/lib/debug and can be used by placing that directory in the
- LD_LIBRARY_PATH environment variable when the code to be debugged is
- executed. Non-programmers will likely have little use for this package.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXrender
-
-Package: libxrender-dev
-Section: libdevel
-Architecture: any
-Depends: libxrender1 (= ${binary:Version}), libx11-dev (>= 2:1.0.0), x11proto-render-dev, x11proto-core-dev, ${misc:Depends},
-Description: X Rendering Extension client library (development files)
- The X Rendering Extension (Render) introduces digital image composition as
- the foundation of a new rendering model within the X Window System.
- Rendering geometric figures is accomplished by client-side tessellation into
- either triangles or trapezoids. Text is drawn by loading glyphs into the
- server and rendering sets of them. The Xrender library exposes this
- extension to X clients.
- .
- This package provides a static library and C header files.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libXrender
+++ /dev/null
-This package was downloaded from
-http://xorg.freedesktop.org/releases/individual/lib/
-
-Copyright © 2001,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 © 2000 SuSE, Inc.
-
-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 SuSE not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission. SuSE makes no representations about the
-suitability of this software for any purpose. It is provided "as is"
-without express or implied warranty.
-
-SuSE DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
-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.
+++ /dev/null
-usr/include/X11/*
-usr/lib/libXrender.a
-usr/lib/libXrender.so
-usr/lib/libXrender.la
-usr/lib/pkgconfig/xrender.pc
-usr/share/doc/libXrender/* usr/share/doc/libxrender-dev
+++ /dev/null
-usr/lib/libXrender.so.1*
+++ /dev/null
-usr/lib/libXrender.so.1*
+++ /dev/null
-#!/usr/bin/make -f
-# debian/rules for the Debian libxrender 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
-
-# set this to the name of the main shlib's binary package
-PACKAGE = libxrender1
-
-include debian/xsfbs/xsfbs.mk
-
-CFLAGS = -Wall -g
-LDFLAGS += -Wl,--hash-style=both -Wl,--as-needed
-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 $(confflags) \
- CFLAGS="$(CFLAGS)" \
- LDFLAGS="$(LDFLAGS)"
- cd obj-$(DEB_BUILD_GNU_TYPE) && $(MAKE)
- >$@
-
-clean:
- dh_testdir
- dh_testroot
- rm -f build-stamp
-
- rm -f config.cache config.log config.status
- rm -f */config.cache */config.log */config.status
- rm -f conftest* */conftest*
- rm -rf autom4te.cache */autom4te.cache
- rm -rf obj-*
- rm -f aclocal.m4 config.guess config.h.in config.sub configure
- rm -f depcomp install-sh ltmain.sh missing mkinstalldirs
- find -name Makefile.in -exec rm -f {} \;
- #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-dependent files here.
-binary-arch: build install
- dh_testdir
- dh_testroot
-
-# dh_installdocs
- dh_install --sourcedir=debian/tmp --list-missing
-# dh_installchangelogs ChangeLog
- dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
- dh_compress
- dh_fixperms
- dh_makeshlibs
-# dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
- dh_shlibdeps
- dh_installdeb
- dh_gencontrol
- dh_md5sums
- dh_builddeb
-
-# Build architecture-independent files here.
-binary-indep: build install
-# Nothing to do
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+++ /dev/null
-version=3
-http://xorg.freedesktop.org/releases/individual/lib/ libXrender-(.*)\.tar\.gz
+++ /dev/null
-#!/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
+++ /dev/null
-#!/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)/logdir $(STAMP_DIR)/genscripts
- >$@
-
-.PHONY: logdir
-stampdir_targets+=logdir
-logdir: $(STAMP_DIR)/logdir
-$(STAMP_DIR)/logdir: $(STAMP_DIR)/stampdir
- mkdir -p $(STAMP_DIR)/log
- >$@
-
-# Apply all patches to the upstream source.
-.PHONY: patch
-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)/logdir
- 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
- >$@
-
-# Compute dependencies for drivers
-#
-VIDEODEP = $(shell cat /usr/share/xserver-xorg/videodrvdep 2>/dev/null)
-INPUTDEP = $(shell cat /usr/share/xserver-xorg/xinputdep 2>/dev/null)
-
-# these two can be removed post-squeeze
-VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
-INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
-VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI), xorg-driver-video
-INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI), xorg-driver-input
-
-ifeq ($(PACKAGE),)
-PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
-endif
-
-.PHONY: serverabi
-serverabi: install
-ifeq ($(VIDEODEP),)
- @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
- @exit 1
-else
- echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
- echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars
- # the following is there for compatibility...
- echo "xviddriver:Provides=$(VIDDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
- echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
- echo "xserver:Depends=$(VIDEODEP), $(INPUTDEP)" >> debian/$(PACKAGE).substvars
-endif
-
-# vim:set noet ai sts=8 sw=8 tw=0:
+++ /dev/null
-# 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.
#define PictStandardA1 4
#define PictStandardNUM 5
-As a convenience, this function locates PictFormats that coorespond to
+As a convenience, this function locates PictFormats that correspond to
commonly used formats.
ARGB32 depth 32, bits 31-24 A, 23-16 R, 15-8 G, 7-0 B
A4 depth 4, bits 3-0 A
A1 depth 1, bits 0 A
-Any server supporting Render must have a PictFormat cooresponding to each of
+Any server supporting Render must have a PictFormat corresponding to each of
these standard formats.
3.4 Index type PictFormat color values
#define CPPolyMode (1 << 10)
#define CPDither (1 << 11)
#define CPComponentAlpha (1 << 12)
- #define CPLastBit 11
+ #define CPLastBit 12
Creates a picture for drawable in the specified format. Any values
specified in 'attributes' and 'valuemask' are used in place of the default
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
unsigned long mask,
_Xconst XRenderPictFormat *templ,
int count);
-
+
#define PictStandardARGB32 0
#define PictStandardRGB24 1
#define PictStandardA8 2
int npoints,
int winding);
Status
-XRenderParseColor(Display *dpy,
+XRenderParseColor(Display *dpy,
char *spec,
XRenderColor *def);
--- /dev/null
+Summary: X.Org X11 libXrender runtime library
+Name: libXrender
+Version: 0.9.7
+Release: 1
+License: MIT
+Group: System Environment/Libraries
+URL: http://www.x.org
+
+Source0: %{name}-%{version}.tar.gz
+
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(xorg-macros)
+BuildRequires: pkgconfig(renderproto)
+BuildRequires: libX11-devel
+
+%description
+X.Org X11 libXrender runtime library
+
+%package devel
+Summary: X.Org X11 libXrender development package
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
+Provides: libxrender-devel
+
+%description devel
+X.Org X11 libXrender development package
+
+%prep
+%setup -q
+
+%build
+%reconfigure --disable-static \
+ LDFLAGS="${LDFLAGS} -Wl,--hash-style=both -Wl,--as-needed"
+make %{?jobs:-j%jobs}
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+make install DESTDIR=$RPM_BUILD_ROOT
+# undo this, we'll add it ourselves in %%doc
+rm $RPM_BUILD_ROOT/%{_docdir}/*/libXrender.txt
+
+# We intentionally don't ship *.la files
+rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+%remove_docs
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING ChangeLog
+%{_libdir}/libXrender.so.1
+%{_libdir}/libXrender.so.1.3.0
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/libXrender.txt
+%{_includedir}/X11/extensions/Xrender.h
+%{_libdir}/libXrender.so
+%{_libdir}/pkgconfig/xrender.pc
+++ /dev/null
-
-Name: libxrender
-Summary: X.Org X11 libXrender runtime library
-Version: 0.9.6
-Release: 2.5
-Group: System/Libraries
-License: MIT
-URL: http://www.x.org
-Source0: http://xorg.freedesktop.org/releases/individual/lib/%{name}-%{version}.tar.gz
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-BuildRequires: pkgconfig(xorg-macros)
-BuildRequires: pkgconfig(renderproto)
-BuildRequires: pkgconfig(x11)
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-
-%description
-Description: %{summary}
-
-
-%package devel
-Summary: X.Org X11 libXrender development package
-Group: System/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: xorg-x11-filesystem
-
-%description devel
-Description: %{summary}
-
-
-%prep
-%setup -q -n %{name}-%{version}
-
-
-%build
-export LDFLAGS+=" -Wl,--hash-style=both -Wl,--as-needed"
-%reconfigure
-
-# Call make instruction with smp support
-make %{?jobs:-j%jobs}
-
-%install
-rm -rf %{buildroot}
-%make_install
-
-
-%clean
-rm -rf %{buildroot}
-
-
-
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
-
-
-
-%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog
-%{_libdir}/libXrender.so.1
-%{_libdir}/libXrender.so.1.3.0
-
-
-%files devel
-%defattr(-,root,root,-)
-%dir %{_includedir}/X11
-%dir %{_includedir}/X11/extensions
-%{_includedir}/X11/extensions/Xrender.h
-%{_libdir}/libXrender.so
-%{_libdir}/pkgconfig/xrender.pc
-%doc %{_datadir}/doc/libXrender/libXrender.txt
-
Status
XRenderParseColor(Display *dpy, char *spec, XRenderColor *def)
{
-
+
if (!strncmp (spec, "rgba:", 5))
{
unsigned short elements[4];
unsigned short *pShort;
int i, n;
char c;
-
+
spec += 5;
/*
* Attempt to parse the value portion.
{
XColor coreColor;
Colormap colormap;
-
+
colormap = DefaultColormap (dpy, DefaultScreen (dpy));
if (!XParseColor (dpy, colormap, spec, &coreColor))
return 0;
def->blue = coreColor.blue;
def->alpha = 0xffff;
}
- def->red = (def->red * def->alpha) / 65535;
- def->green = (def->green * def->alpha) / 65535;
- def->blue = (def->blue * def->alpha) / 65535;
+ def->red = (def->red * def->alpha) / 0xffffU;
+ def->green = (def->green * def->alpha) / 0xffffU;
+ def->blue = (def->blue * def->alpha) / 0xffffU;
return 1;
}
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
req->src = source;
req->x = x;
req->y = y;
-
+
UnlockDisplay(dpy);
SyncHandle();
return cid;
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderCreateAnimCursor;
req->cid = cid = XAllocID (dpy);
-
+
len = (long) ncursor * SIZEOF (xAnimCursorElt) >> 2;
SetReqLen (req, len, len);
len <<= 2;
Data32 (dpy, (long *) cursors, len);
-
+
UnlockDisplay(dpy);
SyncHandle();
return cid;
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
dpy->bufptr += SIZEOF(xRectangle);
#endif /* not MUSTCOPY */
}
- else
+ else
{
GetReqExtra(RenderFillRectangles, SIZEOF(xRectangle), req);
-
+
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderFillRectangles;
req->op = op;
req->color.green = color->green;
req->color.blue = color->blue;
req->color.alpha = color->alpha;
-
+
#ifdef MUSTCOPY
dpy->bufptr -= SIZEOF(xRectangle);
#else
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
- while (n_rects)
+ while (n_rects)
{
GetReq(RenderFillRectangles, req);
-
+
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderFillRectangles;
req->op = op;
req->color.green = color->green;
req->color.blue = color->blue;
req->color.alpha = color->alpha;
-
+
n = n_rects;
len = ((long)n) << 1;
- if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length))
+ if (!dpy->bigreq_size && len > (dpy->max_request_size - req->length))
{
n = (dpy->max_request_size - req->length) >> 1;
len = ((long)n) << 1;
#include <config.h>
#endif
#include "Xrenderint.h"
-
+
XFilters *
XRenderQueryFilters (Display *dpy, Drawable drawable)
{
char len;
int i;
long nbytes, nbytesAlias, nbytesName;
-
+
if (!RenderHasExtension (info))
return NULL;
xri = info->info;
if (xri->minor_version < 6)
return NULL;
-
+
LockDisplay (dpy);
GetReq (RenderQueryFilters, req);
req->reqType = info->codes->major_opcode;
if (rep.numAliases & 1)
nbytesAlias += 2;
nbytesName = nbytes - nbytesAlias;
-
+
/*
* Allocate one giant block for the whole data structure
*/
* numAliases short alias values
* nbytesName char strings
*/
-
+
filters->nfilter = rep.numFilters;
filters->nalias = rep.numAliases;
filters->filter = (char **) (filters + 1);
if (i & 3)
_XEatData (dpy, 4 - (i & 3));
-
+
UnlockDisplay (dpy);
SyncHandle ();
return filters;
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
UnlockDisplay(dpy);
SyncHandle();
}
-
+
void
XRenderCompositeString8 (Display *dpy,
int op,
if (!nchar)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
/*
* xGlyphElt must be aligned on a 32-bit boundary; this is
* easily done by filling no more than 252 glyphs in each
* bucket
*/
-
+
#define MAX_8 252
len = SIZEOF(xGlyphElt) * ((nchar + MAX_8-1) / MAX_8) + nchar;
-
+
req->length += (len + 3)>>2; /* convert to number of 32-bit words */
-
- /*
+
+ /*
* If the entire request does not fit into the remaining space in the
* buffer, flush the buffer first.
*/
nchar = nchar - MAX_8;
string += MAX_8;
}
-
+
if (nchar)
{
nbytes = (nchar + SIZEOF(xGlyphElt) + 3) & ~3;
- BufAlloc (xGlyphElt *, elt, nbytes);
+ BufAlloc (xGlyphElt *, elt, nbytes);
elt->len = nchar;
elt->deltax = xDst;
elt->deltay = yDst;
memcpy ((char *) (elt + 1), string, nchar);
}
#undef MAX_8
-
+
UnlockDisplay(dpy);
SyncHandle();
}
if (!nchar)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
-
+
GetReq(RenderCompositeGlyphs16, req);
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderCompositeGlyphs16;
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
#define MAX_16 254
len = SIZEOF(xGlyphElt) * ((nchar + MAX_16-1) / MAX_16) + nchar * 2;
-
+
req->length += (len + 3)>>2; /* convert to number of 32-bit words */
-
- /*
+
+ /*
* If the entire request does not fit into the remaining space in the
* buffer, flush the buffer first.
*/
nchar = nchar - MAX_16;
string += MAX_16;
}
-
+
if (nchar)
{
nbytes = (nchar * 2 + SIZEOF(xGlyphElt) + 3) & ~3;
- BufAlloc (xGlyphElt *, elt, nbytes);
+ BufAlloc (xGlyphElt *, elt, nbytes);
elt->len = nchar;
elt->deltax = xDst;
elt->deltay = yDst;
memcpy ((char *) (elt + 1), (char *) string, nchar * 2);
}
#undef MAX_16
-
+
UnlockDisplay(dpy);
SyncHandle();
}
if (!nchar)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
-
+
GetReq(RenderCompositeGlyphs32, req);
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderCompositeGlyphs32;
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
#define MAX_32 254
len = SIZEOF(xGlyphElt) * ((nchar + MAX_32-1) / MAX_32) + nchar * 4;
-
+
req->length += (len + 3)>>2; /* convert to number of 32-bit words */
-
- /*
+
+ /*
* If the entire request does not fit into the remaining space in the
* buffer, flush the buffer first.
*/
nchar = nchar - MAX_32;
string += MAX_32;
}
-
+
if (nchar)
{
nbytes = nchar * 4 + SIZEOF(xGlyphElt);
- BufAlloc (xGlyphElt *, elt, nbytes);
+ BufAlloc (xGlyphElt *, elt, nbytes);
elt->len = nchar;
elt->deltax = xDst;
elt->deltay = yDst;
memcpy ((char *) (elt + 1), (char *) string, nchar * 4);
}
#undef MAX_32
-
+
UnlockDisplay(dpy);
SyncHandle();
}
if (!nelt)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = elts[0].glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
/*
* Compute the space necessary
*/
len = 0;
-
+
#define MAX_8 252
glyphset = elts[0].glyphset;
elen = SIZEOF(xGlyphElt) * ((nchars + MAX_8-1) / MAX_8) + nchars;
len += (elen + 3) >> 2;
}
-
+
req->length += len;
/*
}
}
#undef MAX_8
-
+
UnlockDisplay(dpy);
SyncHandle();
}
if (!nelt)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = elts[0].glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
/*
* Compute the space necessary
*/
len = 0;
-
+
#define MAX_16 254
glyphset = elts[0].glyphset;
elen = SIZEOF(xGlyphElt) * ((nchars + MAX_16-1) / MAX_16) + nchars * 2;
len += (elen + 3) >> 2;
}
-
+
req->length += len;
glyphset = elts[0].glyphset;
{
int this_chars = nchars > MAX_16 ? MAX_16 : nchars;
int this_bytes = this_chars * 2;
-
+
BufAlloc (xGlyphElt *, elt, SIZEOF(xGlyphElt))
elt->len = this_chars;
elt->deltax = xDst;
}
}
#undef MAX_16
-
+
UnlockDisplay(dpy);
SyncHandle();
}
if (!nelt)
return;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
-
+
GetReq(RenderCompositeGlyphs32, req);
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderCompositeGlyphs32;
req->maskFormat = maskFormat ? maskFormat->id : None;
req->glyphset = elts[0].glyphset;
req->xSrc = xSrc;
- req->ySrc = ySrc;
+ req->ySrc = ySrc;
/*
* Compute the space necessary
len = 0;
#define MAX_32 254
-
+
glyphset = elts[0].glyphset;
for (i = 0; i < nelt; i++)
{
elen = SIZEOF(xGlyphElt) * ((nchars + MAX_32) / MAX_32) + nchars *4;
len += (elen + 3) >> 2;
}
-
+
req->length += len;
glyphset = elts[0].glyphset;
}
}
#undef MAX_32
-
+
UnlockDisplay(dpy);
SyncHandle();
}
libXrender_la_LIBADD = $(RENDER_LIBS)
# -version-number requires libtool >= 1.5
-libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined
+libXrender_la_LDFLAGS = -version-number 1:3:0 -no-undefined
libXrenderincludedir = $(includedir)/X11/extensions
-libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h
+libXrenderinclude_HEADERS = $(top_srcdir)/include/X11/extensions/Xrender.h
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
unsigned long values[32];
register unsigned long *value = values;
unsigned int nvalues;
-
+
if (valuemask & CPRepeat)
*value++ = attributes->repeat;
if (valuemask & CPAlphaMap)
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
xRenderChangePictureReq *req;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
GetReq(RenderChangePicture, req);
int n)
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
- _XRenderSetPictureClipRectangles (dpy, info, picture,
+ _XRenderSetPictureClipRectangles (dpy, info, picture,
xOrigin, yOrigin, rects, n);
UnlockDisplay (dpy);
SyncHandle ();
XRectangle *xr, *pr;
BOX *pb;
unsigned long total;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay(dpy);
total = r->numRects * sizeof (XRectangle);
}
}
if (xr || !r->numRects)
- _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0,
+ _XRenderSetPictureClipRectangles (dpy, info, picture, 0, 0,
xr, r->numRects);
if (xr)
_XFreeTemp(dpy, (char *)xr, total);
UnlockDisplay(dpy);
SyncHandle();
-}
+}
void
XRenderSetPictureTransform (Display *dpy,
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
xRenderSetPictureTransformReq *req;
-
+
RenderSimpleCheckExtension (dpy, info);
LockDisplay (dpy);
GetReq(RenderSetPictureTransform, req);
req->transform.matrix33 = transform->matrix[2][2];
UnlockDisplay(dpy);
SyncHandle();
-
+
}
void
static double
XRenderComputeInverseSlope (XLineFixed *l)
{
- return (XFixedToDouble (l->p2.x - l->p1.x) /
+ return (XFixedToDouble (l->p2.x - l->p1.x) /
XFixedToDouble (l->p2.y - l->p1.y));
}
Edge *active;
Edge *e, *en, *next;
XFixed y, next_y, intersect;
-
+
qsort (edges, nedges, sizeof (Edge), CompareEdge);
-
+
y = edges[0].edge.p1.y;
active = NULL;
inactive = 0;
/* compute x coordinates along this group */
for (e = active; e; e = e->next)
e->current_x = XRenderComputeX (&e->edge, y);
-
+
/* sort active list */
for (e = active; e; e = next)
{
next_y = e->edge.p2.y;
en = e->next;
/* check intersect */
- if (en && e->edge.p2.x > en->edge.p2.x)
+ if (en && e->edge.p2.x > en->edge.p2.x)
{
intersect = XRenderComputeIntersect (&e->edge, &e->next->edge);
/* make sure this point is below the actual intersection */
/* check next inactive point */
if (inactive < nedges && edges[inactive].edge.p1.y < next_y)
next_y = edges[inactive].edge.p1.y;
-
+
/* walk the list generating trapezoids */
for (e = active; e && (en = e->next); e = en->next)
{
}
y = next_y;
-
+
/* delete inactive edges from list */
for (e = active; e; e = next)
{
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
* XextFindDisplay.)
*/
static XRenderExtDisplayInfo *
-XRenderExtFindDisplay (XRenderExtInfo *extinfo,
+XRenderExtFindDisplay (XRenderExtInfo *extinfo,
Display *dpy)
{
XRenderExtDisplayInfo *dpyinfo;
/*
* see if this was the most recently accessed display
*/
- if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy)
+ if ((dpyinfo = extinfo->cur) && dpyinfo->display == dpy)
return dpyinfo;
/*
* any screen, tell the application that Render is not present.
*/
-#define DEPTH_MASK(d) (1 << ((d) - 1))
-
+#define DEPTH_MASK(d) (1U << ((d) - 1))
+
/*
* Render requires support for depth 1, 4, 8, 24 and 32 pixmaps
*/
DEPTH_MASK(8) | \
DEPTH_MASK(24) | \
DEPTH_MASK(32))
-
+
typedef struct _DepthCheckRec {
struct _DepthCheckRec *next;
Display *dpy;
dpyinfo->codes = NULL;
/*
- * if the server has the extension, then we can initialize the
+ * if the server has the extension, then we can initialize the
* appropriate function vectors
*/
if (dpyinfo->codes) {
- XESetCloseDisplay (dpy, dpyinfo->codes->extension,
+ XESetCloseDisplay (dpy, dpyinfo->codes->extension,
XRenderCloseDisplay);
} else {
/* The server doesn't have this extension.
* XRenderExtRemoveDisplay - remove the indicated display from the
* extension object. (Replaces XextRemoveDisplay.)
*/
-static int
+static int
XRenderExtRemoveDisplay (XRenderExtInfo *extinfo, Display *dpy)
{
XRenderExtDisplayInfo *dpyinfo, *prev;
dpyinfo = XRenderExtFindDisplay (&XRenderExtensionInfo, dpy);
if (!dpyinfo)
- dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy,
+ dpyinfo = XRenderExtAddDisplay (&XRenderExtensionInfo, dpy,
XRenderExtensionName);
return dpyinfo;
}
{
XRenderExtDisplayInfo *info = XRenderFindDisplay (dpy);
if (info && info->info) XFree (info->info);
-
+
return XRenderExtRemoveDisplay (&XRenderExtensionInfo, dpy);
}
-
+
/****************************************************************************
* *
* Render public interfaces *
if (!XRenderQueryFormats (dpy))
return 0;
-
- xri = info->info;
+
+ xri = info->info;
*major_versionp = xri->major_version;
*minor_versionp = xri->minor_version;
return 1;
_XRenderFindFormat (XRenderInfo *xri, PictFormat format)
{
int nf;
-
+
for (nf = 0; nf < xri->nformat; nf++)
if (xri->format[nf].id == format)
return &xri->format[nf];
Bool error;
int major_version;
int minor_version;
-
+
} _XrenderVersionState;
static Bool
int nf, ns, nd, nv;
int rlength;
int nbytes;
-
+
RenderCheckExtension (dpy, info, 0);
LockDisplay (dpy);
if (info->info)
vreq->renderReqType = X_RenderQueryVersion;
vreq->majorVersion = RENDER_MAJOR;
vreq->minorVersion = RENDER_MINOR;
-
+
async_state.version_seq = dpy->request;
async_state.error = False;
async.next = dpy->async_handlers;
async.handler = _XRenderVersionHandler;
async.data = (XPointer) &async_state;
dpy->async_handlers = &async;
-
+
GetReq (RenderQueryPictFormats, req);
req->reqType = info->codes->major_opcode;
req->renderReqType = X_RenderQueryPictFormats;
-
- if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
+
+ if (!_XReply (dpy, (xReply *) &rep, 0, xFalse))
{
DeqAsyncHandler (dpy, &async);
UnlockDisplay (dpy);
*/
if (async_state.major_version == 0 && async_state.minor_version < 6)
rep.numSubpixel = 0;
-
+
xri = (XRenderInfo *) Xmalloc (sizeof (XRenderInfo) +
rep.numFormats * sizeof (XRenderPictFormat) +
rep.numScreens * sizeof (XRenderScreen) +
rep.numSubpixel * 4);
xData = (void *) Xmalloc (rlength);
nbytes = (int) rep.length << 2;
-
+
if (!xri || !xData || nbytes < rlength)
{
if (xri) Xfree (xri);
xDepth = (xPictDepth *) xVisual;
}
screen++;
- xScreen = (xPictScreen *) xDepth;
+ xScreen = (xPictScreen *) xDepth;
}
xSubpixel = (CARD32 *) xScreen;
screen = xri->screen;
*/
if (nbytes > rlength)
_XEatData (dpy, (unsigned long) (nbytes - rlength));
-
+
UnlockDisplay (dpy);
SyncHandle ();
Xfree (xData);
},
0, /* colormap */
},
- PictFormatType |
+ PictFormatType |
PictFormatDepth |
PictFormatRed |
PictFormatRedMask |
},
0, /* colormap */
},
- PictFormatType |
+ PictFormatType |
PictFormatDepth |
PictFormatRed |
PictFormatRedMask |
},
0, /* colormap */
},
- PictFormatType |
+ PictFormatType |
PictFormatDepth |
PictFormatRedMask |
PictFormatGreenMask |
},
0, /* colormap */
},
- PictFormatType |
+ PictFormatType |
PictFormatDepth |
PictFormatRedMask |
PictFormatGreenMask |
},
0, /* colormap */
},
- PictFormatType |
+ PictFormatType |
PictFormatDepth |
PictFormatRedMask |
PictFormatGreenMask |
};
if (0 <= format && format < PictStandardNUM)
- return XRenderFindFormat (dpy,
+ return XRenderFindFormat (dpy,
standardFormats[format].mask,
&standardFormats[format].templ,
0);
for(i = 0; i < rep.numIndexValues; i++)
{
xIndexValue value;
-
+
_XRead (dpy, (char *) &value, SIZEOF (xIndexValue));
values[i].pixel = value.pixel;
values[i].red = value.red;
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL SuSE
* 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
+ * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*
* Author: Keith Packard, SuSE, Inc.
#define _XRENDERINT_H_
#include "config.h"
-#define NEED_EVENTS
-#define NEED_REPLIES
#include <X11/Xlibint.h>
#include <X11/Xutil.h>
#include <X11/extensions/renderproto.h>
projects / framework / uifw / xorg / lib / libxrender.git / commitdiff