rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch, NONE, 1.1 xorg-x11-server-1.1.1-no-composite-in-xnest.patch, NONE, 1.1 xorg-x11-server-1.1.1-selinux-awareness.patch, NONE, 1.1 xorg-x11-server.spec, 1.128, 1.129

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Jul 25 20:26:30 UTC 2006 

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv23877

Modified Files:
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch 
	xorg-x11-server-1.1.1-no-composite-in-xnest.patch 
	xorg-x11-server-1.1.1-selinux-awareness.patch 
Log Message:
* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
  selinux code.
- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
  fix for Xdmx.
- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
  Xnest, as it's known not to work.


xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch:
 dmxpict.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch ---
4c225a3a8b2e7e5e5510347d8473f1318bbac769
diff --git a/hw/dmx/dmxpict.c b/hw/dmx/dmxpict.c
index 9a76a66..9cdd123 100644
--- a/hw/dmx/dmxpict.c
+++ b/hw/dmx/dmxpict.c
@@ -662,7 +662,7 @@ static int dmxProcRenderSetPictureFilter
     int             nparams;
     REQUEST(xRenderSetPictureFilterReq);
 
-    REQUEST_SIZE_MATCH(xRenderSetPictureFilterReq);
+    REQUEST_AT_LEAST_SIZE(xRenderSetPictureFilterReq);
     VERIFY_PICTURE(pPicture, stuff->picture, client, SecurityWriteAccess,
 		   RenderErrBase + BadPicture);
 

xorg-x11-server-1.1.1-no-composite-in-xnest.patch:
 Args.c |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE xorg-x11-server-1.1.1-no-composite-in-xnest.patch ---
--- xorg-server-1.1.1/hw/xnest/Args.c.no-xnest-composite	2006-07-05 14:31:42.000000000 -0400
+++ xorg-server-1.1.1/hw/xnest/Args.c	2006-07-25 14:02:33.000000000 -0400
@@ -51,9 +51,12 @@
 Bool xnestDoDirectColormaps = False;
 Window xnestParentWindow = 0;
 
+/* XXX terrible hack */
+extern Bool noCompositeExtension;
 /* ddxInitGlobals - called by |InitGlobals| from os/util.c */
 void ddxInitGlobals(void)
 {
+    noCompositeExtension = TRUE;
 }
 
 int

xorg-x11-server-1.1.1-selinux-awareness.patch:
 configure.ac                   |    4 +++-
 hw/xfree86/dixmods/Makefile.am |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

--- NEW FILE xorg-x11-server-1.1.1-selinux-awareness.patch ---
--- xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am.selinux-awareness	2006-07-05 14:38:47.000000000 -0400
+++ xorg-server-1.1.1/hw/xfree86/dixmods/Makefile.am	2006-07-25 15:45:47.000000000 -0400
@@ -40,7 +40,7 @@
            -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
--- xorg-server-1.1.1/configure.ac.selinux-awareness	2006-07-07 19:44:45.000000000 -0400
+++ xorg-server-1.1.1/configure.ac	2006-07-25 16:06:24.000000000 -0400
@@ -233,6 +233,8 @@
 	;;
 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])
@@ -954,7 +956,7 @@
 AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes])
 
 if test "x$XNEST" = xyes; then
-	XNEST_LIBS="$FB_LIB $MI_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 $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB"
+	XNEST_LIBS="$FB_LIB $MI_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 $LBX_LIB $COMPOSITE_LIB $XPSTUBS_LIB $CWRAP_LIB $OS_LIB $XSERVER_LIBS"
 	AC_SUBST([XNEST_LIBS])
 fi
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -r1.128 -r1.129
--- xorg-x11-server.spec	24 Jul 2006 07:34:56 -0000	1.128
+++ xorg-x11-server.spec	25 Jul 2006 20:26:27 -0000	1.129
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{dist}.0 -> 25%{dist}.1 ...
-Release:   8%{?dist}
+Release:   9%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -31,6 +31,7 @@
 Patch103:  xorg-x11-server-1.1.0-tfp-damage.patch
 Patch104:  xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
 Patch105:  xorg-x11-server-1.1.1-enable-composite.patch
+Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
@@ -38,10 +39,12 @@
 Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
 Patch1002:  xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
 Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
+Patch1004:  xorg-x11-server-1.1.1-selinux-awareness.patch
 
 # Backports of post-1.1 stuff.
 Patch2001:  xorg-x11-server-1.1.0-pci-scan-fixes.patch
 Patch2004:  xorg-x11-server-1.1.0-no-zlib.patch
+Patch2005:  xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
 
 # autoconfiguration feature patches
 Patch3001:  xorg-x11-server-1.1.0-edid-mode-injection-1.patch
@@ -143,7 +146,7 @@
 # Needed at least for DRI enabled builds
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.5-1
-BuildRequires: mesa-source >= 6.5-1
+BuildRequires: mesa-source >= 6.5-17
 BuildRequires: libdrm-devel >= 2.0-1
 %endif
 %description
@@ -318,14 +321,17 @@
 %patch103 -p0 -b .tfp-damage
 %patch104 -p0 -b .mesa-copy-sub-buffer
 %patch105 -p0 -b .enable-composite
+%patch106 -p1 -b .no-xnest-composite
 
 %patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
 %patch1001 -p1 -b .Red-Hat-extramodes
 %patch1002 -p1 -b .xephyr
 %patch1003 -p1 -b .fpic
+%patch1004 -p1 -b .selinux-awareness
 
 %patch2001 -p1 -b .pci-scan
 %patch2004 -p1 -b .zlib
+%patch2005 -p1 -b .Xdmx
 
 %patch3001 -p1 -b .edid1
 %patch3002 -p1 -b .edid2
@@ -663,6 +669,14 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Jul 25 2006 Adam Jackson <ajackson at redhat.com> 1.1.1-10.fc6
+- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
+  selinux code.
+- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
+  fix for Xdmx.
+- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
+  Xnest, as it's known not to work.
+
 * Mon Jul 24 2006 Mike A. Harris <mharris at redhat.com> 1.1.1-8.fc6
 - Added "1440x900 at 60" CVT mode to Red-Hat-extramodes patch for (#179865)

More information about the fedora-cvs-commits mailing list