diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-16 15:43:45 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2010-08-19 07:29:17 +0200 |
| commit | 5250895e0421cbd95cb97d201fcb8fbc3a7bcc18 (patch) | |
| tree | 61bd75f270c13c23d5d4bbb84926d724eb3b0dc2 /recipes/xorg-xserver | |
| parent | 2c2b2d98a72ede9a3cf6213351bcd0019bed686f (diff) | |
xorg-xserver: move older not pinned versions to obsolete dir
Acked-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-xserver')
51 files changed, 550 insertions, 501 deletions
diff --git a/recipes/xorg-xserver/files/xcalibrate-xorg.diff b/recipes/xorg-xserver/files/xcalibrate-xorg.diff deleted file mode 100644 index 65121efc3b..0000000000 --- a/recipes/xorg-xserver/files/xcalibrate-xorg.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- /tmp/configure.ac 2008-10-29 18:53:23.000000000 +0100 -+++ xorg-server-1.4.2/configure.ac 2008-10-29 18:53:40.000000000 +0100 -@@ -865,7 +865,7 @@ - FONTPATH="built-ins" - fi - --if test "x$XCALIBRATE" = xyes && test "$KDRIVE" = yes; then -+if test "x$XCALIBRATE" = xyes ; then - AC_DEFINE(XCALIBRATE, 1, [Build XCalibrate extension]) - REQUIRED_MODULES="$REQUIRED_MODULES xcalibrateproto" - else diff --git a/recipes/xorg-xserver/files/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch index 3da235e1e1..3da235e1e1 100644 --- a/recipes/xorg-xserver/files/fix-picturestr-include-order.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/fix-picturestr-include-order.patch diff --git a/recipes/xorg-xserver/files/report-correct-randr12.patch b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch index 72c8a18add..72c8a18add 100644 --- a/recipes/xorg-xserver/files/report-correct-randr12.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.3.0.0/report-correct-randr12.patch diff --git a/recipes/xorg-xserver/files/sysroot_fix.patch b/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch index 59753d5803..59753d5803 100644 --- a/recipes/xorg-xserver/files/sysroot_fix.patch +++ b/recipes/xorg-xserver/xserver-kdrive-1.5.3/sysroot_fix.patch diff --git a/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-imageon/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/files/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch index 540f598fad..540f598fad 100644 --- a/recipes/xorg-xserver/files/report-correct-randr10.patch +++ b/recipes/xorg-xserver/xserver-kdrive-imageon/report-correct-randr10.patch diff --git a/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-nomadik/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch new file mode 100644 index 0000000000..3da235e1e1 --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-xomap/fix-picturestr-include-order.patch @@ -0,0 +1,15 @@ +# Reverse include order in render/picturestr.h to be able to compile against renderproto >= 0.9.3 +Index: xorg-server-1.2.0/render/picturestr.h +=================================================================== +--- xorg-server-1.2.0.orig/render/picturestr.h 2008-02-09 22:54:46.000000000 +0100 ++++ xorg-server-1.2.0/render/picturestr.h 2008-02-09 22:54:50.000000000 +0100 +@@ -26,8 +26,8 @@ + #ifndef _PICTURESTR_H_ + #define _PICTURESTR_H_ + +-#include "glyphstr.h" + #include "scrnintstr.h" ++#include "glyphstr.h" + #include "resource.h" + + typedef struct _DirectFormat { diff --git a/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch new file mode 100644 index 0000000000..540f598fad --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive-xomap/report-correct-randr10.patch @@ -0,0 +1,25 @@ +Index: xorg-server-1.1.0/randr/randr.c +=================================================================== +--- xorg-server-1.1.0.orig/randr/randr.c ++++ xorg-server-1.1.0/randr/randr.c +@@ -56,6 +56,9 @@ + #define SubPixelUnknown 0 + #endif + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 0 ++ + #define RR_VALIDATE + int RRGeneration; + int RRNScreens; +@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client) + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/recipes/xorg-xserver/files/pkgconfig_fix.patch b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch index e75e209cbe..e75e209cbe 100644 --- a/recipes/xorg-xserver/files/pkgconfig_fix.patch +++ b/recipes/xorg-xserver/xserver-kdrive/pkgconfig_fix.patch diff --git a/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch new file mode 100644 index 0000000000..540f598fad --- /dev/null +++ b/recipes/xorg-xserver/xserver-kdrive/report-correct-randr10.patch @@ -0,0 +1,25 @@ +Index: xorg-server-1.1.0/randr/randr.c +=================================================================== +--- xorg-server-1.1.0.orig/randr/randr.c ++++ xorg-server-1.1.0/randr/randr.c +@@ -56,6 +56,9 @@ + #define SubPixelUnknown 0 + #endif + ++#define SERVER_RANDR_MAJOR 1 ++#define SERVER_RANDR_MINOR 0 ++ + #define RR_VALIDATE + int RRGeneration; + int RRNScreens; +@@ -473,8 +476,8 @@ ProcRRQueryVersion (ClientPtr client) + rep.type = X_Reply; + rep.length = 0; + rep.sequenceNumber = client->sequence; +- rep.majorVersion = RANDR_MAJOR; +- rep.minorVersion = RANDR_MINOR; ++ rep.majorVersion = SERVER_RANDR_MAJOR; ++ rep.minorVersion = SERVER_RANDR_MINOR; + if (client->swapped) { + swaps(&rep.sequenceNumber, n); + swapl(&rep.length, n); diff --git a/recipes/xorg-xserver/files/xorg-avr32-support.diff b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff index 583191e84f..583191e84f 100644 --- a/recipes/xorg-xserver/files/xorg-avr32-support.diff +++ b/recipes/xorg-xserver/xserver-kdrive/xorg-avr32-support.diff diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch deleted file mode 100644 index 72bdcda358..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/drmfix.patch +++ /dev/null @@ -1,13 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - ---- xorg-server-1.3.0.0.orig/hw/xfree86/os-support/linux/Makefile.am -+++ xorg-server-1.3.0.0/hw/xfree86/os-support/linux/Makefile.am -@@ -38,7 +38,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SOURCES = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch b/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch deleted file mode 100644 index 6dfe7baeb5..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.3.0.0/glyphstr.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: https://bugs.freedesktop.org/show_bug.cgi?id=22133 -status: Rejected -comment: It's a bit unclear if this patch was ever needed, but recent versions seem - to work fine without it. - ---- xorg-server-1.3.0.0/render/glyphstr.h~ 2006-09-18 03:04:18.000000000 -0300 -+++ xorg-server-1.3.0.0/render/glyphstr.h 2008-02-03 22:14:23.187159732 -0200 -@@ -25,6 +25,7 @@ - #ifndef _GLYPHSTR_H_ - #define _GLYPHSTR_H_ - -+#include <X11/X.h> - #include <X11/extensions/renderproto.h> - #include "picture.h" - #include "screenint.h" diff --git a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch deleted file mode 100644 index dde76376f3..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.4.2/drmfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - -Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am -=================================================================== ---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200 -+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100 -@@ -41,7 +41,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch deleted file mode 100644 index dde76376f3..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.4/drmfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - -Index: xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am -=================================================================== ---- xorg-server-1.4.orig/hw/xfree86/os-support/linux/Makefile.am 2007-08-23 21:04:53.000000000 +0200 -+++ xorg-server-1.4/hw/xfree86/os-support/linux/Makefile.am 2008-03-13 18:27:23.000000000 +0100 -@@ -41,7 +41,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch deleted file mode 100644 index 8ebda98975..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.5.1/drmfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - -Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am -=================================================================== ---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 -+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 -@@ -40,7 +40,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch deleted file mode 100644 index 8ebda98975..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.5.3/drmfix.patch +++ /dev/null @@ -1,15 +0,0 @@ -upstream: applied in b3e981c9d4ff31263a43b47f83cf8db4c2b5aeff (2008-07-28) - -Index: xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am -=================================================================== ---- xorg-server-1.5.1.orig/hw/xfree86/os-support/linux/Makefile.am 2008-09-23 19:24:59.000000000 +0100 -+++ xorg-server-1.5.1/hw/xfree86/os-support/linux/Makefile.am 2008-10-27 13:27:40.000000000 +0000 -@@ -40,7 +40,7 @@ - - AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(DIX_CFLAGS) $(XORG_CFLAGS) $(PLATFORM_DEFINES) - --INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) -I/usr/include/drm # FIXME this last part is crack -+INCLUDES = $(XORG_INCS) $(PLATFORM_INCLUDES) $(LIBDRM_CFLAGS) - - # FIXME: These need to be added to the build - LNX_EXTRA_SRCS = \ diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch deleted file mode 100644 index 85db023a6d..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-configure.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ddb265e3c5e99065ceeef92ecb9fd94b4c3e169e Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Thu, 7 May 2009 14:23:25 +0200 -Subject: [PATCH 36/78] configure.ac: Add GLX_SYS_LIBS for Xvfb and Xnest - -This fixes the linking for these two when using DRI2, which requires -DLOPEN_LIBS. -(cherry picked from commit ae38151ddda9984effca5bb7c582540061201dce) - -Conflicts: - - configure.ac ---- - configure.ac | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -Index: xorg-server-1.5.3/configure.ac -=================================================================== ---- xorg-server-1.5.3.orig/configure.ac 2008-11-05 11:46:15.000000000 -0800 -+++ xorg-server-1.5.3/configure.ac 2009-09-14 19:48:11.043879237 -0700 -@@ -1215,7 +1215,7 @@ - - if test "x$XVFB" = xyes; then - XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB" -- XVFB_SYS_LIBS="$XVFBMODULES_LIBS" -+ XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS" - AC_SUBST([XVFB_LIBS]) - AC_SUBST([XVFB_SYS_LIBS]) - fi -@@ -1233,7 +1233,7 @@ - - if test "x$XNEST" = xyes; then - XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB" -- XNEST_SYS_LIBS="$XNESTMODULES_LIBS" -+ XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS" - AC_SUBST([XNEST_LIBS]) - AC_SUBST([XNEST_SYS_LIBS]) - fi diff --git a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch b/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch deleted file mode 100644 index 17eb0f58a6..0000000000 --- a/recipes/xorg-xserver/xserver-xorg-1.5.3/xorg-server-1.5.3-glcore-prepare-for-dynamic.patch +++ /dev/null @@ -1,108 +0,0 @@ -From 70df9cb2b93ed3d4b7d6e201a58951c9981bbc93 Mon Sep 17 00:00:00 2001 -From: =?utf-8?q?R=C3=A9mi=20Cardona?= <remi@gentoo.org> -Date: Thu, 7 May 2009 14:19:22 +0200 -Subject: [PATCH 35/78] cherry-pick the rest of "glcore: prepare for dynamic loading" - -When f2c30a57e3c6169fbecdbb60ac24ad2a5e9aa8a4 was cherry-picked into the -1.5 branch, some parts were lost. This commit brings the missing bits. - -Conflicts: - - configure.ac ---- - configure.ac | 2 +- - hw/kdrive/ephyr/Makefile.am | 4 ++++ - hw/kdrive/fake/Makefile.am | 4 ++++ - hw/kdrive/fbdev/Makefile.am | 4 ++++ - hw/kdrive/sdl/Makefile.am | 4 ++++ - hw/kdrive/vesa/Makefile.am | 4 ++++ - 6 files changed, 21 insertions(+), 1 deletions(-) - -Index: xorg-server-1.5.3/configure.ac -=================================================================== ---- xorg-server-1.5.3.orig/configure.ac 2009-09-14 19:48:11.043879237 -0700 -+++ xorg-server-1.5.3/configure.ac 2009-09-14 19:49:34.903881120 -0700 -@@ -1964,7 +1964,7 @@ - KDRIVE_LOCAL_LIBS="$TSLIB_LIBS $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB $CONFIG_LIB" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS" - KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB" -- KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS" -+ KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS" - - # check if we can build Xephyr - PKG_CHECK_MODULES(XEPHYR, $XEPHYR_REQUIRED_LIBS, [xephyr="yes"], [xephyr="no"]) -Index: xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am -=================================================================== ---- xorg-server-1.5.3.orig/hw/kdrive/ephyr/Makefile.am 2008-11-05 08:52:17.000000000 -0800 -+++ xorg-server-1.5.3/hw/kdrive/ephyr/Makefile.am 2009-09-14 19:49:34.903881120 -0700 -@@ -67,6 +67,10 @@ - Xephyr_SOURCES = \ - ephyrinit.c - -+if GLX -+Xephyr_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+endif -+ - Xephyr_LDADD = \ - libxephyr.a \ - libxephyr-hostx.a \ -Index: xorg-server-1.5.3/hw/kdrive/fake/Makefile.am -=================================================================== ---- xorg-server-1.5.3.orig/hw/kdrive/fake/Makefile.am 2008-07-11 08:12:13.000000000 -0700 -+++ xorg-server-1.5.3/hw/kdrive/fake/Makefile.am 2009-09-14 19:49:34.903881120 -0700 -@@ -16,6 +16,10 @@ - Xfake_SOURCES = \ - fakeinit.c - -+if GLX -+Xfake_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+endif -+ - Xfake_LDADD = \ - libfake.a \ - @KDRIVE_LIBS@ \ -Index: xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am -=================================================================== ---- xorg-server-1.5.3.orig/hw/kdrive/fbdev/Makefile.am 2008-07-11 08:12:13.000000000 -0700 -+++ xorg-server-1.5.3/hw/kdrive/fbdev/Makefile.am 2009-09-14 19:49:34.903881120 -0700 -@@ -14,6 +14,10 @@ - Xfbdev_SOURCES = \ - fbinit.c - -+if GLX -+Xfbdev_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+endif -+ - Xfbdev_LDADD = \ - libfbdev.a \ - @KDRIVE_LIBS@ -Index: xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am -=================================================================== ---- xorg-server-1.5.3.orig/hw/kdrive/sdl/Makefile.am 2008-07-11 08:12:13.000000000 -0700 -+++ xorg-server-1.5.3/hw/kdrive/sdl/Makefile.am 2009-09-14 19:49:34.903881120 -0700 -@@ -7,6 +7,10 @@ - - Xsdl_SOURCES = sdl.c - -+if GLX -+Xsdl_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+endif -+ - Xsdl_LDADD = \ - @KDRIVE_LIBS@ \ - @XSDL_LIBS@ -Index: xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am -=================================================================== ---- xorg-server-1.5.3.orig/hw/kdrive/vesa/Makefile.am 2008-11-05 08:52:17.000000000 -0800 -+++ xorg-server-1.5.3/hw/kdrive/vesa/Makefile.am 2009-09-14 19:49:34.903881120 -0700 -@@ -19,6 +19,10 @@ - Xvesa_SOURCES = \ - vesainit.c - -+if GLX -+Xvesa_LDFLAGS = $(LD_EXPORT_SYMBOLS_FLAG) -+endif -+ - Xvesa_LDADD = \ |