|
mharris |
5efabee |
%define pkgname xorg-server
|
|
Kristian Høgsberg |
ce50e2c |
|
|
mharris |
683564b |
Summary: X.Org X11 X server
|
|
mharris |
dc2469d |
Name: xorg-x11-server
|
|
|
8181e8f |
Version: 1.1.1
|
|
mharris |
c37ce84 |
# NOTE: Now using the 'dist' tag as per http://fedoraproject.org/wiki/DistTag
|
|
mharris |
c37ce84 |
# For rawhide builds, bump the number /before/ the dist tag. For package
|
|
mharris |
c37ce84 |
# upgrades to officially released distribution releases, if the package
|
|
mharris |
c37ce84 |
# Version field above is not changing, append and/or bump a digit /after/
|
|
mharris |
c37ce84 |
# the dist tag. ie: 25%{dist}.0 -> 25%{dist}.1 ...
|
|
mharris |
d9aa1ba |
Release: 12%{?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 |
|
|
mharris |
83c9ed8 |
Patch0: xorg-x11-server-0.99.3-init-origins-fix.patch
|
|
mharris |
83c9ed8 |
# https://bugs.freedesktop.org/show_bug.cgi?id=5093
|
|
mharris |
83c9ed8 |
Patch1: xorg-server-0.99.3-fbmmx-fix-for-non-SSE-cpu.patch
|
|
mharris |
a98a47a |
Patch3: xserver-1.0.0-parser-add-missing-headers-to-sdk.patch
|
|
mharris |
539c67e |
Patch4: xorg-x11-server-1.0.1-composite-fastpath-fdo4320.patch
|
|
mharris |
4072bdd |
Patch5: xorg-x11-server-libxf86config-dont-write-empty-sections.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
|
|
Kristian Høgsberg |
d470a6c |
Patch102: xorg-x11-server-1.1.0-gl-include-inferiors.patch
|
|
Kristian Høgsberg |
47263aa |
Patch103: xorg-x11-server-1.1.0-tfp-damage.patch
|
|
Kristian Høgsberg |
5569e79 |
Patch104: xorg-x11-server-1.1.0-mesa-copy-sub-buffer.patch
|
|
Kristian Høgsberg |
17e6d9b |
Patch105: xorg-x11-server-1.1.1-enable-composite.patch
|
|
|
44ad9a9 |
Patch106: xorg-x11-server-1.1.1-no-composite-in-xnest.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 |
361e746 |
Patch1000: xorg-redhat-die-ugly-pattern-die-die-die.patch
|
|
mharris |
7be6a00 |
Patch1001: xorg-x11-server-Red-Hat-extramodes.patch
|
|
|
d844c6d |
Patch1002: xorg-x11-server-1.1.0-redhat-xephyr-only-hack.patch
|
|
|
94d8e40 |
Patch1003: xorg-x11-server-1.0.1-fpic-libxf86config.patch
|
|
|
44ad9a9 |
Patch1004: xorg-x11-server-1.1.1-selinux-awareness.patch
|
|
|
94d8e40 |
|
|
|
94d8e40 |
# Backports of post-1.1 stuff.
|
|
|
94d8e40 |
Patch2001: xorg-x11-server-1.1.0-pci-scan-fixes.patch
|
|
|
9023d19 |
Patch2004: xorg-x11-server-1.1.0-no-zlib.patch
|
|
|
44ad9a9 |
Patch2005: xorg-x11-server-1.1.1-Xdmx-render-fix-fdo7482.patch
|
|
mharris |
dc2469d |
|
|
|
caa4f1f |
# autoconfiguration feature patches
|
|
|
caa4f1f |
Patch3001: xorg-x11-server-1.1.0-edid-mode-injection-1.patch
|
|
|
bf0fce9 |
Patch3002: xorg-x11-server-1.1.0-edid-mode-injection-2.patch
|
|
|
bf0fce9 |
Patch3003: xorg-x11-server-1.1.0-cvt-generator-in-core.patch
|
|
|
caa4f1f |
Patch3004: xorg-x11-server-1.1.0-no-autoconfig-targetrefresh.patch
|
|
|
42f0053 |
Patch3005: xorg-x11-server-1.1.1-getconfig-pl-die-die-die.patch
|
|
|
fcc974b |
Patch3006: xorg-x11-server-1.1.1-dpms-on-by-default.patch
|
|
|
5b64167 |
Patch3007: xorg-x11-server-1.1.1-edid-root-window-properties.patch
|
|
|
025cb0e |
Patch3008: xorg-x11-server-1.1.1-sanedefaultmode.patch
|
|
|
e613865 |
Patch3009: xorg-x11-server-1.1.1-module-list.patch
|
|
|
caa4f1f |
|
|
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 %{ix86} x86_64 ppc ppc64 ia64 alpha sparc sparc64
|
|
mharris |
a30689e |
%define xservers --enable-xorg --enable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
|
|
mharris |
a30689e |
%define with_hw_servers 1
|
|
mharris |
a30689e |
%define with_dmx_server 1
|
|
mharris |
a30689e |
%endif
|
|
mharris |
a30689e |
%ifarch s390 s390x
|
|
mharris |
4dc8c98 |
%define xservers --disable-xorg --disable-dmx --enable-xvfb --enable-xnest --enable-kdrive --enable-xephyr
|
|
mharris |
a30689e |
%define with_hw_servers 0
|
|
mharris |
a30689e |
%define with_dmx_server 0
|
|
mharris |
9e7c1dd |
%endif
|
|
mharris |
dc2469d |
|
|
mharris |
382d04d |
# NOTE: The developer utils are intended for low level video driver hackers,
|
|
mharris |
382d04d |
# doing low level bit twiddling, who really know what they are doing, and are
|
|
mharris |
382d04d |
# disabled by default, as they are not generally useful to end users.
|
|
mharris |
3a3aa5e |
# FIXME: Reconfigure the spec file to put them in a separate subpackage, so
|
|
mharris |
3a3aa5e |
# I can build one build with them enabled, install them, then disable it again.
|
|
mharris |
382d04d |
%define with_developer_utils 0
|
|
mharris |
382d04d |
|
|
mharris |
5b0338c |
%ifarch %{ix86} x86_64 ppc ia64 alpha sparc sparc64
|
|
mharris |
382d04d |
%define with_dri 1
|
|
mharris |
5b0338c |
%endif
|
|
mharris |
5b0338c |
%ifarch ppc64 s390 s390x
|
|
mharris |
382d04d |
%define with_dri 0
|
|
mharris |
382d04d |
%endif
|
|
mharris |
382d04d |
|
|
mharris |
a30689e |
# FIXME: Temporary Build deps on autotools, as needed...
|
|
mharris |
eb8b1bd |
#BuildRequires: automake17
|
|
mharris |
eb8b1bd |
BuildRequires: automake
|
|
|
87930f1 |
BuildRequires: autoconf
|
|
Kristian Høgsberg |
48ea57b |
BuildRequires: libtool
|
|
mharris |
a30689e |
|
|
mharris |
382d04d |
BuildRequires: pkgconfig
|
|
mharris |
382d04d |
BuildRequires: xorg-x11-util-macros >= 0.99.1
|
|
mharris |
a30689e |
BuildRequires: xorg-x11-proto-devel >= 7.1-1
|
|
mharris |
dc2469d |
BuildRequires: xorg-x11-xtrans-devel
|
|
mharris |
093a3e3 |
# FIXME: The version specification can be removed from here in the future,
|
|
mharris |
093a3e3 |
# as it is not really mandatory, but forces a bugfix workaround on people who
|
|
mharris |
093a3e3 |
# are using pre-rawhide modular X.
|
|
mharris |
093a3e3 |
BuildRequires: libXfont-devel >= 0.99.2-3
|
|
mharris |
683564b |
BuildRequires: libXau-devel
|
|
mharris |
683564b |
BuildRequires: libxkbfile-devel
|
|
mharris |
a30689e |
# libXres-devel needed for something that links to libXres that I never 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
|
|
mharris |
8b3540d |
#
|
|
mharris |
8b3540d |
BuildRequires: freetype-devel >= 2.1.9-1
|
|
mharris |
057c9b5 |
# FIXME: Disabling zlib-devel dep as we are applying the xorg-x11-server-1.1.0-no-zlib.patch
|
|
mharris |
057c9b5 |
# patch which should remove any dependency on zlib anyway.
|
|
mharris |
057c9b5 |
#BuildRequires: zlib-devel
|
|
mharris |
8b3540d |
|
|
mharris |
8b3540d |
# FIXME: libXt-devel should be wrapped in with_dmx_server - for Xdmxconfig,
|
|
mharris |
8b3540d |
# probably should only be needed for DMX builds, but the build explodes with
|
|
mharris |
8b3540d |
# a bogus configure check failure if this is missing.
|
|
mharris |
6ea5073 |
BuildRequires: libXt-devel
|
|
mharris |
d7ac96e |
|
|
mharris |
d7ac96e |
|
|
mharris |
a30689e |
%if %{with_dmx_server}
|
|
mharris |
b2db270 |
# libdmx-devel needed for Xdmx
|
|
mharris |
b2db270 |
BuildRequires: libdmx-devel
|
|
mharris |
683564b |
# libXmu-devel needed for Xdmx
|
|
mharris |
683564b |
BuildRequires: libXmu-devel
|
|
mharris |
683564b |
# libXrender-devel needed for Xdmx
|
|
mharris |
683564b |
BuildRequires: libXrender-devel
|
|
mharris |
683564b |
# libXi-devel needed for Xdmx
|
|
mharris |
683564b |
BuildRequires: libXi-devel
|
|
mharris |
6ea5073 |
BuildRequires: libXpm-devel
|
|
mharris |
6ea5073 |
BuildRequires: libXaw-devel
|
|
mharris |
a30689e |
%endif
|
|
mharris |
7814b99 |
|
|
mharris |
aa15493 |
# To query fontdir from fontutil.pc
|
|
mharris |
aa15493 |
BuildRequires: xorg-x11-font-utils >= 1.0.0-1
|
|
mharris |
382d04d |
# Needed at least for DRI enabled builds
|
|
mharris |
382d04d |
%if %{with_dri}
|
|
Kristian Høgsberg |
6f719cb |
BuildRequires: mesa-libGL-devel >= 6.5-1
|
|
|
2d08a27 |
BuildRequires: mesa-source >= 6.5-19
|
|
mharris |
aa15493 |
BuildRequires: libdrm-devel >= 2.0-1
|
|
mharris |
382d04d |
%endif
|
|
|
869288f |
|
|
|
869288f |
BuildRequires: libselinux-devel
|
|
|
869288f |
|
|
mharris |
dc2469d |
%description
|
|
mharris |
683564b |
X.Org X11 X server
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
# ----- Xorg --------------------------------------------------------
|
|
mharris |
a30689e |
%if %{with_hw_servers}
|
|
mharris |
dc2469d |
%package Xorg
|
|
mharris |
683564b |
Summary: Xorg X server
|
|
mharris |
dc2469d |
Group: User Interface/X
|
|
mharris |
8ea210f |
# NOTE: The X server invokes xkbcomp directly, so this is required.
|
|
mharris |
8ea210f |
Requires: xkbcomp
|
|
mharris |
093a3e3 |
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
|
|
mharris |
093a3e3 |
# by xorg-x11-fonts-base
|
|
mharris |
093a3e3 |
Requires: xorg-x11-fonts-base
|
|
mharris |
5db2b3c |
# NOTE: Require some basic drivers for minimal configuration. (#173060)
|
|
|
998c064 |
# We _should_ install every driver, but OLPC wants different (#191781),
|
|
|
998c064 |
# which is quite lame and wants an better solution.
|
|
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
|
|
mharris |
7814b99 |
#Requires: xorg-x11-drivers >= 0.99.2-4
|
|
mharris |
a66ebcc |
|
|
mharris |
093a3e3 |
# NOTE: We use implementation non-specific "xkbdata" here, to make it easy
|
|
mharris |
093a3e3 |
# to switch to the freedesktop.org 'xkeyboard-config' project replacment
|
|
mharris |
093a3e3 |
# in the future.
|
|
mharris |
093a3e3 |
Requires: xkbdata
|
|
mharris |
093a3e3 |
# FIXME: Investigate these two and see what utils are needed, and use virtuals
|
|
mharris |
83c9ed8 |
Requires: xorg-x11-server-utils >= 0.99.2-5
|
|
mharris |
83c9ed8 |
Requires: xorg-x11-utils
|
|
mharris |
093a3e3 |
# FIXME: This Requires on libXfont can be removed from here in the future,
|
|
mharris |
093a3e3 |
# as it is not really mandatory, but forces a bugfix workaround on people who
|
|
mharris |
093a3e3 |
# are using pre-rawhide modular X.
|
|
mharris |
093a3e3 |
Requires: libXfont >= 0.99.2-3
|
|
mharris |
093a3e3 |
|
|
mharris |
093a3e3 |
Obsoletes: XFree86 xorg-x11
|
|
mharris |
3fabd3e |
# NOTE: This virtual provide should be used when one wants to depend on
|
|
mharris |
3fabd3e |
# the implementation specific (and optionally version specific) Xorg X
|
|
mharris |
3fabd3e |
# server, but in an OS packaging independent manner. This futureproofs
|
|
mharris |
3fabd3e |
# package dependencies against possible future Xorg package renaming.
|
|
mharris |
3fabd3e |
Provides: Xorg = %{version}-%{release}
|
|
|
b363f21 |
Provides: Xserver
|
|
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 |
|
|
Kristian Høgsberg |
106a334 |
# ----- Xnest -------------------------------------------------------
|
|
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 |
3fabd3e |
# NOTE: This virtual provide should be used by packages which want to depend
|
|
mharris |
3fabd3e |
# on an implementation nonspecific Xnest X server. It is intentionally not
|
|
mharris |
3fabd3e |
# versioned, since it should be agnostic.
|
|
mharris |
dc2469d |
Provides: Xnest
|
|
mharris |
dc2469d |
|
|
mharris |
3fb8417 |
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
|
|
mharris |
3fb8417 |
# by xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
Requires: xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
|
|
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 |
|
|
mharris |
dc2469d |
# ----- Xdmx --------------------------------------------------------
|
|
mharris |
a30689e |
%if %{with_dmx_server}
|
|
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 |
3fabd3e |
# NOTE: This virtual provide should be used by packages which want to depend
|
|
mharris |
3fabd3e |
# on an implementation nonspecific Xdmx X server. It is intentionally not
|
|
mharris |
3fabd3e |
# versioned, since it should be agnostic.
|
|
mharris |
dc2469d |
Provides: Xdmx
|
|
mharris |
dc2469d |
|
|
mharris |
3fb8417 |
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
|
|
mharris |
3fb8417 |
# by xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
Requires: xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
|
|
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.
|
|
mharris |
a30689e |
%endif
|
|
mharris |
dc2469d |
# ----- Xvfb --------------------------------------------------------
|
|
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 |
3fabd3e |
# NOTE: This virtual provide should be used by packages which want to depend
|
|
mharris |
3fabd3e |
# on an implementation nonspecific Xvfb X server. It is intentionally not
|
|
mharris |
3fabd3e |
# versioned, since it should be agnostic.
|
|
mharris |
dc2469d |
Provides: Xvfb
|
|
mharris |
dc2469d |
|
|
mharris |
3fb8417 |
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
|
|
mharris |
3fb8417 |
# by xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
Requires: xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
|
|
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 |
# ----- Xephyr -------------------------------------------------------
|
|
|
304cf10 |
|
|
|
304cf10 |
%package Xephyr
|
|
|
304cf10 |
Summary: A nested server.
|
|
|
304cf10 |
Group: User Interface/X
|
|
|
304cf10 |
# NOTE: This virtual provide should be used by packages which want to depend
|
|
|
304cf10 |
# on an implementation nonspecific Xephyr X server. It is intentionally not
|
|
|
304cf10 |
# versioned, since it should be agnostic.
|
|
|
304cf10 |
Provides: Xephyr
|
|
|
304cf10 |
|
|
mharris |
3fb8417 |
# NOTE: The X server requires 'fixed' and 'cursor' font, which are provided
|
|
mharris |
3fb8417 |
# by xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
Requires: xorg-x11-fonts-base
|
|
mharris |
3fb8417 |
|
|
|
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 |
|
|
mharris |
dc2469d |
# ----- sdk ---------------------------------------------------------
|
|
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 |
2025148 |
|
|
mharris |
83c9ed8 |
Requires(pre): xorg-x11-filesystem >= 0.99.2-3
|
|
mharris |
dc2469d |
|
|
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
|
|
mharris |
dc2469d |
# -------------------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
%prep
|
|
mharris |
5efabee |
%setup -q -n %{pkgname}-%{version}
|
|
mharris |
3a3aa5e |
%patch0 -p0 -b .init-origins-fix
|
|
mharris |
a98a47a |
%patch3 -p0 -b .parser-add-missing-headers-to-sdk
|
|
mharris |
4072bdd |
%patch5 -p0 -b .libxf86config-dont-write-empty-sections
|
|
|
0f01422 |
|
|
Kristian Høgsberg |
d470a6c |
%patch100 -p0 -b .no-move-damage
|
|
Kristian Høgsberg |
d470a6c |
%patch101 -p0 -b .dont-backfill-bg-none
|
|
Kristian Høgsberg |
d470a6c |
%patch102 -p0 -b .gl-include-inferiors
|
|
Kristian Høgsberg |
47263aa |
%patch103 -p0 -b .tfp-damage
|
|
Kristian Høgsberg |
5569e79 |
%patch104 -p0 -b .mesa-copy-sub-buffer
|
|
Kristian Høgsberg |
17e6d9b |
%patch105 -p0 -b .enable-composite
|
|
|
44ad9a9 |
%patch106 -p1 -b .no-xnest-composite
|
|
Kristian Høgsberg |
9675a54 |
|
|
mharris |
361e746 |
%patch1000 -p0 -b .redhat-die-ugly-pattern-die-die-die
|
|
mharris |
d9aa1ba |
%patch1001 -p0 -b .Red-Hat-extramodes
|
|
|
d844c6d |
%patch1002 -p1 -b .xephyr
|
|
|
94d8e40 |
%patch1003 -p1 -b .fpic
|
|
|
44ad9a9 |
%patch1004 -p1 -b .selinux-awareness
|
|
mharris |
f7385e3 |
|
|
|
94d8e40 |
%patch2001 -p1 -b .pci-scan
|
|
|
9023d19 |
%patch2004 -p1 -b .zlib
|
|
|
44ad9a9 |
%patch2005 -p1 -b .Xdmx
|
|
|
caa4f1f |
|
|
|
caa4f1f |
%patch3001 -p1 -b .edid1
|
|
|
bf0fce9 |
%patch3002 -p1 -b .edid2
|
|
|
bf0fce9 |
%patch3003 -p1 -b .cvt
|
|
|
caa4f1f |
%patch3004 -p1 -b .targetrefresh
|
|
|
42f0053 |
%patch3005 -p1 -b .getconfig-pl-die-die-die
|
|
|
fcc974b |
%patch3006 -p1 -b .dpms-on-by-default
|
|
|
5b64167 |
%patch3007 -p1 -b .edid-on-root-window
|
|
|
025cb0e |
%patch3008 -p1 -b .sanedefaultmode
|
|
|
e613865 |
%patch3009 -p1 -b .module-list
|
|
|
caa4f1f |
|
|
mharris |
dc2469d |
%build
|
|
mharris |
1651c54 |
#FONTDIR="${datadir}/X11/fonts"
|
|
mharris |
1651c54 |
#DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/CID/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled"
|
|
mharris |
1651c54 |
|
|
mharris |
aa15493 |
# --disable-dependency-tracking \
|
|
|
304cf10 |
# also, --enable-kdrive just for Xephyr is overkill, should fix that upstream
|
|
mharris |
aa15493 |
|
|
mharris |
56d2ac6 |
aclocal ; automake ; autoconf
|
|
mharris |
683564b |
%configure %{xservers} \
|
|
mharris |
683564b |
--disable-xprint \
|
|
mharris |
683564b |
--disable-static \
|
|
|
998c064 |
--with-pic \
|
|
mharris |
382d04d |
--enable-composite \
|
|
mharris |
382d04d |
--enable-xtrap \
|
|
mharris |
382d04d |
--enable-xcsecurity \
|
|
mharris |
382d04d |
--enable-xevie \
|
|
|
e613865 |
--with-default-font-path="unix/:7100" \
|
|
mharris |
382d04d |
--with-module-dir=%{moduledir} \
|
|
mharris |
382d04d |
--with-os-name="Fedora Core 5" \
|
|
mharris |
382d04d |
--with-os-vendor="Red Hat, Inc." \
|
|
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 |
%if %{with_dri}
|
|
|
998c064 |
--enable-dri \
|
|
|
998c064 |
--with-mesa-source=%{_datadir}/mesa/source \
|
|
|
998c064 |
--with-dri-driver-path=%{drimoduledir} \
|
|
mharris |
11e13cd |
%else
|
|
mharris |
11e13cd |
--disable-dri \
|
|
|
998c064 |
%endif
|
|
mharris |
aa15493 |
|
|
mharris |
093a3e3 |
make %{?_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 |
9e7c1dd |
# FIXME: This should be done upstream, so it's one less thing to hack.
|
|
mharris |
dc2469d |
# Make these directories now so the Xorg package can own them.
|
|
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).
|
|
mharris |
0af35d4 |
{
|
|
mharris |
0af35d4 |
mkdir -p $RPM_BUILD_ROOT%{_datadir}/xorg
|
|
mharris |
0af35d4 |
for each in vesamodes extramodes ; do
|
|
mharris |
0af35d4 |
install -m 0644 %{SOURCE100} $RPM_BUILD_ROOT%{_datadir}/xorg/$each
|
|
mharris |
0af35d4 |
cat hw/xfree86/common/$each >> $RPM_BUILD_ROOT%{_datadir}/xorg/$each
|
|
mharris |
0af35d4 |
chmod 0444 $RPM_BUILD_ROOT%{_datadir}/xorg/$each
|
|
mharris |
0af35d4 |
done
|
|
mharris |
0af35d4 |
}
|
|
mharris |
a30689e |
%endif
|
|
mharris |
0af35d4 |
|
|
mharris |
382d04d |
# FIXME: 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
|
|
Kristian Høgsberg |
5ee49e3 |
rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/cfg.sample
|
|
Kristian Høgsberg |
5ee49e3 |
rm -f $RPM_BUILD_ROOT%{_libdir}/X11/getconfig/xorg.cfg
|
|
|
42f0053 |
rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig
|
|
|
42f0053 |
rm -f $RPM_BUILD_ROOT%{_bindir}/getconfig.pl
|
|
mharris |
bdcccdf |
%if ! %{with_developer_utils}
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/inb
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/inl
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/inw
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/ioport
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/outb
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/outl
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/outw
|
|
mharris |
bdcccdf |
rm -f $RPM_BUILD_ROOT%{_bindir}/pcitweak
|
|
mharris |
f71fb24 |
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/pcitweak.1*
|
|
mharris |
bdcccdf |
%endif
|
|
|
42f0053 |
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/getconfig.1x*
|
|
|
42f0053 |
rm -f $RPM_BUILD_ROOT%{_mandir}/man5/getconfig.5x*
|
|
mharris |
a30689e |
# Remove all libtool archives (*.la)
|
|
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.
|
|
mharris |
e063a92 |
# error: Installed (but unpackaged) file(s) found:
|
|
mharris |
e063a92 |
# /randrstr.h
|
|
mharris |
e063a92 |
# /usr/lib/pkgconfig/xorg-server.pc
|
|
mharris |
e063a92 |
# /usr/lib/xserver/SecurityPolicy
|
|
mharris |
e063a92 |
# /usr/share/aclocal/xorg-server.m4
|
|
mharris |
e063a92 |
# /usr/share/man/man1/Xserver.1x.gz
|
|
mharris |
e063a92 |
# /var/lib/xkb/README.compiled
|
|
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%{_libdir}/xserver
|
|
mharris |
e063a92 |
rm -rf $RPM_BUILD_ROOT%{_datadir}/aclocal
|
|
mharris |
e063a92 |
rm -rf $RPM_BUILD_ROOT/var/lib/xkb
|
|
mharris |
9f21d39 |
# rm -f $RPM_BUILD_ROOT%{_datadir}/man/man1/Xserver.1x*
|
|
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 |
5a71ca7 |
# Install/Upgrade section
|
|
mharris |
3a3aa5e |
pushd /etc/X11
|
|
mharris |
3a3aa5e |
# Migrate any pre-existing XFree86 4.x config file to xorg.conf if it
|
|
mharris |
5a71ca7 |
# doesn't already exist, and rename any remaining XFree86 4.x config files
|
|
mharris |
3a3aa5e |
# to have .obsoleted file extensions, to help avoid end user confusion for
|
|
mharris |
3a3aa5e |
# people unaware of the config file name change between server
|
|
mharris |
3a3aa5e |
# implementations, and avoid bug reports. If this turns out to confuse
|
|
mharris |
3a3aa5e |
# users, I can modify it to add comments to the top of the obsoleted files
|
|
mharris |
3a3aa5e |
# to point users to xorg.conf <mharris@redhat.com>
|
|
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
|
|
mharris |
3a3aa5e |
# Massage pre-existing config files to work properly with X.org X11
|
|
mharris |
3a3aa5e |
# - Remove xie and pex5 modules from the config files, as they are long
|
|
mharris |
3a3aa5e |
# since obsolete, and not provided since XFree86 4.2.0
|
|
mharris |
3a3aa5e |
# - Remove Option "XkbRules" "xfree86" to help work around upgrade problems
|
|
mharris |
3a3aa5e |
# such as https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=120858
|
|
mharris |
3a3aa5e |
# for configfile in xorg.conf ; do
|
|
mharris |
3a3aa5e |
configfile="xorg.conf"
|
|
mharris |
83c9ed8 |
OLD_MODULEPATH="/usr/X11R6/lib/modules"
|
|
mharris |
3a3aa5e |
if [ -r $configfile -a -w $configfile ]; then
|
|
mharris |
3a3aa5e |
# Remove module load lines from the config file for obsolete modules
|
|
mharris |
3a3aa5e |
perl -p -i -e 's/^.*Load.*"(pex5|xie|xtt).*\n$"//gi' $configfile
|
|
mharris |
3a3aa5e |
# Change the keyboard configuration from the deprecated "keyboard"
|
|
mharris |
3a3aa5e |
# driver, to the newer "kbd" driver.
|
|
mharris |
3a3aa5e |
perl -p -i -e 's/^\s*Driver(.*)"keyboard"/Driver\1"kbd"/gi' $configfile
|
|
mharris |
3a3aa5e |
# Remove any Options "XkbRules" lines that may be present
|
|
mharris |
3a3aa5e |
perl -p -i -e 's/^.*Option.*"XkbRules".*"(xfree86|xorg)".*\n$//gi' $configfile
|
|
mharris |
3a3aa5e |
# Remove RgbPath specifications from the config file as they are
|
|
mharris |
3a3aa5e |
# unnecessary, and break upgrades from monolithic to modular X.
|
|
mharris |
3a3aa5e |
# Fixes bugs (#173036, 173435, 173453, 173428)
|
|
mharris |
3a3aa5e |
perl -p -i -e 's#^\s*RgbPath.*$##gi' $configfile
|
|
mharris |
3a3aa5e |
# If ModulePath is specified in the config file, check for the old
|
|
mharris |
3a3aa5e |
# monolithic module path, and replace it with the new one.
|
|
mharris |
83c9ed8 |
perl -p -i -e "m,^\s*ModulePath.*\"${OLD_MODULEPATH}\".*$,; s,${OLD_MODULEPATH},%{moduledir}," $configfile
|
|
mharris |
3a3aa5e |
fi
|
|
mharris |
3a3aa5e |
# done
|
|
mharris |
3a3aa5e |
popd
|
|
mharris |
171a920 |
} &> /dev/null || :
|
|
mharris |
a30689e |
%endif
|
|
mharris |
3a3aa5e |
|
|
mharris |
dc2469d |
# ----- Xorg --------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
a30689e |
%if %{with_hw_servers}
|
|
mharris |
dc2469d |
%files Xorg
|
|
mharris |
dc2469d |
%defattr(-,root,root,-)
|
|
mharris |
dc2469d |
# FIXME: The build fails to find the Changelog for some reason.
|
|
mharris |
dc2469d |
#%doc ChangeLog
|
|
mharris |
af712a9 |
%{_bindir}/X
|
|
|
add023b |
%attr(4711, root, root) %{_bindir}/Xorg
|
|
mharris |
382d04d |
%{_bindir}/gtf
|
|
|
46fa1ed |
%{_bindir}/cvt
|
|
|
2ccbc40 |
%if %{with_developer_utils}
|
|
mharris |
382d04d |
%{_bindir}/inb
|
|
mharris |
382d04d |
%{_bindir}/inl
|
|
mharris |
382d04d |
%{_bindir}/inw
|
|
mharris |
382d04d |
%{_bindir}/ioport
|
|
mharris |
382d04d |
%{_bindir}/outb
|
|
mharris |
382d04d |
%{_bindir}/outl
|
|
mharris |
382d04d |
%{_bindir}/outw
|
|
mharris |
382d04d |
%{_bindir}/pcitweak
|
|
mharris |
382d04d |
%endif
|
|
mharris |
382d04d |
%{_bindir}/scanpci
|
|
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 |
a3dab0f |
%if %{with_dri}
|
|
mharris |
aa15493 |
%{_libdir}/xorg/modules/extensions/libGLcore.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/extensions/libdri.so
|
|
mharris |
aa15493 |
%{_libdir}/xorg/modules/extensions/libglx.so
|
|
mharris |
a3dab0f |
%endif
|
|
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/libbitmap.so
|
|
mharris |
aa15493 |
%{_libdir}/xorg/modules/fonts/libfreetype.so
|
|
mharris |
aa15493 |
%{_libdir}/xorg/modules/fonts/libtype1.so
|
|
mharris |
382d04d |
%dir %{_libdir}/xorg/modules/linux
|
|
mharris |
a3dab0f |
%if %{with_dri}
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/linux/libdrm.so
|
|
mharris |
a3dab0f |
%endif
|
|
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/libcfb16.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libcfb32.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libddc.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libexa.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libfb.so
|
|
mharris |
aa15493 |
%{_libdir}/xorg/modules/libi2c.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/librac.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libramdac.so
|
|
mharris |
382d04d |
%{_libdir}/xorg/modules/libscanpci.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
|
|
mharris |
539c67e |
#%dir %{_mandir}/man1x
|
|
mharris |
e89dbb8 |
%if %{with_developer_utils}
|
|
mharris |
aa15493 |
%{_mandir}/man1/pcitweak.1x*
|
|
mharris |
e89dbb8 |
%endif
|
|
mharris |
e89dbb8 |
%{_mandir}/man1/gtf.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/scanpci.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/Xorg.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/Xserver.1x*
|
|
Kristian Høgsberg |
16cbfe9 |
%{_mandir}/man1/cvt.1*
|
|
mharris |
539c67e |
#%dir %{_mandir}/man4x
|
|
mharris |
aa15493 |
#%{_mandir}/man4/fbdevhw.4x*
|
|
mharris |
aa15493 |
%{_mandir}/man4/fbdevhw.4*
|
|
mharris |
539c67e |
#%dir %{_mandir}/man5x
|
|
mharris |
aa15493 |
%{_mandir}/man5/xorg.conf.5x*
|
|
mharris |
382d04d |
%dir %{_localstatedir}/lib/xkb
|
|
mharris |
382d04d |
%{_localstatedir}/lib/xkb/README.compiled
|
|
mharris |
a30689e |
%endif
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
# ----- Xnest -------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
%files Xnest
|
|
mharris |
dc2469d |
%defattr(-,root,root,-)
|
|
mharris |
dc2469d |
%{_bindir}/Xnest
|
|
mharris |
539c67e |
#%dir %{_mandir}/man1x
|
|
mharris |
aa15493 |
%{_mandir}/man1/Xnest.1x*
|
|
mharris |
9f21d39 |
# NOTE: Xserver.1x intentionally present in multiple subpackages
|
|
mharris |
9f21d39 |
%{_mandir}/man1/Xserver.1x*
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
# ----- Xdmx --------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
a30689e |
%if %{with_dmx_server}
|
|
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
|
|
mharris |
539c67e |
#%dir %{_mandir}/man1x
|
|
mharris |
aa15493 |
%{_mandir}/man1/Xdmx.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/dmxtodmx.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/vdltodmx.1x*
|
|
mharris |
aa15493 |
%{_mandir}/man1/xdmxconfig.1x*
|
|
mharris |
9f21d39 |
# NOTE: Xserver.1x intentionally present in multiple subpackages
|
|
mharris |
9f21d39 |
%{_mandir}/man1/Xserver.1x*
|
|
mharris |
a30689e |
%endif
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
# ----- Xvfb --------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
%files Xvfb
|
|
mharris |
dc2469d |
%defattr(-,root,root,-)
|
|
mharris |
dc2469d |
%{_bindir}/Xvfb
|
|
mharris |
539c67e |
#%dir %{_mandir}/man1x
|
|
mharris |
aa15493 |
%{_mandir}/man1/Xvfb.1x*
|
|
mharris |
9f21d39 |
# NOTE: Xserver.1x intentionally present in multiple subpackages
|
|
mharris |
9f21d39 |
%{_mandir}/man1/Xserver.1x*
|
|
mharris |
dc2469d |
|
|
|
304cf10 |
# ----- Xephyr -------------------------------------------------------
|
|
|
304cf10 |
|
|
|
304cf10 |
%files Xephyr
|
|
|
304cf10 |
%defattr(-,root,root,-)
|
|
|
304cf10 |
%{_bindir}/Xephyr
|
|
|
304cf10 |
# no manpage yet
|
|
|
304cf10 |
#%dir %{_mandir}/man1x
|
|
|
304cf10 |
#%{_mandir}/man1/Xephyr.1x*
|
|
mharris |
9f21d39 |
# NOTE: Xserver.1x intentionally present in multiple subpackages
|
|
mharris |
9f21d39 |
%{_mandir}/man1/Xserver.1x*
|
|
|
304cf10 |
|
|
mharris |
dc2469d |
# ----- sdk ---------------------------------------------------------
|
|
mharris |
a30689e |
%if %{with_hw_servers}
|
|
mharris |
dc2469d |
%files sdk
|
|
mharris |
dc2469d |
%defattr(-,root,root,-)
|
|
mharris |
aa15493 |
%{_libdir}/libxf86config.a
|
|
mharris |
dc2469d |
%dir %{_libdir}/pkgconfig
|
|
mharris |
dc2469d |
%{_libdir}/pkgconfig/xorg-server.pc
|
|
mharris |
0a0dee1 |
%dir %{_includedir}/xorg
|
|
mharris |
aa15493 |
#%dir %{_includedir}/xorg/sdk
|
|
mharris |
1651c54 |
%{sdkdir}/*.h
|
|
mharris |
af712a9 |
%{_datadir}/aclocal/xorg-server.m4
|
|
mharris |
a30689e |
%endif
|
|
mharris |
dc2469d |
# -------------------------------------------------------------------
|
|
mharris |
dc2469d |
|
|
mharris |
dc2469d |
%changelog
|
|
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.
|