rpms/xorg-x11-server/OLPC-3 swrast-dont-abort.patch, NONE, 1.1 .cvsignore, 1.47, 1.48 sources, 1.41, 1.42 xorg-x11-server.spec, 1.338, 1.339 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-xaa-sucks.patch, 1.2, NONE
Daniel Drake (dsd)
fedora-extras-commits at redhat.com
Thu Jul 24 19:07:04 UTC 2008
Author: dsd
Update of /cvs/pkgs/rpms/xorg-x11-server/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5531
Modified Files:
.cvsignore sources xorg-x11-server.spec
Added Files:
swrast-dont-abort.patch
Removed Files:
xserver-1.4.99-selinux-awareness.patch
xserver-1.4.99-xaa-evict-pixmaps.patch
xserver-1.5.0-xaa-sucks.patch
Log Message:
resync with F-9, dont crash if swrast not present
swrast-dont-abort.patch:
--- NEW FILE swrast-dont-abort.patch ---
>From 6bf46df463d19456761ae670f60e0b153e285bd9 Mon Sep 17 00:00:00 2001
From: Daniel Drake <dsd at laptop.org>
Date: Thu, 24 Jul 2008 14:42:22 -0400
Subject: [PATCH] Don't abort if swrast library is not present
---
glx/glxdriswrast.c | 6 ++++++
glx/glxext.c | 37 ++++++++++++++++++++++++-------------
2 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/glx/glxdriswrast.c b/glx/glxdriswrast.c
index cf4827e..20c39ab 100644
--- a/glx/glxdriswrast.c
+++ b/glx/glxdriswrast.c
@@ -468,6 +468,12 @@ __glXDRIscreenProbe(ScreenPtr pScreen)
screen->driver = dlopen(filename, RTLD_LAZY | RTLD_LOCAL);
if (screen->driver == NULL) {
+ if (errno == ENOENT) {
+ xfree(screen);
+ LogMessage(X_INFO, "AIGLX: swrast library %s not found\n",
+ filename);
+ return NULL;
+ }
LogMessage(X_ERROR, "AIGLX error: dlopen of %s failed (%s)\n",
filename, dlerror());
goto handle_error;
diff --git a/glx/glxext.c b/glx/glxext.c
index 13c65da..6ba404f 100644
--- a/glx/glxext.c
+++ b/glx/glxext.c
@@ -279,6 +279,7 @@ void GlxExtensionInit(void)
ScreenPtr pScreen;
int i;
__GLXprovider *p;
+ Bool glx_provided = False;
__glXContextRes = CreateNewResourceType((DeleteType)ContextGone);
__glXDrawableRes = CreateNewResourceType((DeleteType)DrawableGone);
@@ -289,6 +290,29 @@ void GlxExtensionInit(void)
if (!AddCallback (&ClientStateCallback, glxClientCallback, 0))
return;
+ for (i = 0; i < screenInfo.numScreens; i++) {
+ pScreen = screenInfo.screens[i];
+
+ for (p = __glXProviderStack; p != NULL; p = p->next) {
+ if (p->screenProbe(pScreen) != NULL) {
+ LogMessage(X_INFO,
+ "GLX: Initialized %s GL provider for screen %d\n",
+ p->name, i);
+ break;
+ }
+ }
+
+ if (!p)
+ LogMessage(X_INFO,
+ "GLX: no usable GL providers found for screen %d\n", i);
+ else
+ glx_provided = True;
+ }
+
+ /* don't register extension if GL is not provided on any screen */
+ if (!glx_provided)
+ return;
+
/*
** Add extension to server extensions.
*/
@@ -306,19 +330,6 @@ void GlxExtensionInit(void)
}
__glXErrorBase = extEntry->errorBase;
-
- for (i = 0; i < screenInfo.numScreens; i++) {
- pScreen = screenInfo.screens[i];
-
- for (p = __glXProviderStack; p != NULL; p = p->next) {
- if (p->screenProbe(pScreen) != NULL) {
- LogMessage(X_INFO,
- "GLX: Initialized %s GL provider for screen %d\n",
- p->name, i);
- break;
- }
- }
- }
}
/************************************************************************/
--
1.5.5.1
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/.cvsignore,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- .cvsignore 12 Jun 2008 02:07:31 -0000 1.47
+++ .cvsignore 24 Jul 2008 19:06:12 -0000 1.48
@@ -1 +1 @@
-xorg-server-20080612.tar.bz2
+xorg-server-1.4.99.906.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 12 Jun 2008 02:07:31 -0000 1.41
+++ sources 24 Jul 2008 19:06:12 -0000 1.42
@@ -1 +1 @@
-067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2
+d225476fea6721d9f64c3268e47d6c51 xorg-server-1.4.99.906.tar.bz2
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/OLPC-3/xorg-x11-server.spec,v
retrieving revision 1.338
retrieving revision 1.339
diff -u -r1.338 -r1.339
--- xorg-x11-server.spec 17 Jun 2008 22:51:39 -0000 1.338
+++ xorg-x11-server.spec 24 Jul 2008 19:06:12 -0000 1.339
@@ -12,55 +12,50 @@
# F9 TODO list:
#
# Fix rhpxl to no longer need vesamodes/extramodes
-# RHEL5 bugfix sync
%define pkgname xorg-server
-%define gitdate 20080612
+#define gitdate 20080723
Summary: X.Org X11 X server
Name: xorg-x11-server
-Version: 1.4.99.902
-Release: 3.%{gitdate}%{?dist}.1
+Version: 1.4.99.906
+Release: 1%{?dist}
URL: http://www.x.org
License: MIT
Group: User Interface/X
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-%if 0%{gitdate}
+%if 0%{?gitdate}
# git snapshot. to recreate, run:
# ./make-git-snapshot.sh `cat commitid`
-Source0: xorg-server-%{gitdate}.tar.bz2
+Source0: xorg-server-%{?gitdate}.tar.bz2
Source1: make-git-snapshot.sh
Source2: commitid
%else
-Source0: ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
+Source0: http://www.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
%endif
+# Add by OLPC: don't abort if mesa swrast library is not found
+Patch1: swrast-dont-abort.patch
+
# OpenGL compositing manager feature/optimization patches.
Patch100: xorg-x11-server-1.1.0-no-move-damage.patch
Patch101: xserver-1.4.99-dont-backfill-bg-none.patch
# 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
Patch1003: xserver-1.4.99-pic-libxf86config.patch
-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
Patch2013: xserver-1.4.99-document-fontpath-correctly.patch
# Trivial things to never merge upstream ever
-# Don't merge this without protecting the gccisms.
-Patch5001: xserver-1.4.99-alloca-poison.patch
# This really could be done prettier.
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
%define moduledir %{_libdir}/xorg/modules
%define drimoduledir %{_libdir}/dri
@@ -99,8 +94,6 @@
BuildRequires: libXfont-devel libXau-devel libxkbfile-devel libXres-devel
BuildRequires: libfontenc-devel libXtst-devel libXdmcp-devel
BuildRequires: libX11-devel libXext-devel
-# XXX Really? Why would we need this, Xfont should hide it.
-BuildRequires: freetype-devel >= 2.1.9-1
# DMX config utils buildreqs.
BuildRequires: libXt-devel libdmx-devel libXmu-devel libXrender-devel
@@ -111,8 +104,7 @@
# 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
# XXX silly...
BuildRequires: libdrm-devel >= 2.4.0
%if %{with_hw_servers}
@@ -122,17 +114,6 @@
BuildRequires: audit-libs-devel libselinux-devel >= 2.0.59-1
BuildRequires: hal-devel dbus-devel
-# Make sure libXfont has the catalogue FPE
-Conflicts: libXfont < 1.2.9
-
-# Make sure we pull ABI compatible drivers.
-Conflicts: xorg-x11-drv-ati < 6.6.1
-Conflicts: xorg-x11-drv-i810 < 1.6.0
-# Match up work-arounds between compiz and the xserver
-Conflicts: compiz < 0.0.13-0.20.20060817git.fc6
-# Match up GLX_EXT_texture_from_pixmap opcodes
-Conflicts: mesa-libGL < 6.5.1-2.fc6
-
# All server subpackages have a virtual provide for the name of the server
# they deliver. The Xorg one is versioned, the others are intentionally
# unversioned.
@@ -185,10 +166,7 @@
%description Xnest
Xnest is an X server, which has been implemented as an ordinary
X application. It runs in a window just like other X applications,
-but it is an X server itself in which you can run other software. It
-is a very useful tool for developers who wish to test their
-applications without running them on their real X server.
-
+but it is an X server itself in which you can run other software.
%package Xdmx
Summary: Distributed Multihead X Server and utilities
@@ -201,12 +179,7 @@
Xdmx is proxy X server that provides multi-head support for multiple displays
attached to different machines (each of which is running a typical X server).
When Xinerama is used with Xdmx, the multiple displays on multiple machines
-are presented to the user as a single unified screen. A simple application
-for Xdmx would be to provide multi-head support using two desktop machines,
-each of which has a single display device attached to it. A complex
-application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
-(each attached to one of 16 computers) into a unified 5120x4096 display.
-
+are presented to the user as a single unified screen.
%package Xvfb
Summary: A X Windows System virtual framebuffer X server.
@@ -232,10 +205,8 @@
%description Xephyr
Xephyr is an X server, which has been implemented as an ordinary
X application. It runs in a window just like other X applications,
-but it is an X server itself in which you can run other software. It
-is a very useful tool for developers who wish to test their
-applications without running them on their real X server. Unlike
-Xnest, Xephyr renders to an X image rather than relaying the
+but it is an X server itself in which you can run other software.
+Unlike Xnest, Xephyr renders to an X image rather than relaying the
X protocol, and therefore supports the newer X extensions like
Render and Composite.
@@ -270,21 +241,20 @@
%prep
%setup -q -n %{pkgname}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
-%if 0%{gitdate}
+%if 0%{?gitdate}
# XXX hack
git checkout -b fedora
# make it something you can push to.
sed -i 's/git/&+ssh/' .git/config
%else
git-init-db
-echo "This is incomplete. FIXME."
-exit 1
-%endif
-
if [ -z "$GIT_COMMITTER_NAME" ]; then
- export GIT_COMMITTER_NAME="Fedora X Ninjas"
+ git-config user.email "x at fedoraproject.org"
+ git-config user.name "Fedora X Ninjas"
fi
-
+git-add .
+git-commit -a -q -m "%{version} baseline."
+%endif
# Apply all the patches. Hold your nose...
git-am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
@@ -308,9 +278,8 @@
--with-xkb-output=%{_localstatedir}/lib/xkb \
--with-rgb-path=%{_datadir}/X11/rgb \
--disable-xorgcfg \
- --disable-record \
+ --disable-record --disable-xtrap \
--enable-install-libxf86config \
- --with-mesa-source=%{_datadir}/mesa/source \
--enable-xselinux \
--with-dri-driver-path=%{drimoduledir} \
${CONFIGURE}
@@ -336,7 +305,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/
@@ -356,21 +324,6 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
-
-%if !%{with_hw_servers}
- # These get installed regardless of whether you're building Xorg.
- # XXX Re-check this list.
- # error: Installed (but unpackaged) file(s) found:
- # /randrstr.h
- # /usr/lib/pkgconfig/xorg-server.pc
- # /usr/share/aclocal/xorg-server.m4
- # /var/lib/xkb/README.compiled
-
- rm -f $RPM_BUILD_ROOT/randrstr.h
- rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
- rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
- rm -rf $RPM_BUILD_ROOT/var/lib/xkb
-%endif
}
%clean
@@ -418,13 +371,11 @@
%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
%{_libdir}/xorg/modules/extensions/libdbe.so
%{_libdir}/xorg/modules/extensions/libextmod.so
-%{_libdir}/xorg/modules/extensions/libxtrap.so
%dir %{_libdir}/xorg/modules/input
%dir %{_libdir}/xorg/modules/fonts
%{_libdir}/xorg/modules/fonts/libfreetype.so
@@ -511,6 +462,10 @@
%changelog
+* Thu Jul 24 2008 Daniel Drake <dsd at laptop.org> 1.4.99.906-1
+- resync with F-9 for new xinput ABI
+- add patch to allow X server to run when mesa's swrast is not present
+
* Tue Jun 17 2008 Dennis Gilmore <dennis at ausil.us> 1.4.99.902-3.20080612.1
- disable the noevdev patch for OLPC
--- xserver-1.4.99-selinux-awareness.patch DELETED ---
--- xserver-1.4.99-xaa-evict-pixmaps.patch DELETED ---
--- xserver-1.5.0-xaa-sucks.patch DELETED ---
More information about the fedora-extras-commits
mailing list