rpms/xorg-x11-server/devel xorg-x11-server-1.0.99.2-no-kdrive-dri.patch, NONE, 1.1 xorg-x11-server.spec, 1.50, 1.51
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Thu Apr 6 21:17:55 UTC 2006
Author: ajackson
Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv29630
Modified Files:
xorg-x11-server.spec
Added Files:
xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
Log Message:
* Thu Apr 6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
- Remove LBX to match upstream policy.
- Add Xephyr server.
xorg-x11-server-1.0.99.2-no-kdrive-dri.patch:
Makefile.am | 26 +++++++++++++-------------
ati.h | 1 +
2 files changed, 14 insertions(+), 13 deletions(-)
--- NEW FILE xorg-x11-server-1.0.99.2-no-kdrive-dri.patch ---
Temporary hack to disable DRI support in Xati. Backported from HEAD, will go
away in 1.0.99.3. - ajax
--- ./hw/kdrive/ati/ati.h.no-kdrive-dri 2006-02-16 02:17:29.000000000 -0500
+++ ./hw/kdrive/ati/ati.h 2006-04-06 16:02:28.000000000 -0400
@@ -39,6 +39,7 @@
#include "kxv.h"
+#undef XF86DRI
#ifdef XF86DRI
#define USE_DRI
#include "libdrm.h"
--- ./hw/kdrive/ati/Makefile.am.no-kdrive-dri 2006-04-06 16:20:50.000000000 -0400
+++ ./hw/kdrive/ati/Makefile.am 2006-04-06 16:21:04.000000000 -0400
@@ -1,16 +1,16 @@
-if DRI
-DRI_INCLUDES = -I$(top_srcdir)/dri \
- -I$(top_srcdir)/drm
-DRI_LIBS = $(top_builddir)/dri/libdri.a \
- $(top_builddir)/drm/libdrm.a
-DRI_SOURCES = ati_dri.c \
- ati_dri.h \
- ati_dripriv.h \
- r128_common.h \
- r128_sarea.h \
- radeon_common.h \
- radeon_sarea.h
-endif
+#if DRI
+#DRI_INCLUDES = -I$(top_srcdir)/dri \
+# -I$(top_srcdir)/drm
+#DRI_LIBS = $(top_builddir)/dri/libdri.a \
+# $(top_builddir)/drm/libdrm.a
+#DRI_SOURCES = ati_dri.c \
+# ati_dri.h \
+# ati_dripriv.h \
+# r128_common.h \
+# r128_sarea.h \
+# radeon_common.h \
+# radeon_sarea.h
+#endif
if KDRIVEFBDEV
FBDEV_INCLUDES =-I$(top_srcdir)/hw/kdrive/fbdev
Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- xorg-x11-server.spec 4 Apr 2006 22:17:58 -0000 1.50
+++ xorg-x11-server.spec 6 Apr 2006 21:17:53 -0000 1.51
@@ -4,7 +4,7 @@
Summary: X.Org X11 X server
Name: xorg-x11-server
Version: 1.0.99.2
-Release: 1
+Release: 2
URL: http://www.x.org
License: MIT/X11
Group: User Interface/X
@@ -22,6 +22,8 @@
Patch6: xserver-1.0.1-randr-sdk.patch
# https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=181292. hacky patch
Patch7: xorg-x11-server-1.0.1-fpic-libxf86config.patch
+# REMOVE ME FOR 1.0.99.3
+Patch8: xorg-x11-server-1.0.99.2-no-kdrive-dri.patch
# Spiffiffity feature/optimization patches.
Patch100: xorg-server-1.0.99.2-spiffiffity.patch
@@ -84,8 +86,6 @@
# libfontenc-devel needed for Xorg, but not specified by
# upstream deps. Build fails without it.
BuildRequires: libfontenc-devel
-# liblbxutil-devel needed for lbx
-BuildRequires: liblbxutil-devel
# Required for Xtst examples
BuildRequires: libXtst-devel
# For Xdmxconfig
@@ -210,6 +210,27 @@
not open any devices, but behaves otherwise as an X display. Xvfb
is normally used for testing servers.
+# ----- Xephyr -------------------------------------------------------
+
+%package Xephyr
+Summary: A nested server.
+Group: User Interface/X
+#Requires: %{name} = %{version}-%{release}
+# NOTE: This virtual provide should be used by packages which want to depend
+# on an implementation nonspecific Xephyr X server. It is intentionally not
+# versioned, since it should be agnostic.
+Provides: Xephyr
+
+%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
+X protocol, and therefore supports the newer X extensions like
+Render and Composite.
+
# ----- sdk ---------------------------------------------------------
%package sdk
@@ -237,6 +258,7 @@
%patch4 -p0 -b .composite-fastpath-fdo4320
%patch6 -p1 -b .randrsdk
%patch7 -p1 -b .xf86configfpic
+%patch8 -p0 -b .no-kdrive-dri
%patch100 -p0 -b .spiffiffity
@@ -248,6 +270,7 @@
#DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
# --disable-dependency-tracking \
+# also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
automake; autoconf
%configure %{xservers} \
@@ -257,7 +280,8 @@
--enable-xtrap \
--enable-xcsecurity \
--enable-xevie \
- --enable-lbx \
+ --enable-kdrive \
+ --enable-xephyr \
%if %{with_dri}
--enable-dri \
--with-mesa-source=%{_datadir}/mesa/source \
@@ -315,6 +339,22 @@
rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
rm -f $RPM_BUILD_ROOT%{_bindir}/cvt
%endif
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xati
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xchips
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xepson
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xfake
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xfbdev
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xi810
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xmach64
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xmga
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xneomagic
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xnvidia
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xpm2
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xr128
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xsdl
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xsmi
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xvesa
+ rm -f $RPM_BUILD_ROOT%{_bindir}/Xvia
}
%clean
@@ -501,6 +541,15 @@
#%dir %{_mandir}/man1x
%{_mandir}/man1/Xvfb.1x*
+# ----- Xephyr -------------------------------------------------------
+
+%files Xephyr
+%defattr(-,root,root,-)
+%{_bindir}/Xephyr
+# no manpage yet
+#%dir %{_mandir}/man1x
+#%{_mandir}/man1/Xephyr.1x*
+
# ----- sdk ---------------------------------------------------------
%files sdk
@@ -516,6 +565,10 @@
# -------------------------------------------------------------------
%changelog
+* Thu Apr 6 2006 Adam Jackson <ajax at redhat.com> 1.0.99.2-2
+- Remove LBX to match upstream policy.
+- Add Xephyr server.
+
* Tue Apr 4 2006 Kristian Høgsberg <krh at redhat.com> 1.0.99.2-1
- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
- Drop xorg-server-1.0.99-composite-visibility.patch.
More information about the fedora-cvs-commits
mailing list