rpms/xorg-x11-server/devel xserver-1.5.0-comment-out-glxdri2.c, NONE, 1.1 xorg-x11-server.spec, 1.351, 1.352
Soren Sandmann Pedersen
ssp at fedoraproject.org
Thu Sep 11 18:34:18 UTC 2008
Author: ssp
Update of /cvs/pkgs/rpms/xorg-x11-server/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6370
Modified Files:
xorg-x11-server.spec
Added Files:
xserver-1.5.0-comment-out-glxdri2.c
Log Message:
Comment out glxdri2.c since it doesn't compile
--- NEW FILE xserver-1.5.0-comment-out-glxdri2.c ---
>From 70cd71bc194060b58c0973ba931f69b4de0f698d Mon Sep 17 00:00:00 2001
From: =?utf-8?q?S=C3=B8ren=20Sandmann=20Pedersen?= <sandmann at redhat.com>
Date: Thu, 11 Sep 2008 14:28:25 -0400
Subject: [PATCH] Comment out glxdri2.c
---
glx/glxdri2.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/glx/glxdri2.c b/glx/glxdri2.c
index 9a3bc1f..4862124 100644
--- a/glx/glxdri2.c
+++ b/glx/glxdri2.c
@@ -1,3 +1,4 @@
+#if 0
/*
* Copyright © 2007 Red Hat, Inc
*
@@ -582,3 +583,4 @@ __GLXprovider __glXDRI2Provider = {
"DRI2",
NULL
};
+#endif
--
1.6.0.1
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.351
retrieving revision 1.352
diff -u -r1.351 -r1.352
--- xorg-x11-server.spec 11 Sep 2008 17:47:24 -0000 1.351
+++ xorg-x11-server.spec 11 Sep 2008 18:33:48 -0000 1.352
@@ -19,7 +19,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.5.0
-Release: 5%{?dist}
+Release: 6%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
@@ -55,6 +55,7 @@
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
Patch2014: xserver-1.5.0-projector-fb-size.patch
+Patch2015: xserver-1.5.0-comment-out-glxdri2.c
# Trivial things to never merge upstream ever
# Don't merge this without protecting the gccisms.
@@ -99,7 +100,7 @@
BuildRequires: xorg-x11-proto-devel >= 7.4-3
BuildRequires: damageproto >= 1.1
-BuildRequires: dri2proto >= 1.1
+BuildRequires: dri2proto >= 1.99.1
BuildRequires: fixesproto >= 4.0
BuildRequires: glproto >= 1.4.9
BuildRequires: kbproto >= 1.0.3
@@ -499,6 +500,10 @@
%changelog
+* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-6
+- Comment out glxdri2.c since it doesn't compile. (krh says it
+ won't break at runtime).
+
* Thu Sep 11 2008 Soren Sandmann <sandmann at redhat.com> 1.5.0-5
- Bump BuildRequires on mesa-GL-devel. Maybe that will work.
More information about the fedora-extras-commits
mailing list