ChangeLog | 147 ++++++++++++++++++++++++
aclocal.m4 | 20 ++-
composite/compwindow.c | 4
config/hal.c | 8 -
configure | 104 ++++++++++++++--
configure.ac | 2
debian/changelog | 13 +-
debian/control | 98 ++++++++--------
debian/patches/03_auto_load_driver.diff | 26 ++--
debian/patches/04_auto_load_driver_no_conf.diff | 6
debian/patches/40_default_dpi_96.patch | 19 ---
debian/patches/series | 1
debian/rules | 2
hw/dmx/Makefile.am | 1
hw/dmx/Makefile.in | 1
hw/dmx/dmxinput.c | 11 +
hw/kdrive/ephyr/Makefile.am | 1
hw/kdrive/ephyr/Makefile.in | 1
hw/kdrive/src/kdrive.c | 6
hw/xfree86/common/xf86AutoConfig.c | 9 +
hw/xfree86/common/xf86Priv.h | 2
hw/xfree86/modes/xf86Cursors.c | 3
include/do-not-use-config.h.in | 3
ltmain.sh | 2
xkb/ddxLoad.c | 2
25 files changed, 366 insertions(+), 126 deletions(-)
New commits:
commit 8534900d8420b1f3321236f83b23a83da10664ff
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 17:50:31 2008 +0200
Document the fact that xprint is now enabled in debian/changelog
diff --git a/debian/changelog b/debian/changelog
index 1762299..b95923a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
2a3d1421e0cc18822ae8f478fcc272e16a9e9340, with removal of
CONFIG_LIB from configure.ac shifted to 94_xprint_XSERVER_LIBS.
Closes: #472180.
+ * Enable the xprint DDX, and build the xprint and xprint-common packages.
-- Drew Parsons <[EMAIL PROTECTED]> Sat, 10 May 2008 03:18:04 +1000
commit 732faeda97c84bfa2847f2da5436ff6d72a15b69
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 17:00:45 2008 +0200
Re-enable the dmx DDX, and build the xdmx and xdmx-tools packages
The build is now fixed upstream.
diff --git a/debian/changelog b/debian/changelog
index 497058b..1762299 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* Add x11-common to the Depends field of xnest, xvfb and xserver-xephyr (its
init script sets up the /tmp/.X11-unix directory).
+ * Re-enable the dmx DDX, and build the xdmx and xdmx-tools packages (the
+ build is now fixed upstream); closes: #449254.
[ Drew Parsons ]
* Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
diff --git a/debian/control b/debian/control
index a327329..19c46cb 100644
--- a/debian/control
+++ b/debian/control
@@ -88,40 +88,40 @@ Description: Xorg X server - development files
.
This package is built from the X.org xserver module.
-#Package: xdmx
-#Architecture: any
-#Depends: ${shlibs:Depends}, ${misc:Depends}
-#Description: distributed multihead X server
-# Xdmx is a proxy X server that uses one or more other X servers as its
-# display device(s). It provides multi-head X functionality for displays that
-# might be located on different machines. Xdmx functions as a front-end X
server
-# that acts as a proxy to a set of back-end X servers. All of the visible
-# rendering is passed to the back-end X servers. Clients connect to the Xdmx
-# front-end, and everything appears as it would in a regular multi-head
-# configuration. If Xinerama is enabled (e.g., with +xinerama on the command
-# line), the clients see a single large screen.
-# .
-# More information about X.Org can be found at:
-# <URL:http://www.X.org>
-# <URL:http://xorg.freedesktop.org>
-# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
-# .
-# This package is built from the X.org xserver module.
-#
-#Package: xdmx-tools
-#Architecture: any
-#Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
-#Replaces: xdmx (<= 2:1.1.1-10)
-#Description: Distributed Multihead X tools
-# This package provides a collection of tools used for administration of
-# the Xdmx server; see the xdmx package for more information.
-# .
-# More information about X.Org can be found at:
-# <URL:http://www.X.org>
-# <URL:http://xorg.freedesktop.org>
-# <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
-# .
-# This package is built from the X.org xserver module.
+Package: xdmx
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: distributed multihead X server
+ Xdmx is a proxy X server that uses one or more other X servers as its
+ display device(s). It provides multi-head X functionality for displays that
+ might be located on different machines. Xdmx functions as a front-end X server
+ that acts as a proxy to a set of back-end X servers. All of the visible
+ rendering is passed to the back-end X servers. Clients connect to the Xdmx
+ front-end, and everything appears as it would in a regular multi-head
+ configuration. If Xinerama is enabled (e.g., with +xinerama on the command
+ line), the clients see a single large screen.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xserver module.
+
+Package: xdmx-tools
+Architecture: any
+Depends: xdmx, ${shlibs:Depends}, ${misc:Depends}
+Replaces: xdmx (<= 2:1.1.1-10)
+Description: Distributed Multihead X tools
+ This package provides a collection of tools used for administration of
+ the Xdmx server; see the xdmx package for more information.
+ .
+ More information about X.Org can be found at:
+ <URL:http://www.X.org>
+ <URL:http://xorg.freedesktop.org>
+ <URL:http://lists.freedesktop.org/mailman/listinfo/xorg>
+ .
+ This package is built from the X.org xserver module.
Package: xnest
Architecture: any
diff --git a/debian/rules b/debian/rules
index 385e906..1dd17c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,7 +56,7 @@ confflags += --disable-static \
--with-serverconfig-path=/etc/X11/xserver \
--with-rgb-path=/etc/X11/rgb \
--enable-xtrap \
- --disable-dmx \
+ --enable-dmx \
--enable-vfb \
--enable-kdrive \
--enable-xephyr \
commit f2b6e4f6f7f08ec94b33fcaa3d15748945e08861
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 16:59:16 2008 +0200
Add x11-common to the Depends field of xnest, xvfb and xserver-xephyr
Its init script sets up the /tmp/.X11-unix directory.
diff --git a/debian/changelog b/debian/changelog
index 862e23e..497058b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
04_auto_load_driver_no_conf.diff
* Don't build-depend on packages with a -1 debian revision.
* Drop the XS- prefix from Vcs-* control fields.
+ * Add x11-common to the Depends field of xnest, xvfb and xserver-xephyr (its
+ init script sets up the /tmp/.X11-unix directory).
[ Drew Parsons ]
* Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
diff --git a/debian/control b/debian/control
index 128a93f..a327329 100644
--- a/debian/control
+++ b/debian/control
@@ -125,7 +125,7 @@ Description: Xorg X server - development files
Package: xnest
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
Description: Nested X server
Xnest is a nested X server that simply relays all its requests to another
X server, where it runs as a client. This means that it appears as another
@@ -143,7 +143,7 @@ Description: Nested X server
Package: xvfb
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients, xfonts-base
Description: Virtual Framebuffer 'fake' X server
Xvfb provides an X server that can run on machines with no display hardware
@@ -170,7 +170,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
Recommends: xbase-clients, xfonts-base
Description: nested X server
Xephyr is an X server that can be run inside another X server,
commit 34d2dcfc48ec7586267765d610a77e92b714c21e
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 16:56:23 2008 +0200
Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index c742ef0..862e23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
+ refresh patches 03_auto_load_driver.diff and
04_auto_load_driver_no_conf.diff
* Don't build-depend on packages with a -1 debian revision.
+ * Drop the XS- prefix from Vcs-* control fields.
[ Drew Parsons ]
* Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
diff --git a/debian/control b/debian/control
index b04b1f9..128a93f 100644
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,8 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release, pkg-config,
bison, flex,
libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev
[!hurd-i386]
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.3
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
+Vcs-Git: git://git.debian.org/git/pkg-xorg/xserver/xorg-server
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
commit 844884a589795155c27a3dce444f24cb99042d69
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 16:56:00 2008 +0200
Don't build-depend on packages with a -1 debian revision.
diff --git a/debian/changelog b/debian/changelog
index 76bb598..c742ef0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
+ drop patch 40_default_dpi_96.patch applied upstream
+ refresh patches 03_auto_load_driver.diff and
04_auto_load_driver_no_conf.diff
+ * Don't build-depend on packages with a -1 debian revision.
[ Drew Parsons ]
* Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
diff --git a/debian/control b/debian/control
index 1c00a3d..b04b1f9 100644
--- a/debian/control
+++ b/debian/control
@@ -14,22 +14,22 @@ Build-Depends: debhelper (>= 4.0.0), lsb-release,
pkg-config, bison, flex,
x11proto-kb-dev (>= 1.0.3), x11proto-xinerama-dev, x11proto-randr-dev (>=
1.2),
x11proto-record-dev, x11proto-render-dev (>= 2:0.9.3), x11proto-resource-dev,
x11proto-scrnsaver-dev, x11proto-trap-dev, x11proto-video-dev,
- x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0-1),
+ x11proto-xcmisc-dev, x11proto-xext-dev (>= 6.9.99.0),
x11proto-xf86bigfont-dev, x11proto-xf86dga-dev, x11proto-xf86misc-dev,
- x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1-1),
+ x11proto-xf86vidmode-dev, xtrans-dev, libxau-dev (>= 1:0.99.1),
x11proto-input-dev (>= 1.4.2),
- libxdmcp-dev (>= 1:0.99.1-1), libxfont-dev, libfontenc-dev,
- libxkbfile-dev (>= 1:0.99.1-1), libpixman-1-dev (>= 0.9.4-2),
+ libxdmcp-dev (>= 1:0.99.1), libxfont-dev, libfontenc-dev,
+ libxkbfile-dev (>= 1:0.99.1), libpixman-1-dev (>= 0.9.4-2),
x11proto-xf86dri-dev, libdrm-dev (>= 2.3.0) [!hurd-i386],
x11proto-print-dev, libfreetype6-dev, xfonts-utils,
mesa-swx11-source (>> 7.0.1~rc2-1),
x11proto-gl-dev (>= 1.4.8), libgl1-mesa-dev (>= 6.5.1),
- libxmuu-dev (>= 1:0.99.1-1), libxext-dev (>= 1:0.99.1-1),
- libx11-dev (>= 1:0.99.2-1), libxrender-dev (>= 1:0.9.0-1),
- libxi-dev (>= 1:0.99.1-1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1-1),
- libxpm-dev (>= 1:3.5.3-1), libxaw7-dev (>= 1:0.99.1-1),
- libxt-dev (>= 1:0.99.1-1), libxmu-dev (>= 1:0.99.1-1),
- libxtst-dev (>= 1:0.99.1-1), libxres-dev (>= 1:0.99.1-1),
+ libxmuu-dev (>= 1:0.99.1), libxext-dev (>= 1:0.99.1),
+ libx11-dev (>= 1:0.99.2), libxrender-dev (>= 1:0.9.0),
+ libxi-dev (>= 1:0.99.1), x11proto-dmx-dev, quilt, libdmx-dev (>= 1:1.0.1),
+ libxpm-dev (>= 1:3.5.3), libxaw7-dev (>= 1:0.99.1),
+ libxt-dev (>= 1:0.99.1), libxmu-dev (>= 1:0.99.1),
+ libxtst-dev (>= 1:0.99.1), libxres-dev (>= 1:0.99.1),
libxfixes-dev (>= 1:3.0.0), libdbus-1-dev [!hurd-i386], libhal-dev
[!hurd-i386]
Build-Conflicts: xlibs-static-dev
Standards-Version: 3.7.3
commit 118a65982f6281c4b88de6604b10e24b3f1fc281
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 16:53:59 2008 +0200
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index fd9a8a9..f76f8c4 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package,
typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-3 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
@@ -7371,6 +7371,12 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
#include <sys/socket.h>
#include <netinet/in.h>
])
+
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ AC_CHECK_TYPES([socklen_t], [], [], [
+AC_INCLUDES_DEFAULT
+#include <sys/socket.h>])
+
]) # XTRANS_TCP_FLAGS
# XTRANS_CONNECTION_FLAGS()
@@ -7380,17 +7386,21 @@ AC_DEFUN([XTRANS_TCP_FLAGS],[
AC_DEFUN([XTRANS_CONNECTION_FLAGS],[
AC_REQUIRE([AC_CANONICAL_HOST])
AC_REQUIRE([AC_TYPE_SIGNAL])
+ [case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac]
AC_ARG_ENABLE(unix-transport,
AC_HELP_STRING([--enable-unix-transport],[Enable UNIX domain socket
transport]),
- [UNIXCONN=$enableval], [UNIXCONN=yes])
- AC_ARG_ENABLE(tcp-transport,
- AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
- [TCPCONN=$enableval], [TCPCONN=yes])
+ [UNIXCONN=$enableval], [UNIXCONN=$unixdef])
AC_MSG_CHECKING([if Xtrans should support UNIX socket connections])
if test "$UNIXCONN" = "yes"; then
AC_DEFINE(UNIXCONN,1,[Support UNIX socket connections])
fi
AC_MSG_RESULT($UNIXCONN)
+ AC_ARG_ENABLE(tcp-transport,
+ AC_HELP_STRING([--enable-tcp-transport],[Enable TCP socket transport]),
+ [TCPCONN=$enableval], [TCPCONN=yes])
AC_MSG_CHECKING([if Xtrans should support TCP socket connections])
AC_MSG_RESULT($TCPCONN)
if test "$TCPCONN" = "yes"; then
diff --git a/configure b/configure
index ae56122..6789fd6 100755
--- a/configure
+++ b/configure
@@ -27600,18 +27600,15 @@ fi
+ case $host_os in
+ mingw*) unixdef="no" ;;
+ *) unixdef="yes" ;;
+ esac
# Check whether --enable-unix-transport was given.
if test "${enable_unix_transport+set}" = set; then
enableval=$enable_unix_transport; UNIXCONN=$enableval
else
- UNIXCONN=yes
-fi
-
- # Check whether --enable-tcp-transport was given.
-if test "${enable_tcp_transport+set}" = set; then
- enableval=$enable_tcp_transport; TCPCONN=$enableval
-else
- TCPCONN=yes
+ UNIXCONN=$unixdef
fi
{ echo "$as_me:$LINENO: checking if Xtrans should support UNIX socket
connections" >&5
@@ -27625,6 +27622,13 @@ _ACEOF
fi
{ echo "$as_me:$LINENO: result: $UNIXCONN" >&5
echo "${ECHO_T}$UNIXCONN" >&6; }
+ # Check whether --enable-tcp-transport was given.
+if test "${enable_tcp_transport+set}" = set; then
+ enableval=$enable_tcp_transport; TCPCONN=$enableval
+else
+ TCPCONN=yes
+fi
+
{ echo "$as_me:$LINENO: checking if Xtrans should support TCP socket
connections" >&5
echo $ECHO_N "checking if Xtrans should support TCP socket connections...
$ECHO_C" >&6; }
{ echo "$as_me:$LINENO: result: $TCPCONN" >&5
@@ -28023,6 +28027,74 @@ _ACEOF
fi
+ # POSIX.1g changed the type of pointer passed to getsockname/getpeername/etc.
+ { echo "$as_me:$LINENO: checking for socklen_t" >&5
+echo $ECHO_N "checking for socklen_t... $ECHO_C" >&6; }
+if test "${ac_cv_type_socklen_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+$ac_includes_default
+#include <sys/socket.h>
+
+typedef socklen_t ac__type_new_;
+int
+main ()
+{
+if ((ac__type_new_ *) 0)
+ return 0;
+if (sizeof (ac__type_new_))
+ return 0;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_type_socklen_t=yes
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ ac_cv_type_socklen_t=no
+fi
+
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ echo "$as_me:$LINENO: result: $ac_cv_type_socklen_t" >&5
+echo "${ECHO_T}$ac_cv_type_socklen_t" >&6; }
+if test $ac_cv_type_socklen_t = yes; then
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_SOCKLEN_T 1
+_ACEOF
+
+
+fi
+
+
+
fi
case $host_os in
solaris*|sco*|sysv4*) localdef="yes" ;;
@@ -36216,12 +36288,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XEPHYR_CFLAGS="$XEPHYR_CFLAGS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext
xfont xau xdmcp\"") >&5
- ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext
xfont xau xdmcp \$PIXMAN\"") >&5
+ ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp $PIXMAN") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xfont xau xdmcp"
2>/dev/null`
+ pkg_cv_XEPHYR_CFLAGS=`$PKG_CONFIG --cflags "x11 xext xfont xau xdmcp
$PIXMAN" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -36234,12 +36306,12 @@ if test -n "$PKG_CONFIG"; then
pkg_cv_XEPHYR_LIBS="$XEPHYR_LIBS"
else
if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext
xfont xau xdmcp\"") >&5
- ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp") 2>&5
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"x11 xext
xfont xau xdmcp \$PIXMAN\"") >&5
+ ($PKG_CONFIG --exists --print-errors "x11 xext xfont xau xdmcp $PIXMAN") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "x11 xext xfont xau xdmcp"
2>/dev/null`
+ pkg_cv_XEPHYR_LIBS=`$PKG_CONFIG --libs "x11 xext xfont xau xdmcp $PIXMAN"
2>/dev/null`
else
pkg_failed=yes
fi
@@ -36258,9 +36330,9 @@ else
_pkg_short_errors_supported=no
fi
if test $_pkg_short_errors_supported = yes; then
- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "x11 xext xfont xau xdmcp"`
+ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --short-errors
--errors-to-stdout --print-errors "x11 xext xfont xau xdmcp $PIXMAN"`
else
- XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "x11 xext xfont xau xdmcp"`
+ XEPHYR_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout
--print-errors "x11 xext xfont xau xdmcp $PIXMAN"`
fi
# Put the nasty error message in config.log where it belongs
echo "$XEPHYR_PKG_ERRORS" >&5
diff --git a/hw/dmx/Makefile.in b/hw/dmx/Makefile.in
index 22ce691..0bcbfc5 100644
--- a/hw/dmx/Makefile.in
+++ b/hw/dmx/Makefile.in
@@ -484,6 +484,7 @@ Xdmx_LDADD = $(XORG_CORE_LIBS) \
$(GLX_LIBS) \
input/libdmxinput.a \
config/libdmxconfig.a \
+ @XSERVER_LIBS@ \
@DMXMODULES_LIBS@
diff --git a/hw/kdrive/ephyr/Makefile.in b/hw/kdrive/ephyr/Makefile.in
index d24c897..e113ecd 100644
--- a/hw/kdrive/ephyr/Makefile.in
+++ b/hw/kdrive/ephyr/Makefile.in
@@ -403,6 +403,7 @@ Xephyr_LDADD = \
libxephyr-hostx.a \
../../../exa/libexa.la \
@KDRIVE_LIBS@ \
+ @XSERVER_LIBS@ \
@XEPHYR_LIBS@
Xephyr_DEPENDENCIES = \
diff --git a/include/do-not-use-config.h.in b/include/do-not-use-config.h.in
index f293901..26e34c7 100644
--- a/include/do-not-use-config.h.in
+++ b/include/do-not-use-config.h.in
@@ -259,6 +259,9 @@
/* Define to 1 if you have the <SDL/SDL.h> header file. */
#undef HAVE_SDL_SDL_H
+/* Define to 1 if the system has the type `socklen_t'. */
+#undef HAVE_SOCKLEN_T
+
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
diff --git a/ltmain.sh b/ltmain.sh
index bba8b1c..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-3"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit 1b674d4fa6e67693ffcee7d72a3799ca720ddc94
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Sat May 17 16:36:56 2008 +0200
Update patch stack and changelog for new upstream pull
+ drop patch 40_default_dpi_96.patch applied upstream
+ refresh patches 03_auto_load_driver.diff and
04_auto_load_driver_no_conf.diff
diff --git a/ChangeLog b/ChangeLog
index cb0fe4a..ba131de 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,150 @@
+commit ddcca23a81abf5215f906a7ad097f1ed088ed92b
+Author: Peter Hutterer <[EMAIL PROTECTED]>
+Date: Thu Feb 7 15:48:04 2008 +1030
+
+ xkb: when copying the keymap, make sure the structs default to 0/NULL.
+
+ It actually does help if a pointer is NULL rather than pointing to nirvana
+ when you're trying to free it lateron. Who would have thought?
+ (cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
+ (cherry picked from commit 0b0a09797302ac2171db5df20fc5110aafc8efbb)
+
+commit 4e5cf76ecaa6b20f825738b07c257f4929e4652a
+Author: Mart Raudsepp <[EMAIL PROTECTED]>
+Date: Fri May 16 20:06:31 2008 +0300
+
+ xf86: Add AutoConfig driver for PCI ID 1022:2081 to 'amd'
+
+ (cherry picked from commit ab9b0b36ac8ac72fc48c0abd91a83de49a18313c)
+ (cherry picked from commit 4fa89fbe18c929e0d36305ab47e7e17841309ffd)
+ ... and backported to 1.4 (back to no new devprivates and "amd" driver
name)
+
+commit 22b1a9dd0f68e3307cdcf3e6f8fcaeda34acd483
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Oct 18 17:44:48 2007 +0200
+
+ EXA: Skip empty glyphs. (cherry picked from commit
ce50bfd3369686cfecee5a138bd84ef1107a249d)
+
+commit 2989f1071648770b5bbbfd80979f04d949f3dc57
+Author: Daniel Stone <[EMAIL PROTECTED]>
+Date: Fri May 16 19:49:05 2008 +0300
+
+ Prevent the -wm command line option from causing a SEGV
+
+ The -wm (when mapped) option for the BackingStore support has been
+ causing the server to dereference a NULL pointer.
+
+ This has probably been the case since backing store has been
+ implemented on top of Composite.
+
+ It looks like (some of?) Composite didn’t expect its WIndowPtr
+ argument to be the root window.
+
+ In Composite’s compCheckRedirect() function we now avoid calling
+ compAllocPixmap() and compFreePixmap() when the pWin pointer’s
+ parent member is NULL, as is it the case with a server’s root window.
+
+ This addresses:
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=15878
+ (cherry picked from commit 04211c3532ca078420e3745a5eac3d9de120bc32)
+
+commit 33a9ee9ba0ab44548afafa965bbd0a715cb1509c
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon Mar 24 12:22:19 2008 -0400
+
+ Bug #13962: Re-arm the DPMS timer when re-enabling DPMS.
+ (cherry picked from commit 536f2ff5382aaaace3b55481e15366bb15d87801)
+
+commit a08f848d4cd4c8c6e055a1182542d053a0a32c6b
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Sun Nov 18 11:57:01 2007 -0500
+
+ Bump DEFAULT_DPI to 96.
+
+ 75 is just nonsense.
+ (cherry picked from commit db9ae863536fff80b5463d99e71dc47ae587980d)
+
+commit d5a7badd6a0ea4ecbe76f0205aa53b42f7cd90dc
+Author: Adam Jackson <[EMAIL PROTECTED]>
+Date: Mon May 5 14:37:07 2008 -0400
+
+ Fix hal shutdown crash.
+
+ Removing the device invalidates its ->next pointer. Copy it aside before
+ destroying the device.
+ (cherry picked from commit f52f6c5c7efc281f9ac204fbaa4f71383df7463d)
+
+commit 458b487723a7beb792857c920e9be22c2ce4625d
+Author: Eric Anholt <[EMAIL PROTECTED]>
+Date: Fri Aug 17 12:14:16 2007 -0700
+
+ Fix overly-restrictive integer overflow check in EXA pixmap creation.
+
+ The result was that at 32bpp, pixmaps of width 8192 or greater couldn't be
+ created, due to treating a pitch value as a width.
+ (cherry picked from commit bc2d516f16d94c805b4dfa8e5b9eef40ff0cbe98)
+
+commit 2621380cf680941a0423d64d827fb3513545ebf5
+Author: Michel Dänzer <[EMAIL PROTECTED]>
+Date: Thu Mar 20 09:18:29 2008 -0400
+
+ Fix RandR 1.2 driver interface conversion of two colour cursors to ARGB
+
+ This patch (and not setting HARDWARE_CURSOR_BIT_ORDER_MSBFIRST on big
endian
+ platforms) fixes it for me with the radeon driver and doesn't break intel.
+
+ Correct patch this time :)
+ (cherry picked from commit da973e962d09854b571320dee7dd9569060bc39e)
+
+commit 9db5401d69f1fab8db4bdd166536a25e4516e231
+Author: Donnie Berkholz <[EMAIL PROTECTED]>
+Date: Thu May 8 00:08:12 2008 -0700
+
+ xprint: fix linking by including XSERVER_LIBS.
+
+commit 1022c7774b0a92946e87c61aa79b076a6ffe95ff
+Author: Donnie Berkholz <[EMAIL PROTECTED]>
+Date: Thu May 8 00:07:57 2008 -0700
+
+ xprint: fix build by adding {New,Delete}InputDeviceRequest.
+
+commit 9df3886354152250983171825daeb93a6a845369
+Author: Donnie Berkholz <[EMAIL PROTECTED]>
+Date: Thu May 8 00:06:16 2008 -0700
+
+ xephyr: fix linking by adding pixman and using XSERVER_LIBS.
+
+commit 6c5c1c5c9819fe9a5f2e2a6995017e414662d6cf
+Author: Donnie Berkholz <[EMAIL PROTECTED]>
+Date: Thu May 8 00:05:00 2008 -0700
+
+ dmx: link in XSERVER_LIBS.
+
+commit 71f0711f40d825de3f1a7a09de78c6181fb3a521
+Author: Donnie Berkholz <[EMAIL PROTECTED]>
+Date: Thu May 8 00:04:36 2008 -0700
+
+ dmx: fix build by adding {New,Delete}InputDeviceRequest.
+
+commit d0554a57489e272233bcb38cb453f2c0bc0b1729
+Author: Alan Coopersmith <[EMAIL PROTECTED]>
+Date: Tue May 13 16:39:30 2008 -0700
+
+ When XKB fails to open rules file, log the file name, not the NULL file
pointer
+ (cherry picked from commit 7cdc19b29d93bf15cecfd6b69e269fab2501bca0)
+
+commit 3f8ba890762513edc7eddbbbd4bb26f908540c8d
+Author: Julien Cristau <[EMAIL PROTECTED]>
+Date: Sun May 11 23:17:27 2008 +0200
+
+ kdrive: allow disabling Composite
+
+ KdInitOutput() used to enable Composite when it was disabled by default,
+ but now this hack prevents ``-extension Composite'' from working.
+ Remove it, as Composite is enabled by default anyway.
+ (cherry picked from commit 9dfb525f6c91acab5d1a65765a046bf9ee2aa082)
+
commit 104048501f37b139d4113562ef1711978cc76018
Author: Daniel Stone <[EMAIL PROTECTED]>
Date: Wed May 7 23:11:31 2008 +0300
diff --git a/debian/changelog b/debian/changelog
index 0de5078..76bb598 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
-xorg-server (2:1.4.1~git20080507-2) UNRELEASED; urgency=low
+xorg-server (2:1.4.1~git20080517-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Pass -DPRE_RELEASE=0 in CPPFLAGS, so we don't print the pre-release
warning in the Xorg log.
+ * Pull from upstream server-1.4-branch
+ + drop patch 40_default_dpi_96.patch applied upstream
+ + refresh patches 03_auto_load_driver.diff and
+ 04_auto_load_driver_no_conf.diff
[ Drew Parsons ]
* Patch 95_xprint_disable_dbus disables dbus in Xprint by providing
diff --git a/debian/patches/03_auto_load_driver.diff
b/debian/patches/03_auto_load_driver.diff
index 971b4ac..fe03db4 100644
--- a/debian/patches/03_auto_load_driver.diff
+++ b/debian/patches/03_auto_load_driver.diff
@@ -1,7 +1,7 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-09-20
21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-09-20
23:00:23.000000000 -0400
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -39,6 +39,7 @@
#include "xf86Config.h"
#include "xf86Priv.h"
@@ -10,7 +10,7 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
/* Sections for the default built-in configuration. */
-@@ -287,3 +288,207 @@
+@@ -292,3 +293,207 @@
return (ret == CONFIG_OK);
}
@@ -220,8 +220,8 @@ Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
+}
Index: xorg-server/hw/xfree86/common/xf86Config.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.c 2007-09-20
21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.c 2007-09-20 23:00:23.000000000
-0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.c
++++ xorg-server/hw/xfree86/common/xf86Config.c
@@ -1928,8 +1928,10 @@
return FALSE;
}
@@ -256,8 +256,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.c
devicep->board = conf_device->dev_board;
Index: xorg-server/hw/xfree86/common/xf86Config.h
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Config.h 2007-09-20
21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Config.h 2007-09-20 21:41:57.000000000
-0400
+--- xorg-server.orig/hw/xfree86/common/xf86Config.h
++++ xorg-server/hw/xfree86/common/xf86Config.h
@@ -34,6 +34,8 @@
#define _xf86_config_h
@@ -278,8 +278,8 @@ Index: xorg-server/hw/xfree86/common/xf86Config.h
#endif /* _xf86_config_h */
Index: xorg-server/hw/xfree86/common/xf86Init.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86Init.c 2007-09-20
21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86Init.c 2007-09-20 23:00:15.000000000
-0400
+--- xorg-server.orig/hw/xfree86/common/xf86Init.c
++++ xorg-server/hw/xfree86/common/xf86Init.c
@@ -347,6 +347,16 @@
}
@@ -299,8 +299,8 @@ Index: xorg-server/hw/xfree86/common/xf86Init.c
xfree(modulelist);
Index: xorg-server/hw/xfree86/parser/Screen.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/Screen.c 2007-09-20
21:41:34.000000000 -0400
-+++ xorg-server/hw/xfree86/parser/Screen.c 2007-09-20 21:41:57.000000000
-0400
+--- xorg-server.orig/hw/xfree86/parser/Screen.c
++++ xorg-server/hw/xfree86/parser/Screen.c
@@ -526,15 +526,7 @@
}
}
@@ -320,8 +320,8 @@ Index: xorg-server/hw/xfree86/parser/Screen.c
while (adaptor)
Index: xorg-server/hw/xfree86/parser/read.c
===================================================================
---- xorg-server.orig/hw/xfree86/parser/read.c 2007-09-20 21:41:34.000000000
-0400
-+++ xorg-server/hw/xfree86/parser/read.c 2007-09-20 21:41:57.000000000
-0400
+--- xorg-server.orig/hw/xfree86/parser/read.c
++++ xorg-server/hw/xfree86/parser/read.c
@@ -80,8 +80,8 @@
static int
xf86validateConfig (XF86ConfigPtr p)
diff --git a/debian/patches/04_auto_load_driver_no_conf.diff
b/debian/patches/04_auto_load_driver_no_conf.diff
index 445fcf4..be2bf63 100644
--- a/debian/patches/04_auto_load_driver_no_conf.diff
+++ b/debian/patches/04_auto_load_driver_no_conf.diff
@@ -1,8 +1,8 @@
Index: xorg-server/hw/xfree86/common/xf86AutoConfig.c
===================================================================
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2007-08-23
22:28:33.000000000 -0400
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2007-08-23
22:30:10.000000000 -0400
-@@ -220,22 +220,7 @@
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
+@@ -225,22 +225,7 @@
char *driver = NULL;
ConfigStatus ret;
diff --git a/debian/patches/40_default_dpi_96.patch
b/debian/patches/40_default_dpi_96.patch
deleted file mode 100644
index cfbe33c..0000000
--- a/debian/patches/40_default_dpi_96.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit db9ae863536fff80b5463d99e71dc47ae587980d
-Author: Adam Jackson <[EMAIL PROTECTED]>
-Date: Sun Nov 18 11:57:01 2007 -0500
-
- Bump DEFAULT_DPI to 96.
-
- 75 is just nonsense.
-
---- xorg-server.orig/hw/xfree86/common/xf86Priv.h
-+++ xorg-server/hw/xfree86/common/xf86Priv.h
-@@ -119,7 +119,7 @@
- #define DEFAULT_LOG_VERBOSE 3
- #endif
- #ifndef DEFAULT_DPI
--#define DEFAULT_DPI 75
-+#define DEFAULT_DPI 96
- #endif
-
- #define DEFAULT_UNRESOLVED TRUE
diff --git a/debian/patches/series b/debian/patches/series
index b48bd45..9713eb7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,7 +14,6 @@
16_X86EMU-pass-the-correct-bus-dev-fn-tag-to-pci-emula.patch
17_x86emu_handle_cpuid.patch
21_glx_align_fixes.patch
-40_default_dpi_96.patch
41_vbe_filter_less.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
44_preferredmode_infinite_loop.diff
commit ddcca23a81abf5215f906a7ad097f1ed088ed92b
Author: Peter Hutterer <[EMAIL PROTECTED]>
Date: Thu Feb 7 15:48:04 2008 +1030
xkb: when copying the keymap, make sure the structs default to 0/NULL.
It actually does help if a pointer is NULL rather than pointing to nirvana
when you're trying to free it lateron. Who would have thought?
(cherry picked from commit 7a97ca667405a42d008265c3a870210cc1da97dd)
(cherry picked from commit 0b0a09797302ac2171db5df20fc5110aafc8efbb)
diff --git a/xkb/xkbUtils.c b/xkb/xkbUtils.c
index e90df0d..ce4df4c 100644
--- a/xkb/xkbUtils.c
+++ b/xkb/xkbUtils.c
@@ -1707,9 +1707,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
else {
if (dst->geom->sz_shapes) {
xfree(dst->geom->shapes);
- dst->geom->shapes = NULL;
}
-
+ dst->geom->shapes = NULL;
dst->geom->num_shapes = 0;
dst->geom->sz_shapes = 0;
}
@@ -1758,6 +1757,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
}
dst->geom->num_sections = 0;
+ dst->geom->sections = NULL;
}
if (src->geom->num_sections) {
@@ -1769,6 +1769,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
tmp = xalloc(src->geom->num_sections * sizeof(XkbSectionRec));
if (!tmp)
return FALSE;
+ memset(tmp, 0, src->geom->num_sections * sizeof(XkbSectionRec));
dst->geom->sections = tmp;
dst->geom->num_sections = src->geom->num_sections;
@@ -1804,6 +1805,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
return FALSE;
dsection->doodads = tmp;
}
+ else {
+ dsection->doodads = NULL;
+ }
+
for (k = 0,
sdoodad = ssection->doodads,
ddoodad = dsection->doodads;
@@ -1831,9 +1836,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
else {
if (dst->geom->sz_sections) {
xfree(dst->geom->sections);
- dst->geom->sections = NULL;
}
+ dst->geom->sections = NULL;
dst->geom->num_sections = 0;
dst->geom->sz_sections = 0;
}
@@ -1862,6 +1867,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
}
}
}
+ dst->geom->num_doodads = 0;
+ dst->geom->doodads = NULL;
}
if (src->geom->num_doodads) {
@@ -1874,7 +1881,7 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
sizeof(XkbDoodadRec));
if (!tmp)
return FALSE;
- bzero(tmp, src->geom->num_doodads * sizeof(XkbDoodadRec));
+ memset(tmp, 0, src->geom->num_doodads * sizeof(XkbDoodadRec));
dst->geom->doodads = tmp;
dst->geom->sz_doodads = src->geom->num_doodads;
@@ -1903,9 +1910,9 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
else {
if (dst->geom->sz_doodads) {
xfree(dst->geom->doodads);
- dst->geom->doodads = NULL;
}
+ dst->geom->doodads = NULL;
dst->geom->num_doodads = 0;
dst->geom->sz_doodads = 0;
}
@@ -1933,10 +1940,10 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
dst->geom->num_key_aliases = dst->geom->sz_key_aliases;
}
else {
- if (dst->geom->sz_key_aliases && dst->geom->key_aliases) {
+ if (dst->geom->key_aliases) {
xfree(dst->geom->key_aliases);
- dst->geom->key_aliases = NULL;
}
+ dst->geom->key_aliases = NULL;
dst->geom->num_key_aliases = 0;
dst->geom->sz_key_aliases = 0;
}
@@ -1967,8 +1974,8 @@ XkbCopyKeymap(XkbDescPtr src, XkbDescPtr dst, Bool
sendNotifies)
else {
if (dst->geom->label_font) {
xfree(dst->geom->label_font);
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
