Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Tue Sep 29 14:49:30 CEST 2009.
--------
--- xorg-x11-server/xorg-x11-server.changes 2009-09-21 16:47:24.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2009-09-28 20:57:14.000000000 +0200
@@ -1,0 +2,21 @@
+Mon Sep 28 20:50:34 CEST 2009 - sndirsch@suse.de
+
+- xorg-server 1.6.4
+ * fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
+ * render: return the supported version rather than just passing
+ the proto's version
+ * xfree86/modes: Remove all framebuffer support from DGA
+ * dri2: Don't crash if pPriv is NULL.
+ * Don't send events through the master if the device has
+ SendCoreEvents off.
+ * Don't reset the lastDeviceEventTime when doing DPMS actions
+ * dix: append "built-ins" to the font path in SetDefaultFontPath
+
+-------------------------------------------------------------------
+Mon Sep 28 20:32:13 CEST 2009 - sndirsch@suse.de
+
+- bug532341.diff
+ * fixes Xserver crash when running x11perf -shmputxy10 test case
+ (bnc #532341, bfo #23298)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
xorg-server-1.6.3.901.tar.bz2
New:
----
bug532341.diff
xorg-server-1.6.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.VfTlT7/_old 2009-09-29 14:43:34.000000000 +0200
+++ /var/tmp/diff_new_pack.VfTlT7/_new 2009-09-29 14:43:34.000000000 +0200
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.6.3.901
+%define dirsuffix 1.6.4
%define fglrx_driver_hack 0
### FIXME
%define vnc 1
@@ -33,7 +33,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
-Release: 54
+Release: 55
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -138,6 +138,7 @@
Patch190: 0001-Unclaim-PCI-slot-if-driver-probing-fails.patch
Patch191: 0001-Fix-sporadic-segfault-on-resume-with-intel-KMS-due-t.patch
Patch200: bug534768-prefer_local_symbols.patch
+Patch532341: bug532341.diff
%description
This package contains the X.Org Server.
@@ -280,6 +281,7 @@
%patch190 -p1
%patch191 -p1
%patch200 -p1
+%patch532341 -p1
%build
pushd xorg-docs-*
++++++ bug532341.diff ++++++
diff --git a/Xext/shm.c b/Xext/shm.c
index dd097e6..99bbd37 100644
--- a/Xext/shm.c
+++ b/Xext/shm.c
@@ -496,15 +496,40 @@ doShmPutImage(DrawablePtr dst, GCPtr pGC,
char *data)
{
PixmapPtr pPixmap;
-
- pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
- BitsPerPixel(depth),
- PixmapBytePad(w, depth),
- data);
- if (!pPixmap)
- return;
- pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
- FreeScratchPixmapHeader(pPixmap);
+
+ if (format == ZPixmap || depth == 1) {
+ pPixmap = GetScratchPixmapHeader(dst->pScreen, w, h, depth,
+ BitsPerPixel(depth),
+ PixmapBytePad(w, depth),
+ data);
+ if (!pPixmap)
+ return;
+ pGC->ops->CopyArea((DrawablePtr)pPixmap, dst, pGC, sx, sy, sw, sh, dx, dy);
+ FreeScratchPixmapHeader(pPixmap);
+ } else {
+ GCPtr putGC = GetScratchGC(depth, dst->pScreen);
+
+ if (!putGC)
+ return;
+
+ pPixmap = (*dst->pScreen->CreatePixmap)(dst->pScreen, sw, sh, depth,
+ CREATE_PIXMAP_USAGE_SCRATCH);
+ if (!pPixmap) {
+ FreeScratchGC(putGC);
+ return;
+ }
+ ValidateGC(&pPixmap->drawable, putGC);
+ (*putGC->ops->PutImage)(&pPixmap->drawable, putGC, depth, -sx, -sy, w, h, 0,
+ (format == XYPixmap) ? XYPixmap : ZPixmap, data);
+ FreeScratchGC(putGC);
+ if (format == XYBitmap)
+ (void)(*pGC->ops->CopyPlane)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
+ dx, dy, 1L);
+ else
+ (void)(*pGC->ops->CopyArea)(&pPixmap->drawable, dst, pGC, 0, 0, sw, sh,
+ dx, dy);
+ (*pPixmap->drawable.pScreen->DestroyPixmap)(pPixmap);
+ }
}
#ifdef PANORAMIX
++++++ xorg-server-1.6.3.901.tar.bz2 -> xorg-server-1.6.4.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/ChangeLog new/xorg-server-1.6.4/ChangeLog
--- old/xorg-server-1.6.3.901/ChangeLog 2009-08-26 07:38:10.000000000 +0200
+++ new/xorg-server-1.6.4/ChangeLog 2009-09-28 04:22:40.000000000 +0200
@@ -1,3 +1,108 @@
+commit 8cf659f3a5914369a2137ac17b689e5a9fe9ca27
+Author: Keith Packard
+Date: Sun Sep 27 19:21:45 2009 -0700
+
+ Bump to version 1.6.4
+
+ Signed-off-by: Keith Packard
+
+commit a26fd1a6d61507b3e69a04d6f6c192a6ec363c5c
+Author: Peter Hutterer
+Date: Wed Sep 16 15:46:55 2009 +1000
+
+ Don't send events through the master if the device has SendCoreEvents off.
+
+ In server 1.6, all devices are attached to the master device (VCP or VCK).
+ Sending an event through the master device means the device is sending core
+ events. If a device is configured as SendCoreEvents, just send through the
+ device, not through the master.
+
+ Signed-off-by: Peter Hutterer
+
+commit 507e57381fea6334f7dc8da6925e53d2c76fddcb
+Author: Keith Packard
+Date: Fri Sep 18 21:12:17 2009 -0700
+
+ xfree86/modes: Remove all framebuffer support from DGA
+
+ This removes all rendering and mapping code from xf86DiDGA, leaving
+ just mode setting and raw input device access. The mapping code didn't
+ have the offset within /dev/mem for the frame buffer and the pixmap
+ support assumed that the framebuffer was never reallocated.
+ (cherry picked from 0b7c6c728c2e2d8433a188315cc591308a89cd85)
+
+ Signed-off-by: Keith Packard
+ Signed-off-by: Peter Hutterer
+
+commit c3d182a47902d02f9e64f933b8565ae336f73f54
+Author: Rémi Cardona
+Date: Mon Sep 14 17:09:59 2009 +0200
+
+ dix: append "built-ins" to the font path in SetDefaultFontPath
+
+ 49b93df8a3002db7196aa3fc1fd8dca1c12a55d6 made the hard dependency on
+ a "fixed" font go away but only Xorg could use the built-ins fonts by
+ default.
+
+ With this commit, all DDXs get "built-ins" appended to their FontPath, not
+ just Xorg.
+
+ Tested with Xorg, Xvfb and Xnest.
+ (cherry picked from commit f56cbe1ef24415d0142b9a7d0ab0a031069ccb52)
+
+ Signed-off-by: Rémi Cardona
+ Signed-off-by: Jon TURNEY
+ Tested-by: Jon TURNEY
+ Signed-off-by: Peter Hutterer
+ Signed-off-by: Keith Packard
+
+commit 9bc4a69040493e589a3811ca5e085e323438996d
+Author: Daniel Stone
+Date: Wed Sep 9 15:48:33 2009 +1000
+
+ fbdevhw: Test for graphics:fb%d as well as graphics/fb%d
+
+ Apparently the kernel can't decide on an API to expose to userspace, so
+ let's just try both in the hope that one will work.
+
+ Signed-off-by: Daniel Stone
+ Acked-by: Michel Dänzer
+ (cherry picked from commit f4350c66b493d63fa06be87caa958d7033232ea4)
+
+commit d78669c92d751464bc3c8f79f2aa21ca0951e3a9
+Author: Keith Packard
+Date: Tue Sep 22 12:09:48 2009 -0700
+
+ render: return the supported version rather than just passing the proto's version
+
+ Signed-off-by: Keith Packard
+
+commit f5d1da499c3d64f0a4ac217eb19911b8e35cb49b
+Author: Michel Dänzer
+Date: Tue Jun 23 16:45:39 2009 +0200
+
+ dri2: Don't crash if pPriv is NULL.
+ (cherry picked from commit df597709d71f47b8516e27c6fb1bfffd59de5e48)
+
+ Signed-off-by: Keith Packard
+
+commit 468787bdd2c34f9edf46da76b6357034c216fa7b
+Author: Richard Hughes
+Date: Fri Aug 14 11:44:35 2009 +0100
+
+ Don't reset the lastDeviceEventTime when doing DPMS actions
+
+ When we change the DPMS mode, don't play games with the last event time as
+ this breaks applications using IDLETIME to turn the backlight off after a
+ preset time.
+
+ This patch fixes gnome-power-manager and xfce-power-manager
+
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit c1d901d723c3bee523736eacc15b44a7dff484fe)
+
+ Signed-off-by: Keith Packard
+
commit 3044711412d0a08ba65a491bd2441c0c8980f5e2
Author: Keith Packard
Date: Tue Aug 25 22:37:16 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/Xext/dpms.c new/xorg-server-1.6.4/Xext/dpms.c
--- old/xorg-server-1.6.3.901/Xext/dpms.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/Xext/dpms.c 2009-09-22 21:03:33.000000000 +0200
@@ -219,19 +219,10 @@
if (!DPMSEnabled)
return BadMatch;
- if (stuff->level == DPMSModeOn) {
- lastDeviceEventTime.milliseconds =
- GetTimeInMillis();
- } else if (stuff->level == DPMSModeStandby) {
- lastDeviceEventTime.milliseconds =
- GetTimeInMillis() - DPMSStandbyTime;
- } else if (stuff->level == DPMSModeSuspend) {
- lastDeviceEventTime.milliseconds =
- GetTimeInMillis() - DPMSSuspendTime;
- } else if (stuff->level == DPMSModeOff) {
- lastDeviceEventTime.milliseconds =
- GetTimeInMillis() - DPMSOffTime;
- } else {
+ if (stuff->level != DPMSModeOn &&
+ stuff->level != DPMSModeStandby &&
+ stuff->level != DPMSModeSuspend &&
+ stuff->level != DPMSModeOff) {
client->errorValue = stuff->level;
return BadValue;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/aclocal.m4 new/xorg-server-1.6.4/aclocal.m4
--- old/xorg-server-1.6.3.901/aclocal.m4 2009-08-26 07:37:44.000000000 +0200
+++ new/xorg-server-1.6.4/aclocal.m4 2009-09-28 04:22:10.000000000 +0200
@@ -9179,7 +9179,7 @@
# See the "minimum version" comment for each macro you use to see what
# version you require.
m4_defun([XORG_MACROS_VERSION],[
-m4_define([vers_have], [1.2.2])
+m4_define([vers_have], [1.3.0])
m4_define([maj_have], m4_substr(vers_have, 0, m4_index(vers_have, [.])))
m4_define([maj_needed], m4_substr([$1], 0, m4_index([$1], [.])))
m4_if(m4_cmp(maj_have, maj_needed), 0,,
@@ -9455,7 +9455,7 @@
# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
AC_ARG_ENABLE(malloc0returnsnull,
- AC_HELP_STRING([--enable-malloc0returnsnull],
+ AS_HELP_STRING([--enable-malloc0returnsnull],
[malloc(0) returns NULL (default: auto)]),
[MALLOC_ZERO_RETURNS_NULL=$enableval],
[MALLOC_ZERO_RETURNS_NULL=auto])
@@ -9507,7 +9507,7 @@
AC_DEFUN([XORG_WITH_LINT],[
# Allow checking code with lint, sparse, etc.
-AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint],
+AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint],
[Use a lint-style source code checker (default: disabled)])],
[use_lint=$withval], [use_lint=no])
if test "x$use_lint" = "xyes" ; then
@@ -9548,7 +9548,7 @@
AC_DEFUN([XORG_LINT_LIBRARY],[
AC_REQUIRE([XORG_WITH_LINT])
# Build lint "library" for more indepth checks of programs calling this library
-AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library],
+AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library],
[Create lint library (default: disabled)])],
[make_lint_lib=$enableval], [make_lint_lib=no])
if test "x$make_lint_lib" != "xno" ; then
@@ -9590,7 +9590,51 @@
fi
fi
AC_SUBST(CWARNFLAGS)
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
]) # XORG_CWARNFLAGS
+
+# XORG_STRICT_OPTION
+# -----------------------
+# Minimum version: 1.3.0
+#
+# Add configure option to enable strict compilation
+AC_DEFUN([XORG_STRICT_OPTION], [
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PROG_CC_C99])
+AC_REQUIRE([XORG_CWARNFLAGS])
+
+AC_ARG_ENABLE(strict-compilation,
+ AS_HELP_STRING([--enable-strict-compilation],
+ [Enable all warnings from compiler and make them errors (default: disabled)]),
+ [STRICT_COMPILE=$enableval], [STRICT_COMPILE=no])
+if test "x$STRICT_COMPILE" = "xyes"; then
+ AC_CHECK_DECL([__SUNPRO_C], [SUNCC="yes"], [SUNCC="no"])
+ AC_CHECK_DECL([__INTEL_COMPILER], [INTELCC="yes"], [INTELCC="no"])
+ if test "x$GCC" = xyes ; then
+ STRICT_CFLAGS="-pedantic -Werror"
+ elif test "x$SUNCC" = "xyes"; then
+ STRICT_CFLAGS="-errwarn"
+ elif test "x$INTELCC" = "xyes"; then
+ STRICT_CFLAGS="-Werror"
+ fi
+fi
+CWARNFLAGS="$CWARNFLAGS $STRICT_CFLAGS"
+AC_SUBST([CWARNFLAGS])
+]) # XORG_STRICT_OPTION
+
+# XORG_DEFAULT_OPTIONS
+# --------------------
+# Minimum version: 1.3.0
+#
+# Defines default options for X.Org modules.
+#
+AC_DEFUN([XORG_DEFAULT_OPTIONS], [
+XORG_CWARNFLAGS
+XORG_STRICT_OPTION
+XORG_RELEASE_VERSION
+XORG_CHANGELOG
+XORG_MANPAGE_SECTIONS
+]) # XORG_DEFAULT_OPTIONS
dnl Copyright 2005 Red Hat, Inc
dnl
dnl Permission to use, copy, modify, distribute, and sell this software and its
@@ -9625,7 +9669,7 @@
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
- AC_HELP_STRING([--with-release-version=STRING],
+ AS_HELP_STRING([--with-release-version=STRING],
[Use release version string in package name]),
[RELEASE_VERSION="$withval"],
[RELEASE_VERSION=""])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/configure new/xorg-server-1.6.4/configure
--- old/xorg-server-1.6.3.901/configure 2009-08-26 07:37:46.000000000 +0200
+++ new/xorg-server-1.6.4/configure 2009-09-28 04:22:13.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.64 for xorg-server 1.6.3.901.
+# Generated by GNU Autoconf 2.64 for xorg-server 1.6.4.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -699,8 +699,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.6.3.901'
-PACKAGE_STRING='xorg-server 1.6.3.901'
+PACKAGE_VERSION='1.6.4'
+PACKAGE_STRING='xorg-server 1.6.4'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
PACKAGE_URL=''
@@ -1904,7 +1904,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 xorg-server 1.6.3.901 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.6.4 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1974,7 +1974,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.6.3.901:";;
+ short | recursive ) echo "Configuration of xorg-server 1.6.4:";;
esac
cat <<\_ACEOF
@@ -2280,7 +2280,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.6.3.901
+xorg-server configure 1.6.4
generated by GNU Autoconf 2.64
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2922,7 +2922,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorg-server $as_me 1.6.3.901, which was
+It was created by xorg-server $as_me 1.6.4, which was
generated by GNU Autoconf 2.64. Invocation command line was
$ $0 $@
@@ -3731,7 +3731,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.6.3.901'
+ VERSION='1.6.4'
cat >>confdefs.h <<_ACEOF
@@ -3795,7 +3795,7 @@
-RELEASE_DATE="2009-8-25"
+RELEASE_DATE="2009-9-27"
ac_config_headers="$ac_config_headers include/do-not-use-config.h"
@@ -22148,7 +22148,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorg-server $as_me 1.6.3.901, which was
+This file was extended by xorg-server $as_me 1.6.4, which was
generated by GNU Autoconf 2.64. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -22212,7 +22212,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xorg-server config.status 1.6.3.901
+xorg-server config.status 1.6.4
configured by $0, generated by GNU Autoconf 2.64,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/configure.ac new/xorg-server-1.6.4/configure.ac
--- old/xorg-server-1.6.3.901/configure.ac 2009-08-26 07:36:40.000000000 +0200
+++ new/xorg-server-1.6.4/configure.ac 2009-09-28 04:21:10.000000000 +0200
@@ -26,12 +26,12 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-AC_INIT([xorg-server], 1.6.3.901, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
-RELEASE_DATE="2009-8-25"
+RELEASE_DATE="2009-9-27"
dnl this gets generated by autoheader, and thus contains all the defines. we
dnl don't ever actually use it, internally.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/dix/dixfonts.c new/xorg-server-1.6.4/dix/dixfonts.c
--- old/xorg-server-1.6.3.901/dix/dixfonts.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/dix/dixfonts.c 2009-09-22 21:12:37.000000000 +0200
@@ -1815,6 +1815,9 @@
int
SetDefaultFontPath(char *path)
{
+ char *temp_path,
+ *start,
+ *end;
unsigned char *cp,
*pp,
*nump,
@@ -1825,12 +1828,31 @@
size = 0,
bad;
+ /* ensure temp_path contains "built-ins" */
+ start = path;
+ while (1) {
+ start = strstr(start, "built-ins");
+ if (start == NULL)
+ break;
+ end = start + strlen("built-ins");
+ if ((start == path || start[-1] == ',') && (!*end || *end == ','))
+ break;
+ start = end;
+ }
+ if (!start) {
+ temp_path = Xprintf("%s%sbuilt-ins", path, *path ? "," : "");
+ } else {
+ temp_path = Xstrdup(path);
+ }
+ if (!temp_path)
+ return BadAlloc;
+
/* get enough for string, plus values -- use up commas */
- len = strlen(path) + 1;
- nump = cp = newpath = (unsigned char *) xalloc(len);
+ len = strlen(temp_path) + 1;
+ nump = cp = newpath = xalloc(len);
if (!newpath)
return BadAlloc;
- pp = (unsigned char *) path;
+ pp = (unsigned char *) temp_path;
cp++;
while (*pp) {
if (*pp == ',') {
@@ -1849,6 +1871,7 @@
err = SetFontPathElements(num, newpath, &bad, TRUE);
xfree(newpath);
+ xfree(temp_path);
return err;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/dix/getevents.c new/xorg-server-1.6.4/dix/getevents.c
--- old/xorg-server-1.6.3.901/dix/getevents.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/dix/getevents.c 2009-09-28 04:08:14.000000000 +0200
@@ -536,7 +536,7 @@
updateFromMaster(EventListPtr events, DeviceIntPtr dev, int *num_events)
{
DeviceIntPtr master = dev->u.master;
- if (master && master->u.lastSlave != dev)
+ if (master && master->u.lastSlave != dev && dev->coreEvents)
{
updateSlaveDeviceCoords(master, dev);
master->u.lastSlave = dev;
@@ -674,7 +674,7 @@
* to the current screen. */
miPointerSetPosition(dev, &dev->last.valuators[0], &dev->last.valuators[1]);
- if (dev->u.master) {
+ if (dev->u.master && dev->coreEvents) {
dev->u.master->last.valuators[0] = dev->last.valuators[0];
dev->u.master->last.valuators[1] = dev->last.valuators[1];
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c new/xorg-server-1.6.4/hw/xfree86/common/xf86Config.c
--- old/xorg-server-1.6.3.901/hw/xfree86/common/xf86Config.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/common/xf86Config.c 2009-09-22 21:11:19.000000000 +0200
@@ -612,22 +612,6 @@
pathFrom = X_DEFAULT;
temp_path = defaultFontPath ? defaultFontPath : "";
- /* ensure defaultFontPath contains "built-ins" */
- start = strstr(temp_path, "built-ins");
- end = start + strlen("built-ins");
- if (start == NULL ||
- !((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
- defaultFontPath = Xprintf("%s%sbuilt-ins",
- temp_path, *temp_path ? "," : "");
- if (must_copy == TRUE) {
- if (defaultFontPath != NULL) {
- must_copy = FALSE;
- }
- } else {
- /* already made a copy of the font path */
- xfree(temp_path);
- }
- }
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
defaultFontPath = xf86ValidateFontPath(temp_path);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/dri2/dri2.c new/xorg-server-1.6.4/hw/xfree86/dri2/dri2.c
--- old/xorg-server-1.6.3.901/hw/xfree86/dri2/dri2.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/dri2/dri2.c 2009-09-22 21:04:27.000000000 +0200
@@ -190,10 +190,18 @@
int need_fake_front = 0;
int have_fake_front = 0;
int front_format = 0;
- const int dimensions_match = (pDraw->width == pPriv->width)
- && (pDraw->height == pPriv->height);
+ int dimensions_match;
int i;
+ if (!pPriv) {
+ *width = pDraw->width;
+ *height = pDraw->height;
+ *out_count = 0;
+ return NULL;
+ }
+
+ dimensions_match = (pDraw->width == pPriv->width)
+ && (pDraw->height == pPriv->height);
buffers = xalloc((count + 1) * sizeof(buffers[0]));
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/fbdevhw/fbdevhw.c new/xorg-server-1.6.4/hw/xfree86/fbdevhw/fbdevhw.c
--- old/xorg-server-1.6.3.901/hw/xfree86/fbdevhw/fbdevhw.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/fbdevhw/fbdevhw.c 2009-09-22 21:10:41.000000000 +0200
@@ -318,7 +318,13 @@
pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
fd = open(filename, O_RDONLY, 0);
- if (fd != -1) {
+ if (fd < 0) {
+ sprintf(filename,
+ "/sys/bus/pci/devices/%04x:%02x:%02x.%d/graphics:fb%d",
+ pPci->domain, pPci->bus, pPci->dev, pPci->func, i);
+ fd = open(filename, O_RDONLY, 0);
+ }
+ if (fd >= 0) {
close(fd);
sprintf(filename, "/dev/fb%d", i);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c
--- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86Crtc.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c 2009-09-22 21:15:36.000000000 +0200
@@ -769,6 +769,9 @@
config->CloseScreen = screen->CloseScreen;
screen->CloseScreen = xf86CrtcCloseScreen;
+#ifdef XFreeXDGA
+ xf86DiDGAInit(screen, 0);
+#endif
#ifdef RANDR_13_INTERFACE
return RANDR_INTERFACE_VERSION;
#else
@@ -1882,6 +1885,10 @@
}
}
scrn->currentMode = scrn->modes;
+#ifdef XFreeXDGA
+ if (scrn->pScreen)
+ xf86DiDGAReInit(scrn->pScreen);
+#endif
}
static void
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86DiDGA.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c
--- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86DiDGA.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c 2009-09-22 21:15:36.000000000 +0200
@@ -72,8 +72,7 @@
mode = modes + num++;
mode->mode = display_mode;
- mode->flags = DGA_CONCURRENT_ACCESS | DGA_PIXMAP_AVAILABLE;
- mode->flags |= DGA_FILL_RECT | DGA_BLIT_RECT;
+ mode->flags = DGA_CONCURRENT_ACCESS;
if (display_mode->Flags & V_DBLSCAN)
mode->flags |= DGA_DOUBLESCAN;
if (display_mode->Flags & V_INTERLACE)
@@ -91,14 +90,14 @@
mode->yViewportStep = 1;
mode->viewportFlags = DGA_FLIP_RETRACE;
mode->offset = 0;
- mode->address = (unsigned char *) xf86_config->dga_address;
- mode->bytesPerScanline = xf86_config->dga_stride;
- mode->imageWidth = xf86_config->dga_width;
- mode->imageHeight = xf86_config->dga_height;
+ mode->address = 0;
+ mode->imageWidth = mode->viewportWidth;
+ mode->imageHeight = mode->viewportHeight;
+ mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3;
mode->pixmapWidth = mode->imageWidth;
mode->pixmapHeight = mode->imageHeight;
- mode->maxViewportX = mode->imageWidth - mode->viewportWidth;
- mode->maxViewportY = mode->imageHeight - mode->viewportHeight;
+ mode->maxViewportX = 0;
+ mode->maxViewportY = 0;
display_mode = display_mode->next;
if (display_mode == scrn->modes)
@@ -149,93 +148,11 @@
}
static Bool
-xf86_dga_get_drawable_and_gc (ScrnInfoPtr scrn, DrawablePtr *ppDrawable, GCPtr *ppGC)
-{
- ScreenPtr pScreen = scrn->pScreen;
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
- PixmapPtr pPixmap;
- GCPtr pGC;
-
- pPixmap = GetScratchPixmapHeader (pScreen, xf86_config->dga_width, xf86_config->dga_height,
- scrn->depth, scrn->bitsPerPixel, xf86_config->dga_stride,
- (char *) scrn->memPhysBase + scrn->fbOffset);
- if (!pPixmap)
- return FALSE;
- pGC = GetScratchGC (scrn->depth, pScreen);
- if (!pGC)
- {
- FreeScratchPixmapHeader (pPixmap);
- return FALSE;
- }
- *ppDrawable = &pPixmap->drawable;
- *ppGC = pGC;
- return TRUE;
-}
-
-static void
-xf86_dga_release_drawable_and_gc (ScrnInfoPtr scrn, DrawablePtr pDrawable, GCPtr pGC)
-{
- FreeScratchGC (pGC);
- FreeScratchPixmapHeader ((PixmapPtr) pDrawable);
-}
-
-static void
-xf86_dga_fill_rect(ScrnInfoPtr scrn, int x, int y, int w, int h, unsigned long color)
-{
- GCPtr pGC;
- DrawablePtr pDrawable;
- XID vals[1];
- xRectangle r;
-
- if (!xf86_dga_get_drawable_and_gc (scrn, &pDrawable, &pGC))
- return;
- vals[0] = color;
- ChangeGC (pGC, GCForeground, vals);
- ValidateGC (pDrawable, pGC);
- r.x = x;
- r.y = y;
- r.width = w;
- r.height = h;
- pGC->ops->PolyFillRect (pDrawable, pGC, 1, &r);
- xf86_dga_release_drawable_and_gc (scrn, pDrawable, pGC);
-}
-
-static void
-xf86_dga_sync(ScrnInfoPtr scrn)
-{
- ScreenPtr pScreen = scrn->pScreen;
- WindowPtr pRoot = WindowTable [pScreen->myNum];
- char buffer[4];
-
- pScreen->GetImage (&pRoot->drawable, 0, 0, 1, 1, ZPixmap, ~0L, buffer);
-}
-
-static void
-xf86_dga_blit_rect(ScrnInfoPtr scrn, int srcx, int srcy, int w, int h, int dstx, int dsty)
-{
- DrawablePtr pDrawable;
- GCPtr pGC;
-
- if (!xf86_dga_get_drawable_and_gc (scrn, &pDrawable, &pGC))
- return;
- ValidateGC (pDrawable, pGC);
- pGC->ops->CopyArea (pDrawable, pDrawable, pGC, srcx, srcy, w, h, dstx, dsty);
- xf86_dga_release_drawable_and_gc (scrn, pDrawable, pGC);
-}
-
-static Bool
xf86_dga_open_framebuffer(ScrnInfoPtr scrn,
char **name,
unsigned char **mem, int *size, int *offset, int *flags)
{
- xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
-
- *size = xf86_config->dga_stride * xf86_config->dga_height;
- *mem = (unsigned char *) (xf86_config->dga_address);
- *offset = 0;
- *flags = DGA_NEED_ROOT;
-
- return TRUE;
+ return FALSE;
}
static void
@@ -249,9 +166,9 @@
xf86_dga_set_mode,
xf86_dga_set_viewport,
xf86_dga_get_viewport,
- xf86_dga_sync,
- xf86_dga_fill_rect,
- xf86_dga_blit_rect,
+ NULL,
+ NULL,
+ NULL,
NULL
};
@@ -261,6 +178,9 @@
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ if (!DGAAvailable(pScreen->myNum))
+ return TRUE;
+
if (!xf86_dga_get_modes (pScreen))
return FALSE;
@@ -273,11 +193,14 @@
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+ if (DGAAvailable(pScreen->myNum))
+ return TRUE;
+
xf86_config->dga_flags = 0;
- xf86_config->dga_address = dga_address;
- xf86_config->dga_width = scrn->virtualX;
- xf86_config->dga_height = scrn->virtualY;
- xf86_config->dga_stride = scrn->displayWidth * scrn->bitsPerPixel >> 3;
+ xf86_config->dga_address = 0;
+ xf86_config->dga_width = 0;
+ xf86_config->dga_height = 0;
+ xf86_config->dga_stride = 0;
if (!xf86_dga_get_modes (pScreen))
return FALSE;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c new/xorg-server-1.6.4/hw/xfree86/modes/xf86RandR12.c
--- old/xorg-server-1.6.3.901/hw/xfree86/modes/xf86RandR12.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/hw/xfree86/modes/xf86RandR12.c 2009-09-22 21:16:31.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright � 2002 Keith Packard, member of The XFree86 Project, Inc.
+ * Copyright © 2002 Keith Packard, member of The XFree86 Project, Inc.
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
@@ -460,7 +460,6 @@
{
xf86ProbeOutputModes (scrp, 0, 0);
xf86SetScrnInfoModes (scrp);
- xf86DiDGAReInit (pScreen);
}
for (mode = scrp->modes; ; mode = mode->next)
@@ -1481,7 +1480,6 @@
return TRUE;
xf86ProbeOutputModes (pScrn, 0, 0);
xf86SetScrnInfoModes (pScrn);
- xf86DiDGAReInit (pScreen);
return xf86RandR12SetInfo12 (pScreen);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/mi/mieq.c new/xorg-server-1.6.4/mi/mieq.c
--- old/xorg-server-1.6.3.901/mi/mieq.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/mi/mieq.c 2009-09-28 04:08:14.000000000 +0200
@@ -446,7 +446,7 @@
NewCurrentScreen (dev, DequeueScreen(dev), x, y);
}
else {
- if (master) {
+ if (master && dev->coreEvents) {
/* Force a copy of the key class into the VCK so that the layout
is transferred. */
if (event->u.u.type == DeviceKeyPress ||
@@ -473,7 +473,7 @@
/* process slave first, then master */
dev->public.processInputProc(event, dev, nevents);
- if (master)
+ if (master && dev->coreEvents)
master->public.processInputProc(masterEvents->event, master,
nevents);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.3.901/render/render.c new/xorg-server-1.6.4/render/render.c
--- old/xorg-server-1.6.3.901/render/render.c 2009-08-26 04:25:26.000000000 +0200
+++ new/xorg-server-1.6.4/render/render.c 2009-09-22 21:09:41.000000000 +0200
@@ -54,6 +54,9 @@
#define UINT32_MAX 0xffffffffU
#endif
+#define SERVER_RENDER_MAJOR 0
+#define SERVER_RENDER_MINOR 10
+
static int ProcRenderQueryVersion (ClientPtr pClient);
static int ProcRenderQueryPictFormats (ClientPtr pClient);
static int ProcRenderQueryPictIndexValues (ClientPtr pClient);
@@ -271,8 +274,8 @@
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.majorVersion = RENDER_MAJOR;
- rep.minorVersion = RENDER_MINOR;
+ rep.majorVersion = SERVER_RENDER_MAJOR;
+ rep.minorVersion = SERVER_RENDER_MINOR;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org