rpms/xorg-x11-server/devel dri2-page-flip.patch, 1.3, 1.4 xorg-x11-server.spec, 1.485, 1.486 xserver-1.6.99-randr-error-debugging.patch, 1.1, 1.2 xserver-1.6.99-right-of.patch, 1.1, 1.2

Tue Sep 15 15:10:04 UTC 2009

Author: ajax

Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23047

Modified Files:
	dri2-page-flip.patch xorg-x11-server.spec 
	xserver-1.6.99-randr-error-debugging.patch 
	xserver-1.6.99-right-of.patch 
Log Message:
* Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
- xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
- Point to bodhi for the "check for latest version" message.


dri2-page-flip.patch:
 glx/glxcontext.h          |    4 +
 glx/glxdri2.c             |   47 ++++++++++++++----
 glx/glxext.c              |    3 +
 glx/glxserver.h           |   18 +++----
 hw/xfree86/dri2/dri2.c    |  118 ++++++++++++++++++++++++++++++++++++++++++++--
 hw/xfree86/dri2/dri2.h    |   12 +++-
 hw/xfree86/dri2/dri2ext.c |   27 +++++++++-
 7 files changed, 201 insertions(+), 28 deletions(-)

Index: dri2-page-flip.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/dri2-page-flip.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4

--- dri2-page-flip.patch	1 Sep 2009 06:22:47 -0000	1.3
+++ dri2-page-flip.patch	15 Sep 2009 15:10:02 -0000	1.4
@@ -1,7 +1,7 @@
-From f66b2a8321af2e7779b18e1bcf5f60752b9e3705 Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
+From 4b3dcbc2b7175262cd6ec13778cfd02efacc9ab7 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= <krh at redhat.com>
 Date: Wed, 29 Jul 2009 08:26:14 -0400
-Subject: [PATCH] DRI2 Page Flipping
+Subject: [PATCH 04/16] DRI2 Page Flipping
 
 ---
  glx/glxcontext.h          |    4 ++
@@ -172,7 +172,7 @@ index 46c9382..3e62782 100644
  extern __GLXclientState *glxGetClient(ClientPtr pClient);
  
 diff --git a/hw/xfree86/dri2/dri2.c b/hw/xfree86/dri2/dri2.c
-index d15ced1..7b9fb23 100644
+index d15ced1..2285fd4 100644
 --- a/hw/xfree86/dri2/dri2.c
 +++ b/hw/xfree86/dri2/dri2.c
 @@ -38,6 +38,7 @@
@@ -275,7 +275,7 @@ index d15ced1..7b9fb23 100644
 +    box.x2 = pDraw->width;
 +    box.y2 = pDraw->height;
 +    REGION_INIT(drawable->pDraw->pScreen, &region, &box, 0);
-+    
++
 +    return DRI2CopyRegion(pDraw, &region,
 +			  DRI2BufferFrontLeft, DRI2BufferBackLeft);
 +}
@@ -457,5 +457,5 @@ index 72f9a44..c859e6e 100644
  	return BadRequest;
      }
 -- 
-1.6.3.rc1.2.g0164.dirty
+1.6.4.2
 


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.485
retrieving revision 1.486
diff -u -p -r1.485 -r1.486
--- xorg-x11-server.spec	15 Sep 2009 00:46:01 -0000	1.485
+++ xorg-x11-server.spec	15 Sep 2009 15:10:02 -0000	1.486
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.6.99.901
-Release:   1%{dist}
+Release:   2%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -77,6 +77,7 @@ Patch6030: xserver-1.6.99-right-of.patch
 Patch6031: xserver-1.6.99-dri2-crash-fixes.patch
 Patch6032: xserver-1.6.99-dri2-swapbuffers-fallback.patch
 Patch6033: xserver-1.6.99-default-modes.patch
+Patch6044: xserver-1.6.99-hush-prerelease-warning.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -319,6 +320,10 @@ git am -p1 %{lua: for i, p in ipairs(pat
 %define dri_flags --disable-dri
 %endif
 
+%if 0%{?fedora}
+%define bodhi_flags --with-vendor-web="http://bodhi.fedoraproject.org/"
+%endif
+
 # --with-pie ?
 autoreconf -v --install || exit 1
 export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow -rdynamic $CFLAGS"
@@ -329,10 +334,11 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict
 	--with-default-font-path=%{default_font_path} \
 	--with-module-dir=%{moduledir} \
 	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
+	--with-os-name="$(hostname -s) $(uname -r)" \
 	--with-xkb-output=%{_localstatedir}/lib/xkb \
 	--enable-install-libxf86config \
 	--enable-xselinux --enable-record \
-	%{dri_flags} \
+	%{dri_flags} %{?bodhi_flags} \
 	${CONFIGURE}
         
 make %{?_smp_mflags}
@@ -500,6 +506,10 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Tue Sep 15 2009 Adam Jackson <ajax at redhat.com> 1.6.99.901-2
+- xserver-1.6.99-hush-prerelease-warning.patch: Quiet, you.
+- Point to bodhi for the "check for latest version" message.
+
 * Mon Sep 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.6.99.901-1
 - xserver 1.6.99.901 
 - Re-enable Xdmx

xserver-1.6.99-randr-error-debugging.patch:
 randr.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Index: xserver-1.6.99-randr-error-debugging.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-randr-error-debugging.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-randr-error-debugging.patch	28 Jul 2009 14:16:23 -0000	1.1
+++ xserver-1.6.99-randr-error-debugging.patch	15 Sep 2009 15:10:02 -0000	1.2
@@ -1,14 +1,14 @@
-From 9e5f2dcdd30c22661760a0a962da44e4acb6a7e3 Mon Sep 17 00:00:00 2001
+From 16be69ef1e2ea9f19cd596b99b5ede7567d374b8 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Mon, 27 Jul 2009 16:52:42 -0400
-Subject: [PATCH] additional randr debugging
+Subject: [PATCH 11/16] additional randr debugging
 
 ---
- randr/randr.c |   32 ++++++++++++++++++++++++++++----
- 1 files changed, 28 insertions(+), 4 deletions(-)
+ randr/randr.c |   16 +++++++++++++++-
+ 1 files changed, 15 insertions(+), 1 deletions(-)
 
 diff --git a/randr/randr.c b/randr/randr.c
-index 1c1d0c4..e4d7cfc 100644
+index 1c1d0c4..accf614 100644
 --- a/randr/randr.c
 +++ b/randr/randr.c
 @@ -477,10 +477,24 @@ RRVerticalRefresh (xRRModeInfo *mode)
@@ -21,7 +21,7 @@ index 1c1d0c4..e4d7cfc 100644
  	return BadRequest;
 -    return (*ProcRandrVector[stuff->data]) (client);
 +    ret = ProcRandrVector[stuff->data](client);
-+    
++
 +    if (ret) {
 +        int i;
 +        ErrorF("RANDR failure: %d (extension base %d)\n", ret, RRErrorBase);
@@ -30,7 +30,7 @@ index 1c1d0c4..e4d7cfc 100644
 +            if ((i+1) % 4 == 0)
 +               ErrorF("\n");
 +        }
-+        ErrorF("\n"); 
++        ErrorF("\n");
 +    }
 +
 +    return ret;
@@ -38,5 +38,5 @@ index 1c1d0c4..e4d7cfc 100644
  
  static int
 -- 
-1.6.3.3
+1.6.4.2
 

xserver-1.6.99-right-of.patch:
 xf86Crtc.c |   72 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 64 insertions(+), 8 deletions(-)

Index: xserver-1.6.99-right-of.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xserver-1.6.99-right-of.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- xserver-1.6.99-right-of.patch	28 Jul 2009 18:41:29 -0000	1.1
+++ xserver-1.6.99-right-of.patch	15 Sep 2009 15:10:02 -0000	1.2
@@ -1,17 +1,17 @@
-From 9d16f202248b0ca29b832d28441871b96d0b040d Mon Sep 17 00:00:00 2001
+From 96794b48a3dd37bf0e74b566e5bcba00293836c7 Mon Sep 17 00:00:00 2001
 From: Adam Jackson <ajax at redhat.com>
 Date: Tue, 28 Jul 2009 11:07:13 -0400
-Subject: [PATCH] RANDR: right-of placement by default
+Subject: [PATCH 12/16] RANDR: right-of placement by default
 
 ---
  hw/xfree86/modes/xf86Crtc.c |   71 ++++++++++++++++++++++++++++++++++++++----
  1 files changed, 64 insertions(+), 7 deletions(-)
 
 diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
-index 94fc158..4f14a75 100644
+index 2ee109b..8f726fa 100644
 --- a/hw/xfree86/modes/xf86Crtc.c
 +++ b/hw/xfree86/modes/xf86Crtc.c
-@@ -1140,6 +1140,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
+@@ -1141,6 +1141,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes)
      int			o;
      int			min_x, min_y;
      
@@ -23,11 +23,11 @@ index 94fc158..4f14a75 100644
 +	if (output->initial_x || output->initial_y)
 +            return TRUE;
 +    }
-+    
++
      for (o = 0; o < config->num_output; o++)
      {
  	xf86OutputPtr	output = config->output[o];
-@@ -2025,6 +2034,54 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
+@@ -2026,6 +2035,54 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
      return match;
  }
  
@@ -51,7 +51,7 @@ index 94fc158..4f14a75 100644
 +
 +    if (numEnabledOutputs(config, enabled) < 2)
 +	return FALSE;
-+    
++
 +    for (o = -1; nextEnabledOutput(config, enabled, &o); ) {
 +	DisplayModePtr mode =
 +	    xf86OutputHasPreferredMode(config->output[o], width, height);
@@ -82,7 +82,7 @@ index 94fc158..4f14a75 100644
  static Bool
  xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
  		    DisplayModePtr *modes, Bool *enabled,
-@@ -2082,13 +2139,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
+@@ -2083,13 +2140,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
       * biggest mode for its aspect ratio, assuming one exists.
       */
      if (!ret) do {
@@ -97,7 +97,7 @@ index 94fc158..4f14a75 100644
  	    break;
  
  	p = -1;
-@@ -2375,6 +2428,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2376,6 +2429,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  
      if (xf86TargetUserpref(scrn, config, modes, enabled, width, height))
  	xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n");
@@ -106,7 +106,7 @@ index 94fc158..4f14a75 100644
      else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height))
  	xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n");
      else if (xf86TargetAspect(scrn, config, modes, enabled, width, height))
-@@ -2391,8 +2446,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
+@@ -2392,8 +2447,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow)
  			config->output[o]->name);
  	else
  	    xf86DrvMsg (scrn->scrnIndex, X_INFO,
@@ -120,5 +120,5 @@ index 94fc158..4f14a75 100644
  
      /*
 -- 
-1.6.3.3
+1.6.4.2
 


