Hello community,
here is the log from the commit of package xorg-x11-libs
checked in at Mon Sep 10 12:52:43 CEST 2007.
--------
--- xorg-x11-libs/xorg-x11-libs.changes 2007-08-28 04:15:43.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-libs/xorg-x11-libs.changes 2007-09-06 23:46:30.370487000 +0200
@@ -1,0 +2,31 @@
+Thu Sep 6 23:25:32 CEST 2007 - sndirsch@suse.de
+
+- pixman-0.9.5
+ * Don't skip fbFetch/fbStore when PIXMAN_FB_ACCESSORS is enabled.
+ * Remove redundant defines.
+ * Remove unnecessary wrapping from fbFetch/fbStore.
+ * One more minor wrapping fix
+ * Fix typo AC_MAJOR -> PIXMAN_MAJOR
+ * Update .pc file for library version name change.
+ * Fix failure to set identity transform in pixman.
+ * Add conjoint and disjoint operators to pixman.h
+ * Remove trailing comma in enum
+ * Add missing comma in enum
+ * Set accessors for the destination image in composite-test.c
+ * Add pixman_image_set_source_clipping()
+ * Fix bug 12039, based on Chris Wilson's patch
+ * rasterize traps that extend outside of the image bounds
+ correctly
+- libXi 1.1.3
+ * The most important feature of this release is a set of locking
+ fixes, which unbreak this library for threaded apps. The lock
+ issues were exposed by libxcb.
+- libXfont 1.3.1
+ * This release fixes bugs in the catalogue dir support.
+- libXrandr 1.2.2
+ * This release fixes a protocol encode/decode copy'n'paste bug.
+- libXxf86dga 1.0.2
+ * This release fixes a sign-extension bug with nasty results on
+ I32L64 platforms.
+
+-------------------------------------------------------------------
Old:
----
libXfont-1.3.0.tar.bz2
libXi-1.1.2.tar.bz2
libXrandr-1.2.1.tar.bz2
libXxf86dga-X11R7.1-1.0.1.tar.bz2
pixman-0.9.4.tar.bz2
New:
----
libXfont-1.3.1.tar.bz2
libXi-1.1.3.tar.bz2
libXrandr-1.2.2.tar.bz2
libXxf86dga-1.0.2.tar.bz2
pixman-0.9.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-libs.spec ++++++
--- /var/tmp/diff_new_pack.w11829/_old 2007-09-10 12:52:19.000000000 +0200
+++ /var/tmp/diff_new_pack.w11829/_new 2007-09-10 12:52:19.000000000 +0200
@@ -19,7 +19,7 @@
%endif
URL: http://xorg.freedesktop.org/
Version: 7.2
-Release: 95
+Release: 97
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/Libraries
@@ -34,16 +34,16 @@
Source7: libXcursor-1.1.9.tar.bz2
Source8: libXdamage-1.1.1.tar.bz2
Source9: libXevie-1.0.2.tar.bz2
-Source10: libXfont-1.3.0.tar.bz2
+Source10: libXfont-1.3.1.tar.bz2
Source11: libXfontcache-1.0.4.tar.bz2
Source12: libXft-2.1.12.tar.bz2
-Source13: libXi-1.1.2.tar.bz2
+Source13: libXi-1.1.3.tar.bz2
Source14: libXinerama-1.0.2.tar.bz2
Source15: libXprintAppUtil-X11R7.0-1.0.1.tar.bz2
-Source16: libXrandr-1.2.1.tar.bz2
+Source16: libXrandr-1.2.2.tar.bz2
Source17: libXtst-1.0.3.tar.bz2
Source18: libXvMC-1.0.4.tar.bz2
-Source19: libXxf86dga-X11R7.1-1.0.1.tar.bz2
+Source19: libXxf86dga-1.0.2.tar.bz2
Source20: libXxf86misc-X11R7.1-1.0.1.tar.bz2
Source21: libXxf86vm-X11R7.1-1.0.1.tar.bz2
Source22: libdmx-X11R7.1-1.0.2.tar.bz2
@@ -56,7 +56,7 @@
Source29: libvnc-20070501.tar.bz2
Source30: libXcliplist-20070501.tar.bz2
Source31: xcb-util-0.2.tar.bz2
-Source32: pixman-0.9.4.tar.bz2
+Source32: pixman-0.9.5.tar.bz2
Source33: libpciaccess-0.9.1.tar.bz2
Patch: libXrandr.diff
Patch2: libXft-2.1.7-lcd-filter-2.patch
@@ -219,6 +219,34 @@
%{_mandir}/man3/*
%changelog
+* Thu Sep 06 2007 - sndirsch@suse.de
+- pixman-0.9.5
+ * Don't skip fbFetch/fbStore when PIXMAN_FB_ACCESSORS is enabled.
+ * Remove redundant defines.
+ * Remove unnecessary wrapping from fbFetch/fbStore.
+ * One more minor wrapping fix
+ * Fix typo AC_MAJOR -> PIXMAN_MAJOR
+ * Update .pc file for library version name change.
+ * Fix failure to set identity transform in pixman.
+ * Add conjoint and disjoint operators to pixman.h
+ * Remove trailing comma in enum
+ * Add missing comma in enum
+ * Set accessors for the destination image in composite-test.c
+ * Add pixman_image_set_source_clipping()
+ * Fix bug 12039, based on Chris Wilson's patch
+ * rasterize traps that extend outside of the image bounds
+ correctly
+- libXi 1.1.3
+ * The most important feature of this release is a set of locking
+ fixes, which unbreak this library for threaded apps. The lock
+ issues were exposed by libxcb.
+- libXfont 1.3.1
+ * This release fixes bugs in the catalogue dir support.
+- libXrandr 1.2.2
+ * This release fixes a protocol encode/decode copy'n'paste bug.
+- libXxf86dga 1.0.2
+ * This release fixes a sign-extension bug with nasty results on
+ I32L64 platforms.
* Tue Aug 28 2007 - sndirsch@suse.de
- added libpciaccess (release 0.9.1)
* Mon Aug 27 2007 - sndirsch@suse.de
++++++ libXfont-1.3.0.tar.bz2 -> libXfont-1.3.1.tar.bz2 ++++++
++++ 16933 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.3.0/ChangeLog new/libXfont-1.3.1/ChangeLog
--- old/libXfont-1.3.0/ChangeLog 2007-07-02 21:01:26.000000000 +0200
+++ new/libXfont-1.3.1/ChangeLog 2007-09-05 18:53:44.000000000 +0200
@@ -1,3 +1,61 @@
+commit aca95d12a8b35de7ae914632fc9e8a723d58a860
+Author: Matthieu Herrb
+Date: Sat Aug 25 23:32:54 2007 +0200
+
+ Kill unused macro definition.
+
+commit 3c3b47bf6f080ddb700886de3e5bfa42c2f0774e
+Merge: 9f86614... 32d2d33...
+Author: Dodji Seketeli
+Date: Sat Aug 11 23:09:50 2007 +0200
+
+ Merge branch 'master' of ssh://dodji@git.freedesktop.org/git/xorg/lib/libXfont
+
+commit 9f86614394af81bc484cf00f3e9996510d3718cb
+Author: Ademar de Souza Reis Jr
+Date: Mon Jul 30 14:36:21 2007 -0400
+
+ Fix dirfd leak on CatalogueRescan().
+
+commit 87f50267181887ed9214536608bd2035d2dd70f7
+Author: Ademar de Souza Reis Jr
+Date: Mon Jul 30 14:35:01 2007 -0400
+
+ Support relative paths in catalogue:<dir> symlinks.
+
+ Relative symlinks are common inside the catalogue directory and
+ should be supported as well.
+
+commit 32d2d335eacd1b55980323a71ef35cdf7c22366d
+Author: Ademar de Souza Reis Jr
+Date: Mon Jul 30 14:36:21 2007 -0400
+
+ Fix dirfd leak on CatalogueRescan().
+
+commit 0a5b31a40c4933f4c69157c61d4d4890af2205b1
+Author: Ademar de Souza Reis Jr
+Date: Mon Jul 30 14:35:01 2007 -0400
+
+ Support relative paths in catalogue:<dir> symlinks.
+
+ Relative symlinks are common inside the catalogue directory and
+ should be supported as well.
+
+commit 7670d4a2720c61fbc7b989fed14c676f04ac3ad1
+Author: Dodji Seketeli
+Date: Mon Jul 16 12:24:34 2007 +0200
+
+ Remove side effects from BuiltinReadDirectory()
+
+ The first time BuiltinReadDirectory() is called,
+ save the content of builtin_dir and builtin_alias,
+ before calling FontFileAddFontFile(), because that fonction
+ will modify those.
+
+ Then, in subsequent calls to BuiltinReadDirectory(), restore
+ builtin_dir and builtin_alias so that the side effect incurred
+ by the first call disappears.
+
commit e3642d9b2c0819a607d4cce413b9f0541285545b
Author: Kristian Høgsberg
Date: Mon Jul 2 15:01:05 2007 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.3.0/configure.ac new/libXfont-1.3.1/configure.ac
--- old/libXfont-1.3.0/configure.ac 2007-07-02 21:00:44.000000000 +0200
+++ new/libXfont-1.3.1/configure.ac 2007-09-05 18:50:57.000000000 +0200
@@ -26,7 +26,7 @@
AC_PREREQ([2.57])
AC_INIT([libXfont],
- 1.3.0,
+ 1.3.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
libXfont)
dnl
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.3.0/src/builtins/dir.c new/libXfont-1.3.1/src/builtins/dir.c
--- old/libXfont-1.3.0/src/builtins/dir.c 2007-06-26 16:29:22.000000000 +0200
+++ new/libXfont-1.3.1/src/builtins/dir.c 2007-09-05 02:18:23.000000000 +0200
@@ -29,6 +29,133 @@
#endif
#include "builtin.h"
+BuiltinDirPtr
+BuiltinDirsDup (const BuiltinDirPtr a_dirs,
+ int a_dirs_len)
+{
+ BuiltinDirPtr dirs=NULL ;
+ int i=0 ;
+
+ if (!a_dirs)
+ return NULL ;
+
+ dirs = xcalloc (a_dirs_len, sizeof (BuiltinDirRec)) ;
+ if (!dirs)
+ return NULL ;
+
+ for (i=0; i < a_dirs_len; i++) {
+ int len = strlen (a_dirs[i].file_name) ;
+ dirs[i].file_name = xcalloc (1, len) ;
+ memmove (dirs[i].file_name, a_dirs[i].file_name, len);
+ len = strlen (a_dirs[i].font_name) ;
+ dirs[i].font_name = xcalloc (1, len) ;
+ memmove (dirs[i].font_name, a_dirs[i].font_name, len);
+ }
+ return dirs ;
+}
+
+/**
+ * Copy a_save back into a_cur
+ * @param a_cur the instance of BuiltinDir to restore
+ * @param a_saved the saved instance of BuiltinDir to copy into a_cur
+ * @return 0 if went okay, 1 otherwise.
+ */
+int
+BuiltinDirRestore (BuiltinDirPtr a_cur,
+ const BuiltinDirPtr a_saved)
+{
+ if (!a_cur)
+ return 1 ;
+ if (!a_saved)
+ return 0 ;
+
+ if (a_saved->font_name)
+ memmove (a_cur->font_name, a_saved->font_name, strlen (a_saved->font_name)) ;
+ return 0 ;
+}
+
+
+int
+BuiltinDirsRestore (BuiltinDirPtr a_cur_tab,
+ const BuiltinDirPtr a_saved_tab,
+ int a_tab_len)
+{
+ int i=0 ;
+
+ if (!a_cur_tab)
+ return 1 ;
+ if (!a_saved_tab)
+ return 0 ;
+
+ for (i=0 ; i < a_tab_len; i++) {
+ if (BuiltinDirRestore (&a_cur_tab[i], &a_saved_tab[i]))
+ return 1 ;
+ }
+ return 0 ;
+}
+
+BuiltinAliasPtr
+BuiltinAliasesDup (const BuiltinAliasPtr a_aliases,
+ int a_aliases_len)
+{
+ BuiltinAliasPtr aliases=NULL ;
+ int i=0 ;
+
+ if (!a_aliases)
+ return NULL ;
+
+ aliases = xcalloc (a_aliases_len, sizeof (BuiltinAliasRec)) ;
+ if (!aliases)
+ return NULL ;
+
+ for (i=0; i < a_aliases_len; i++) {
+ int len = strlen (a_aliases[i].font_name) ;
+ aliases[i].font_name = xcalloc (1, len) ;
+ memmove (aliases[i].font_name, a_aliases[i].font_name, len);
+ }
+ return aliases ;
+}
+
+/**
+ * Copy a_save back into a_cur
+ * @param a_cur the instance of BuiltinAlias to restore
+ * @param a_saved the saved instance of BuiltinAlias to copy into a_cur
+ * @return 0 if went okay, 1 otherwise.
+ */
+int
+BuiltinAliasRestore (BuiltinAliasPtr a_cur,
+ const BuiltinAliasPtr a_save)
+{
+ if (!a_cur)
+ return 1 ;
+ if (!a_save)
+ return 0 ;
+ if (a_save->alias_name)
+ memmove (a_cur->alias_name, a_save->alias_name, strlen (a_save->alias_name)) ;
+ if (a_save->font_name)
+ memmove (a_cur->font_name, a_save->font_name, strlen (a_save->font_name)) ;
+ return 0 ;
+}
+
+int
+BuiltinAliasesRestore (BuiltinAliasPtr a_cur_tab,
+ const BuiltinAliasPtr a_saved_tab,
+ int a_tab_len)
+{
+ int i=0 ;
+
+ if (!a_cur_tab)
+ return 1 ;
+ if (!a_saved_tab)
+ return 0 ;
+
+ for (i=0 ; i < a_tab_len; i++) {
+ if (BuiltinAliasRestore (&a_cur_tab[i], &a_saved_tab[i]))
+ return 1 ;
+ }
+ return 0 ;
+}
+
int
BuiltinReadDirectory (char *directory, FontDirectoryPtr *pdir)
{
@@ -36,6 +163,34 @@
int i;
dir = FontFileMakeDir ("", builtin_dir_count);
+ static BuiltinDirPtr saved_builtin_dir ;
+ static BuiltinAliasPtr saved_builtin_alias ;
+
+
+ if (saved_builtin_dir)
+ {
+ BuiltinDirsRestore ((BuiltinDirPtr) builtin_dir,
+ saved_builtin_dir,
+ builtin_dir_count) ;
+ }
+ else
+ {
+ saved_builtin_dir = BuiltinDirsDup ((const BuiltinDirPtr) builtin_dir,
+ builtin_dir_count) ;
+ }
+
+ if (saved_builtin_alias)
+ {
+ BuiltinAliasesRestore ((BuiltinAliasPtr) builtin_alias,
+ saved_builtin_alias,
+ builtin_alias_count) ;
+ }
+ else
+ {
+ saved_builtin_alias = BuiltinAliasesDup ((const BuiltinAliasPtr) builtin_alias,
+ builtin_alias_count) ;
+ }
+
for (i = 0; i < builtin_dir_count; i++)
{
if (!FontFileAddFontFile (dir,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.3.0/src/fontfile/catalogue.c new/libXfont-1.3.1/src/fontfile/catalogue.c
--- old/libXfont-1.3.0/src/fontfile/catalogue.c 2007-06-26 16:34:20.000000000 +0200
+++ new/libXfont-1.3.1/src/fontfile/catalogue.c 2007-09-05 02:18:23.000000000 +0200
@@ -136,6 +136,7 @@
DIR *dir;
struct dirent *entry;
int len;
+ int pathlen;
path = fpe->name + strlen(CataloguePrefix);
if (stat(path, &statbuf) < 0 || !S_ISDIR(statbuf.st_mode))
@@ -159,6 +160,17 @@
if (len < 0)
continue;
+ dest[len] = '\0';
+
+ if (dest[0] != '/')
+ {
+ pathlen = strlen(path);
+ memmove(dest + pathlen + 1, dest, sizeof dest - pathlen - 1);
+ memcpy(dest, path, pathlen);
+ memcpy(dest + pathlen, "/", 1);
+ len += pathlen + 1;
+ }
+
attrib = strchr(link, ':');
if (attrib && len + strlen(attrib) < sizeof dest)
{
@@ -206,6 +218,8 @@
}
}
+ closedir(dir);
+
qsort(cat->fpeList,
cat->fpeCount, sizeof cat->fpeList[0], ComparePriority);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXfont-1.3.0/src/FreeType/fttools.c new/libXfont-1.3.1/src/FreeType/fttools.c
--- old/libXfont-1.3.0/src/FreeType/fttools.c 2007-06-26 16:29:22.000000000 +0200
+++ new/libXfont-1.3.1/src/FreeType/fttools.c 2007-09-05 02:18:22.000000000 +0200
@@ -43,13 +43,6 @@
#include FT_TRUETYPE_IDS_H
#include "ft.h"
-/* backward compatibility hack */
-#if (FREETYPE_VERSION < 2001008)
-# ifndef ft_isdigit
-# define ft_isdigit isdigit
-# endif
-#endif
-
#ifndef LSBFirst
#define LSBFirst 0
#define MSBFirst 1
++++++ libXi-1.1.2.tar.bz2 -> libXi-1.1.3.tar.bz2 ++++++
++++ 17065 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/ChangeLog new/libXi-1.1.3/ChangeLog
--- old/libXi-1.1.2/ChangeLog 2007-08-01 00:37:42.000000000 +0200
+++ new/libXi-1.1.3/ChangeLog 2007-09-05 18:45:33.000000000 +0200
@@ -1,3 +1,54 @@
+commit 0239ef13d66113024066b7db8ade3942af563656
+Author: Eric Anholt
+Date: Wed Sep 5 09:45:20 2007 -0700
+
+ Bump version to 1.1.3.
+
+commit 235b283ef6eda4591c95b4749d0a8cd0181783a6
+Author: James Cloos
+Date: Mon Sep 3 05:53:41 2007 -0400
+
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 89d7e38124cdb34c55f8c28680725b5b645fe106
+Author: Eric S. Raymond
+Date: Sun Jan 14 10:51:00 2007 -0800
+
+ Bug #9659: Bad markup on XListInputDevices.3x
+
+ X.Org Bugzilla #9659 https://bugs.freedesktop.org/show_bug.cgi?id=9659
+
+commit bf01e98979e6fa500f74d882c1b21746c60d5d31
+Author: Daniel Stone
+Date: Wed Aug 1 05:16:45 2007 +0300
+
+ XSetDeviceFocus: Add missing extension check
+
+ Actually check for Xi existing before we try to do anything fancy.
+
+commit 8f5f7e9d6fc288a5cc00df3a7fec44211cdbe8f4
+Author: David Weinehall
+Date: Wed Aug 1 05:12:21 2007 +0300
+
+ XGetSelectedExtensionEvents: Still more locking bugs
+
+ Fix a couple more return-without-unlocks.
+
+commit a07c3cc1eec0427a056414ef44ef6ee4204df383
+Author: Daniel Stone
+Date: Wed Aug 1 03:03:44 2007 +0300
+
+ XChangeDeviceControl: Fix completely broken locking
+
+ Drop the display lock when we exit from XChangeDeviceControl(), instead of
+ leaking it.
+
+commit 7f1b5257b7eb0c873988c33453c110fc5f9996dd
+Author: Daniel Stone
+Date: Wed Aug 1 01:59:17 2007 +0300
+
+ Bump to 1.1.2
+
commit 257345a0500ef0b7cf8e56f19a8bf93721408673
Author: Daniel Stone
Date: Wed Aug 1 01:37:05 2007 +0300
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/configure.ac new/libXi-1.1.3/configure.ac
--- old/libXi-1.1.2/configure.ac 2007-08-01 00:37:13.000000000 +0200
+++ new/libXi-1.1.3/configure.ac 2007-09-05 18:42:33.000000000 +0200
@@ -4,7 +4,7 @@
AC_PREREQ([2.57])
-AC_INIT(libXi, 1.1.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.1.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/man/XListInputDevices.man new/libXi-1.1.3/man/XListInputDevices.man
--- old/libXi-1.1.2/man/XListInputDevices.man 2007-06-30 17:25:37.000000000 +0200
+++ new/libXi-1.1.3/man/XListInputDevices.man 2007-09-05 18:41:58.000000000 +0200
@@ -175,7 +175,7 @@
The XValuatorInfo structure defines the characteristics of the valuators
on the device. It is defined as follows:
.LP
-.DE
+.DS
.nf
typedef struct _XValuatorInfo {
XID class;
@@ -186,7 +186,7 @@
XAxisInfoPtr axes;
} XValuatorInfo;
.fi
-.DS
+.DE
num_axes contains the number of axes the device supports.
.LP
mode is a constant that has one of the following
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/src/XChgDCtl.c new/libXi-1.1.3/src/XChgDCtl.c
--- old/libXi-1.1.2/src/XChgDCtl.c 2007-06-30 17:25:37.000000000 +0200
+++ new/libXi-1.1.3/src/XChgDCtl.c 2007-09-05 18:41:58.000000000 +0200
@@ -104,8 +104,11 @@
UnlockDisplay(dpy);
SyncHandle();
return (NoSuchExtension);
- } else
+ } else {
+ UnlockDisplay(dpy);
+ SyncHandle();
return (rep.status);
+ }
}
case DEVICE_ABS_CALIB:
{
@@ -132,6 +135,8 @@
return NoSuchExtension;
}
else {
+ UnlockDisplay(dpy);
+ SyncHandle();
return rep.status;
}
}
@@ -158,6 +163,8 @@
return NoSuchExtension;
}
else {
+ UnlockDisplay(dpy);
+ SyncHandle();
return rep.status;
}
}
@@ -179,6 +186,8 @@
return NoSuchExtension;
}
else {
+ UnlockDisplay(dpy);
+ SyncHandle();
return rep.status;
}
}
@@ -200,6 +209,8 @@
return NoSuchExtension;
}
else {
+ UnlockDisplay(dpy);
+ SyncHandle();
return rep.status;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/src/XGtSelect.c new/libXi-1.1.3/src/XGtSelect.c
--- old/libXi-1.1.2/src/XGtSelect.c 2007-06-30 17:25:37.000000000 +0200
+++ new/libXi-1.1.3/src/XGtSelect.c 2007-09-05 18:41:58.000000000 +0200
@@ -106,6 +106,8 @@
sizeof(XEventClass));
if (!*this_client_list) {
_XEatData(dpy, (unsigned long)tlen + alen);
+ UnlockDisplay(dpy);
+ SyncHandle();
return (Success);
}
for (i = 0; i < *this_client_count; i++) {
@@ -122,6 +124,8 @@
Xfree((char *)*this_client_list);
*this_client_list = NULL;
_XEatData(dpy, (unsigned long)alen);
+ UnlockDisplay(dpy);
+ SyncHandle();
return (Success);
}
for (i = 0; i < *all_clients_count; i++) {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXi-1.1.2/src/XStFocus.c new/libXi-1.1.3/src/XStFocus.c
--- old/libXi-1.1.2/src/XStFocus.c 2007-06-30 17:25:37.000000000 +0200
+++ new/libXi-1.1.3/src/XStFocus.c 2007-09-05 18:41:58.000000000 +0200
@@ -72,6 +72,8 @@
XExtDisplayInfo *info = XInput_find_display(dpy);
LockDisplay(dpy);
+ if (_XiCheckExtInit(dpy, XInput_Initial_Release, info) == -1)
+ return (NoSuchExtension);
GetReq(SetDeviceFocus, req);
req->reqType = info->codes->major_opcode;
++++++ libXrandr-1.2.1.tar.bz2 -> libXrandr-1.2.2.tar.bz2 ++++++
++++ 19571 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.1/config.h.in new/libXrandr-1.2.2/config.h.in
--- old/libXrandr-1.2.1/config.h.in 2007-03-05 05:02:32.000000000 +0100
+++ new/libXrandr-1.2.2/config.h.in 2007-09-05 19:01:23.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.1/configure.ac new/libXrandr-1.2.2/configure.ac
--- old/libXrandr-1.2.1/configure.ac 2007-03-05 05:01:44.000000000 +0100
+++ new/libXrandr-1.2.2/configure.ac 2007-09-05 19:00:57.000000000 +0200
@@ -32,7 +32,7 @@
dnl digit in the version number to track changes which don't affect the
dnl protocol, so Xrandr version l.n.m corresponds to protocol version l.n
dnl
-AC_INIT(libXrandr, 1.2.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
+AC_INIT(libXrandr, 1.2.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXrandr)
AC_CONFIG_AUX_DIR(.)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.1/missing new/libXrandr-1.2.2/missing
--- old/libXrandr-1.2.1/missing 2006-04-13 23:12:34.000000000 +0200
+++ new/libXrandr-1.2.2/missing 2007-09-05 19:01:24.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXrandr-1.2.1/src/Xrandr.c new/libXrandr-1.2.2/src/Xrandr.c
--- old/libXrandr-1.2.1/src/Xrandr.c 2006-12-13 10:24:25.000000000 +0100
+++ new/libXrandr-1.2.2/src/Xrandr.c 2007-09-05 18:56:56.000000000 +0200
@@ -116,7 +116,7 @@
aevent->rotation = awire->rotation;
aevent->x = awire->x;
aevent->y = awire->y;
- aevent->width = awire->height;
+ aevent->width = awire->width;
aevent->height = awire->height;
return True;
}
@@ -191,7 +191,7 @@
awire->rotation = aevent->rotation;
awire->x = aevent->x;
awire->y = aevent->y;
- awire->width = aevent->height;
+ awire->width = aevent->width;
awire->height = aevent->height;
return True;
}
++++++ libXxf86dga-X11R7.1-1.0.1.tar.bz2 -> libXxf86dga-1.0.2.tar.bz2 ++++++
++++ 27518 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86dga-X11R7.1-1.0.1/configure.ac new/libXxf86dga-1.0.2/configure.ac
--- old/libXxf86dga-X11R7.1-1.0.1/configure.ac 2006-04-27 02:25:08.000000000 +0200
+++ new/libXxf86dga-1.0.2/configure.ac 2007-09-05 19:17:40.000000000 +0200
@@ -1,6 +1,6 @@
AC_PREREQ([2.57])
-AC_INIT(libXxf86dga, 1.0.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
+AC_INIT(libXxf86dga, 1.0.2, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXxf86dga)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -11,7 +11,7 @@
AC_PROG_LIBTOOL
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext xf86dgaproto)
+PKG_CHECK_MODULES(XXF86DGA, xproto x11 xextproto xext [xf86dgaproto >= 2.0.3])
XORG_CHECK_MALLOC_ZERO
XORG_MANPAGE_SECTIONS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86dga-X11R7.1-1.0.1/man/Makefile.am new/libXxf86dga-1.0.2/man/Makefile.am
--- old/libXxf86dga-X11R7.1-1.0.1/man/Makefile.am 2006-02-12 19:19:23.000000000 +0100
+++ new/libXxf86dga-1.0.2/man/Makefile.am 2007-09-05 19:05:56.000000000 +0200
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.6 2005/12/06 22:48:45 kem Exp $
+# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86dga-X11R7.1-1.0.1/missing new/libXxf86dga-1.0.2/missing
--- old/libXxf86dga-X11R7.1-1.0.1/missing 2006-05-22 03:45:03.000000000 +0200
+++ new/libXxf86dga-1.0.2/missing 2007-09-05 19:18:18.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2005-06-08.21
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,6 +33,8 @@
fi
run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -44,7 +46,7 @@
msg="missing on your system"
-case "$1" in
+case $1 in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -77,6 +79,7 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -106,7 +109,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case "$1" in
+case $1 in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -135,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case "$1" in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -164,7 +167,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case "$f" in
+ case $f in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -192,8 +195,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -f "$file"; then
touch $file
else
@@ -214,25 +217,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if [ ! -f y.tab.h ]; then
+ if test ! -f y.tab.h; then
echo >y.tab.h
fi
- if [ ! -f y.tab.c ]; then
+ if test ! -f y.tab.c; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -244,18 +247,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if [ $# -ne 1 ]; then
+ if test $# -ne 1; then
eval LASTARG="\${$#}"
- case "$LASTARG" in
+ case $LASTARG in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if [ -f "$SRCFILE" ]; then
+ if test -f "$SRCFILE"; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if [ ! -f lex.yy.c ]; then
+ if test ! -f lex.yy.c; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -267,11 +270,9 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
- if test -z "$file"; then
- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
- fi
- if [ -f "$file" ]; then
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
touch $file
else
test -z "$file" || exec >$file
@@ -289,11 +290,17 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -317,13 +324,13 @@
fi
firstarg="$1"
if shift; then
- case "$firstarg" in
+ case $firstarg in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case "$firstarg" in
+ case $firstarg in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86dga-X11R7.1-1.0.1/src/config.h.in new/libXxf86dga-1.0.2/src/config.h.in
--- old/libXxf86dga-X11R7.1-1.0.1/src/config.h.in 2006-05-22 03:45:01.000000000 +0200
+++ new/libXxf86dga-1.0.2/src/config.h.in 2007-09-05 19:18:17.000000000 +0200
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libXxf86dga-X11R7.1-1.0.1/src/XF86DGA.c new/libXxf86dga-1.0.2/src/XF86DGA.c
--- old/libXxf86dga-X11R7.1-1.0.1/src/XF86DGA.c 2005-11-08 07:33:25.000000000 +0100
+++ new/libXxf86dga-1.0.2/src/XF86DGA.c 2007-09-05 19:05:56.000000000 +0200
@@ -98,7 +98,7 @@
Bool XF86DGAGetVideoLL(
Display* dpy,
int screen,
- int *offset,
+ unsigned int *offset,
int *width,
int *bank_size,
int *ram_size
@@ -120,7 +120,7 @@
return False;
}
- *offset = /*(char *)*/rep.offset;
+ *offset = rep.offset;
*width = rep.width;
*bank_size = rep.bank_size;
*ram_size = rep.ram_size;
@@ -678,7 +678,7 @@
int *bank,
int *ram
){
- /*unsigned long*/ int offset;
+ unsigned int offset;
static int beenHere = 0;
ScrPtr sp;
MapPtr mp;
++++++ pixman-0.9.4.tar.bz2 -> pixman-0.9.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/configure new/pixman-0.9.5/configure
--- old/pixman-0.9.4/configure 2007-08-06 23:26:46.000000000 +0200
+++ new/pixman-0.9.5/configure 2007-08-17 23:23:21.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for pixman 0.9.4.
+# Generated by GNU Autoconf 2.61 for pixman 0.9.5.
#
# Report bugs to <"sandmann@daimi.au.dk">.
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='pixman'
PACKAGE_TARNAME='pixman'
-PACKAGE_VERSION='0.9.4'
-PACKAGE_STRING='pixman 0.9.4'
+PACKAGE_VERSION='0.9.5'
+PACKAGE_STRING='pixman 0.9.5'
PACKAGE_BUGREPORT='"sandmann@daimi.au.dk"'
# Factoring default headers for most tests.
@@ -870,7 +870,7 @@
FFLAGS
ac_ct_F77
LIBTOOL
-AC_MAJOR
+PIXMAN_MAJOR
LT_VERSION_INFO
MMX_CFLAGS
USE_MMX_TRUE
@@ -1405,7 +1405,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures pixman 0.9.4 to adapt to many kinds of systems.
+\`configure' configures pixman 0.9.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1475,7 +1475,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of pixman 0.9.4:";;
+ short | recursive ) echo "Configuration of pixman 0.9.5:";;
esac
cat <<\_ACEOF
@@ -1580,7 +1580,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-pixman configure 0.9.4
+pixman configure 0.9.5
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1594,7 +1594,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by pixman $as_me 0.9.4, which was
+It was created by pixman $as_me 0.9.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2284,7 +2284,7 @@
# Define the identity of the package.
PACKAGE='pixman'
- VERSION='0.9.4'
+ VERSION='0.9.5'
cat >>confdefs.h <<_ACEOF
@@ -19618,7 +19618,7 @@
-LT_VERSION_INFO="9:4:9"
+LT_VERSION_INFO="9:5:9"
PIXMAN_MAJOR=0
@@ -20343,7 +20343,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by pixman $as_me 0.9.4, which was
+This file was extended by pixman $as_me 0.9.5, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20396,7 +20396,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-pixman config.status 0.9.4
+pixman config.status 0.9.5
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -20721,7 +20721,7 @@
FFLAGS!$FFLAGS$ac_delim
ac_ct_F77!$ac_ct_F77$ac_delim
LIBTOOL!$LIBTOOL$ac_delim
-AC_MAJOR!$AC_MAJOR$ac_delim
+PIXMAN_MAJOR!$PIXMAN_MAJOR$ac_delim
LT_VERSION_INFO!$LT_VERSION_INFO$ac_delim
MMX_CFLAGS!$MMX_CFLAGS$ac_delim
USE_MMX_TRUE!$USE_MMX_TRUE$ac_delim
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/configure.ac new/pixman-0.9.5/configure.ac
--- old/pixman-0.9.4/configure.ac 2007-08-06 23:26:38.000000000 +0200
+++ new/pixman-0.9.5/configure.ac 2007-08-17 23:23:06.000000000 +0200
@@ -42,7 +42,7 @@
m4_define([pixman_major], 0)
m4_define([pixman_minor], 9)
-m4_define([pixman_micro], 4)
+m4_define([pixman_micro], 5)
m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
@@ -69,7 +69,7 @@
LT_VERSION_INFO="lt_current:lt_revision:lt_age"
PIXMAN_MAJOR=pixman_major
-AC_SUBST(AC_MAJOR)
+AC_SUBST(PIXMAN_MAJOR)
AC_SUBST(LT_VERSION_INFO)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/Makefile.in new/pixman-0.9.5/Makefile.in
--- old/pixman-0.9.4/Makefile.in 2007-08-06 23:26:45.000000000 +0200
+++ new/pixman-0.9.5/Makefile.in 2007-08-17 23:23:20.000000000 +0200
@@ -82,7 +82,6 @@
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
ACLOCAL = @ACLOCAL@
-AC_MAJOR = @AC_MAJOR@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -137,6 +136,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_MAJOR = @PIXMAN_MAJOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/Makefile.in new/pixman-0.9.5/pixman/Makefile.in
--- old/pixman-0.9.4/pixman/Makefile.in 2007-08-06 23:26:45.000000000 +0200
+++ new/pixman-0.9.5/pixman/Makefile.in 2007-08-17 23:23:20.000000000 +0200
@@ -108,7 +108,6 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AC_MAJOR = @AC_MAJOR@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -163,6 +162,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_MAJOR = @PIXMAN_MAJOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-compose.c new/pixman-0.9.5/pixman/pixman-compose.c
--- old/pixman-0.9.4/pixman/pixman-compose.c 2007-07-16 21:05:16.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-compose.c 2007-08-15 19:24:47.000000000 +0200
@@ -134,7 +134,7 @@
const uint32_t *pixel = (const uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, READ(pixel++) | 0xff000000);
+ *buffer++ = READ(pixel++) | 0xff000000;
}
}
@@ -145,10 +145,10 @@
const uint32_t *pixel = (uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, ((READ(pixel) & 0xff00ff00) |
- ((READ(pixel) >> 16) & 0xff) |
- ((READ(pixel) & 0xff) << 16)));
- ++pixel;
+ uint32_t p = READ(pixel++);
+ *buffer++ = (p & 0xff00ff00) |
+ ((p >> 16) & 0xff) |
+ ((p & 0xff) << 16);
}
}
@@ -159,11 +159,11 @@
const uint32_t *pixel = (uint32_t *)bits + x;
const uint32_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, 0xff000000 |
- ((READ(pixel) & 0x0000ff00) |
- ((READ(pixel) >> 16) & 0xff) |
- ((READ(pixel) & 0xff) << 16)));
- ++pixel;
+ uint32_t p = READ(pixel++);
+ *buffer++ = 0xff000000 |
+ (p & 0x0000ff00) |
+ ((p >> 16) & 0xff) |
+ ((p & 0xff) << 16);
}
}
@@ -176,7 +176,7 @@
while (pixel < end) {
uint32_t b = Fetch24(pixel) | 0xff000000;
pixel += 3;
- WRITE(buffer++, b);
+ *buffer++ = b;
}
}
@@ -197,7 +197,7 @@
b |= (READ(pixel++) << 8);
b |= (READ(pixel++));
#endif
- WRITE(buffer++, b);
+ *buffer++ = b;
}
}
@@ -209,13 +209,13 @@
const uint16_t *pixel = (const uint16_t *)bits + x;
const uint16_t *end = pixel + width;
while (pixel < end) {
- uint32_t p = READ(pixel++);
+ uint32_t p = READ(pixel++);
uint32_t r = (((p) << 3) & 0xf8) |
(((p) << 5) & 0xfc00) |
(((p) << 8) & 0xf80000);
r |= (r >> 5) & 0x70007;
r |= (r >> 6) & 0x300;
- WRITE(buffer++, 0xff000000 | r);
+ *buffer++ = 0xff000000 | r;
}
}
@@ -233,7 +233,7 @@
b = ((p & 0xf800) | ((p & 0xe000) >> 5)) >> 8;
g = ((p & 0x07e0) | ((p & 0x0600) >> 6)) << 5;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -252,7 +252,7 @@
r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -270,7 +270,7 @@
r = ((p & 0x7c00) | ((p & 0x7000) >> 5)) << 9;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
b = ((p & 0x001c) | ((p & 0x001f) << 5)) >> 2;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -289,7 +289,7 @@
b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -307,7 +307,7 @@
b = ((p & 0x7c00) | ((p & 0x7000) >> 5)) >> 7;
g = ((p & 0x03e0) | ((p & 0x0380) >> 5)) << 6;
r = ((p & 0x001c) | ((p & 0x001f) << 5)) << 14;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -325,7 +325,7 @@
r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
b = ((p & 0x000f) | ((p & 0x000f) << 4));
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -343,7 +343,7 @@
r = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) << 12;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
b = ((p & 0x000f) | ((p & 0x000f) << 4));
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -362,7 +362,7 @@
b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
- WRITE(buffer++, (a | r | g | b));
+ *buffer++ = a | r | g | b;
}
}
@@ -380,7 +380,7 @@
b = ((p & 0x0f00) | ((p & 0x0f00) >> 4)) >> 4;
g = ((p & 0x00f0) | ((p & 0x00f0) >> 4)) << 8;
r = ((p & 0x000f) | ((p & 0x000f) << 4)) << 16;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -391,7 +391,7 @@
const uint8_t *pixel = (const uint8_t *)bits + x;
const uint8_t *end = pixel + width;
while (pixel < end) {
- WRITE(buffer++, READ(pixel++) << 24);
+ *buffer++ = READ(pixel++) << 24;
}
}
@@ -412,7 +412,7 @@
((p & 0x03) << 2) |
((p & 0x03) << 4) |
((p & 0x03) << 6));
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -435,7 +435,7 @@
r = (((p & 0x07) ) |
((p & 0x07) << 3) |
((p & 0x06) << 6)) << 16;
- WRITE(buffer++, (0xff000000 | r | g | b));
+ *buffer++ = 0xff000000 | r | g | b;
}
}
@@ -453,7 +453,7 @@
r = ((p & 0x30) * 0x55) << 12;
g = ((p & 0x0c) * 0x55) << 6;
b = ((p & 0x03) * 0x55);
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -471,7 +471,7 @@
b = ((p & 0x30) * 0x55) >> 6;
g = ((p & 0x0c) * 0x55) << 6;
r = ((p & 0x03) * 0x55) << 16;
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -483,7 +483,7 @@
const uint8_t *end = pixel + width;
while (pixel < end) {
uint32_t p = READ(pixel++);
- WRITE(buffer++, indexed->rgba[p]);
+ *buffer++ = indexed->rgba[p];
}
}
@@ -495,11 +495,11 @@
const uint8_t *end = pixel + width;
while (pixel < end) {
uint8_t p = READ(pixel++) & 0xf;
- WRITE(buffer++, (p | (p << 4)) << 24);
+ *buffer++ = (p | (p << 4)) << 24;
}
}
-#define Fetch8(l,o) (((uint8_t *) (l))[(o) >> 2])
+#define Fetch8(l,o) (READ((uint8_t *)(l) + ((o) >> 2)))
#if IMAGE_BYTE_ORDER == MSBFirst
#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
#else
@@ -515,7 +515,7 @@
uint32_t p = Fetch4(bits, i + x);
p |= p << 4;
- WRITE(buffer++, p << 24);
+ *buffer++ = p << 24;
}
}
@@ -531,7 +531,7 @@
r = ((p & 0x8) * 0xff) << 13;
g = ((p & 0x6) * 0x55) << 7;
b = ((p & 0x1) * 0xff);
- WRITE(buffer++, 0xff000000|r|g|b);
+ *buffer++ = 0xff000000|r|g|b;
}
}
@@ -547,7 +547,7 @@
b = ((p & 0x8) * 0xff) >> 3;
g = ((p & 0x6) * 0x55) << 7;
r = ((p & 0x1) * 0xff) << 16;
- WRITE(buffer++, 0xff000000|r|g|b);
+ *buffer++ = 0xff000000|r|g|b;
}
}
@@ -564,7 +564,7 @@
r = ((p & 0x4) * 0xff) << 14;
g = ((p & 0x2) * 0xff) << 7;
b = ((p & 0x1) * 0xff);
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -581,7 +581,7 @@
r = ((p & 0x4) * 0xff) >> 3;
g = ((p & 0x2) * 0xff) << 7;
b = ((p & 0x1) * 0xff) << 16;
- WRITE(buffer++, a|r|g|b);
+ *buffer++ = a|r|g|b;
}
}
@@ -593,7 +593,7 @@
for (i = 0; i < width; ++i) {
uint32_t p = Fetch4(bits, i + x);
- WRITE(buffer++, indexed->rgba[p]);
+ *buffer++ = indexed->rgba[p];
}
}
@@ -604,7 +604,7 @@
{
int i;
for (i = 0; i < width; ++i) {
- uint32_t p = ((uint32_t *)bits)[(i + x) >> 5];
+ uint32_t p = READ(bits + ((i + x) >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = p >> (0x1f - ((i+x) & 0x1f));
@@ -615,7 +615,7 @@
a |= a << 1;
a |= a << 2;
a |= a << 4;
- WRITE(buffer++, a << 24);
+ *buffer++ = a << 24;
}
}
@@ -625,7 +625,7 @@
{
int i;
for (i = 0; i < width; ++i) {
- uint32_t p = ((uint32_t *)bits)[(i+x) >> 5];
+ uint32_t p = READ(bits + ((i+x) >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = p >> (0x1f - ((i+x) & 0x1f));
@@ -633,7 +633,7 @@
a = p >> ((i+x) & 0x1f);
#endif
a = a & 1;
- WRITE(buffer++, indexed->rgba[a]);
+ *buffer++ = indexed->rgba[a];
}
}
@@ -993,13 +993,6 @@
return ((pixel & 0xf) | ((pixel & 0xf) << 4)) << 24;
}
-#define Fetch8(l,o) (((uint8_t *) (l))[(o) >> 2])
-#if IMAGE_BYTE_ORDER == MSBFirst
-#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) & 0xf : Fetch8(l,o) >> 4)
-#else
-#define Fetch4(l,o) ((o) & 2 ? Fetch8(l,o) >> 4 : Fetch8(l,o) & 0xf)
-#endif
-
static FASTCALL uint32_t
fbFetchPixel_a4 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
@@ -1078,7 +1071,7 @@
fbFetchPixel_a1 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
{
- uint32_t pixel = ((uint32_t *)bits)[offset >> 5];
+ uint32_t pixel = READ(bits + (offset >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
@@ -1096,7 +1089,7 @@
fbFetchPixel_g1 (pixman_image_t *image,
const uint32_t *bits, int offset, const pixman_indexed_t * indexed)
{
- uint32_t pixel = ((uint32_t *)bits)[offset >> 5];
+ uint32_t pixel = READ(bits + (offset >> 5));
uint32_t a;
#if BITMAP_BIT_ORDER == MSBFirst
a = pixel >> (0x1f - (offset & 0x1f));
@@ -1185,7 +1178,7 @@
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, READ(values + i) & 0xffffff);
+ WRITE(pixel++, values[i] & 0xffffff);
}
static FASTCALL void
@@ -1195,7 +1188,7 @@
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, (READ(values + i) & 0xff00ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
+ WRITE(pixel++, (values[i] & 0xff00ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
}
static FASTCALL void
@@ -1205,7 +1198,7 @@
int i;
uint32_t *pixel = (uint32_t *)bits + x;
for (i = 0; i < width; ++i)
- WRITE(pixel++, (READ(values + i) & 0x0000ff00) | ((READ(values + i) >> 16) & 0xff) | ((READ(values + i) & 0xff) << 16));
+ WRITE(pixel++, (values[i] & 0x0000ff00) | ((values[i] >> 16) & 0xff) | ((values[i] & 0xff) << 16));
}
static FASTCALL void
@@ -1216,7 +1209,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + 3*x;
for (i = 0; i < width; ++i) {
- Store24(pixel, READ(values + i));
+ Store24(pixel, values[i]);
pixel += 3;
}
}
@@ -1228,7 +1221,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + 3*x;
for (i = 0; i < width; ++i) {
- uint32_t val = READ(values + i);
+ uint32_t val = values[i];
#if IMAGE_BYTE_ORDER == MSBFirst
WRITE(pixel++, Blue(val));
WRITE(pixel++, Green(val));
@@ -1248,7 +1241,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- uint32_t s = READ(values + i);
+ uint32_t s = values[i];
WRITE(pixel++, ((s >> 3) & 0x001f) |
((s >> 5) & 0x07e0) |
((s >> 8) & 0xf800));
@@ -1262,7 +1255,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 8) & 0xf800) |
((g << 3) & 0x07e0) |
((r >> 3) ));
@@ -1276,7 +1269,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0x8000) |
((r << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
@@ -1291,7 +1284,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((r << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
((b >> 3) ));
@@ -1305,7 +1298,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0x8000) |
((b << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
@@ -1320,7 +1313,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 7) & 0x7c00) |
((g << 2) & 0x03e0) |
((r >> 3) ));
@@ -1334,7 +1327,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0xf000) |
((r << 4) & 0x0f00) |
((g ) & 0x00f0) |
@@ -1349,7 +1342,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((r << 4) & 0x0f00) |
((g ) & 0x00f0) |
((b >> 4) ));
@@ -1363,7 +1356,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a << 8) & 0xf000) |
((b << 4) & 0x0f00) |
((g ) & 0x00f0) |
@@ -1378,7 +1371,7 @@
int i;
uint16_t *pixel = ((uint16_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++, ((b << 4) & 0x0f00) |
((g ) & 0x00f0) |
((r >> 4) ));
@@ -1392,7 +1385,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, READ(values + i) >> 24);
+ WRITE(pixel++, values[i] >> 24);
}
}
@@ -1403,7 +1396,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++,
((r ) & 0xe0) |
((g >> 3) & 0x1c) |
@@ -1418,7 +1411,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Split(READ(values + i));
+ Split(values[i]);
WRITE(pixel++,
((b ) & 0xc0) |
((g >> 2) & 0x1c) |
@@ -1433,7 +1426,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- Splita(READ(values + i));
+ Splita(values[i]);
WRITE(pixel++, ((a ) & 0xc0) |
((r >> 2) & 0x30) |
((g >> 4) & 0x0c) |
@@ -1448,7 +1441,7 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, miIndexToEnt24(indexed,READ(values + i)));
+ WRITE(pixel++, miIndexToEnt24(indexed,values[i]));
}
}
@@ -1459,11 +1452,11 @@
int i;
uint8_t *pixel = ((uint8_t *) bits) + x;
for (i = 0; i < width; ++i) {
- WRITE(pixel++, READ(values + i) >> 28);
+ WRITE(pixel++, values[i] >> 28);
}
}
-#define Store8(l,o,v) (((uint8_t *) l)[(o) >> 3] = (v))
+#define Store8(l,o,v) (WRITE((uint8_t *)(l) + ((o) >> 3), (v)))
#if IMAGE_BYTE_ORDER == MSBFirst
#define Store4(l,o,v) Store8(l,o,((o) & 4 ? \
(Fetch8(l,o) & 0xf0) | (v) : \
@@ -1480,7 +1473,7 @@
{
int i;
for (i = 0; i < width; ++i) {
- Store4(bits, i + x, READ(values + i)>>28);
+ Store4(bits, i + x, values[i]>>28);
}
}
@@ -1492,7 +1485,7 @@
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Split(READ(values + i));
+ Split(values[i]);
pixel = (((r >> 4) & 0x8) |
((g >> 5) & 0x6) |
((b >> 7) ));
@@ -1508,7 +1501,7 @@
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Split(READ(values + i));
+ Split(values[i]);
pixel = (((b >> 4) & 0x8) |
((g >> 5) & 0x6) |
((r >> 7) ));
@@ -1523,7 +1516,7 @@
int i;
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Splita(READ(values + i));
+ Splita(values[i]);
pixel = (((a >> 4) & 0x8) |
((r >> 5) & 0x4) |
((g >> 6) & 0x2) |
@@ -1539,7 +1532,7 @@
int i;
for (i = 0; i < width; ++i) {
uint32_t pixel;
- Splita(READ(values + i));
+ Splita(values[i]);
pixel = (((a >> 4) & 0x8) |
((b >> 5) & 0x4) |
((g >> 6) & 0x2) |
@@ -1556,7 +1549,7 @@
for (i = 0; i < width; ++i) {
uint32_t pixel;
- pixel = miIndexToEnt24(indexed, READ(values + i));
+ pixel = miIndexToEnt24(indexed, values[i]);
Store4(bits, i + x, pixel);
}
}
@@ -1570,7 +1563,7 @@
uint32_t *pixel = ((uint32_t *) bits) + ((i+x) >> 5);
uint32_t mask = FbStipMask((i+x) & 0x1f, 1);
- uint32_t v = READ(values + i) & 0x80000000 ? mask : 0;
+ uint32_t v = values[i] & 0x80000000 ? mask : 0;
WRITE(pixel, (READ(pixel) & ~mask) | v);
}
}
@@ -1584,7 +1577,7 @@
uint32_t *pixel = ((uint32_t *) bits) + ((i+x) >> 5);
uint32_t mask = FbStipMask((i+x) & 0x1f, 1);
- uint32_t v = miIndexToEntY24(indexed,READ(values + i)) ? mask : 0;
+ uint32_t v = miIndexToEntY24(indexed,values[i]) ? mask : 0;
WRITE(pixel, (READ(pixel) & ~mask) | v);
}
}
@@ -4257,6 +4250,7 @@
case PIXMAN_OP_CLEAR:
case PIXMAN_OP_SRC:
fetchDest = NULL;
+#ifndef PIXMAN_FB_ACCESSORS
/* fall-through */
case PIXMAN_OP_ADD:
case PIXMAN_OP_OVER:
@@ -4268,6 +4262,7 @@
default:
break;
}
+#endif
break;
}
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-edge.c new/pixman-0.9.5/pixman/pixman-edge.c
--- old/pixman-0.9.4/pixman/pixman-edge.c 2007-07-16 21:05:51.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-edge.c 2007-08-30 02:57:34.000000000 +0200
@@ -129,7 +129,7 @@
int fill_size = 0;
uint32_t *buf = (image)->bits.bits;
int32_t stride = (image)->bits.rowstride;
- uint32_t width = (image)->bits.width;
+ int32_t width = (image)->bits.width;
line = buf + pixman_fixed_to_int (y) * stride;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-edge-imp.h new/pixman-0.9.5/pixman/pixman-edge-imp.h
--- old/pixman-0.9.4/pixman/pixman-edge-imp.h 2007-06-17 08:41:31.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-edge-imp.h 2007-08-30 02:57:34.000000000 +0200
@@ -35,8 +35,8 @@
pixman_fixed_t y = t;
uint32_t *line;
uint32_t *buf = (image)->bits.bits;
- uint32_t stride = (image)->bits.rowstride;
- uint32_t width = (image)->bits.width;
+ int32_t stride = (image)->bits.rowstride;
+ int32_t width = (image)->bits.width;
line = buf + pixman_fixed_to_int (y) * stride;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman.h new/pixman-0.9.5/pixman/pixman.h
--- old/pixman-0.9.4/pixman/pixman.h 2007-08-07 00:11:20.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman.h 2007-08-30 02:57:34.000000000 +0200
@@ -182,20 +182,46 @@
typedef enum
{
- PIXMAN_OP_CLEAR,
- PIXMAN_OP_SRC,
- PIXMAN_OP_DST,
- PIXMAN_OP_OVER,
- PIXMAN_OP_OVER_REVERSE,
- PIXMAN_OP_IN,
- PIXMAN_OP_IN_REVERSE,
- PIXMAN_OP_OUT,
- PIXMAN_OP_OUT_REVERSE,
- PIXMAN_OP_ATOP,
- PIXMAN_OP_ATOP_REVERSE,
- PIXMAN_OP_XOR,
- PIXMAN_OP_ADD,
- PIXMAN_OP_SATURATE
+ PIXMAN_OP_CLEAR = 0x00,
+ PIXMAN_OP_SRC = 0x01,
+ PIXMAN_OP_DST = 0x02,
+ PIXMAN_OP_OVER = 0x03,
+ PIXMAN_OP_OVER_REVERSE = 0x04,
+ PIXMAN_OP_IN = 0x05,
+ PIXMAN_OP_IN_REVERSE = 0x06,
+ PIXMAN_OP_OUT = 0x07,
+ PIXMAN_OP_OUT_REVERSE = 0x08,
+ PIXMAN_OP_ATOP = 0x09,
+ PIXMAN_OP_ATOP_REVERSE = 0x0a,
+ PIXMAN_OP_XOR = 0x0b,
+ PIXMAN_OP_ADD = 0x0c,
+ PIXMAN_OP_SATURATE = 0x0d,
+
+ PIXMAN_OP_DISJOINT_CLEAR = 0x10,
+ PIXMAN_OP_DISJOINT_SRC = 0x11,
+ PIXMAN_OP_DISJOINT_DST = 0x12,
+ PIXMAN_OP_DISJOINT_OVER = 0x13,
+ PIXMAN_OP_DISJOINT_OVER_REVERSE = 0x14,
+ PIXMAN_OP_DISJOINT_IN = 0x15,
+ PIXMAN_OP_DISJOINT_IN_REVERSE = 0x16,
+ PIXMAN_OP_DISJOINT_OUT = 0x17,
+ PIXMAN_OP_DISJOINT_OUT_REVERSE = 0x18,
+ PIXMAN_OP_DISJOINT_ATOP = 0x19,
+ PIXMAN_OP_DISJOINT_ATOP_REVERSE = 0x1a,
+ PIXMAN_OP_DISJOINT_XOR = 0x1b,
+
+ PIXMAN_OP_CONJOINT_CLEAR = 0x20,
+ PIXMAN_OP_CONJOINT_SRC = 0x21,
+ PIXMAN_OP_CONJOINT_DST = 0x22,
+ PIXMAN_OP_CONJOINT_OVER = 0x23,
+ PIXMAN_OP_CONJOINT_OVER_REVERSE = 0x24,
+ PIXMAN_OP_CONJOINT_IN = 0x25,
+ PIXMAN_OP_CONJOINT_IN_REVERSE = 0x26,
+ PIXMAN_OP_CONJOINT_OUT = 0x27,
+ PIXMAN_OP_CONJOINT_OUT_REVERSE = 0x28,
+ PIXMAN_OP_CONJOINT_ATOP = 0x29,
+ PIXMAN_OP_CONJOINT_ATOP_REVERSE = 0x2a,
+ PIXMAN_OP_CONJOINT_XOR = 0x2b
} pixman_op_t;
/*
@@ -278,8 +304,10 @@
pixman_bool_t pixman_region_inverse (pixman_region16_t *newReg,
pixman_region16_t *reg1,
pixman_box16_t *invRect);
-pixman_bool_t pixman_region_contains_point (pixman_region16_t *region, int x, int y, pixman_box16_t *box);
-pixman_region_overlap_t pixman_region_contains_rectangle (pixman_region16_t *pixman_region16_t, pixman_box16_t *prect);
+pixman_bool_t pixman_region_contains_point (pixman_region16_t *region,
+ int x, int y, pixman_box16_t *box);
+pixman_region_overlap_t pixman_region_contains_rectangle (pixman_region16_t *pixman_region16_t,
+ pixman_box16_t *prect);
pixman_bool_t pixman_region_not_empty (pixman_region16_t *region);
pixman_box16_t * pixman_region_extents (pixman_region16_t *region);
int pixman_region_n_rects (pixman_region16_t *region);
@@ -288,7 +316,7 @@
pixman_bool_t pixman_region_equal (pixman_region16_t *region1,
pixman_region16_t *region2);
pixman_bool_t pixman_region_selfcheck (pixman_region16_t *region);
-void pixman_region_reset(pixman_region16_t *region, pixman_box16_t *box);
+void pixman_region_reset (pixman_region16_t *region, pixman_box16_t *box);
pixman_bool_t pixman_region_init_rects (pixman_region16_t *region,
pixman_box16_t *boxes, int count);
@@ -470,6 +498,8 @@
void pixman_image_set_filter_params (pixman_image_t *image,
pixman_fixed_t *params,
int n_params);
+void pixman_image_set_source_cliping (pixman_image_t *image,
+ pixman_bool_t source_clipping);
void pixman_image_set_alpha_map (pixman_image_t *image,
pixman_image_t *alpha_map,
int16_t x,
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-image.c new/pixman-0.9.5/pixman/pixman-image.c
--- old/pixman-0.9.4/pixman/pixman-image.c 2007-08-07 00:11:20.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-image.c 2007-08-21 22:31:45.000000000 +0200
@@ -403,25 +403,17 @@
if (memcmp (&id, transform, sizeof (pixman_transform_t)) == 0)
{
- transform = NULL;
+ free(common->transform);
+ common->transform = NULL;
return TRUE;
}
- if (common->transform)
- free (common->transform);
-
- if (transform)
- {
+ if (common->transform == NULL)
common->transform = malloc (sizeof (pixman_transform_t));
- if (!common->transform)
- return FALSE;
+ if (common->transform == NULL)
+ return FALSE;
- *common->transform = *transform;
- }
- else
- {
- common->transform = NULL;
- }
+ memcpy(common->transform, transform, sizeof(pixman_transform_t));
return TRUE;
}
@@ -466,6 +458,18 @@
return TRUE;
}
+void
+pixman_image_set_source_clipping (pixman_image_t *image,
+ pixman_bool_t source_clipping)
+{
+ image_common_t *common = &image->common;
+
+ if (source_clipping)
+ common->src_clip = &common->clip_region;
+ else
+ common->src_clip = &common->full_region;
+}
+
/* Unlike all the other property setters, this function does not
* copy the content of indexed. Doing this copying is simply
* way, way too expensive.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-private.h new/pixman-0.9.5/pixman/pixman-private.h
--- old/pixman-0.9.4/pixman/pixman-private.h 2007-07-16 21:05:16.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-private.h 2007-08-30 02:57:34.000000000 +0200
@@ -630,7 +630,7 @@
do { \
size_t _i; \
uint8_t *_dst = (uint8_t*)(dst); \
- for(_i = 0; _i < size; _i++) { \
+ for(_i = 0; _i < (size_t) size; _i++) { \
WRITE(_dst +_i, (val)); \
} \
} while (0)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman/pixman-region.c new/pixman-0.9.5/pixman/pixman-region.c
--- old/pixman-0.9.4/pixman/pixman-region.c 2007-07-16 21:05:16.000000000 +0200
+++ new/pixman-0.9.5/pixman/pixman-region.c 2007-08-18 01:37:42.000000000 +0200
@@ -1507,6 +1507,8 @@
box = PIXREGION_BOXPTR(&ri[0].reg);
ri[0].reg.extents = *box;
ri[0].reg.data->numRects = 1;
+ badreg->extents = *pixman_region_emptyBox;
+ badreg->data = pixman_region_emptyData;
/* Now scatter rectangles into the minimum set of valid regions. If the
next rectangle to be added to a region would force an existing rectangle
@@ -1620,6 +1622,8 @@
freeData(hreg);
}
numRI -= half;
+ if (!ret)
+ goto bail;
}
*badreg = ri[0].reg;
free(ri);
@@ -1629,6 +1633,7 @@
for (i = 0; i < numRI; i++)
freeData(&ri[i].reg);
free (ri);
+
return pixman_break (badreg);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/pixman-1.pc.in new/pixman-0.9.5/pixman-1.pc.in
--- old/pixman-0.9.4/pixman-1.pc.in 2007-08-06 22:57:15.000000000 +0200
+++ new/pixman-0.9.5/pixman-1.pc.in 2007-08-15 19:24:47.000000000 +0200
@@ -7,5 +7,5 @@
Description: The pixman library (version 1)
Version: @PACKAGE_VERSION@
Cflags: -I${includedir}/pixman-1 @DEP_CFLAGS@
-Libs: -L${libdir} -lpixman @DEP_LIBS@
+Libs: -L${libdir} -lpixman-1 @DEP_LIBS@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/test/composite-test.c new/pixman-0.9.5/test/composite-test.c
--- old/pixman-0.9.4/test/composite-test.c 2007-06-13 05:43:17.000000000 +0200
+++ new/pixman-0.9.5/test/composite-test.c 2007-08-30 02:57:34.000000000 +0200
@@ -122,13 +122,14 @@
src,
WIDTH * 4);
- pixman_image_set_accessors (src_img, reader, writer);
-
dest_img = pixman_image_create_bits (PIXMAN_a8r8g8b8,
WIDTH, HEIGHT,
dest,
WIDTH * 4);
+ pixman_image_set_accessors (src_img, reader, writer);
+ pixman_image_set_accessors (dest_img, reader, writer);
+
pixman_image_composite (PIXMAN_OP_OVER, src_img, NULL, dest_img,
0, 0, 0, 0, 0, 0, WIDTH, HEIGHT);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/pixman-0.9.4/test/Makefile.in new/pixman-0.9.5/test/Makefile.in
--- old/pixman-0.9.4/test/Makefile.in 2007-08-06 23:26:45.000000000 +0200
+++ new/pixman-0.9.5/test/Makefile.in 2007-08-17 23:23:20.000000000 +0200
@@ -74,7 +74,6 @@
CTAGS = ctags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
-AC_MAJOR = @AC_MAJOR@
AMTAR = @AMTAR@
AR = @AR@
AUTOCONF = @AUTOCONF@
@@ -129,6 +128,7 @@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
+PIXMAN_MAJOR = @PIXMAN_MAJOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
SED = @SED@
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org