7156009 Xorg modules fail to load in S11.1 build 12
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Fri, 23 Mar 2012 13:16:44 -0700
changeset 1260 00de6d69162d
parent 1259 ca852ee9121b
child 1261 3b92d1254188
7156009 Xorg modules fail to load in S11.1 build 12
open-src/xserver/xorg/dixmods-deps.patch
open-src/xserver/xorg/glx-impure.patch
open-src/xserver/xorg/patch-list
--- a/open-src/xserver/xorg/dixmods-deps.patch	Fri Mar 16 15:54:46 2012 -0700
+++ b/open-src/xserver/xorg/dixmods-deps.patch	Fri Mar 23 13:16:44 2012 -0700
@@ -15,7 +15,7 @@
 @@ -45,8 +47,10 @@ libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
  libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
  
- libglx_la_LDFLAGS = -avoid-version -mimpure-text
+ libglx_la_LDFLAGS = -avoid-version
 +libglx_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
  if AIGLX
  GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
--- a/open-src/xserver/xorg/glx-impure.patch	Fri Mar 16 15:54:46 2012 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index 5e5725e..bf81436 100644
---- a/hw/xfree86/dixmods/Makefile.am
-+++ b/hw/xfree86/dixmods/Makefile.am
-@@ -44,7 +44,7 @@ libwfb_la_LIBADD = $(top_builddir)/fb/libwfb.la
- libwfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
- libwfb_la_CFLAGS = $(AM_CFLAGS) -DFB_ACCESS_WRAPPER
- 
--libglx_la_LDFLAGS = -avoid-version
-+libglx_la_LDFLAGS = -avoid-version -mimpure-text
- if AIGLX
- GLXDRI_LIBRARY = $(top_builddir)/glx/libglxdri.la
- endif
--- a/open-src/xserver/xorg/patch-list	Fri Mar 16 15:54:46 2012 -0700
+++ b/open-src/xserver/xorg/patch-list	Fri Mar 23 13:16:44 2012 -0700
@@ -17,7 +17,6 @@
 amd64-loader-path.patch,-p1
 fontmod.patch,-p1
 sparc-probe.patch,-p1
-glx-impure.patch,-p1
 nvidia-autoconfig.patch,-p1
 autoconfig.patch,-p1
 signal-handler.patch,-p1