rpms/xorg-x11-server/devel .cvsignore, 1.45, 1.46 sources, 1.39, 1.40 xorg-x11-server.spec, 1.329, 1.330 xorg-x11-server-Red-Hat-extramodes.patch, 1.8, NONE xserver-1.4.99-selinux-awareness.patch, 1.3, NONE xserver-1.4.99-xaa-evict-pixmaps.patch, 1.2, NONE xserver-1.5.0-fix-single-aspect.patch, 1.1, NONE xserver-1.5.0-xaa-sucks.patch, 1.2, NONE

Adam Tkac (atkac) fedora-extras-commits at redhat.com
Wed Jul 2 12:37:34 UTC 2008


Author: atkac

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

Modified Files:
	.cvsignore sources xorg-x11-server.spec 
Removed Files:
	xorg-x11-server-Red-Hat-extramodes.patch 
	xserver-1.4.99-selinux-awareness.patch 
	xserver-1.4.99-xaa-evict-pixmaps.patch 
	xserver-1.5.0-fix-single-aspect.patch 
	xserver-1.5.0-xaa-sucks.patch 
Log Message:
- merged 1.4.99.901-23.20080415 ... 1.4.99.905-1.20080701 changes from F9 branch



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/.cvsignore,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- .cvsignore	12 Jun 2008 06:18:47 -0000	1.45
+++ .cvsignore	2 Jul 2008 12:36:39 -0000	1.46
@@ -1 +1 @@
-xorg-server-20080612.tar.bz2
+xorg-server-20080701.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/sources,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- sources	12 Jun 2008 06:18:47 -0000	1.39
+++ sources	2 Jul 2008 12:36:39 -0000	1.40
@@ -1 +1 @@
-067f2f0fdbcac0f8a7cd4f4ee046a2c8  xorg-server-20080612.tar.bz2
+a0e25d1c6ed0ed945e4a84b6b288f6fe  xorg-server-20080701.tar.bz2


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.329
retrieving revision 1.330
diff -u -r1.329 -r1.330
--- xorg-x11-server.spec	19 Jun 2008 14:24:12 -0000	1.329
+++ xorg-x11-server.spec	2 Jul 2008 12:36:39 -0000	1.330
@@ -15,12 +15,12 @@
 # RHEL5 bugfix sync
 
 %define pkgname xorg-server
-%define gitdate 20080612
+%define gitdate 20080701
 
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
-Version:   1.4.99.902
-Release:   2.%{gitdate}%{?dist}
+Version:   1.4.99.905
+Release:   1.%{gitdate}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -42,27 +42,28 @@
 
 # Red Hat specific tweaking, not intended for upstream
 # XXX move these to the end of the list
-Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
+# dropme
+#Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
 Patch1003:  xserver-1.4.99-pic-libxf86config.patch
-Patch1004:  xserver-1.4.99-selinux-awareness.patch
+# maybe?
+#Patch1004:  xserver-1.4.99-selinux-awareness.patch
 Patch1005:  xserver-1.4.99-builtin-fonts.patch
 Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
-Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
+# rebase for GL/glx -> glx move
+#Patch1014:  xserver-1.4.99-xaa-evict-pixmaps.patch
 
 Patch2013:  xserver-1.4.99-document-fontpath-correctly.patch
 
-# Trivial things to maybe merge upstream at next rebase
-
 # Trivial things to never merge upstream ever
 # Don't merge this without protecting the gccisms.
-Patch5001: xserver-1.4.99-alloca-poison.patch
+Patch5001:  xserver-1.4.99-alloca-poison.patch
 # This really could be done prettier.
-Patch5002: xserver-1.4.99-ssh-isnt-local.patch
+Patch5002:  xserver-1.4.99-ssh-isnt-local.patch
 
-Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch
-Patch5008: xserver-1.5.0-xaa-sucks.patch
-Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch
-Patch5010: xserver-1.5.0-fix-single-aspect.patch
+Patch5007:  xserver-1.5.0-bad-fbdev-thats-mine.patch
+#Patch5008:  xserver-1.5.0-xaa-sucks.patch
+Patch5009:  xserver-1.5.0-no-evdev-keyboards-kthnx.patch
+#Patch5010:  xserver-1.5.0-fix-single-aspect.patch
 
 # Workaround RH bug #449944
 Patch5011: xserver-1.4.99-endian.patch
@@ -116,8 +117,9 @@
 
 # openssl? really?
 BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
-BuildRequires: mesa-libGL-devel >= 7.1-0.21
-BuildRequires: mesa-source >= 7.1-0.21
+BuildRequires: mesa-libGL-devel >= 7.1-0.36
+# should be useless now...
+# BuildRequires: mesa-source >= 7.1-0.36
 # XXX silly...
 BuildRequires: libdrm-devel >= 2.4.0
 %if %{with_hw_servers}
@@ -315,7 +317,6 @@
 	--disable-xorgcfg \
 	--disable-record \
 	--enable-install-libxf86config \
-	--with-mesa-source=%{_datadir}/mesa/source \
 	--enable-xselinux \
 	--with-dri-driver-path=%{drimoduledir} \
 	${CONFIGURE}
@@ -341,7 +342,6 @@
 mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}}
 cp cpprules.in %{inst_srcdir}
 cp xkb/README.compiled %{inst_srcdir}/xkb
-cp GL/symlink-mesa.sh %{inst_srcdir}/GL
 cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
 cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/
@@ -423,7 +423,6 @@
 %dir %{_libdir}/xorg/modules
 %dir %{_libdir}/xorg/modules/drivers
 %dir %{_libdir}/xorg/modules/extensions
-%{_libdir}/xorg/modules/extensions/libGLcore.so
 %{_libdir}/xorg/modules/extensions/libglx.so
 %{_libdir}/xorg/modules/extensions/libdri.so
 %{_libdir}/xorg/modules/extensions/libdri2.so
@@ -516,10 +515,16 @@
 
 
 %changelog
-* Thu Jun 19 2008 Adam Tkac <atkac redhat com> 1.4.99.902-2.20080612
+* Mon Jun 30 2008 Adam Jackson <ajax at redhat.com> 1.4.99.905-1.20080701
+- 1.5RC5.
+
+* Thu Jun 19 2008 Adam Tkac <atkac redhat com>
 - workaround broken AC_C_BIGENDIAN macro (#449944)
 
-* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-1.20080612
+* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-3.20080612
+- xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor.
+
+* Thu Jun 12 2008 Dave Airlie <airlied at redhat.com> 1.4.99.902-2.20080612
 - cve-2008-1377: Record and Security Extension Input validation
 - cve-2008-1379: MIT-SHM extension Input Validation flaw
 - cve-2008-2360: Render AllocateGlyph extension Integer overflows
@@ -527,9 +532,40 @@
 - cve-2008-2362: Render Gradient extension Integer overflows
 - Rebase to 1.5 head for security patches for above
 
+* Mon Jun 09 2008 Adam Jackson <ajax at redhat.com> 1.4.99.902-1.20080609
+- Today's git snapshot.
+
+* Tue May 06 2008 Bill Nottingham <notting at redhat.com> 1.4.99.901-29.20080415
+- rebuild against new xorg-x11-xtrans-devel (#445303)
+
+* Mon May 05 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-28.20080415
+- xserver-1.5.0-compiz-clip-fix.patch: Make compiz stop blinking every
+  so often. (#441219)
+
+* Mon May 05 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-27.20080415
+- xserver-1.5.0-hal-closedown.patch: Fix a crash in the hal code when
+  closing a device.
+
 * Mon Apr 28 2008 Soren Sandmann <sandmann at redhat.com>
 - Preserve user's CFLAGS
 
+* Thu Apr 24 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-26.20080415
+- xserver-1.5.0-no-evdev-keyboards-kthnx.patch: Disable evdev for keyboards
+  even on combo devices.  This means combo devices will go through the old
+  mouse driver too.  Oh well.  (#440380)
+
+* Thu Apr 24 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-25.20080415
+- xserver-1.5.0-f-spot-screws-glx.patch: stop GLX crashing X server when
+  f-spot exists (#443299)
+
+* Wed Apr 23 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-24.20080415
+- xserver-1.5.0-glcore-swap-no-crashy.patch: Fix issue with googleearth
+  crashing GLcore.
+
+* Tue Apr 22 2008 Adam Jackson <ajax at redhat.com> 1.4.99.901-23.20080415
+- xserver-1.5.0-stenciled-visuals.patch: Prefer visuals with a stencil
+  buffer for the default GLX visual.  (Hans de Goede, #442510)
+
 * Tue Apr 15 2008 Dave Airlie <airlied at redhat.com> 1.4.99.901-22.20080415
 - rebase to upstream server 1.5 branch from today - drop acr quirk
 


--- xorg-x11-server-Red-Hat-extramodes.patch DELETED ---


--- xserver-1.4.99-selinux-awareness.patch DELETED ---


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


--- xserver-1.5.0-fix-single-aspect.patch DELETED ---


--- xserver-1.5.0-xaa-sucks.patch DELETED ---




More information about the fedora-extras-commits mailing list