diff --git a/commit-a18551c.diff b/commit-a18551c.diff new file mode 100644 index 0000000..405fe94 --- /dev/null +++ b/commit-a18551c.diff @@ -0,0 +1,81 @@ +commit a18551cad1bf88b30d8466859509fb1fcfd1f2d6 +Author: Adam Jackson +Date: Wed Jul 2 11:25:50 2008 -0400 + + Fix GLX in Xvfb and kdrive. + (cherry picked from commit 689292e58cc5242cbfeaa29fcf65b6dcd9dfabb9) + +diff --git a/hw/kdrive/ephyr/Makefile.am b/hw/kdrive/ephyr/Makefile.am +index 81d3d69..7a56d34 100644 +--- a/hw/kdrive/ephyr/Makefile.am ++++ b/hw/kdrive/ephyr/Makefile.am +@@ -85,5 +85,7 @@ Xephyr_DEPENDENCIES = \ + $(LIBXEPHYR_HOSTDRI) \ + @KDRIVE_LOCAL_LIBS@ + ++Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++ + relink: + rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) +diff --git a/hw/kdrive/fake/Makefile.am b/hw/kdrive/fake/Makefile.am +index 09d179e..76ed9fc 100644 +--- a/hw/kdrive/fake/Makefile.am ++++ b/hw/kdrive/fake/Makefile.am +@@ -21,6 +21,8 @@ Xfake_LDADD = \ + @KDRIVE_LIBS@ \ + @XSERVER_LIBS@ + ++Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++ + Xfake_DEPENDENCIES = \ + libfake.a \ + @KDRIVE_LOCAL_LIBS@ +diff --git a/hw/kdrive/fbdev/Makefile.am b/hw/kdrive/fbdev/Makefile.am +index 420855b..cb12928 100644 +--- a/hw/kdrive/fbdev/Makefile.am ++++ b/hw/kdrive/fbdev/Makefile.am +@@ -22,6 +22,8 @@ Xfbdev_DEPENDENCIES = \ + libfbdev.a \ + $(KDRIVE_PURE_LIBS) + ++Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++ + relink: + rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) + endif +diff --git a/hw/kdrive/sdl/Makefile.am b/hw/kdrive/sdl/Makefile.am +index fe9309e..0973cb4 100644 +--- a/hw/kdrive/sdl/Makefile.am ++++ b/hw/kdrive/sdl/Makefile.am +@@ -13,5 +13,7 @@ Xsdl_LDADD = \ + + Xsdl_DEPENDENCIES = @KDRIVE_LOCAL_LIBS@ + ++Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++ + relink: + rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) +diff --git a/hw/kdrive/vesa/Makefile.am b/hw/kdrive/vesa/Makefile.am +index ac50d2b..4225dcf 100644 +--- a/hw/kdrive/vesa/Makefile.am ++++ b/hw/kdrive/vesa/Makefile.am +@@ -27,5 +27,7 @@ Xvesa_DEPENDENCIES = \ + libvesa.a \ + @KDRIVE_LOCAL_LIBS@ + ++Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) ++ + relink: + rm -f $(bin_PROGRAMS) && make $(bin_PROGRAMS) +diff --git a/hw/vfb/Makefile.am b/hw/vfb/Makefile.am +index 9ceeccc..a4a120a 100644 +--- a/hw/vfb/Makefile.am ++++ b/hw/vfb/Makefile.am +@@ -26,6 +26,7 @@ XVFB_LIBS = \ + + Xvfb_LDADD = $(XVFB_LIBS) $(XVFB_SYS_LIBS) $(XSERVER_SYS_LIBS) + Xvfb_DEPENDENCIES = $(XVFB_LIBS) ++Xvfb_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) + + # Man page + include $(top_srcdir)/cpprules.in diff --git a/p_xf86Mode.diff b/p_xf86Mode.diff deleted file mode 100644 index 7299fc5..0000000 --- a/p_xf86Mode.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- programs/Xserver/hw/xfree86/common/xf86Mode.c.orig 2005-11-30 11:35:17.000000000 +0100 -+++ programs/Xserver/hw/xfree86/common/xf86Mode.c 2006-01-30 15:25:48.000000000 +0100 -@@ -765,7 +765,7 @@ - } - if (mon_range) { - /* mode->Clock in kHz, DDC in MHz */ -- if (mon_range->max_clock < 2550 && -+ if (mon_range->max_clock != 0 && mon_range->max_clock < 2550 && - mode->Clock / 1000.0 > mon_range->max_clock) { - xf86Msg(X_WARNING, - "(%s,%s) mode clock %gMHz exceeds DDC maximum %dMHz\n", diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes index e244cdb..b9cd3c9 100644 --- a/xorg-x11-server.changes +++ b/xorg-x11-server.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Jul 8 08:38:15 CEST 2008 - sndirsch@suse.de + +- commit-a18551c.diff + * Fix GLX in Xvfb and kdrive. + Xvfb could no longer be started: "Xvfb: symbol lookup error: + /usr/lib/dri/swrast_dri.so: undefined symbol: + _glapi_add_dispatch". This is fixed now. +- removed no longer appliable patch 'p_xf86Mode.diff' + ------------------------------------------------------------------- Fri Jul 4 22:29:06 CEST 2008 - sndirsch@suse.de diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8497987..f9431a6 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -23,7 +23,7 @@ BuildRequires: libjpeg-devel Url: http://xorg.freedesktop.org/ %define EXPERIMENTAL 0 Version: 7.3 -Release: 114 +Release: 115 License: X11/MIT BuildRoot: %{_tmppath}/%{name}-%{version}-build Group: System/X11/Servers/XF86_4 @@ -51,7 +51,6 @@ Patch6: pu_fixes.diff Patch7: p_mouse_misc.diff Patch8: p_bug96328.diff Patch11: ps_showopts.diff -Patch12: p_xf86Mode.diff Patch13: p_xorg_acpi.diff Patch14: p_xkills_wrong_client.diff Patch16: p_xnest-ignore-getimage-errors.diff @@ -93,6 +92,7 @@ Patch111: xorg-server-1.4-vnc-render_sig11.diff Patch112: fix-dpi-values.diff Patch113: no-return-in-nonvoid-function.diff Patch114: 64bit-portability-issue.diff +Patch115: commit-a18551c.diff %description This package contains the X.Org Server. @@ -161,7 +161,6 @@ An X Window System server for Virtual Network Computing (VNC). %patch7 -p2 %patch8 -p0 %patch11 -#%patch12 -p2 %patch13 %patch14 %patch16 -p2 @@ -211,6 +210,7 @@ popd %patch112 -p0 %patch113 -p0 %patch114 -p0 +%patch115 -p1 %build pushd xorg-docs-* @@ -530,6 +530,13 @@ exit 0 %endif %changelog +* Tue Jul 08 2008 sndirsch@suse.de +- commit-a18551c.diff + * Fix GLX in Xvfb and kdrive. + Xvfb could no longer be started: "Xvfb: symbol lookup error: + /usr/lib/dri/swrast_dri.so: undefined symbol: + _glapi_add_dispatch". This is fixed now. +- removed no longer appliable patch 'p_xf86Mode.diff' * Sat Jul 05 2008 sndirsch@suse.de - xorg-server-1.4.99.905 * obsolete patches