a8fcc0d
# FC7 cleanups: (TODO)
a8fcc0d
#
4dbca59
# Fix rhpxl to no longer need vesamodes/extramodes
a8fcc0d
# RHEL5 bugfix sync
f7f3689
# --enable-kdrive just for Xephyr is overkill, should fix that upstream
a8fcc0d
mharris 5efabee
%define pkgname xorg-server
Kristian Høgsberg ce50e2c
mharris 683564b
Summary:   X.Org X11 X server
mharris dc2469d
Name:      xorg-x11-server
b8160aa
Version:   1.3.0.0
e31b8a8
Release:   3%{?dist}
mharris dc2469d
URL:       http://www.x.org
mharris 1bd453c
License:   MIT/X11
mharris dc2469d
Group:     User Interface/X
mharris 683564b
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
mharris 83c9ed8
mharris 2a97f38
Source0:   ftp://ftp.x.org/pub/individual/xserver/%{pkgname}-%{version}.tar.bz2
mharris 0af35d4
Source100: comment-header-modefiles.txt
mharris 83c9ed8
eb5ef29
# general bug fixes
mharris 83c9ed8
Patch0:    xorg-x11-server-0.99.3-init-origins-fix.patch
mharris 4072bdd
Patch5:    xorg-x11-server-libxf86config-dont-write-empty-sections.patch
6824c6b
Patch6:    xorg-x11-server-1.1.1-builderstring.patch
d2f9881
Patch7:    xorg-x11-server-1.1.1-xkb-in-xnest.patch
9c546f8
Patch10:   xorg-x11-server-1.1.1-vbe-filter-less.patch
eb5ef29
Patch11:   xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch
sandmann f4d5d10
Patch12:   xorg-x11-server-1.1.1-graphics-expose.patch
a549381
Patch15:   xorg-x11-server-1.1.1-automake-1.10-fixes.patch
72b72a2
Patch18:   xorg-x11-server-1.1.1-glcore-visual-matching.patch
115cc5d
Patch19:   xserver-1.3.0-xnest-exposures.patch
65a4e80
Patch20:   xserver-1.3.0-x86emu-imul-int64.patch
e31b8a8
Patch21:   xserver-1.3.0-xkb-and-loathing.patch
Kristian Høgsberg 453016d
Kristian Høgsberg d470a6c
# OpenGL compositing manager feature/optimization patches.
Kristian Høgsberg d470a6c
Patch100:  xorg-x11-server-1.1.0-no-move-damage.patch
Kristian Høgsberg d470a6c
Patch101:  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch
99319d2
Patch105:  xorg-x11-server-1.2.0-enable-composite.patch
44ad9a9
Patch106:  xorg-x11-server-1.1.1-no-composite-in-xnest.patch
Kristian Høgsberg b99e229
Patch107:  xorg-x11-server-1.1.1-offscreen-pixmaps.patch
115cc5d
Patch108:  xserver-1.3.0-no-pseudocolor-composite.patch
Kristian Høgsberg 9675a54
94d8e40
# Red Hat specific tweaking, not intended for upstream
94d8e40
# XXX move these to the end of the list
mharris 7be6a00
Patch1001:  xorg-x11-server-Red-Hat-extramodes.patch
99319d2
Patch1002:  xorg-x11-server-1.2.0-xephyr-only.patch
94d8e40
Patch1003:  xorg-x11-server-1.0.1-fpic-libxf86config.patch
99319d2
Patch1004:  xorg-x11-server-1.2.0-selinux-awareness.patch
Kristian Høgsberg 77b4f52
Patch1005:  xorg-x11-server-1.1.1-builtin-fonts.patch
860c5ba
Patch1006:  xorg-x11-server-1.1.1-no-scanpci.patch
860c5ba
Patch1007:  xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch
99319d2
Patch1008:  xorg-x11-server-1.2.0-xf86config-comment-less.patch
d0f52e0
Patch1009:  xorg-x11-server-1.2.0-maxpixclock-option.patch
98df0b5
Patch1010:  xserver-1.3.0-no-prerelease-warning.patch
mharris dc2469d
d0f52e0
Patch2001:  xserver-1.2.0-geode-mmx.patch
d0f52e0
Patch2002:  xserver-1.2.0-xephyr-keysym-madness.patch
bc24ef2
Patch2003:  xserver-1.2.0-vfprintf.patch
708d7fa
Patch2004:  xserver-1.2.0-honor-displaysize.patch
1f7d5c8
Patch2005:  xserver-1.2.99.901-xephyr-crash-at-exit.patch
6f79486
Patch2006:  xserver-1.3.0-less-randr-fakerama.patch
caa4f1f
115cc5d
# assorted PCI layer shenanigans.  oh the pain.
115cc5d
Patch2500:  xorg-x11-server-1.2.99-unbreak-domain.patch
115cc5d
Patch2501:  xserver-1.3.0-pci-bus-count.patch
115cc5d
Patch2502:  xserver-1.3.0-mmap-failure-check.patch
115cc5d
Patch2503:  xserver-1.3.0-rom-search.patch
65a4e80
Patch2504:  xserver-1.3.0-domain-obiwan.patch
407286e
Patch2505:  xserver-1.3.0-pci-device-enable.patch
115cc5d
mharris 1651c54
%define moduledir	%{_libdir}/xorg/modules
Kristian Høgsberg 2a0fe97
%define drimoduledir	%{_libdir}/dri
mharris aa15493
%define sdkdir		%{_includedir}/xorg
mharris 9e7c1dd
mharris a30689e
%ifarch s390 s390x
mharris a30689e
%define with_hw_servers 0
f7f3689
%else
f7f3689
%define with_hw_servers 1
mharris 9e7c1dd
%endif
mharris dc2469d
f7f3689
%if %{with_hw_servers}
f7f3689
%define enable_xorg --enable-xorg
f7f3689
%else
f7f3689
%define enable_xorg --disable-xorg
mharris 382d04d
%endif
mharris 382d04d
f7f3689
%define xservers --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr --enable-dmx
f7f3689
mharris a30689e
# FIXME: Temporary Build deps on autotools, as needed...
f7f3689
BuildRequires: automake autoconf libtool
mharris a30689e
mharris 382d04d
BuildRequires: pkgconfig
f7f3689
BuildRequires: xorg-x11-util-macros >= 1.1.5
e31b8a8
f7f3689
BuildRequires: xorg-x11-proto-devel >= 7.1-11
e31b8a8
BuildRequires: randrproto >= 1.2
e31b8a8
BuildRequires: fixesproto >= 4.0
e31b8a8
BuildRequires: damageproto >= 1.1
e31b8a8
BuildRequires: scrnsaverproto >= 1.1
e31b8a8
BuildRequires: kbproto >= 1.0.3
e31b8a8
mharris dc2469d
BuildRequires: xorg-x11-xtrans-devel
f7f3689
BuildRequires: libXfont-devel
mharris 683564b
BuildRequires: libXau-devel
mharris 683564b
BuildRequires: libxkbfile-devel
f7f3689
# libXres-devel needed for something that links to libXres that I never
f7f3689
# bothered to figure out yet
mharris a30689e
BuildRequires: libXres-devel
mharris a30689e
# libfontenc-devel needed for Xorg, but not specified by
mharris a30689e
# upstream deps.  Build fails without it.
mharris a30689e
BuildRequires: libfontenc-devel
mharris a30689e
# Required for Xtst examples
mharris a30689e
BuildRequires: libXtst-devel
mharris 8b3540d
# libXdmcp-devel needed for Xdmx, Xnest, Xephyr
mharris d7ac96e
BuildRequires: libXdmcp-devel
mharris 8b3540d
# libX11-devel needed for Xdmx, Xnest, Xephyr
mharris 8b3540d
BuildRequires: libX11-devel
mharris 8b3540d
# libXext-devel needed for Xdmx, Xnest, Xephyr
mharris 8b3540d
BuildRequires: libXext-devel
99319d2
# XXX Really?  Why would we need this, Xfont should hide it.
mharris 8b3540d
BuildRequires: freetype-devel >= 2.1.9-1
mharris 8b3540d
f7f3689
# DMX config utils buildreqs.
mharris 6ea5073
BuildRequires: libXt-devel
mharris b2db270
BuildRequires: libdmx-devel
mharris 683564b
BuildRequires: libXmu-devel
mharris 683564b
BuildRequires: libXrender-devel
mharris 683564b
BuildRequires: libXi-devel
mharris 6ea5073
BuildRequires: libXpm-devel
mharris 6ea5073
BuildRequires: libXaw-devel
99319d2
BuildRequires: libXfixes-devel
mharris 7814b99
mharris aa15493
BuildRequires: xorg-x11-font-utils >= 1.0.0-1
f7f3689
BuildRequires: mesa-libGL-devel >= 6.5.2
f7f3689
BuildRequires: mesa-source >= 6.5.2
f7f3689
# XXX silly...
99319d2
BuildRequires: libdrm-devel >= 2.3.0
f7f3689
%if %{with_hw_servers}
99319d2
Requires: libdrm >= 2.3.0
mharris 382d04d
%endif
869288f
869288f
BuildRequires: libselinux-devel
869288f
Kristian Høgsberg a366c66
# Make sure we pull ABI compatible drivers.
Kristian Høgsberg a366c66
Conflicts: xorg-x11-drv-ati < 6.6.1
Kristian Høgsberg a366c66
Conflicts: xorg-x11-drv-i810 < 1.6.0
Kristian Høgsberg bdb7b59
# Match up work-arounds between compiz and the xserver
Kristian Høgsberg bdb7b59
Conflicts: compiz < 0.0.13-0.20.20060817git.fc6
Kristian Høgsberg bfb38bb
# Match up GLX_EXT_texture_from_pixmap opcodes
Kristian Høgsberg bfb38bb
Conflicts: mesa-libGL < 6.5.1-2.fc6
Kristian Høgsberg bfb38bb
f7f3689
# All server subpackages have a virtual provide for the name of the server
f7f3689
# they deliver.  The Xorg one is versioned, the others are intentionally
f7f3689
# unversioned.
f7f3689
mharris dc2469d
%description
mharris 683564b
X.Org X11 X server
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%package Xorg
mharris 683564b
Summary: Xorg X server
mharris dc2469d
Group: User Interface/X
f7f3689
Provides: Xorg = %{version}-%{release}
f7f3689
Provides: Xserver
f7f3689
# Requires: xorg-x11-drivers >= 0.99.2-4
mharris 5db2b3c
Requires: xorg-x11-drv-mouse xorg-x11-drv-keyboard xorg-x11-drv-vesa
998c064
Requires: xorg-x11-drv-void xorg-x11-drv-evdev
f7f3689
# virtuals.  XXX fix the xkbcomp fork() upstream.
f7f3689
Requires: xkbdata xkbcomp
mharris 093a3e3
Obsoletes: XFree86 xorg-x11
mharris dc2469d
mharris dc2469d
%description Xorg
mharris dc2469d
X.org X11 is an open source implementation of the X Window System.  It
mharris dc2469d
provides the basic low level functionality which full fledged
mharris dc2469d
graphical user interfaces (GUIs) such as GNOME and KDE are designed
mharris dc2469d
upon.
mharris a30689e
%endif
mharris dc2469d
f7f3689
mharris dc2469d
%package Xnest
mharris dc2469d
Summary: A nested server.
mharris dc2469d
Group: User Interface/X
mharris 8ea210f
Obsoletes: XFree86-Xnest, xorg-x11-Xnest
mharris dc2469d
Provides: Xnest
mharris dc2469d
mharris dc2469d
%description Xnest
mharris dc2469d
Xnest is an X server, which has been implemented as an ordinary
mharris dc2469d
X application.  It runs in a window just like other X applications,
mharris dc2469d
but it is an X server itself in which you can run other software.  It
mharris dc2469d
is a very useful tool for developers who wish to test their
mharris dc2469d
applications without running them on their real X server.
mharris dc2469d
f7f3689
mharris dc2469d
%package Xdmx
mharris dc2469d
Summary: Distributed Multihead X Server and utilities
mharris dc2469d
Group: User Interface/X
mharris 1bd453c
Obsoletes: xorg-x11-Xdmx
mharris dc2469d
Provides: Xdmx
mharris dc2469d
mharris dc2469d
%description Xdmx
mharris dc2469d
Xdmx is proxy X server that provides multi-head support for multiple displays
mharris dc2469d
attached to different machines (each of which is running a typical X server).
mharris dc2469d
When Xinerama is used with Xdmx, the multiple displays on multiple machines
mharris dc2469d
are presented to the user as a single unified screen.  A simple application
mharris dc2469d
for Xdmx would be to provide multi-head support using two desktop machines,
mharris dc2469d
each of which has a single display device attached to it.  A complex
mharris dc2469d
application for Xdmx would be to unify a 4 by 4 grid of 1280x1024 displays
mharris dc2469d
(each attached to one of 16 computers) into a unified 5120x4096 display.
f7f3689
mharris dc2469d
mharris dc2469d
%package Xvfb
mharris dc2469d
Summary: A X Windows System virtual framebuffer X server.
mharris dc2469d
Group: User Interface/X
mharris dc2469d
Obsoletes: XFree86-Xvfb xorg-x11-Xvfb
mharris dc2469d
Provides: Xvfb
mharris dc2469d
mharris dc2469d
%description Xvfb
mharris dc2469d
Xvfb (X Virtual Frame Buffer) is an X server that is able to run on
mharris dc2469d
machines with no display hardware and no physical input devices.
mharris dc2469d
Xvfb simulates a dumb framebuffer using virtual memory.  Xvfb does
mharris dc2469d
not open any devices, but behaves otherwise as an X display.  Xvfb
mharris dc2469d
is normally used for testing servers.
mharris dc2469d
304cf10
304cf10
%package Xephyr
304cf10
Summary: A nested server.
304cf10
Group: User Interface/X
304cf10
Provides: Xephyr
304cf10
304cf10
%description Xephyr
304cf10
Xephyr is an X server, which has been implemented as an ordinary
304cf10
X application.  It runs in a window just like other X applications,
304cf10
but it is an X server itself in which you can run other software.  It
304cf10
is a very useful tool for developers who wish to test their
304cf10
applications without running them on their real X server.  Unlike
304cf10
Xnest, Xephyr renders to an X image rather than relaying the
304cf10
X protocol, and therefore supports the newer X extensions like
304cf10
Render and Composite.
304cf10
f7f3689
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%package sdk
mharris dc2469d
Summary: SDK for X server driver module development
mharris dc2469d
Group: User Interface/X
mharris dc2469d
Obsoletes: XFree86-sdk xorg-x11-sdk
mharris 382d04d
Requires: xorg-x11-util-macros
mharris 2025148
Requires: xorg-x11-proto-devel
mharris 83c9ed8
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
mharris 1d1b706
Provides: libxf86config-devel = %{version}-%{release}
mharris 1d1b706
mharris dc2469d
%description sdk
mharris dc2469d
The SDK package provides the developmental files which are necessary for
mharris dc2469d
developing X server driver modules, and for compiling driver modules
mharris dc2469d
outside of the standard X11 source code tree.  Developers writing video
mharris dc2469d
drivers, input drivers, or other X modules should install this package.
mharris a30689e
%endif
f7f3689
Adam Tkac aeec5f9
%package source
Adam Tkac aeec5f9
Summary: Xserver source code required to build VNC server (Xvnc)
Adam Tkac aeec5f9
Group: Development/Libraries
Adam Tkac aeec5f9
Adam Tkac aeec5f9
%description source
Adam Tkac aeec5f9
Xserver source code needed to build VNC server (Xvnc)
mharris dc2469d
mharris dc2469d
%prep
mharris 5efabee
%setup -q -n %{pkgname}-%{version}
mharris 3a3aa5e
%patch0 -p0 -b .init-origins-fix
mharris 4072bdd
%patch5 -p0 -b .libxf86config-dont-write-empty-sections
6824c6b
%patch6 -p1 -b .builderstring
d2f9881
%patch7 -p1 -b .xkb-in-xnest
9c546f8
%patch10 -p1 -b .vbe-filter
eb5ef29
%patch11 -p1 -b .vt-activate
sandmann f4d5d10
%patch12 -p1 -b .graphics-expose
a549381
%patch15 -p1 -b .automake-1.10
72b72a2
%patch18 -p1 -b .glcore-visual
115cc5d
%patch19 -p1 -b .xnest-expose
65a4e80
%patch20 -p1 -b .x86emu-imul
e31b8a8
%patch21 -p1 -b .xkb-signal-loathing
0f01422
Kristian Høgsberg d470a6c
%patch100 -p0 -b .no-move-damage
Kristian Høgsberg d470a6c
%patch101 -p0 -b .dont-backfill-bg-none
99319d2
%patch105 -p1 -b .enable-composite
44ad9a9
%patch106 -p1 -b .no-xnest-composite
Kristian Høgsberg 22c56dc
%patch107 -p1 -b .offscreen-pixmaps
115cc5d
%patch108 -p1 -b .composite-paranoia
Kristian Høgsberg 9675a54
34d1ce8
%patch1001 -p1 -b .Red-Hat-extramodes
d844c6d
%patch1002 -p1 -b .xephyr
94d8e40
%patch1003 -p1 -b .fpic
44ad9a9
%patch1004 -p1 -b .selinux-awareness
Kristian Høgsberg 9d29f49
%patch1005 -p0 -b .builtin-fonts
860c5ba
%patch1006 -p1 -b .no-scanpci
860c5ba
%patch1007 -p1 -b .xf1bpp
4dbca59
%patch1008 -p1 -b .comment-less
d0f52e0
%patch1009 -p1 -b .maxpixclock
98df0b5
%patch1010 -p1 -b .prerelease-warning
d0f52e0
d0f52e0
%patch2001 -p1 -b .geode-mmx
d0f52e0
%patch2002 -p1 -b .xephyr-keysym
bc24ef2
%patch2003 -p1 -b .vfprintf
708d7fa
%patch2004 -p1 -b .displaysize
1f7d5c8
%patch2005 -p1 -b .xephyr-crash
6f79486
%patch2006 -p1 -b .fakerama
caa4f1f
115cc5d
%patch2500 -p1 -b .unbreak-domains
115cc5d
%patch2501 -p1 -b .pci-bus-count
115cc5d
%patch2502 -p1 -b .mmap-check
115cc5d
%patch2503 -p1 -b .rom-search
65a4e80
%patch2504 -p1 -b .domain-obiwan
407286e
%patch2505 -p1 -b .device-enable
115cc5d
mharris dc2469d
%build
mharris aa15493
f7f3689
# --with-rgb-path should be superfluous now ?
f7f3689
# --with-pie ?
a549381
aclocal ; automake -a ; autoconf
f7f3689
%configure \
f7f3689
	%{enable_xorg} \
f7f3689
	--disable-xprint --enable-xvfb --enable-xnest --enable-dmx \
f7f3689
	--enable-kdrive --enable-xephyr \
mharris 683564b
	--disable-static \
998c064
	--with-pic \
mharris 382d04d
	--enable-composite \
mharris 382d04d
	--enable-xtrap \
mharris 382d04d
	--enable-xcsecurity \
mharris 382d04d
	--enable-xevie \
9d75614
	--with-int10=x86emu \
Kristian Høgsberg 70b680e
	--with-default-font-path="unix/:7100,built-ins" \
mharris 382d04d
	--with-module-dir=%{moduledir} \
a549381
	--with-os-name="Fedora Core 7" \
mharris 382d04d
	--with-os-vendor="Red Hat, Inc." \
6824c6b
	--with-builderstring="Build ID: %{name} %{version}-%{release}" \
mharris 382d04d
	--with-xkb-output=%{_localstatedir}/lib/xkb \
mharris 83c9ed8
	--with-rgb-path=%{_datadir}/X11/rgb \
mharris aa15493
	--disable-xorgcfg \
mharris aa15493
	--enable-install-libxf86config \
998c064
	--with-fontdir=%(pkg-config --variable=fontdir fontutil) \
998c064
	--with-mesa-source=%{_datadir}/mesa/source \
f7f3689
%if %{with_hw_servers}
f7f3689
	--enable-dri \
998c064
	--with-dri-driver-path=%{drimoduledir} \
998c064
%endif
a549381
	${CONFIGURE}
mharris aa15493
0f2c2e4
make -s %{?_smp_mflags}
Kristian Høgsberg ce50e2c
mharris dc2469d
%install
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris aa15493
make install DESTDIR=$RPM_BUILD_ROOT moduledir=%{moduledir}
Kristian Høgsberg ce50e2c
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
mkdir -p $RPM_BUILD_ROOT%{_libdir}/xorg/modules/{drivers,input}
mharris dc2469d
mharris 0af35d4
# Install the vesamodes and extramodes files to let our install/config tools
mharris 0af35d4
# be able to parse the same modelist as the X server uses (rhpxl).
115cc5d
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
115cc5d
for each in vesamodes extramodes ; do
115cc5d
    install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
115cc5d
    cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
115cc5d
    chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
115cc5d
done
mharris a30689e
%endif
mharris 0af35d4
9d53449
# Make the source package
Adam Tkac aeec5f9
%define xserver_source_dir %{_datadir}/xorg-x11-server-source
9d53449
%define inst_srcdir %{buildroot}/%{xserver_source_dir}
9d53449
mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}}
9d53449
cp cpprules.in %{inst_srcdir}
9d53449
cp Xext/SecurityPolicy %{inst_srcdir}/Xext
9d53449
cp xkb/README.compiled %{inst_srcdir}/xkb
9d53449
cp GL/symlink-mesa.sh %{inst_srcdir}/GL
9d53449
cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86
9d53449
cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common
9d53449
cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/
Adam Tkac aeec5f9
Adam Tkac aeec5f9
find . -type f | egrep '.*\.(c|h|am|ac|inc|m4|h.in|pc.in|man.pre|pl)$' |
Adam Tkac 6d65eb0
xargs tar cf - | (cd %{inst_srcdir} && tar xf -)
Adam Tkac aeec5f9
0f2c2e4
# Remove unwanted files/dirs
mharris 382d04d
{
Kristian Høgsberg 5ee49e3
    rm -f $RPM_BUILD_ROOT%{_bindir}/xorgconfig
Kristian Høgsberg 5ee49e3
    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xorgconfig.1*
Kristian Høgsberg 5ee49e3
    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Cards
Kristian Høgsberg 5ee49e3
    rm -f $RPM_BUILD_ROOT%{_libdir}/X11/Options
0f2c2e4
    rm -f $RPM_BUILD_ROOT%{_bindir}/in?
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
0f2c2e4
    rm -f $RPM_BUILD_ROOT%{_bindir}/out?
mharris bdcccdf
    rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
mharris f71fb24
    rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
mharris a30689e
    find $RPM_BUILD_ROOT -type f -name '*.la' | xargs rm -f -- || :
mharris e063a92
mharris e063a92
%ifarch s390 s390x
mharris e063a92
    # FIXME: The following files get installed on s390/s390x and we don't
mharris e063a92
    # want some of them on s390 at all, and others should be in a -common
mharris e063a92
    # subpackage, but it's not worth doing that for 3 files right now.
115cc5d
    # error: Installed (but unpackaged) file(s) found:
115cc5d
    #	   /randrstr.h
115cc5d
    #	   /usr/lib/pkgconfig/xorg-server.pc
115cc5d
    #	      /usr/share/aclocal/xorg-server.m4
115cc5d
    #	      /usr/share/man/man1/Xserver.1x.gz
115cc5d
    #	      /var/lib/xkb/README.compiled
0f2c2e4
mharris e063a92
    rm -f $RPM_BUILD_ROOT/randrstr.h
mharris e063a92
    rm -rf $RPM_BUILD_ROOT%{_libdir}/pkgconfig
mharris e063a92
    rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
mharris e063a92
    rm -rf $RPM_BUILD_ROOT/var/lib/xkb
mharris e063a92
%endif
mharris 382d04d
}
mharris 382d04d
mharris dc2469d
%clean
mharris dc2469d
rm -rf $RPM_BUILD_ROOT
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris 3a3aa5e
%pre Xorg
mharris 3a3aa5e
{
mharris 3a3aa5e
  pushd /etc/X11
mharris 3a3aa5e
  for configfile in XF86Config XF86Config-4 ; do
mharris 3a3aa5e
    if [ -r $configfile ]; then
mharris 3a3aa5e
      if [ -r xorg.conf ]; then
mharris 3a3aa5e
        mv -f $configfile $configfile.obsoleted
mharris 3a3aa5e
    else
mharris 3a3aa5e
        mv -f $configfile xorg.conf
mharris 3a3aa5e
      fi
mharris 3a3aa5e
    fi
mharris 3a3aa5e
  done
115cc5d
  configfile="xorg.conf"
115cc5d
  if [ -r xorg.conf -a -w xorg.conf ]; then
115cc5d
    perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' xorg.conf
115cc5d
    perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' xorg.conf
115cc5d
    perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' xorg.conf
115cc5d
    perl -p -i -e 's#^\s*RgbPath.*$##gi' xorg.conf
115cc5d
    perl -p -i -e 's#^\s*ModulePath.*$##gi' xorg.conf
115cc5d
  fi
mharris 3a3aa5e
  popd
mharris 171a920
} &> /dev/null || :
mharris a30689e
%endif
mharris 3a3aa5e
f7f3689
# The Xserver.1 manpage is intentionally present in multiple subpackages.
f7f3689
# It could reasonably form part of a -common subpackage though.
mharris dc2469d
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%files Xorg
mharris dc2469d
%defattr(-,root,root,-)
mharris af712a9
%{_bindir}/X
add023b
%attr(4711, root, root) %{_bindir}/Xorg
mharris 382d04d
%{_bindir}/gtf
46fa1ed
%{_bindir}/cvt
mharris 0af35d4
%dir %{_datadir}/xorg
mharris 0af35d4
%{_datadir}/xorg/vesamodes
mharris 0af35d4
%{_datadir}/xorg/extramodes
mharris dc2469d
%dir %{_libdir}/xorg
mharris dc2469d
%dir %{_libdir}/xorg/modules
mharris dc2469d
%dir %{_libdir}/xorg/modules/drivers
mharris 382d04d
%dir %{_libdir}/xorg/modules/extensions
mharris aa15493
%{_libdir}/xorg/modules/extensions/libGLcore.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libglx.so
f7f3689
%{_libdir}/xorg/modules/extensions/libdri.so
mharris a3dab0f
%{_libdir}/xorg/modules/extensions/libdbe.so
mharris a3dab0f
%{_libdir}/xorg/modules/extensions/libextmod.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/librecord.so
mharris aa15493
%{_libdir}/xorg/modules/extensions/libxtrap.so
mharris dc2469d
%dir %{_libdir}/xorg/modules/input
mharris aa15493
%dir %{_libdir}/xorg/modules/fonts
mharris aa15493
%{_libdir}/xorg/modules/fonts/libfreetype.so
mharris aa15493
%{_libdir}/xorg/modules/fonts/libtype1.so
mharris 382d04d
%dir %{_libdir}/xorg/modules/linux
mharris aa15493
%{_libdir}/xorg/modules/linux/libfbdevhw.so
mharris 382d04d
%dir %{_libdir}/xorg/modules/multimedia
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/bt829_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/fi1236_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/msp3430_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda8425_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9850_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/tda9885_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/multimedia/uda1380_drv.so
mharris 382d04d
%{_libdir}/xorg/modules/libafb.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libcfb32.so
mharris 382d04d
%{_libdir}/xorg/modules/libexa.so
mharris 382d04d
%{_libdir}/xorg/modules/libfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libint10.so
mharris 382d04d
%{_libdir}/xorg/modules/libmfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libpcidata.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadow.so
mharris 382d04d
%{_libdir}/xorg/modules/libshadowfb.so
mharris 382d04d
%{_libdir}/xorg/modules/libvbe.so
mharris 382d04d
%{_libdir}/xorg/modules/libvgahw.so
mharris 382d04d
%{_libdir}/xorg/modules/libxaa.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf1bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf4bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf8_16bpp.so
mharris 382d04d
%{_libdir}/xorg/modules/libxf8_32bpp.so
mharris bdcccdf
%dir %{_libdir}/xserver
mharris bdcccdf
%{_libdir}/xserver/SecurityPolicy
74d1670
%{_mandir}/man1/gtf.1*
74d1670
%{_mandir}/man1/Xorg.1*
74d1670
%{_mandir}/man1/Xserver.1*
Kristian Høgsberg 16cbfe9
%{_mandir}/man1/cvt.1*
mharris aa15493
%{_mandir}/man4/fbdevhw.4*
99319d2
%{_mandir}/man4/exa.4*
74d1670
%{_mandir}/man5/xorg.conf.5*
mharris 382d04d
%dir %{_localstatedir}/lib/xkb
mharris 382d04d
%{_localstatedir}/lib/xkb/README.compiled
mharris a30689e
%endif
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xnest
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xnest
74d1670
%{_mandir}/man1/Xnest.1*
74d1670
%{_mandir}/man1/Xserver.1*
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xdmx
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xdmx
mharris 382d04d
%{_bindir}/dmxaddinput
mharris 382d04d
%{_bindir}/dmxaddscreen
mharris 382d04d
%{_bindir}/dmxreconfig
mharris 382d04d
%{_bindir}/dmxresize
mharris 382d04d
%{_bindir}/dmxrminput
mharris 382d04d
%{_bindir}/dmxrmscreen
mharris 382d04d
%{_bindir}/dmxtodmx
mharris 382d04d
%{_bindir}/dmxwininfo
mharris 382d04d
%{_bindir}/vdltodmx
mharris 382d04d
%{_bindir}/xdmx
mharris 382d04d
%{_bindir}/xdmxconfig
74d1670
%{_mandir}/man1/Xdmx.1*
74d1670
%{_mandir}/man1/dmxtodmx.1*
74d1670
%{_mandir}/man1/vdltodmx.1*
74d1670
%{_mandir}/man1/xdmxconfig.1*
74d1670
%{_mandir}/man1/Xserver.1*
mharris dc2469d
mharris dc2469d
mharris dc2469d
%files Xvfb
mharris dc2469d
%defattr(-,root,root,-)
mharris dc2469d
%{_bindir}/Xvfb
74d1670
%{_mandir}/man1/Xvfb.1*
74d1670
%{_mandir}/man1/Xserver.1*
4dbca59
%if !%{with_hw_servers}
4dbca59
%dir %{_libdir}/xserver
4dbca59
%{_libdir}/xserver/SecurityPolicy
4dbca59
%endif
mharris dc2469d
304cf10
304cf10
%files Xephyr
304cf10
%defattr(-,root,root,-)
304cf10
%{_bindir}/Xephyr
74d1670
%{_mandir}/man1/Xserver.1*
304cf10
f7f3689
mharris a30689e
%if %{with_hw_servers}
mharris dc2469d
%files sdk
mharris dc2469d
%defattr(-,root,root,-)
mharris aa15493
%{_libdir}/libxf86config.a
mharris dc2469d
%{_libdir}/pkgconfig/xorg-server.pc
mharris 0a0dee1
%dir %{_includedir}/xorg
mharris 1651c54
%{sdkdir}/*.h
mharris af712a9
%{_datadir}/aclocal/xorg-server.m4
mharris a30689e
%endif
f7f3689
Adam Tkac aeec5f9
%files source
Adam Tkac aeec5f9
%defattr(-, root, root, -)
9d53449
%{xserver_source_dir}
Adam Tkac aeec5f9
mharris dc2469d
mharris dc2469d
%changelog
e31b8a8
* Mon Apr 30 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-3
e31b8a8
- xserver-1.3.0-xkb-and-loathing.patch: Ignore (not just block) SIGALRM
e31b8a8
  around calls to Popen()/Pclose().  Fixes a hang in openoffice when
e31b8a8
  opening menus.
e31b8a8
- Modify BuildRequires to use the virtual protocol Provides.
e31b8a8
6f79486
* Wed Apr 25 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-2
6f79486
- xserver-1.3.0-less-randr-fakerama.patch: Disable RANDR's fake Xinerama
6f79486
  geometry when there's more than one protocol screen. (#231257)
6f79486
b8160aa
* Mon Apr 23 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-1
b8160aa
- xserver 1.3.0.
b8160aa
c45efee
* Fri Apr 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-5
c45efee
- xserver-rc5-to-now.patch: Updates from git.
c45efee
98df0b5
* Wed Apr 11 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-4
98df0b5
- xserver-1.3.0-no-prerelease-warning.patch: Hush the useless prerelease
98df0b5
  warning if we happen to be building one (and even if not).
407286e
- xserver-1.3.0-pci-device-enable.patch: Make sure the PCI device is enabled
407286e
  in sysfs before we start touching it, otherwise, armageddon.
98df0b5
65a4e80
* Tue Apr 10 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-3
65a4e80
- xserver-1.3.0-domain-obiwan.patch: Fix a PCI domain off-by-one. (#235861)
65a4e80
- xserver-1.3.0-x86emu-imul-int64.patch: Fix imul in x86emu. (#235861)
65a4e80
115cc5d
* Mon Apr 09 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-2
115cc5d
- xserver-1.3.0-pci-bus-count.patch: Allocate the PCI bus array dynamically,
115cc5d
  so as not to run off the end of it.
115cc5d
- xserver-1.3.0-mmap-failure-check.patch: Check for failure when mmap'ing
115cc5d
  bus memory. (#234073)
115cc5d
- xserver-1.3.0-rom-search.patch: Look for the sysfs ROM file in the (flat)
115cc5d
  /sys/bus/pci/devices tree, instead of the (bus-topological) /sys/devices,
115cc5d
  so we don't fail to find ROMs merely because they're behind a bridge.
115cc5d
- xserver-1.3.0-no-pseudocolor-composite.patch: Refuse to initialize
115cc5d
  Composite when Render is missing or when the root window is using
115cc5d
  a pseudocolor visual. (#217388)
115cc5d
- xserver-1.3.0-xnest-exposures.patch: Fix Motif app redraw in Xnest. (#229350)
115cc5d
a61fa11
* Fri Apr 06 2007 Adam Jackson <ajax@redhat.com> 1.2.99.905-1
a61fa11
- xserver 1.3 RC5.
a61fa11
67e5bcd
* Fri Mar 30 2007 David Woodhouse <dwmw2@redhat.com> 1.2.99.903-2
67e5bcd
- Fix regression with PCI domains, but disjoint bus numbers (#207659)
67e5bcd
90b2191
* Fri Mar 30 2007 Adam Jackson <ajax@redhat.com> 1.2.99.903-1
90b2191
- xserver 1.3 RC3.
8775f1e
e894201
* Mon Mar 19 2007 Adam Jackson <ajax@redhat.com> 1.2.99.902-1
e894201
- xserver 1.3 RC2.
e894201
1f7d5c8
* Tue Mar 13 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-2
1f7d5c8
- xserver-1.2.99.901-xephyr-crash-at-exit.patch: Fix yet another GLX visual
1f7d5c8
  mess. (#231425)
1f7d5c8
0f2c2e4
* Mon Mar 05 2007 Adam Jackson <ajax@redhat.com> 1.2.99.901-1
0f2c2e4
- xserver 1.3 RC1.  RANDR 1.2 hotness in the hizzouse.
0f2c2e4
- xserver-1.2.0-honor-displaysize.patch: Honor the DisplaySize config
0f2c2e4
  directive again (#220248)
0f2c2e4
- Clean up the post-install cleanup
0f2c2e4
Adam Tkac 6d65eb0
* Fri Mar 02 2007 Adam Tkac <atkac@redhat.com> 1.2.0-10
Adam Tkac 6d65eb0
- change permissions of files in source package to default from read-only
Adam Tkac 6d65eb0
Adam Tkac aeec5f9
* Mon Feb 26 2007 Adam Tkac <atkac@redhat.com> 1.2.0-9
9d53449
- Created new package (xorg-x11-server-source) which is needed to build VNC
9d53449
  server.
Adam Tkac aeec5f9
f672535
* Fri Feb 23 2007 Adam Jackson <ajax@redhat.com> 1.2.0-8
f672535
- xserver-1.2.0-proper-randr-version.patch: Report the RANDR version we
f672535
  actually implement, instead of the version defined by the protocol headers.
f672535
f47fb19
* Thu Feb 22 2007 Adam Jackson <ajax@redhat.com> 1.2.0-7
f47fb19
- Various backports from git master:
f47fb19
  - xserver-1.2.0-xfixes-clientgone-check.patch: Avoids a crash when sending
f47fb19
    events to clients that just disconnected.
f47fb19
  - xserver-1.2.0-os-memory-leak.patch: Plugs a per-connection memory leak.
f47fb19
  - xserver-1.2.0-int10-rdtsc.patch: Implement rdtsc in the int10 emulator.
f47fb19
  - xserver-1.2.0-glcore-visual-count.patch: Count glcore visuals properly,
f47fb19
    fixes crash at exit.
f47fb19
9867079
* Mon Feb 05 2007 Adam Jackson <ajax@redhat.com> 1.2.0-6
9867079
- xorg-x11-server-Red-Hat-extramodes.patch:
9867079
  - Add 1360x768 normal and reduced-blanking.
9867079
  - Add reduced-blanking versions of 1680x1050 and 1920x{1200,1080}.
9867079
  - Remove the >60Hz versions of 2560x1600.  Even leaving the 60Hz timing is
9867079
    kind of ridiculous, since every real LCD that size I've seen uses the
9867079
    reduced blanking timings.  But presumably if you have that nice of a
9867079
    monitor, you also have a video card with working DDC.
9867079
f7f3689
* Sun Feb 04 2007 Adam Jackson <ajax@redhat.com> 1.2.0-5
f7f3689
- Massive spec formatting and style cleanup.
f7f3689
- Build Xdmx on all arches.
f7f3689
- Enable GL support even on non-DRI machines.
f7f3689
- Re-add DRI to ppc64.
f7f3689
- Update BuildRequires to current versions.
f7f3689
- Remove some bogus Requires.
f7f3689
bc24ef2
* Wed Jan 31 2007 Adam Jackson <ajax@redhat.com> 1.2.0-4
bc24ef2
- Fix typo in SDK header. (#222487)
bc24ef2
d0f52e0
* Mon Jan 29 2007 Adam Jackson <ajax@redhat.com> 1.2.0-3
d0f52e0
- Fix MMX check on AMD CPUs. (#222332)
d0f52e0
- Fix Xephyr keysym init on LP64. (#224311)
d0f52e0
1401267
* Wed Jan 24 2007 Adam Jackson <ajax@redhat.com> 1.2.0-2
1401267
- Delete ModulePath lines rather than attempt to munge them.  (#186338)
1401267
99319d2
* Tue Jan 23 2007 Adam Jackson <ajax@redhat.com> 1.2.0-1
99319d2
- Xorg server 1.2.0.
99319d2
0d03177
* Tue Jan 09 2007 Adam Jackson <ajax@redhat.com> 1.1.1-57
0d03177
- xorg-xserver-1.1.0-dbe-render.diff: CVE #2006-6101
0d03177
- xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch: Skip building the
0d03177
  non-Xephyr kdrive servers entirely.
0d03177
72b72a2
* Mon Dec 18 2006 Adam Jackson <ajax@redhat.com> 1.1.1-56
72b72a2
- RHEL5 sync:
72b72a2
  - xorg-x11-server-1.1.1-maxpixclock-option.patch: Allow the maximum pixel
72b72a2
    clock of a monitor to be specified in the config file.
72b72a2
  - xorg-x11-server-1.1.1-glcore-visual-matching.patch: Fix a client crash
72b72a2
    when creating software indirect GLX contexts.
72b72a2
  - xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: During server
72b72a2
    init, abort if either VT activation ioctl fails.  During shutdown, be
72b72a2
    sure to wait for the VT switch to finish before exiting.
72b72a2
01f5fa1
* Mon Dec 11 2006 Adam Jackson <ajax@redhat.com> 1.1.1-55
01f5fa1
- xorg-x11-server-1.1.1-lid-close-crash.patch: Added, backport from head.
01f5fa1
  (#197921)
01f5fa1
Adam Tkac 6d44084
* Mon Dec 11 2006 Adam Tkac <atkac redhat com> 1.1.1-54.1.fc7
Adam Tkac 6d44084
- fixed building against mesa-6.5.2
Adam Tkac 6d44084
01f0482
* Fri Dec 1 2006 Adam Jackson <ajax@redhat.com> 1.1.1-54.fc7
01f0482
- xorg-x11-server-1.1.1-xkb-vidmode-switch.patch: Fix string matching on
01f0482
  XKB actions to be case-insensitive again.  (#216656)
01f0482
a549381
* Fri Dec 1 2006 Adam Jackson <ajax@redhat.com> 1.1.1-53.fc7
a549381
- xorg-x11-server-1.1.1-automake-1.10-fixes.patch: Tweak automakefiles to be
a549381
  1.10-compliant.
631fe6a
- Misc spec fixes.
a549381
4dbca59
* Mon Nov 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-52.fc7
4dbca59
- RHEL5 sync:
4dbca59
  - Deliver SecurityPolicy in Xvfb when !with_hw_servers (s390, s390x)
4dbca59
  - xorg-x11-server-1.1.1-ia64-int10.patch: Fix int10 on ia64.
4dbca59
  - xorg-x11-server-1.1.1-ia64-pci-chipsets.patch: ia64 PCI chipset support.
4dbca59
- Unify the autoconfig patches.
4dbca59
- xorg-x11-server-1.1.1-xf86config-comment-less.patch: Added, makes
4dbca59
  pyxf86config not grow the config file every time it's run.
4dbca59
- Remove with_developer_utils macro.
4dbca59
860c5ba
* Fri Nov 10 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-51.fc7
860c5ba
- xorg-x11-server-1.1.1-no-scanpci.patch: Drop scanpci, it's huge and
860c5ba
  there's no added value relative to lspci.
860c5ba
- xorg-x11-server-1.1.1-spurious-libxf1bpp-link.patch: Minor linktime
860c5ba
  fixup.  There's no reason for libxf4bpp to link against libxf1bpp.
860c5ba
74d1670
* Thu Nov 9 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-50.fc7
74d1670
- Fix man page globs to not care whether it's .1.gz or .1x.gz, etc.
74d1670
9d75614
* Wed Nov 8 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-49.fc7
9d75614
- Switch to using the x86emu version of libint10 even on x86.  Unifies
9d75614
  behaviour among CPUs and works around Xen vm86 emulation bogosity.
9d75614
a8fcc0d
* Wed Nov 8 2006 Adam Jackson <ajackson@redhat.com>
a8fcc0d
- Add FC7 todo list
a8fcc0d
- Bump Release number back to 48, got reduced somehow.
a8fcc0d
Kristian Høgsberg 2fee7ee
* Fri Oct 13 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-48.fc7
Kristian Høgsberg 2fee7ee
- Do not try own /usr/lib/pkgconfig in sdk package.
Kristian Høgsberg 2fee7ee
- Drop dependency on xorg-x11-fonts-base now that we compile in
Kristian Høgsberg 2fee7ee
  'fixed' and 'cursor' fonts.
Kristian Høgsberg 4e51b80
- Drop xorg-redhat-die-ugly-pattern-die-die-die.patch; use -br option
Kristian Høgsberg 475fabb
  instead.
Kristian Høgsberg 2fee7ee
sandmann 88ed5cc
* Wed Oct  4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-47.fc6
sandmann 88ed5cc
- graphics-expose.patch: Call miHandleExposures() with non-translated
sandmann 88ed5cc
  coordinates. 
sandmann 88ed5cc
sandmann 4ff4f04
* Wed Oct  4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-46.fc6
sandmann 4ff4f04
- Fix over-zealous code deletion in graphics-expose.patch. 
sandmann 4ff4f04
sandmann f4d5d10
* Wed Oct  4 2006 Soren Sandmann <sandmann@redhat.com> - 1.1.1-45.fc6
sandmann f4d5d10
- xorg-x11-server-1.1.1-graphics-expose.patch: call
sandmann f4d5d10
  miHandleExposures() in CopyArea/CopyPlane explicitly in cw to
sandmann f4d5d10
  generate GraphicsExposes correctly. (#209336).
sandmann f4d5d10
Kristian Høgsberg 282ba8b
* Mon Oct  2 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-44.fc6
Kristian Høgsberg 282ba8b
- xorg-x11-server-1.1.1-offscreen-pixmaps.patch: Take the server lock
Kristian Høgsberg dacddac
  before calling back into XAA to evict pixmaps (#204810).
Kristian Høgsberg 282ba8b
eb5ef29
* Wed Sep 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-43.fc6
eb5ef29
- xorg-x11-server-1.1.1-vt-activate-is-a-terrible-api.patch: Since the
eb5ef29
  VT_ACTIVATE/VT_WAITACTIVE pair are never guaranteed to successfully
eb5ef29
  complete, set a 5 second timeout on the WAITACTIVE, and retry the pair
eb5ef29
  until we win.  (#207746)
eb5ef29
- xorg-x11-server-1.1.0-pci-scan-fixes.patch: Partial revert to unbreak some
eb5ef29
  (but not all) domainful machines, including Pegasos. (#207659)
eb5ef29
41024cc
* Mon Sep 25 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-42.fc6
41024cc
- xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch: Fix XGI cards (#208000)
41024cc
9c546f8
* Fri Sep 22 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-41.fc6
9c546f8
- xorg-x11-server-1.1.1-vbe-filter-less.patch: Be gentler about rejecting
9c546f8
  VESA modes early, since xf86ValidateModes should handle them just fine.
9c546f8
c87a21a
* Wed Sep 20 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-40.fc6
c87a21a
- xorg-x11-server-1.1.1-pclose-confusion.patch: Be sure to call Pclose()
c87a21a
  on pipes created with Popen(), since the additional magic done by Popen()
c87a21a
  relative to popen() is not undone by plain pclose().  (Third base!)
c87a21a
- xorg-x11-server-1.1.1-edid-hex-dump.patch: Backport EDID hex dump code
c87a21a
  from git.
c87a21a
Kristian Høgsberg bfb38bb
* Wed Sep 20 2006 Kristian Høgsberg <krh@redhat.com> 1.1.1-39.fc6
Kristian Høgsberg bfb38bb
- Bump xorg-x11-proto-devel BuildRequires version and add Conflict
Kristian Høgsberg bfb38bb
  line for older mesa releases, so GLX_EXT_texture_from_pixmap opcodes
Kristian Høgsberg bfb38bb
  match.
Kristian Høgsberg bfb38bb
c84305f
* Thu Sep  7 2006 Adam Jackson <ajackson@redhat.coM> - 1.1.1-38.fc6
c84305f
- xorg-x11-server-1.1.1-believe-monitor-rb-modes.patch: Always believe the
c84305f
  monitor when it reports a reduced-blanking mode, even over VGA.
c84305f
Kristian Høgsberg 70b680e
* Thu Sep  7 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-37.fc6
Kristian Høgsberg 70b680e
- Add "built-ins" to default font path.
Kristian Høgsberg 70b680e
Kristian Høgsberg 77b4f52
* Wed Sep  6 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-36.fc6
Kristian Høgsberg 77b4f52
- Enable builtin fallback versions of cursor and fixed fonts.
Kristian Høgsberg 77b4f52
a602e9a
* Tue Sep  5 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-35.fc6
a602e9a
- xorg-x11-server-1.1.1-always-mouse-thyself.patch: Fix the check to look
a602e9a
  for mouse/void drivers in the running layout, as opposed to the config file,
a602e9a
  so as not to synthesize two mouse devices.
a602e9a
688be3a
* Thu Aug 31 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-34.fc6
688be3a
- xorg-x11-server-1.1.1-infer-virtual.patch: Be slightly more paranoid about
688be3a
  setting line pitch, and rescan the mode list after pruning to re-validate
688be3a
  the estimated virtual size.
688be3a
Kristian Høgsberg ed663d8
* Wed Aug 30 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-33.fc6
Kristian Høgsberg ed663d8
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to evict pixmap
Kristian Høgsberg ed663d8
  when GLX_EXT_texture_from_pixmap is first used.
Kristian Høgsberg ed663d8
Kristian Høgsberg bdb7b59
* Wed Aug 30 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-32.fc6
Kristian Høgsberg bdb7b59
- Drop xorg-x11-server-1.1.0-gl-include-inferiors.patch now that
Kristian Høgsberg bdb7b59
  compiz can uses the composite overlay window.
Kristian Høgsberg bdb7b59
Kristian Høgsberg 8d0b84f
* Mon Aug 28 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-31.fc6
Kristian Høgsberg 8d0b84f
- Update xorg-x11-server-1.1.1-offscreen-pixmaps.patch to log transitions.
Kristian Høgsberg 33bf8f7
- Update xorg-x11-server-1.1.0-tfp-damage.patch to always bind to
Kristian Høgsberg 33bf8f7
  GL_TEXTURE_RECTANGLE_ARB target.
Kristian Høgsberg 8d0b84f
0066a0f
* Fri Aug 25 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-30.fc6
0066a0f
- xorg-x11-server-1.1.1-pci-paranoia.patch: In xf86MatchPciInstances, fail
0066a0f
  gracefully if xf86PciVideoInfo is NULL (like, on Xen).
0066a0f
Kristian Høgsberg 8b6168d
* Fri Aug 25 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-29.fc6
Kristian Høgsberg 8b6168d
- Add xorg-x11-server-1.1.1-aiglx-happy-vt-switch.patch to fix VT
Kristian Høgsberg 8b6168d
  switching (and suspend/resume) when using AIGLX. (#199692, fdo #7916).
Kristian Høgsberg ff1a04b
- Bump mesa source and libGL BuildRequires.
Kristian Høgsberg a63b34d
- Update mesa-6.5.1 patch to work with 6.5.1 rc1 (slang_version_syn.h
Kristian Høgsberg a63b34d
  renamed to slang_pp_version_syn.h).
Kristian Høgsberg 8b6168d
eb1c89a
* Thu Aug 24 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-28.fc6
eb1c89a
- xorg-x11-server-1.1.1-infer-virtual.patch: Only flag modes as preferred
eb1c89a
  if the EDID block says to.
eb1c89a
- xorg-x11-server-1.1.1-mode-sort-kung-fu.patch: Enforce a sort order on
eb1c89a
  modes during lookup: builtin before driver before userdef before other,
eb1c89a
  and preferred modes within a class before others in that class.
eb1c89a
ea88315
* Tue Aug 22 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-27.fc6
ea88315
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Don't set an arbitrary
ea88315
  pixclock limit if the monitor didn't claim to have one.
ea88315
Kristian Høgsberg ed992cb
* Mon Aug 21 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-26.fc6
Kristian Høgsberg ed992cb
- Add Tilman Sauerbecks patch to fix AIGLX DRI locking.
Kristian Høgsberg ed992cb
df97fe4
* Fri Aug 18 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-25.fc6
df97fe4
- xorg-x11-server-1.1.1-xvfb-composite-crash.patch: Fix Xvfb's -render flag
df97fe4
  to also disable the Composite extension.
df97fe4
- xorg-x11-server-1.1.1-mesa-6.5.1.patch: Update build system to account for
df97fe4
  Mesa 6.5.1 snapshots.
df97fe4
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Add all available
df97fe4
  standard timings from EDID rather than just the first five.
df97fe4
01da837
* Fri Aug 18 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-24.fc6
01da837
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Unbreak.
01da837
d2f9881
* Fri Aug 18 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-23.fc6
d2f9881
- xorg-x11-server-1.1.1-xkb-in-xnest.patch: Added. (#193431)
d2f9881
2e5e9b4
* Thu Aug 17 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-22.fc6
2e5e9b4
- xorg-x11-server-1.1.1-infer-virtual.patch: When no modes or virtual size
2e5e9b4
  are given in the config file, attempt to pick a sensible one by examining
2e5e9b4
  the EDID modes and physical geometry.  Also generally make the server
2e5e9b4
  aware of driver-provided modes.
2e5e9b4
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Redo, since the property I was
2e5e9b4
  checking for is both fairly common and fairly predictable.  
2e5e9b4
9301319
* Tue Aug 15 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-21.fc6
9301319
- xorg-x11-server-1.1.1-fix-default-mouse-device-yet-again.patch: Added.
9301319
431d1e2
* Thu Aug 10 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-20.fc6
431d1e2
- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
431d1e2
  device in the config, and the user hasn't asked for any void devices,
431d1e2
  synthesize a mouse section.  (#200347)
431d1e2
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.
431d1e2
6824c6b
* Wed Aug  9 2006 Adam Jackson <ajackson@redhat.com> - 1.1.1-19.fc6
6824c6b
- xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
6824c6b
  string at configure time;
6824c6b
- ... and use it to print the package name and version.
6824c6b
- xorg-x11-server-1.1.1-defaultdepth-24.patch: Set default depth to 24.
6824c6b
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Add EDID quirks list as
6824c6b
  an experiment; needs a better solution though. 
6824c6b
Kristian Høgsberg 22c56dc
* Tue Aug  8 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-18.fc6
Kristian Høgsberg 22c56dc
- Update offscreen-pixmaps patch to migrate pixmaps when the compiz
Kristian Høgsberg 22c56dc
  selection is taken.
Kristian Høgsberg 22c56dc
Kristian Høgsberg a313dc6
* Mon Aug  7 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-17.fc5.aiglx
Kristian Høgsberg a313dc6
- Build for fc5 aiglx repo.
Kristian Høgsberg a313dc6
Kristian Høgsberg b99e229
* Mon Aug  7 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-17.fc6
Kristian Høgsberg b99e229
- Add xorg-x11-server-1.1.1-offscreen-pixmaps.patch to default
Kristian Høgsberg b99e229
  XaaNoOffscreenPixmaps to false, for now.
Kristian Høgsberg b99e229
9a768d9
* Mon Aug  7 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-16.fc6
9a768d9
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Off-by-one error in
9a768d9
  range storage.
9a768d9
2251731
* Wed Aug  2 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-15.fc6
2251731
- xorg-x11-server-1.1.0-edid-mode-injection-2.patch: Allow HorizSync and
2251731
  VertRefresh to be overridden independently.
2251731
d22299d
* Fri Jul 28 2006 Kevin E Martin <kem@redhat.com> - 1.1.1-14.fc6
d22299d
- xorg-x11-server-1.1.1-revert-xkb-change.patch: Revert change to xkb that
d22299d
  broke XkbGetKeyboard().
d22299d
Kristian Høgsberg a366c66
* Fri Jul 28 2006 Kristian Høgsberg <krh@redhat.com> - 1.1.1-13.fc5.aiglx
Kristian Høgsberg a366c66
- Add conflicts for ABI incompatible version of xorg-x11-drv-i810 and
Kristian Høgsberg a366c66
  xorg-x11-drv-ati.
Kristian Høgsberg a366c66
34d1ce8
* Fri Jul 28 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-13.fc6
34d1ce8
- Comment out the 848x480 modes from the extramodes patch.  Any panel that
34d1ce8
  wants it should be doing EDID injection by now, and it screws up
34d1ce8
  autoconfig by _just_ fitting in the ranges for 800x600.
34d1ce8
mharris d9aa1ba
* Wed Jul 26 2006 Mike A. Harris <mharris@redhat.com> 1.1.1-12.fc6
mharris d9aa1ba
- Added "1920x1080" CVT modes to Red-Hat-extramodes patch for (#195272)
mharris d9aa1ba
- Sorted the extramodes file by X res, then Y res for ease of maintenance.
mharris d9aa1ba
bbdcf78
* Tue Jul 25 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-11.fc6
869288f
- Add selinux{,-devel} buildreqs.
bbdcf78
44ad9a9
* Tue Jul 25 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-10.fc6
44ad9a9
- xorg-x11-server-1.1.1-selinux-awareness.patch: Added for new Mesa
44ad9a9
  selinux code.
44ad9a9
- xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch: Backport a Render
44ad9a9
  fix for Xdmx.
44ad9a9
- xorg-x11-server-1.1.1-no-composite-in-xnest.patch: Disable Composite in
44ad9a9
  Xnest, as it's known not to work.
e613865
- Fix default font path to match the config file we used to generate.
e613865
- Fix default module set to match the config file we used to generate.
e613865
- Disable use of TLS GLX dispatch to match Mesa selinux nonsense.
44ad9a9
mharris 7be6a00
* Mon Jul 24 2006 Mike A. Harris <mharris@redhat.com> 1.1.1-8.fc6
mharris 7be6a00
- Added "1440x900@60" CVT mode to Red-Hat-extramodes patch for (#179865)
mharris 7be6a00
mharris a1182a7
* Fri Jul 21 2006 Mike A. Harris <mharris@redhat.com>
mharris a1182a7
- Added "1152x864 @ 100.00" GTF mode to Red-Hat-extramodes patch (#49264)
mharris a1182a7
mharris e89dbb8
* Fri Jul 21 2006 Mike A. Harris <mharris@redhat.com> 1.1.1-7.fc6
mharris e89dbb8
- Only ship pcitweak manpage if we are building it (#199653)
mharris e89dbb8
- Fix dist tag usage (Was {dist}, should be {?dist})
mharris 4072bdd
- Added xorg-x11-server-libxf86config-dont-write-empty-sections.patch to
mharris 4072bdd
  prevent config file parser/writer from writing out empty sections (#198653)
mharris 3fb8417
- Add dependency on xorg-x11-fonts-base to all X server subpackages (#186091)
mharris e89dbb8
mharris e89dbb8
* Tue Jul 18 2006 Jeremy Katz <katzj@redhat.com> 1.1.1-6.fc6
025cb0e
- Saner defaults for hsync/vrefresh on monitors that can't be probed
025cb0e
mharris e89dbb8
* Thu Jul 13 2006 Kristian Høgsberg <krh@redhat.com>  1.1.1-5.fc6
Kristian Høgsberg b47454d
- Tag as 1.1.1-5.fc6.
Kristian Høgsberg b47454d
mharris e89dbb8
* Wed Jul 12 2006 Kristian Høgsberg <krh@redhat.com>  1.1.1-5.fc5.aiglx
Kristian Høgsberg 17e6d9b
- Enable composite by default.
Kristian Høgsberg d470a6c
- Split spiffiffity patch into one patch per change:
Kristian Høgsberg d470a6c
  xorg-x11-server-1.1.0-no-move-damage.patch and
Kristian Høgsberg d470a6c
  xorg-x11-server-1.1.0-dont-backfill-bg-none.patch.
Kristian Høgsberg d470a6c
5b64167
* Wed Jul 12 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-4.fc6
5b64167
- Restore placing the raw EDID block on the root window.
5b64167
5b64167
* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> 1.1.1-3.1.fc6
e687055
- rebuild
e687055
fcc974b
* Tue Jul 11 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-3.fc6
fcc974b
- Enable DPMS by default.
fcc974b
42f0053
* Tue Jul 11 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-2.fc6
42f0053
- Remove nonsensical runtime perl dependency.
42f0053
mharris e89dbb8
* Sat Jul 08 2006 Adam Jackson <ajackson@redhat.com> 1.1.1-1.fc6
8181e8f
- Update to 1.1.1.
8181e8f
mharris e89dbb8
* Sat Jul 08 2006 Kristian Høgsberg <krh@redhat.com>  1.1.0-27.fc6
Kristian Høgsberg c841427
- Enable TLS for GLX to match the mesa build config.
Kristian Høgsberg c841427
mharris e89dbb8
* Fri Jul 07 2006 Kristian Høgsberg <krh@redhat.com>  1.1.0-26
Kristian Høgsberg 5569e79
- Add xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch to hook up the
Kristian Høgsberg 5569e79
  GLX_MESA_copy_sub_buffer extension.
Kristian Høgsberg 5569e79
mharris e89dbb8
* Fri Jun 30 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-25.fc6
mharris c37ce84
- Start using the new %%{dist} tag <http://fedoraproject.org/wiki/DistTag>
mharris c37ce84
  experimentally in the package Release field to help prevent problems like
mharris c37ce84
  (#197266) from occuring in the future.
mharris c37ce84
mharris 057c9b5
* Wed Jun 28 2006 Mike A. Harris <mharris@redhat.com>
mharris 057c9b5
- Disable build dependency on zlib-devel now that we are not uselessly linking
mharris 057c9b5
  against it.
mharris 057c9b5
9023d19
* Tue Jun 27 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-24
9023d19
- Don't (uselessly) link the server against zlib.
9023d19
- Fix the 1680x1050 modes to be the CVT timings instead of GTF.
9023d19
bf0fce9
* Mon Jun 26 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-23
bf0fce9
- Fix an open-coded check for reduced-blanking modes to only apply to analog
bf0fce9
  connectors.
bf0fce9
- Reorder the EDID patches slightly.
bf0fce9
mharris e6840b8
* Tue Jun 20 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-22
mharris e6840b8
- Added xorg-xserver-1.1.0-setuid.diff to fix potential security issue (#196094)
mharris 5b0338c
- Disable DRI on ppc64 builds.
mharris a3dab0f
- Conditionalize inclusion of DRI related X server modules to with_dri builds.
mharris e6840b8
mharris e6840b8
* Tue Jun 20 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-21
Kristian Høgsberg d6e484c
- Update xorg-x11-server-1.1.0-tfp-damage.patch to use glTexSubImage2D
Kristian Høgsberg d6e484c
  to only update the part of the texture that changed, based on damage
Kristian Høgsberg d6e484c
  regions.
Kristian Høgsberg d6e484c
mharris 8b3540d
* Mon Jun 19 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-20
mharris 8b3540d
- Remove with_xnest_server conditional, and fix more BuildRequires to pull
mharris 8b3540d
  in libX11-devel, libXext-devel, zlib-devel, etc. for Xnest and Xephyr.
mharris e063a92
- Remove unwanted files leftover in buildroot for s390/s390x builds.
mharris 9f21d39
- Add Xserver.1x manpage to multiple subpackages, as it applies equally to
mharris 9f21d39
  Xorg, Xnest, Xvfb, Xephyr.
mharris 8b3540d
mharris 8b3540d
* Mon Jun 19 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-19
Kristian Høgsberg 106a334
- Add with_xnest_server conditional and disable on s390, since Xnest
Kristian Høgsberg 106a334
  fails to build on there (Xlib doesn't get added to the link line).
Kristian Høgsberg 5ee49e3
- Add -f to removal of xorgconfig and others which may or may not be built.
Kristian Høgsberg 106a334
mharris 8b3540d
* Mon Jun 19 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-18
Kristian Høgsberg 47263aa
- Add xorg-x11-server-1.1.0-convolution-filter-fix.patch and
Kristian Høgsberg 47263aa
  xorg-x11-server-1.1.0-tfp-damage.patch backported to make compiz go
Kristian Høgsberg 47263aa
  faster and make compiz shadows work.
Kristian Høgsberg 47263aa
94d8e40
* Mon Jun 19 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-17
94d8e40
- Disable filling in monitor gamma info from EDID momentarily, since drivers
94d8e40
  will use that field to set the card's gamma ramp.
4836c0d
- Backport some stuff from git: cw crash fix, faster pci scanning, some
e3a92b5
  log message cleanup.
94d8e40
mharris a30689e
* Fri Jun 16 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-16
mharris a30689e
- Enable spec support for s390, s390x, alpha, sparc, and sparc64 architectures.
mharris a30689e
- Add with_hw_servers conditional to disable hardware servers on s390/s390x.
mharris a30689e
- Add with_dmx_server to disable DMX on s390/s390x.
mharris a30689e
- Added "release" number to "BuildRequires: freetype-devel >= 2.1.9-1" for
mharris a30689e
  dependency futureproofing.
mharris 11e13cd
- Force "--disable-dri" on s390/s390x, to attempt to work around ./configure
mharris 11e13cd
  failure to find libdrm, which should not be needed on s390 builds anyway.
mharris a30689e
e5a76e5
* Thu Jun 15 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-15
e5a76e5
- Add loader infrastructure for publishing PCI ID lists in the drivers, and
e5a76e5
  autodetecting drivers based on that.  Currently unused since no drivers
e5a76e5
  publish such a list yet.
e5a76e5
- Fix mouse autoconfig to use /dev/input/mice instead of /dev/mouse.
e5a76e5
mharris 8b3540d
* Wed Jun 14 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-14
Kristian Høgsberg a8cf64c
- Change selection atom to _COMPIZ_GL_INCLUDE_INFERIORS in
Kristian Høgsberg a8cf64c
  xorg-x11-server-1.1.0-gl-include-inferiors.patch.
Kristian Høgsberg a8cf64c
mharris 8b3540d
* Tue Jun 13 2006 Jeremy Katz <katzj@redhat.com> 1.1.0-13
35fbae1
- put back my -fPIC patch, libxf86config isn't built with fPIC otherwise
35fbae1
caa4f1f
* Tue Jun 13 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-12
caa4f1f
- Add EDID mode autodetection.
caa4f1f
mharris 8b3540d
* Mon Jun 12 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-11
Kristian Høgsberg ae2fff9
- Add xorg-x11-server-1.1.0-gl-include-inferiors.patch to let GL
Kristian Høgsberg ae2fff9
  rendering include child windows.
Kristian Høgsberg ae2fff9
65954d8
* Mon Jun 12 2006 Adam Jackson <ajax@redhat.com> 1.1.0-10
65954d8
- Misc build fixes for ppc64.
65954d8
2ccbc40
* Mon Jun 12 2006 Adam Jackson <ajax@redhat.com> 1.1.0-9
2ccbc40
- --enable-xorg on ppc64 too.
2ccbc40
- Re-add cvt, got dropped somehow.
2ccbc40
mharris 8b3540d
* Fri Jun 09 2006 Kristian Høgsberg <krh@redhat.com> 1.1.0-8
Kristian Høgsberg 48ea57b
- Add our friend, libtool, to BuildRequires.
Kristian Høgsberg 48ea57b
mharris 19891e9
* Thu Jun 08 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-7
mharris 19891e9
- Change "BuildRequires: freetype-devel >= 2.1.10" to 2.1.9, as Xorg 7.0
mharris 19891e9
  contains 2.1.9 in "extras" and 7.1 does not appear to have a requirement on
mharris 19891e9
  a newer freetype.
mharris 19891e9
- Janitorial cleanups for spec file changelog consistency.
mharris eb8b1bd
- Call aclocal before automake, otherwise automake >= 1.9.6 is required in
mharris 0b062d4
  order to rebuild the package.
mharris 60333cd
- Build 1.1.0-4, 1.1.0-5, and 1.1.0-6 appear to have failed in brew but nobody
mharris eb8b1bd
  fixed them.  It appears automake 1.9 breaks the build.
mharris 19891e9
mharris 19891e9
* Wed Jun 07 2006 Jeremy Katz <katzj@redhat.com> 1.1.0-6
87930f1
- BR automake and autoconf
87930f1
mharris 19891e9
* Wed Jun 07 2006 Jeremy Katz <katzj@redhat.com> 1.1.0-5
13e72fd
- build on ppc64 so that we have an X server there
13e72fd
d844c6d
* Tue Jun 06 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-4
d844c6d
- Hack the kdrive makefile to only attempt to build Xephyr, avoids linking
d844c6d
  sixteen extra servers just to delete them.
d844c6d
- Move cvt to the default install set, same as gtf.
d844c6d
998c064
* Mon Jun 05 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-3
998c064
- Drop the libxf86config -fPIC patch, just build the whole thing with
998c064
  --with-pic instead.  Add void and evdev to the required driver list for
998c064
  upcoming autoconfig magic.
998c064
mharris 2025148
* Thu May 25 2006 Mike A. Harris <mharris@redhat.com> 1.1.0-2
mharris 2025148
- Add "Requires: xorg-x11-proto-devel >= 7.1-1" to sdk for numerous (52) bug
mharris 2025148
  reports of drivers failing to build with mock.
mharris 2025148
79a0971
* Tue May 23 2006 Adam Jackson <ajackson@redhat.com> 1.1.0-1
79a0971
- Xorg 7.1 final.
79a0971
mharris 7814b99
* Tue May 23 2006 Mike A. Harris <mharris@redhat.com> 1.0.99.903-2
mharris 7814b99
- Disable dependency on xorg-x11-drivers package, for OLPC.  (#191781)
mharris 7814b99
- Add "BuildRequires: freetype-devel >= 2.1.10" for bug (#192021)
mharris 7814b99
0134afc
* Fri May 12 2006 Adam Jackson <ajackson@redhat.com> 1.0.99.903-1
0134afc
- Update to 7.1RC3, plus experimental fix for fdo bug #6827.
0134afc
mharris 19891e9
* Mon May 01 2006 Adam Jackson <ajackson@redhat.com> 1.0.99.902-1
62b1a84
- Update to 7.1RC2 plus fix for CVE 2006-1526.  Disable the fastpathing
62b1a84
  patch for fdo bug #4320 since that should be covered in the generic
62b1a84
  Render code now.
62b1a84
0f01422
* Mon Apr 24 2006 Adam Jackson <ajackson@redhat.com> 1.0.99.901-6
0f01422
- Backport a Render crash fix from HEAD.
0f01422
Kristian Høgsberg f25636b
* Thu Apr 13 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.901-5
Kristian Høgsberg f25636b
- Update spiffiffity patch to only suppress move damage events for
Kristian Høgsberg f25636b
  manually redirected windows.
Kristian Høgsberg f25636b
Kristian Høgsberg 258ab18
* Wed Apr 12 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.901-4
Kristian Høgsberg 258ab18
- Bump for rawhide build.
Kristian Høgsberg 258ab18
Kristian Høgsberg 453016d
* Wed Apr 12 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.901-3
Kristian Høgsberg 453016d
- Add xorg-x11-server-1.0.99.901-cow-fix.patch to fix crash when
Kristian Høgsberg 453016d
  releasing the COW.
Kristian Høgsberg 453016d
Kristian Høgsberg 59c03a4
* Tue Apr 11 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.901-2
Kristian Høgsberg 59c03a4
- Bump for fc5 build.
Kristian Høgsberg 59c03a4
mharris 19891e9
* Sat Apr 08 2006 Adam Jackson <ajackson@redhat.com> 1.0.99.901-1
63748b1
- Update to 7.1 RC1.
63748b1
mharris 19891e9
* Thu Apr 06 2006 Adam Jackson <ajax@redhat.com> 1.0.99.2-2
304cf10
- Remove LBX to match upstream policy.
304cf10
- Add Xephyr server.
304cf10
mharris 19891e9
* Tue Apr 04 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.2-1
Kristian Høgsberg 6f719cb
- Update to 1.0.99.2 snapshot and go back to using mesa-source package.
Kristian Høgsberg 6f719cb
- Drop xorg-server-1.0.99-composite-visibility.patch.
Kristian Høgsberg 6f719cb
- Drop xorg-server-1.0.1-backtrace.patch.
Kristian Høgsberg 6f719cb
- Drop xorg-server-0.99.3-rgb.txt-dix-config-fix.patch.
Kristian Høgsberg 9675a54
- Add xorg-server-1.0.99.2-spiffiffity.patch.
Kristian Høgsberg 6f719cb
Kristian Høgsberg 2a0fe97
* Thu Mar 23 2006 Kristian Høgsberg <krh@redhat.com>
Kristian Høgsberg 2a0fe97
- Pass --with-dri-driver-path so we're sure to point it to the right path.
Kristian Høgsberg 2a0fe97
sandmann 35c058a
* Wed Mar 22 2006 Soren Sandmann <sandmann@redhat.com> 1.0.99.1-2
sandmann 35c058a
- Add xorg-server-1.0.99-composite-visibility.patch to get rid of flashing
sandmann 35c058a
  titlebars in compositing metacity.
sandmann 35c058a
Kristian Høgsberg 16cbfe9
* Tue Mar 21 2006 Kristian Høgsberg <krh@redhat.com> 1.0.99.1-1
Kristian Høgsberg 16cbfe9
- Update to 1.0.99.1 snapshot.
Kristian Høgsberg 16cbfe9
mharris 19891e9
* Mon Mar 06 2006 Jeremy Katz <katzj@redhat.com> 1.0.1-8
f8b6120
- build libxf86config with -fPIC (#181292)
f8b6120
- fix sgi 1600sw extra mode (#182430)
f8b6120
mharris 5a71ca7
* Wed Feb 22 2006 Jeremy Katz <katzj@redhat.com> 1.0.1-7
18b5b41
- install randrstr.h as part of sdk as required for building some drivers
18b5b41
mharris 04d8f96
* Tue Feb 21 2006 Mike A. Harris <mharris@redhat.com>
mharris 04d8f96
- Added xorg-server-1.0.1-backtrace.patch which enables the Xorg server's
mharris 04d8f96
  built in backtrace support by default, as it was inadvertently disabled in
mharris 04d8f96
  7.0.
mharris 04d8f96
mharris 04d8f96
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> 1.0.1-6.1
782972c
- bump again for double-long bug on ppc(64)
782972c
mharris 19891e9
* Wed Feb 08 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-6
mharris 0af35d4
- Added xorg-x11-server-1.0.1-Red-Hat-extramodes.patch which is a merger of
mharris 0af35d4
  XFree86-4.2.99.2-redhat-custom-modelines.patch and
mharris 0af35d4
  xorg-x11-6.8.2-laptop-modes.patch from FC4 for (#180301)
mharris 0af35d4
- Install a copy of the vesamodes and extramodes files which contain the list
mharris 0af35d4
  of video modes that are built into the X server, so that the "rhpxl" package
mharris 0af35d4
  does not have to carry around an out of sync copy for itself. (#180301)
mharris 0af35d4
mharris 19891e9
* Tue Feb 07 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-5
mharris 1b4ec70
- Updated "BuildRequires: mesa-source >= 6.4.2-2" to get fix for (#176976)
mharris 1b4ec70
mharris 19891e9
* Mon Feb 06 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-4
mharris 171a920
- Fix brown paper bag error introduced in rpm post script in 1.0.1-4.
mharris 171a920
mharris 19891e9
* Mon Feb 06 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-3
mharris 539c67e
- Added xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch with changes
mharris 539c67e
  suggested by ajax to fix (fdo#4320).
mharris 539c67e
- Cosmetic cleanups to satiate the banshees.
mharris 539c67e
mharris 19891e9
* Sun Feb 05 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-2
mharris 361e746
- Added xorg-x11-server-1.0.1-fbpict-fix-rounding.patch from CVS HEAD.
mharris 361e746
- Added xorg-x11-server-1.0.1-SEGV-on-null-interface.patch which prevents a
mharris 361e746
  SEGV on null interfaces (#174279,178986)
mharris 361e746
mharris ecfa41e
* Wed Jan 18 2006 Mike A. Harris <mharris@redhat.com> 1.0.1-1
mharris ecfa41e
- Updated to xserver 1.0.1 from X11R7.0
mharris ecfa41e
mharris 1d1b706
* Thu Dec 22 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-3
mharris 1d1b706
- Added "Provides: libxf86config-devel = %{version}-%{release}" to sdk package.
mharris 1d1b706
mharris a98a47a
* Wed Dec 21 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-2
mharris a98a47a
- Added xserver-1.0.0-parser-add-missing-headers-to-sdk.patch to provide the
mharris a98a47a
  necessary libxf86config.a headers to be able to use the library. (#173084)
mharris a98a47a
mharris aa15493
* Sat Dec 17 2005 Mike A. Harris <mharris@redhat.com> 1.0.0-1
mharris a98a47a
- Updated to xserver 1.0.0 from X11R7 RC4
mharris a98a47a
- Removed the following patches, which are now integrated upstream:
mharris a98a47a
  - xorg-server-0.99.3-rgb.txt-dix-config-fix.patch,
mharris a98a47a
  - xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
mharris a98a47a
- Changed manNx directories to manN to match upstream defaults.
mharris a98a47a
- Added libxf86config.a to sdk subpackage.
mharris a98a47a
- Updated build dependency of "mesa-libGL-devel >= 6.4.1-1"
mharris a98a47a
- Added "BuildRequires: xorg-x11-font-utils >= 1.0.0-1" to be able to query
mharris a98a47a
  the fontdir from fontutil.pc which is implemented currently by a custom
mharris a98a47a
  patch.
mharris a98a47a
- Enable xtrap, xcsecurity, xevie, and lbx on all builds, not just DRI builds.
mharris a98a47a
- Fix sdk installation path, so that drivers can find the files again.
mharris a98a47a
- Update file manifest, to deal with X server modules that have moved to
mharris a98a47a
  a subdir, etc.
mharris aa15493
Kristian Høgsberg d16f815
* Mon Nov 28 2005 Kristian Høgsberg <krh@redhat.com>
Kristian Høgsberg d16f815
- Add a few missing BuildRequires.
Kristian Høgsberg d16f815
mharris 4fda388
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-9
mharris a66ebcc
- Added "Requires: xorg-x11-drivers >= 0.99.2-4" as a dependency of the Xorg
mharris a66ebcc
  subpackage, to ensure that anaconda installs all of the drivers during OS
mharris a66ebcc
  installs and upgrades, as requested by Jeremy Katz.
mharris 4fda388
mharris 642cde5
* Fri Nov 25 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-8
mharris 1651c54
- Added xorg-server-0.99.3-rgb.txt-dix-config-fix.patch which fixes the
mharris 1651c54
  --with-rgb-path option to actually *work*.
mharris 1651c54
- Updated libdrm dep to 1.0.5
mharris 1651c54
mharris 83c9ed8
* Wed Nov 23 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-7
mharris 83c9ed8
- Update xorg-x11-server-utils dep to 0.99.2-5 to ensure rgb.txt is installed
mharris 83c9ed8
  in correct location - _datadir/X11/rgb
mharris 83c9ed8
- Added --with-rgb-path configure option to specify _datadir/X11/rgb so the
mharris 83c9ed8
  X server finds the rgb.txt database properly, for bugs (#173453, 173435,
mharris 83c9ed8
  173428, 173483, 173734, 173737, 173594)
mharris 83c9ed8
- Added xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch to prevent SSE/MMX
mharris 83c9ed8
  code from being activated on non-capable VIA CPU. (#173384,fdo#5093)
mharris 83c9ed8
mharris 3a3aa5e
* Thu Nov 17 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-6
mharris 3a3aa5e
- Add the missing rpm pre script from monolithic xorg-x11 packaging,
mharris 3a3aa5e
  clean it up a bit, reorder it for slight performance gain.
mharris 3a3aa5e
- Add some perl magic to pre script to remove RgbPath from xorg.conf,
mharris 3a3aa5e
  in order to fix bug (#173036, 173435, 173453, 173428)
mharris 3a3aa5e
- Add more perl magic to pre script to update ModulePath to the new
mharris 3a3aa5e
  location if it is specified in xorg.conf.
mharris 3a3aa5e
- Added xorg-x11-server-0.99.3-init-origins-fix.patch ported from monolithic
mharris 3a3aa5e
  xorg-x11 package to fix Xinerama bug.
mharris f7385e3
- Added xorg-redhat-die-ugly-pattern-die-die-die.patch to kill the ugly grey
mharris f7385e3
  stipple once again for bug (#173423).
mharris 6f015dd
- Added "BuildRequires: libdrm-devel" for DRI enabled builds.
mharris 3a3aa5e
mharris 5a71ca7
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-5
mharris 3a3aa5e
- Xorg server should be suid for users to be able to run startx (#173064)
add023b
mharris 093a3e3
* Mon Nov 14 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
mharris 093a3e3
- Added temporary "BuildRequires: libXfont-devel >= 0.99.2-3" and
mharris 093a3e3
  "Requires: libXfont-devel >= 0.99.2-3" to ensure early-testers of
mharris 093a3e3
  pre-rawhide modular X have installed the work around for (#172997).
mharris 093a3e3
- Added implementation specific "Requires: xkbdata" to Xorg subpackage, as
mharris 093a3e3
  we want to ensure the xkb data files are present, but allow us the option
mharris 093a3e3
  of easily switching implementations to "xkeyboard-config" at a future
mharris 093a3e3
  date, if we decide to go that route.
mharris 093a3e3
- Re-enable _smp_mflags during build.
mharris 5db2b3c
- Added "Requires: xorg-x11-drv-vesa" to Xorg subpackage (#173060)
mharris 093a3e3
mharris 5a71ca7
* Mon Nov 14 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-3
b363f21
- provide Xserver
b363f21
- add another requires for basic bits
b363f21
mharris 5a71ca7
* Sun Nov 13 2005 Jeremy Katz <katzj@redhat.com> 0.99.3-2
a57ecab
- add some deps to the Xorg subpackage for base fonts, keyboard and mouse 
mharris 83c9ed8
  drivers, and rgb.txt that the server really wont work without
a57ecab
mharris 9e7c1dd
* Fri Nov 11 2005 Mike A. Harris <mharris@redhat.com> 0.99.3-1
mharris 9e7c1dd
- Update to xorg-server-0.99.3 from X11R7 RC2.
mharris af712a9
- Add xorg-server.m4 to sdk subpackage, and "X" symlink to Xorg subpackage.
mharris 9e7c1dd
mharris 8ea210f
* Thu Nov 10 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-4
mharris 8ea210f
- Added "Requires: xkbcomp" for Xorg server, as it invokes it internally.
mharris 8ea210f
mharris 19891e9
* Wed Nov 09 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-3
mharris a4f0d38
- Added "BuildRequires: libXtst-devel" for Xtst examples.
mharris a4f0d38
mharris 19891e9
* Mon Nov 07 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-2
mharris 3fabd3e
- Added versioning to Xorg virtual Provide, to allow config tools and driver
mharris 3fabd3e
  packages to have version based requires.
mharris 3fabd3e
mharris 382d04d
* Thu Oct 27 2005 Mike A. Harris <mharris@redhat.com> 0.99.2-1
mharris 382d04d
- Update to xorg-server-0.99.2 from X11R7 RC1.
mharris 382d04d
- Add "BuildRequires: xorg-x11-util-macros >= 0.99.1".
mharris 382d04d
- Add "BuildRequires: mesa-source >= 6.4-4" for DRI builds.
mharris 382d04d
- Added dmx related utilities to Xdmx subpackage.
mharris 382d04d
- Individually list each X server module in file manifest.
mharris 382d04d
- Hack man1 manpages to be installed into man1x.
mharris 382d04d
- Add the following ./configure options --disable-dependency-tracking,
mharris 382d04d
  --enable-composite, --enable-xtrap, --enable-xcsecurity, --enable-xevie,
mharris 382d04d
  --enable-lbx, --enable-dri, --with-mesa-source, --with-module-dir,
mharris 382d04d
  --with-os-name, --with-os-vendor, --with-xkb-output, --disable-xorgcfg
mharris 382d04d
- Added getconfig, scanpci et al to Xorg subpackage
mharris 382d04d
- Added inb, inl, inw, ioport, outboutl, outw, pcitweak utils to Xorg package
mharris 382d04d
  conditionally, defaulting to "off".  These utilities are potentially
mharris 382d04d
  dangerous and can physically damage hardware and/or destroy data, so are
mharris 382d04d
  not shipped by default.
mharris 79994c0
- Added "BuildRequires: libdmx-devel" for dmx utilities
mharris 79994c0
- Added "BuildRequires: libXres-devel" for Xres examples
mharris bdcccdf
- Added {_libdir}/xserver/SecurityPolicy to Xorg subpackage for XSECURITY
mharris 382d04d
mharris 19891e9
* Mon Oct 03 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.2
mharris 1bd453c
- Fix license tag to be "MIT/X11"
mharris 1bd453c
- Change Xdmx subpackage to Obsolete xorg-x11-Xdmx instead of xorg-x11-Xnest
mharris 1bd453c
mharris 19891e9
* Sun Oct 02 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050830.1
mharris 683564b
- Update BuildRequires for new library package naming (libX...)
mharris 683564b
- Use Fedora Extras style BuildRoot tag
mharris 683564b
- Invoke make with _smp_mflags to take advantage of SMP systems
mharris 683564b
mharris 683564b
* Tue Aug 30 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-2.cvs20050830
Kristian Høgsberg ce50e2c
- Go back to %spec -n, use new cvs snapshot that supports overriding
Kristian Høgsberg ce50e2c
  moduledir during make install, use %makeinstall.
Kristian Høgsberg ce50e2c
- Drop %{moduledir}/multimedia globs.
Kristian Høgsberg ce50e2c
mharris dc2469d
* Fri Aug 26 2005 Mike A. Harris <mharris@redhat.com> 0.99.1-2.cvs20050825.0
mharris dc2469d
- Added build dependency on xorg-x11-libfontenc-devel, as the build fails
mharris dc2469d
  half way through without it, even though upstream dependencies do not
mharris dc2469d
  specify it as required.
mharris dc2469d
mharris 683564b
* Tue Aug 23 2005 Kristian Hogsberg <krh@redhat.com> 0.99.1-1
mharris dc2469d
- Initial spec file for the modular X server.