Hello community,
here is the log from the commit of package xorg-x11-server for openSUSE:Factory
checked in at Mon Oct 12 21:03:27 CEST 2009.
--------
--- xorg-x11-server/xorg-x11-server.changes 2009-10-09 05:18:41.000000000 +0200
+++ xorg-x11-server/xorg-x11-server.changes 2009-10-12 17:59:38.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Oct 12 16:48:47 CEST 2009 - sndirsch@suse.de
+
+- xorg-server 1.6.5
+ * This release fixes the fact that 1.6.4 would crash on drivers
+ that still tried to initialize the DGA extension. It also has
+ a minor improvement for Xephyr to support nesting within an
+ existing window at a different depth.
+- obsoletes dga-removal-fix.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
dga-removal-fix.diff
xorg-server-1.6.4.tar.bz2
New:
----
xorg-server-1.6.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.cJFGcX/_old 2009-10-12 21:01:47.000000000 +0200
+++ /var/tmp/diff_new_pack.cJFGcX/_new 2009-10-12 21:01:47.000000000 +0200
@@ -20,7 +20,7 @@
%define moblin 0
Name: xorg-x11-server
-%define dirsuffix 1.6.4
+%define dirsuffix 1.6.5
%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: 59
+Release: 60
License: GPL v2 or later ; MIT License (or similar)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -138,7 +138,6 @@
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
-Patch201: dga-removal-fix.diff
Patch532341: bug532341.diff
Patch202: 0001-Check-harder-for-primary-PCI-device.patch
Patch203: 0001-Fix-segfault-when-killing-X-with-ctrl-alt-backspace.patch
@@ -284,7 +283,6 @@
%patch190 -p1
%patch191 -p1
%patch200 -p1
-%patch201 -p1
%patch532341 -p1
%patch202 -p1
%patch203 -p1
++++++ xorg-server-1.6.4.tar.bz2 -> xorg-server-1.6.5.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/ChangeLog new/xorg-server-1.6.5/ChangeLog
--- old/xorg-server-1.6.4/ChangeLog 2009-09-28 04:22:40.000000000 +0200
+++ new/xorg-server-1.6.5/ChangeLog 2009-10-12 07:05:32.000000000 +0200
@@ -1,3 +1,66 @@
+commit 439c58849304907900e4dc7429aedb0192749c02
+Author: Keith Packard
+Date: Sun Oct 11 22:03:32 2009 -0700
+
+ Bump version to 1.6.5
+
+ Signed-off-by: Keith Packard
+
+commit 7f2f71da5125ae01a8279a4886090a711100d671
+Author: Peter Hutterer
+Date: Mon Sep 28 14:18:45 2009 +1000
+
+ ephyr: if -parent is given, check for a trailing -screen. (#24144)
+
+ If -parent is given, don't open up a new window if -screen is given as well.
+ The commandline option -screen allows to set the depth of the embedded
+ Xephry instance, even though width and height are autoscaled on -parent.
+
+ This patch checks for a -screen parameter after -parent and - if one is
+ found - delays initializing the screen. The parent window id is stored
+ temporarily but re-set after a -screen argument.
+ The following command is thus valid:
+
+ Xephyr -parent 1234 -screen 640x480@8 -screen 1024x768
+
+ It embeds the first 8-bit screen into window 1234 and opens up a new window
+ for the second screen. Multiple parent arguments are possible, the screens
+ are embedded in-order.
+
+ X.Org Bug 24144 http://bugs.freedesktop.org/show_bug.cgi?id=24144
+
+ Tested-by: Vic Lee
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit 19be992d9dc542b61fa3f4fd32a09071c9e64880)
+
+ Signed-off-by: Keith Packard
+
+commit c07b2368a7dedb66455eea313c06859afa2e1a9c
+Author: Keith Packard
+Date: Thu Oct 1 15:24:58 2009 -0700
+
+ Bump to version 1.6.4.901
+
+ Signed-off-by: Keith Packard
+
+commit fc31f76b6ff735e4a4006c5454c4d496ee8b154a
+Author: Keith Packard
+Date: Wed Sep 30 11:40:19 2009 -0700
+
+ Re-fix DGA removal.
+
+ Removing DGA ended up breaking any drivers calling into the old
+ xf86DiDGAInit function as it tried to see if DGA was already enabled
+ and ended up crashing if the VT wasn't completely initialized. Oops.
+
+ Also, if the driver initializes DGA itself, have the DiDGA
+ initialization overwrite that information as the DiDGA code will call
+ ReInit on mode detect.
+
+ Signed-off-by: Keith Packard
+ Signed-off-by: Peter Hutterer
+ (cherry picked from commit db98b26ee145f70e732e2cf4a6ac3de77fdf4adc)
+
commit 8cf659f3a5914369a2137ac17b689e5a9fe9ca27
Author: Keith Packard
Date: Sun Sep 27 19:21:45 2009 -0700
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/configure new/xorg-server-1.6.5/configure
--- old/xorg-server-1.6.4/configure 2009-09-28 04:22:13.000000000 +0200
+++ new/xorg-server-1.6.5/configure 2009-10-12 07:04:15.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.4.
+# Generated by GNU Autoconf 2.64 for xorg-server 1.6.5.
#
# 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.4'
-PACKAGE_STRING='xorg-server 1.6.4'
+PACKAGE_VERSION='1.6.5'
+PACKAGE_STRING='xorg-server 1.6.5'
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.4 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.6.5 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.4:";;
+ short | recursive ) echo "Configuration of xorg-server 1.6.5:";;
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.4
+xorg-server configure 1.6.5
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.4, which was
+It was created by xorg-server $as_me 1.6.5, 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.4'
+ VERSION='1.6.5'
cat >>confdefs.h <<_ACEOF
@@ -3795,7 +3795,7 @@
-RELEASE_DATE="2009-9-27"
+RELEASE_DATE="2009-10-11"
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.4, which was
+This file was extended by xorg-server $as_me 1.6.5, 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.4
+xorg-server config.status 1.6.5
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.4/configure.ac new/xorg-server-1.6.5/configure.ac
--- old/xorg-server-1.6.4/configure.ac 2009-09-28 04:21:10.000000000 +0200
+++ new/xorg-server-1.6.5/configure.ac 2009-10-12 07:02:37.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.4, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.6.5, [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-9-27"
+RELEASE_DATE="2009-10-11"
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.4/hw/kdrive/ephyr/Xephyr.man.pre new/xorg-server-1.6.5/hw/kdrive/ephyr/Xephyr.man.pre
--- old/xorg-server-1.6.4/hw/kdrive/ephyr/Xephyr.man.pre 2009-09-22 20:57:38.000000000 +0200
+++ new/xorg-server-1.6.5/hw/kdrive/ephyr/Xephyr.man.pre 2009-10-12 06:21:41.000000000 +0200
@@ -46,6 +46,11 @@
.BI -parent " id"
uses exiting window
.I id .
+If a
+.BI -screen
+argument follows a
+.BI -parent
+argument, this screen is embedded into the given window.
.TP 8
.B -host-cursor
set 'cursor acceleration':
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/hw/kdrive/ephyr/ephyrinit.c new/xorg-server-1.6.5/hw/kdrive/ephyr/ephyrinit.c
--- old/xorg-server-1.6.4/hw/kdrive/ephyr/ephyrinit.c 2009-09-22 20:57:38.000000000 +0200
+++ new/xorg-server-1.6.5/hw/kdrive/ephyr/ephyrinit.c 2009-10-12 06:21:41.000000000 +0200
@@ -147,6 +147,7 @@
int
ddxProcessArgument (int argc, char **argv, int i)
{
+ static char* parent = NULL;
EPHYR_DBG("mark argv[%d]='%s'", i, argv[i] );
if (i == 1)
@@ -158,6 +159,18 @@
{
if(i+1 < argc)
{
+ int j;
+ /* If parent is specified and a screen argument follows, don't do
+ * anything, let the -screen handling init the rest */
+ for (j = i; j < argc; j++)
+ {
+ if (!strcmp(argv[j], "-screen"))
+ {
+ parent = argv[i + 1];
+ return 2;
+ }
+ }
+
processScreenArg ("100x100", argv[i+1]);
return 2;
}
@@ -169,7 +182,8 @@
{
if ((i+1) < argc)
{
- processScreenArg (argv[i+1], NULL);
+ processScreenArg (argv[i+1], parent);
+ parent = NULL;
return 2;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/hw/xfree86/common/xf86DGA.c new/xorg-server-1.6.5/hw/xfree86/common/xf86DGA.c
--- old/xorg-server-1.6.4/hw/xfree86/common/xf86DGA.c 2009-09-22 20:57:38.000000000 +0200
+++ new/xorg-server-1.6.5/hw/xfree86/common/xf86DGA.c 2009-10-12 04:52:40.000000000 +0200
@@ -120,8 +120,22 @@
DGAScreenKey = &DGAScreenKeyIndex;
- if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
- return FALSE;
+ pScreenPriv = DGA_GET_SCREEN_PRIV(pScreen);
+
+ if (!pScreenPriv)
+ {
+ if(!(pScreenPriv = (DGAScreenPtr)xalloc(sizeof(DGAScreenRec))))
+ return FALSE;
+ dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
+ pScreenPriv->CloseScreen = pScreen->CloseScreen;
+ pScreen->CloseScreen = DGACloseScreen;
+ pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
+ pScreen->DestroyColormap = DGADestroyColormap;
+ pScreenPriv->InstallColormap = pScreen->InstallColormap;
+ pScreen->InstallColormap = DGAInstallColormap;
+ pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
+ pScreen->UninstallColormap = DGAUninstallColormap;
+ }
pScreenPriv->pScrn = pScrn;
pScreenPriv->numModes = num;
@@ -146,17 +160,6 @@
modes[i].flags &= ~DGA_PIXMAP_AVAILABLE;
#endif
- dixSetPrivate(&pScreen->devPrivates, DGAScreenKey, pScreenPriv);
- pScreenPriv->CloseScreen = pScreen->CloseScreen;
- pScreen->CloseScreen = DGACloseScreen;
- pScreenPriv->DestroyColormap = pScreen->DestroyColormap;
- pScreen->DestroyColormap = DGADestroyColormap;
- pScreenPriv->InstallColormap = pScreen->InstallColormap;
- pScreen->InstallColormap = DGAInstallColormap;
- pScreenPriv->UninstallColormap = pScreen->UninstallColormap;
- pScreen->UninstallColormap = DGAUninstallColormap;
-
-
return TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c new/xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.c
--- old/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.c 2009-09-22 21:15:36.000000000 +0200
+++ new/xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.c 2009-10-12 04:52:40.000000000 +0200
@@ -770,7 +770,7 @@
screen->CloseScreen = xf86CrtcCloseScreen;
#ifdef XFreeXDGA
- xf86DiDGAInit(screen, 0);
+ _xf86_di_dga_init_internal(screen);
#endif
#ifdef RANDR_13_INTERFACE
return RANDR_INTERFACE_VERSION;
@@ -1887,7 +1887,7 @@
scrn->currentMode = scrn->modes;
#ifdef XFreeXDGA
if (scrn->pScreen)
- xf86DiDGAReInit(scrn->pScreen);
+ _xf86_di_dga_reinit_internal(scrn->pScreen);
#endif
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.h new/xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.h
--- old/xorg-server-1.6.4/hw/xfree86/modes/xf86Crtc.h 2009-09-22 20:57:38.000000000 +0200
+++ new/xorg-server-1.6.5/hw/xfree86/modes/xf86Crtc.h 2009-10-12 04:52:40.000000000 +0200
@@ -807,6 +807,10 @@
Bool
xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address);
+/* this is the real function, used only internally */
+_X_INTERNAL Bool
+_xf86_di_dga_init_internal (ScreenPtr pScreen);
+
/**
* Re-initialize dga for this screen (as when the set of modes changes)
*/
@@ -814,6 +818,10 @@
Bool
xf86DiDGAReInit (ScreenPtr pScreen);
+/* This is the real function, used only internally */
+_X_INTERNAL Bool
+_xf86_di_dga_reinit_internal (ScreenPtr pScreen);
+
/*
* Set the subpixel order reported for the screen using
* the information from the outputs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c new/xorg-server-1.6.5/hw/xfree86/modes/xf86DiDGA.c
--- old/xorg-server-1.6.4/hw/xfree86/modes/xf86DiDGA.c 2009-09-22 21:15:36.000000000 +0200
+++ new/xorg-server-1.6.5/hw/xfree86/modes/xf86DiDGA.c 2009-10-12 04:52:40.000000000 +0200
@@ -175,6 +175,12 @@
_X_EXPORT Bool
xf86DiDGAReInit (ScreenPtr pScreen)
{
+ return TRUE;
+}
+
+Bool
+_xf86_di_dga_reinit_internal (ScreenPtr pScreen)
+{
ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
@@ -190,12 +196,15 @@
_X_EXPORT Bool
xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address)
{
+ return TRUE;
+}
+
+Bool
+_xf86_di_dga_init_internal (ScreenPtr pScreen)
+{
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 = 0;
xf86_config->dga_width = 0;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org