Hello community,
here is the log from the commit of package xorg-x11-server
checked in at Wed Sep 24 17:44:50 CEST 2008.
--------
--- xorg-x11-server/xorg-x11-server.changes 2008-09-13 05:04:51.000000000 +0200
+++ /mounts/work_src_done/STABLE/xorg-x11-server/xorg-x11-server.changes 2008-09-23 21:33:53.199398115 +0200
@@ -0,0 +1,14 @@
+Tue Sep 23 21:30:54 CEST 2008 - sndirsch@suse.de
+
+- xorg-server 1.5.1 (planned for final X.Org 7.4 release)
+ * Conditionalize Composite-based backing store on
+ pScreen->backingStoreSupport. (Aaron Plattner)
+ * Move RELEASE_DATE below AC_INIT. (Adam Jackson)
+ * exa: disable shared pixmaps (Julien Cristau)
+ * Fix panoramiX request and reply swapping (Peter Harris)
+
+-------------------------------------------------------------------
+Mon Sep 22 19:31:52 CEST 2008 - sndirsch@suse.de
+
+- disabled build of optional "xcliplist" module (bnc #428189)
+
Old:
----
xorg-server-1.5.0.tar.bz2
New:
----
xorg-server-1.5.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorg-x11-server.spec ++++++
--- /var/tmp/diff_new_pack.P22873/_old 2008-09-24 17:43:56.000000000 +0200
+++ /var/tmp/diff_new_pack.P22873/_new 2008-09-24 17:43:56.000000000 +0200
@@ -19,7 +19,7 @@
Name: xorg-x11-server
-%define dirsuffix 1.5.0
+%define dirsuffix 1.5.1
%define fglrx_driver_hack 0
%define vnc 1
BuildRequires: Mesa-devel bison flex fontconfig-devel freetype2-devel ghostscript-library libdrm-devel libopenssl-devel pkgconfig xorg-x11 xorg-x11-devel xorg-x11-libICE-devel xorg-x11-libSM-devel xorg-x11-libX11-devel xorg-x11-libXau-devel xorg-x11-libXdmcp-devel xorg-x11-libXext-devel xorg-x11-libXfixes-devel xorg-x11-libXmu-devel xorg-x11-libXp-devel xorg-x11-libXpm-devel xorg-x11-libXprintUtil-devel xorg-x11-libXrender-devel xorg-x11-libXt-devel xorg-x11-libXv-devel xorg-x11-libfontenc-devel xorg-x11-libxkbfile-devel xorg-x11-proto-devel xorg-x11-xtrans-devel
@@ -29,7 +29,7 @@
Url: http://xorg.freedesktop.org/
%define EXPERIMENTAL 0
Version: 7.4
-Release: 2
+Release: 5
License: X11/MIT
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
@@ -237,10 +237,8 @@
--with-release-version=7.2.0.0 \
%endif
%if %vnc
-%ifnarch s390 s390x
- --enable-xcliplist \
-%endif
--enable-vnc \
+ --disable-xcliplist \
%endif
--prefix=/usr \
--sysconfdir=/etc \
@@ -533,6 +531,15 @@
%endif
%changelog
+* Tue Sep 23 2008 sndirsch@suse.de
+- xorg-server 1.5.1 (planned for final X.Org 7.4 release)
+ * Conditionalize Composite-based backing store on
+ pScreen->backingStoreSupport. (Aaron Plattner)
+ * Move RELEASE_DATE below AC_INIT. (Adam Jackson)
+ * exa: disable shared pixmaps (Julien Cristau)
+ * Fix panoramiX request and reply swapping (Peter Harris)
+* Mon Sep 22 2008 sndirsch@suse.de
+- disabled build of optional "xcliplist" module (bnc #428189)
* Sat Sep 13 2008 sndirsch@suse.de
- added /usr/lib64/X11 dir to filelist to fix build on 64bit
platforms
++++++ xorg-server-1.5.0.tar.bz2 -> xorg-server-1.5.1.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/ChangeLog new/xorg-server-1.5.1/ChangeLog
--- old/xorg-server-1.5.0/ChangeLog 2008-09-04 01:00:39.000000000 +0200
+++ new/xorg-server-1.5.1/ChangeLog 2008-09-23 20:28:50.000000000 +0200
@@ -1,3 +1,47 @@
+commit 68c575cb73fd6ff6c9c0ce29a3d8105da44abfcc
+Author: Adam Jackson
+Date: Tue Sep 23 11:05:44 2008 -0400
+
+ Move RELEASE_DATE below AC_INIT.
+
+ Doing it the other way around clobbers the setting, which means you get
+ a null release date string in the log. Thanks autoconf!
+
+commit dba26368e5dbdd35df97d38ed517d1248503ab51
+Author: Peter Harris
+Date: Thu Dec 20 15:58:01 2007 -0500
+
+ Fix panoramiX request and reply swapping
+
+ Fix panoramiX request and reply swapping
+ Set window and screen values in panoramix replies
+ Prevent buffer overrun in ProcPanoramiXGetScreenSize
+ (cherry picked from commit 2b266eda6e23d16116f8a8e258192df353970279)
+
+commit ce6424853c2df2486ad99c0369974afc91a92993
+Author: Julien Cristau
+Date: Tue Sep 16 17:13:42 2008 +0200
+
+ exa: disable shared pixmaps
+
+ They got re-enabled in ee7c684f21d220d5e046bab31ae617a7d64d60f6
+ ("Reimplement ShmPutImage.")
+ (cherry picked from commit b4762c0245ed2966606171cf27f40aa745fdc76e)
+
+commit 37876602957924c7cff759a800eddd574ee2385a
+Author: Aaron Plattner
+Date: Wed Sep 17 15:48:56 2008 -0700
+
+ Conditionalize Composite-based backing store on pScreen->backingStoreSupport.
+
+commit 05fb2f9e1249d0b91bf4318cec4fb309217adff4
+Author: Adam Jackson
+Date: Wed Sep 3 19:14:22 2008 -0400
+
+ xserver 1.5.0
+
+ Drinkin' island is inside each of us, my son.
+
commit f385303cd0242e3a7fded15f8b5c3d610c13ee41
Author: Adam Jackson
Date: Tue Sep 2 15:43:15 2008 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/composite/compinit.c new/xorg-server-1.5.1/composite/compinit.c
--- old/xorg-server-1.5.0/composite/compinit.c 2008-09-03 19:03:39.000000000 +0200
+++ new/xorg-server-1.5.1/composite/compinit.c 2008-09-23 20:24:56.000000000 +0200
@@ -119,7 +119,8 @@
pScreen->ChangeWindowAttributes = cs->ChangeWindowAttributes;
ret = pScreen->ChangeWindowAttributes(pWin, mask);
- if (ret && (mask & CWBackingStore)) {
+ if (ret && (mask & CWBackingStore) &&
+ pScreen->backingStoreSupport != NotUseful) {
if (pWin->backingStore != NotUseful) {
compRedirectWindow(serverClient, pWin, CompositeRedirectAutomatic);
pWin->backStorage = TRUE;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/configure new/xorg-server-1.5.1/configure
--- old/xorg-server-1.5.0/configure 2008-09-04 00:59:44.000000000 +0200
+++ new/xorg-server-1.5.1/configure 2008-09-23 20:27:23.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.62 for xorg-server 1.5.0.
+# Generated by GNU Autoconf 2.62 for xorg-server 1.5.1.
#
# Report bugs to https://bugs.freedesktop.org/enter_bug.cgi?product=xorg.
#
@@ -750,8 +750,8 @@
# Identity of this package.
PACKAGE_NAME='xorg-server'
PACKAGE_TARNAME='xorg-server'
-PACKAGE_VERSION='1.5.0'
-PACKAGE_STRING='xorg-server 1.5.0'
+PACKAGE_VERSION='1.5.1'
+PACKAGE_STRING='xorg-server 1.5.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -2086,7 +2086,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.5.0 to adapt to many kinds of systems.
+\`configure' configures xorg-server 1.5.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -2156,7 +2156,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorg-server 1.5.0:";;
+ short | recursive ) echo "Configuration of xorg-server 1.5.1:";;
esac
cat <<\_ACEOF
@@ -2527,7 +2527,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorg-server configure 1.5.0
+xorg-server configure 1.5.1
generated by GNU Autoconf 2.62
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -2541,7 +2541,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.5.0, which was
+It was created by xorg-server $as_me 1.5.1, which was
generated by GNU Autoconf 2.62. Invocation command line was
$ $0 $@
@@ -2907,6 +2907,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+RELEASE_DATE="23 September 2008"
am__api_version='1.10'
@@ -3256,7 +3257,7 @@
# Define the identity of the package.
PACKAGE='xorg-server'
- VERSION='1.5.0'
+ VERSION='1.5.1'
cat >>confdefs.h <<_ACEOF
@@ -5534,7 +5535,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 5537 "configure"' > conftest.$ac_ext
+ echo '#line 5538 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -8932,11 +8933,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:8935: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8936: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:8939: \$? = $ac_status" >&5
+ echo "$as_me:8940: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9222,11 +9223,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9225: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9226: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9229: \$? = $ac_status" >&5
+ echo "$as_me:9230: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9326,11 +9327,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9329: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9330: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9333: \$? = $ac_status" >&5
+ echo "$as_me:9334: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -11728,7 +11729,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:14241: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14244: \$? = $ac_status" >&5
+ echo "$as_me:14245: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14341,11 +14342,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14344: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14345: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14348: \$? = $ac_status" >&5
+ echo "$as_me:14349: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15926,11 +15927,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15929: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15930: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15933: \$? = $ac_status" >&5
+ echo "$as_me:15934: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16030,11 +16031,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16033: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16034: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16037: \$? = $ac_status" >&5
+ echo "$as_me:16038: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18247,11 +18248,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18250: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18251: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18254: \$? = $ac_status" >&5
+ echo "$as_me:18255: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18537,11 +18538,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18540: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18541: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18544: \$? = $ac_status" >&5
+ echo "$as_me:18545: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18641,11 +18642,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18644: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18645: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18648: \$? = $ac_status" >&5
+ echo "$as_me:18649: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -40782,7 +40783,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.5.0, which was
+This file was extended by xorg-server $as_me 1.5.1, which was
generated by GNU Autoconf 2.62. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -40835,7 +40836,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-xorg-server config.status 1.5.0
+xorg-server config.status 1.5.1
configured by $0, generated by GNU Autoconf 2.62,
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.5.0/configure.ac new/xorg-server-1.5.1/configure.ac
--- old/xorg-server-1.5.0/configure.ac 2008-09-04 00:59:26.000000000 +0200
+++ new/xorg-server-1.5.1/configure.ac 2008-09-23 20:27:01.000000000 +0200
@@ -26,8 +26,8 @@
dnl Process this file with autoconf to create configure.
AC_PREREQ(2.57)
-RELEASE_DATE="3 September 2008"
-AC_INIT([xorg-server], 1.5.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+AC_INIT([xorg-server], 1.5.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server)
+RELEASE_DATE="23 September 2008"
AC_CONFIG_SRCDIR([Makefile.am])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/exa/exa.c new/xorg-server-1.5.1/exa/exa.c
--- old/xorg-server-1.5.0/exa/exa.c 2008-09-03 19:03:39.000000000 +0200
+++ new/xorg-server-1.5.1/exa/exa.c 2008-09-23 20:24:57.000000000 +0200
@@ -43,6 +43,10 @@
DevPrivateKey exaScreenPrivateKey = &exaScreenPrivateKey;
DevPrivateKey exaPixmapPrivateKey = &exaPixmapPrivateKey;
+#ifdef MITSHM
+static ShmFuncs exaShmFuncs = { NULL, NULL };
+#endif
+
static _X_INLINE void*
ExaGetPixmapAddress(PixmapPtr p)
{
@@ -924,6 +928,12 @@
}
#endif
+#ifdef MITSHM
+ /*
+ * Don't allow shared pixmaps.
+ */
+ ShmRegisterFuncs(pScreen, &exaShmFuncs);
+#endif
/*
* Hookup offscreen pixmaps
*/
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/hw/xfree86/common/xf86Build.h new/xorg-server-1.5.1/hw/xfree86/common/xf86Build.h
--- old/xorg-server-1.5.0/hw/xfree86/common/xf86Build.h 2008-09-04 01:00:27.000000000 +0200
+++ new/xorg-server-1.5.1/hw/xfree86/common/xf86Build.h 2008-09-23 20:28:25.000000000 +0200
@@ -1,2 +1,2 @@
-#define BUILD_DATE 20080903
-#define BUILD_TIME 1190025
+#define BUILD_DATE 20080923
+#define BUILD_TIME 1142821
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/include/dix-config.h new/xorg-server-1.5.1/include/dix-config.h
--- old/xorg-server-1.5.0/include/dix-config.h 2008-09-04 01:00:32.000000000 +0200
+++ new/xorg-server-1.5.1/include/dix-config.h 2008-09-23 20:28:36.000000000 +0200
@@ -11,7 +11,7 @@
#define BUILDERADDR "xorg@lists.freedesktop.org"
/* Operating System Name */
-#define OSNAME "Linux 2.6.27-0.290.rc5.fc10.i686 i686"
+#define OSNAME "Linux 2.6.27-0.314.rc5.git9.fc10.i686 i686"
/* Operating System Vendor */
#define OSVENDOR ""
@@ -394,10 +394,10 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((0) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((1) * 1000) + 0)
/* Xorg release date */
-#define XORG_DATE ""
+#define XORG_DATE "23 September 2008"
/* Build Xv Extension */
#define XvExtension 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/include/do-not-use-config.h new/xorg-server-1.5.1/include/do-not-use-config.h
--- old/xorg-server-1.5.0/include/do-not-use-config.h 2008-09-04 01:00:32.000000000 +0200
+++ new/xorg-server-1.5.1/include/do-not-use-config.h 2008-09-23 20:28:36.000000000 +0200
@@ -422,7 +422,7 @@
/* #undef NULL_ROOT_CURSOR */
/* Operating System Name */
-#define OSNAME "Linux 2.6.27-0.290.rc5.fc10.i686 i686"
+#define OSNAME "Linux 2.6.27-0.314.rc5.git9.fc10.i686 i686"
/* Operating System Vendor */
#define OSVENDOR ""
@@ -437,13 +437,13 @@
#define PACKAGE_NAME "xorg-server"
/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "xorg-server 1.5.0"
+#define PACKAGE_STRING "xorg-server 1.5.1"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "xorg-server"
/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.5.0"
+#define PACKAGE_VERSION "1.5.1"
/* Major version of this package */
#define PACKAGE_VERSION_MAJOR 1
@@ -452,7 +452,7 @@
#define PACKAGE_VERSION_MINOR 5
/* Patch version of this package */
-#define PACKAGE_VERSION_PATCHLEVEL 0
+#define PACKAGE_VERSION_PATCHLEVEL 1
/* Internal define for Xinerama */
#define PANORAMIX 1
@@ -553,7 +553,7 @@
/* #undef USE_SYS_ENDIAN_H */
/* Version number of package */
-#define VERSION "1.5.0"
+#define VERSION "1.5.1"
/* Building vgahw module */
#define WITH_VGAHW 1
@@ -654,16 +654,16 @@
#define XORGSERVER 1
/* Vendor release */
-#define XORG_DATE ""
+#define XORG_DATE "23 September 2008"
/* Vendor man version */
-#define XORG_MAN_VERSION "Version 1.5.0"
+#define XORG_MAN_VERSION "Version 1.5.1"
/* Building Xorg server */
#define XORG_SERVER 1
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((0) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((1) * 1000) + 0)
/* Build Print extension */
/* #undef XPRINT */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/include/xorg-config.h new/xorg-server-1.5.1/include/xorg-config.h
--- old/xorg-server-1.5.0/include/xorg-config.h 2008-09-04 01:00:32.000000000 +0200
+++ new/xorg-server-1.5.1/include/xorg-config.h 2008-09-23 20:28:36.000000000 +0200
@@ -17,7 +17,7 @@
#define XORGSERVER 1
/* Current X.Org version. */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((0) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((1) * 1000) + 0)
/* Need XFree86 libc-replacement typedefs. */
#define NEED_XF86_TYPES 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/include/xorg-server.h new/xorg-server-1.5.1/include/xorg-server.h
--- old/xorg-server-1.5.0/include/xorg-server.h 2008-09-04 01:00:32.000000000 +0200
+++ new/xorg-server-1.5.1/include/xorg-server.h 2008-09-23 20:28:36.000000000 +0200
@@ -153,7 +153,7 @@
/* #undef XORG_RELEASE */
/* Current Xorg version */
-#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((0) * 1000) + 0)
+#define XORG_VERSION_CURRENT (((1) * 10000000) + ((5) * 100000) + ((1) * 1000) + 0)
/* Build Xv Extension */
#define XvExtension 1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/randr/rrxinerama.c new/xorg-server-1.5.1/randr/rrxinerama.c
--- old/xorg-server-1.5.0/randr/rrxinerama.c 2008-09-03 19:03:39.000000000 +0200
+++ new/xorg-server-1.5.1/randr/rrxinerama.c 2008-09-23 20:25:01.000000000 +0200
@@ -138,10 +138,11 @@
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = active;
+ rep.window = stuff->window;
if(client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swaps (&rep.state, n);
+ swapl (&rep.window, n);
}
WriteToClient(client, sizeof(xPanoramiXGetStateReply), (char *)&rep);
return client->noClientException;
@@ -192,10 +193,11 @@
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.ScreenCount = RRXineramaScreenCount (pWin->drawable.pScreen);
+ rep.window = stuff->window;
if(client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
- swaps(&rep.ScreenCount, n);
+ swapl(&rep.window, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
return client->noClientException;
@@ -223,11 +225,15 @@
rep.sequenceNumber = client->sequence;
rep.width = pRoot->drawable.width;
rep.height = pRoot->drawable.height;
+ rep.window = stuff->window;
+ rep.screen = stuff->screen;
if(client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
- swaps(&rep.width, n);
- swaps(&rep.height, n);
+ swapl(&rep.width, n);
+ swapl(&rep.height, n);
+ swapl(&rep.window, n);
+ swapl(&rep.screen, n);
}
WriteToClient(client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
return client->noClientException;
@@ -351,6 +357,7 @@
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
+ swapl (&stuff->window, n);
return ProcRRXineramaGetState(client);
}
@@ -361,6 +368,7 @@
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
+ swapl (&stuff->window, n);
return ProcRRXineramaGetScreenCount(client);
}
@@ -371,6 +379,8 @@
register int n;
swaps (&stuff->length, n);
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
+ swapl (&stuff->window, n);
+ swapl (&stuff->screen, n);
return ProcRRXineramaGetScreenSize(client);
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/xorg-server-1.5.0/Xext/panoramiX.c new/xorg-server-1.5.1/Xext/panoramiX.c
--- old/xorg-server-1.5.0/Xext/panoramiX.c 2008-09-03 19:03:38.000000000 +0200
+++ new/xorg-server-1.5.1/Xext/panoramiX.c 2008-09-23 20:24:56.000000000 +0200
@@ -936,10 +936,11 @@
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.state = !noPanoramiXExtension;
+ rep.window = stuff->window;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swaps (&rep.state, n);
+ swapl (&rep.window, n);
}
WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
return client->noClientException;
@@ -963,10 +964,11 @@
rep.length = 0;
rep.sequenceNumber = client->sequence;
rep.ScreenCount = PanoramiXNumScreens;
+ rep.window = stuff->window;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swaps (&rep.ScreenCount, n);
+ swapl (&rep.window, n);
}
WriteToClient (client, sizeof (xPanoramiXGetScreenCountReply), (char *) &rep);
return client->noClientException;
@@ -980,6 +982,9 @@
xPanoramiXGetScreenSizeReply rep;
register int n, rc;
+ if (stuff->screen >= PanoramiXNumScreens)
+ return BadMatch;
+
REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess);
if (rc != Success)
@@ -991,11 +996,15 @@
/* screen dimensions */
rep.width = panoramiXdataPtr[stuff->screen].width;
rep.height = panoramiXdataPtr[stuff->screen].height;
+ rep.window = stuff->window;
+ rep.screen = stuff->screen;
if (client->swapped) {
swaps (&rep.sequenceNumber, n);
swapl (&rep.length, n);
- swaps (&rep.width, n);
- swaps (&rep.height, n);
+ swapl (&rep.width, n);
+ swapl (&rep.height, n);
+ swapl (&rep.window, n);
+ swapl (&rep.screen, n);
}
WriteToClient (client, sizeof (xPanoramiXGetScreenSizeReply), (char *) &rep);
return client->noClientException;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org