rpms/xorg-x11-server/devel xserver-1.4.99-builtin-fonts.patch, NONE, 1.1 xserver-1.4.99-dont-backfill-bg-none.patch, NONE, 1.1 xserver-1.4.99-pic-libxf86config.patch, NONE, 1.1 xserver-1.4.99-selinux-awareness.patch, NONE, 1.1 xserver-1.4.99-xaa-evict-pixmaps.patch, NONE, 1.1

Fri Nov 2 17:17:11 UTC 2007

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14568

Added Files:
	xserver-1.4.99-builtin-fonts.patch 
	xserver-1.4.99-dont-backfill-bg-none.patch 
	xserver-1.4.99-pic-libxf86config.patch 
	xserver-1.4.99-selinux-awareness.patch 
	xserver-1.4.99-xaa-evict-pixmaps.patch 
Log Message:
* Fri Nov 02 2007 Adam Jackson <ajax at redhat.com> 1.4.99.1-0.6
- Merge a bunch of the more trivial patches upstream.
- New git snapshot containing the merged bits.
- Remove unused patches.
- Drop the XFree86 obsoletes.


xserver-1.4.99-builtin-fonts.patch:

--- NEW FILE xserver-1.4.99-builtin-fonts.patch ---
>From fe82a1fe634a2e0ceb030de90309d26044c7b75e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 1 Nov 2007 15:06:17 -0400
Subject: [PATCH] Enable builtin font FPE.

---
 dix/dixfonts.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index c21b3ec..c951b05 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1890,11 +1890,8 @@ InitFonts (void)
     } else 
 #endif
     {
-#ifdef BUILTIN_FONTS
         BuiltinRegisterFpeFunctions();
-#else
 	FontFileRegisterFpeFunctions();
-#endif
 #ifndef NOFONTSERVERACCESS
 	fs_register_fpe_functions();
 #endif
-- 
1.5.3.4


xserver-1.4.99-dont-backfill-bg-none.patch:

--- NEW FILE xserver-1.4.99-dont-backfill-bg-none.patch ---
>From 6a39049e34eeefeeb821970d83e1994870af8f3e Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 1 Nov 2007 14:56:25 -0400
Subject: [PATCH] Don't backfill bg=None windows in Composite.

---
 composite/compalloc.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/composite/compalloc.c b/composite/compalloc.c
index 006e808..67d830d 100644
--- a/composite/compalloc.c
+++ b/composite/compalloc.c
@@ -478,6 +478,7 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
 	 * Copy bits from the parent into the new pixmap so that it will
 	 * have "reasonable" contents in case for background None areas.
 	 */
+#if 0
 	if (pGC)
 	{
 	    XID val = IncludeInferiors;
@@ -492,6 +493,7 @@ compNewPixmap (WindowPtr pWin, int x, int y, int w, int h)
 				   w, h, 0, 0);
 	    FreeScratchGC (pGC);
 	}
+#endif
     }
     else
     {
-- 
1.5.3.4


xserver-1.4.99-pic-libxf86config.patch:

--- NEW FILE xserver-1.4.99-pic-libxf86config.patch ---
>From 6344659a33a7c192dffe6e796c771d02f78da5e5 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 1 Nov 2007 15:02:24 -0400
Subject: [PATCH] Build libxf86config with -fPIC.

---
 hw/xfree86/parser/Makefile.am |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
index 849ee8b..0691158 100644
--- a/hw/xfree86/parser/Makefile.am
+++ b/hw/xfree86/parser/Makefile.am
@@ -25,7 +25,7 @@ libxf86config_a_SOURCES = \
 	DRI.c \
 	Extensions.c
 
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) -fPIC -fvisibility=hidden
 
 EXTRA_DIST = \
 	Configint.h \
-- 
1.5.3.4


xserver-1.4.99-selinux-awareness.patch:

--- NEW FILE xserver-1.4.99-selinux-awareness.patch ---
>From 823a13f90b5619823325ea162ae30d652e448492 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 1 Nov 2007 10:39:57 -0400
Subject: [PATCH] Link GL subsystem against libselinux.

---
 configure.ac                   |    4 +++-
 hw/xfree86/dixmods/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57132b0..a16b46a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,6 +339,8 @@ case $host_cpu in
 	;;
 esac
 
+SYS_LIBS="${SYS_LIBS} -lselinux"
+
 dnl BSD *_video.c selection
 AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes])
 AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes])
@@ -1229,7 +1231,7 @@ AC_MSG_RESULT([$XNEST])
 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
 
 if test "x$XNEST" = xyes; then
-	XNEST_LIBS="$CONFIG_LIB $FB_LIB $FIXES_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 $CWRAP_LIB"
+	XNEST_LIBS="$CONFIG_LIB $FB_LIB $FIXES_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 $CWRAP_LIB $XSERVER_LIBS"
 	XNEST_SYS_LIBS="$XNESTMODULES_LIBS"
 	AC_SUBST([XNEST_LIBS])
 	AC_SUBST([XNEST_SYS_LIBS])
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
index efc5f4a..1b9ecfd 100644
--- a/hw/xfree86/dixmods/Makefile.am
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -50,7 +50,7 @@ INCLUDES = @XORG_INCS@ \
            -I$(top_srcdir)/GL/glx
 
 libGLcore_la_LDFLAGS = -avoid-version
-libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la
+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux
 libGLcore_la_SOURCES = GLcoremodule.c
 
 libafb_la_LDFLAGS = -avoid-version
-- 
1.5.3.4


xserver-1.4.99-xaa-evict-pixmaps.patch:

--- NEW FILE xserver-1.4.99-xaa-evict-pixmaps.patch ---
>From fb3008787193b79909fe922577794f7d4a656922 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax at redhat.com>
Date: Thu, 1 Nov 2007 15:18:31 -0400
Subject: [PATCH] Add pixmap eviction call for XAA.

DRI drivers without zero-copy EXT_texture_from_pixmap need to copy the
texture image out of video memory to bind it.  Ick.  Add a hack to
evict XAA pixmaps and disable the pixmap cache when the first texture
is bound.
---
 GL/glx/glxdri.c          |   16 ++++++++++++++++
 hw/xfree86/xaa/xaaInit.c |   24 ++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c
index c0da07b..6c4faed 100644
--- a/GL/glx/glxdri.c
+++ b/GL/glx/glxdri.c
@@ -360,6 +360,22 @@ __glXDRIbindTexImage(__GLXcontext *baseContext,
 
     pixmap = (PixmapPtr) glxPixmap->pDraw;
 
+    if (!screen->texOffsetStart) {
+         /* When the GLX_EXT_texture_from_pixmap is used, as it's
+          * implemented here, we want to pull pixmap out of video memory
+          * and into host memory. */
+         extern void XAAEvictPixmaps(void);
+         static int evictedPixmaps = 0;
+
+         if (!evictedPixmaps) {
+             __glXDRIenterServer(GL_FALSE);
+                 if (dlsym(RTLD_DEFAULT, "XAAEvictPixmaps"))
+                      XAAEvictPixmaps();
+             __glXDRIleaveServer(GL_FALSE);
+         evictedPixmaps = TRUE;
+         }
+    }
+
     if (screen->texOffsetStart && screen->texOffset) {
 	__GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride;
 	int i, firstEmpty = 16;
diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c
index 4222425..602b525 100644
--- a/hw/xfree86/xaa/xaaInit.c
+++ b/hw/xfree86/xaa/xaaInit.c
@@ -88,6 +88,30 @@ XAADestroyInfoRec(XAAInfoRecPtr infoRec)
     xfree(infoRec);
 }
 
+void
+XAAEvictPixmaps(void)
+{
+    XAAScreenPtr pScreenPriv;
+    XAAInfoRecPtr infoRec;
+    ScreenPtr pScreen;
+    int i;
+
+    xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n");
+
+    for (i = 0; i < screenInfo.numScreens; i++) {
+	pScreen = screenInfo.screens[i];
+	infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen);
+
+	pScreenPriv = pScreen->devPrivates[XAAScreenIndex].ptr;
+	infoRec = pScreenPriv->AccelInfoRec;
+
+	infoRec->offscreenDepths = 0;
+	infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
+
+	XAAMoveOutOffscreenPixmaps(pScreen);
+	XAAInvalidatePixmapCache(pScreen);
+    }
+}
 
 Bool 
 XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
-- 
1.5.3.4



