xorg-server: Changes to 'debian-experimental'
debian/changelog | 5 +++++
debian/control | 5 +++--
debian/rules | 1 +
3 files changed, 9 insertions(+), 2 deletions(-)
New commits:
commit 76702dde1b2f4afc96f56b30fb5dfb30e55ac955
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 6 17:09:25 2008 +0200
Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1).
Without this package, the GLX extension fails to initialise
(and takes the server down) due to missing swrast_dri.so.
diff --git a/debian/changelog b/debian/changelog
index ae17661..4688423 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
software driver itself), and don't pass --with-mesa-source to configure.
* Build with --enable-glx-tls, we build mesa with TLS support (otherwise
swrast_dri.so might fail to load due to unresolved symbols).
+ * Make the servers recommend libgl1-mesa-dri (>= 7.1~rc1). Without this
+ package, the GLX extension fails to initialise (and takes the server down)
+ due to missing swrast_dri.so.
[ Timo Aaltonen ]
* Re-enable dri & glx.
diff --git a/debian/control b/debian/control
index 9b5b17e..bec5d3a 100644
--- a/debian/control
+++ b/debian/control
@@ -40,7 +40,7 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/xserver/xorg-server.git
Package: xserver-xorg-core
Architecture: any
Depends: x11-common (>= 1:7.0.0), ${shlibs:Depends}, ${misc:Depends}, xserver-xorg
-Recommends: xkb-data, xfonts-base
+Recommends: xkb-data, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Suggests: xfonts-100dpi | xfonts-75dpi, xfonts-scalable
Conflicts: xserver-xorg (<< 6.8.2-38), xserver-xfree86 (<< 1:7.0.0),
xserver-xorg-video, xserver-common, xserver-xorg-video-1.0, xserver-xorg-input,
@@ -128,6 +128,7 @@ Description: Distributed Multihead X tools
Package: xnest
Architecture: any
Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
+Recommends: libgl1-mesa-dri (>= 7.1~rc1)
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
@@ -173,7 +174,7 @@ Description: Virtual Framebuffer 'fake' X server
Package: xserver-xephyr
Architecture: any
Depends: x11-common, ${shlibs:Depends}, ${misc:Depends}
-Recommends: xbase-clients, xfonts-base
+Recommends: xbase-clients, xfonts-base, libgl1-mesa-dri (>= 7.1~rc1)
Description: nested X server
Xephyr is an X server that can be run inside another X server,
much like Xnest. It is based on the kdrive X server, and as a
commit 6ead5f675d5ea587c68c00ba55049320ff3e806c
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 6 17:07:34 2008 +0200
Build with --enable-glx-tls
This needs to be in sync with mesa, which we build with TLS support
(otherwise swrast_dri.so might fail to load due to unresolved symbols).
diff --git a/debian/changelog b/debian/changelog
index 0701579..ae17661 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ xorg-server (2:1.4.99.905-1) UNRELEASED; urgency=low
* bump serverminver to 2:1.4.99.905.
* Stop build-depending on mesa-swx11-source (mesa 7.1 will build the
software driver itself), and don't pass --with-mesa-source to configure.
+ * Build with --enable-glx-tls, we build mesa with TLS support (otherwise
+ swrast_dri.so might fail to load due to unresolved symbols).
[ Timo Aaltonen ]
* Re-enable dri & glx.
diff --git a/debian/rules b/debian/rules
index 2d5ef53..488b8c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,6 +47,7 @@ confflags += --disable-static \
--with-default-font-path="/usr/share/fonts/X11/misc,/usr/share/fonts/X11/cyrillic,/usr/share/fonts/X11/100dpi/:unscaled,/usr/share/fonts/X11/75dpi/:unscaled,/usr/share/fonts/X11/Type1,/usr/share/fonts/X11/100dpi,/usr/share/fonts/X11/75dpi,/var/lib/defoma/x-ttcidfont-conf.d/dirs/TrueType" \
--with-serverconfig-path=/etc/X11/xserver \
--enable-xtrap \
+ --enable-glx-tls \
--enable-dmx \
--enable-vfb \
--enable-kdrive \
Reply to: