rpms/xorg-x11-server
5
0
Fork 0
Code Issues Pull Requests Releases Activity

* Tue Apr 1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-14.20080401

Browse Source 
- Rebase to new snapshot to pull in DRI2 direct rendering work.
This commit is contained in:
Kristian Høgsberg 2008-04-01 19:30:46 +00:00
parent 32f1dcae65
commit 81c5019f54
5 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
xorg-server-20080314.tar.bz2 xorg-server-20080331.tar.bz2

2
commitid
View File

@ -1 +1 @@
4a61cf3b08942895868e18bff11e0e4e12f69a7e 2156bdf3b7b5b7d3ee4d3278eac0f28c7bff830a

2
sources
View File

@ -1 +1 @@
455e0406e3b9f7a22d33f596284f9cd0 xorg-server-20080314.tar.bz2 e858611812f37e34092e13c51094e2ce xorg-server-20080401.tar.bz2

11
xorg-x11-server.spec
View File

@ -15,7 +15,7 @@
# RHEL5 bugfix sync # RHEL5 bugfix sync
%define pkgname xorg-server %define pkgname xorg-server
%define gitdate 20080314 %define gitdate 20080401
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
@ -90,7 +90,7 @@ BuildRequires: git-core
BuildRequires: automake autoconf libtool pkgconfig BuildRequires: automake autoconf libtool pkgconfig
BuildRequires: xorg-x11-util-macros >= 1.1.5 BuildRequires: xorg-x11-util-macros >= 1.1.5
BuildRequires: xorg-x11-proto-devel >= 7.3-7 BuildRequires: xorg-x11-proto-devel >= 7.3-10
BuildRequires: damageproto >= 1.1 BuildRequires: damageproto >= 1.1
BuildRequires: fixesproto >= 4.0 BuildRequires: fixesproto >= 4.0
BuildRequires: glproto >= 1.4.9 BuildRequires: glproto >= 1.4.9
@ -115,8 +115,8 @@ BuildRequires: libXv-devel
# openssl? really? # openssl? really?
BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex
BuildRequires: mesa-libGL-devel >= 7.1-0.20 BuildRequires: mesa-libGL-devel >= 7.1-0.21
BuildRequires: mesa-source >= 7.1-0.20 BuildRequires: mesa-source >= 7.1-0.21
# XXX silly... # XXX silly...
BuildRequires: libdrm-devel >= 2.4.0 BuildRequires: libdrm-devel >= 2.4.0
%if %{with_hw_servers} %if %{with_hw_servers}
@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Apr 1 2008 Kristian Høgsberg <krh@redhat.com> 1.4.99.901-15.20080401
- Rebase to new snapshot to pull in DRI2 direct rendering work.
* Tue Apr 01 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-14.20080314 * Tue Apr 01 2008 Adam Jackson <ajax@redhat.com> 1.4.99.901-14.20080314
- Remove vmmouse again, way too broken. Let this be a lesson to you: - Remove vmmouse again, way too broken. Let this be a lesson to you:
never try. never try.

6
xserver-1.5.0-xaa-sucks.patch
View File

@ -31,11 +31,12 @@ index 1b7c154..f3c8f56 100644
{ -1, NULL, { -1, NULL,
OPTV_NONE, {0}, FALSE } OPTV_NONE, {0}, FALSE }
}; };
@@ -518,7 +521,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) @@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
#define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0) #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy && if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
- !xf86IsOptionSet(options, XAAOPT_OFFSCREEN_PIXMAPS)) { - !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS,
- FALSE)) {
+ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE)) + xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
+ { + {
XAAMSG("\tOffscreen Pixmaps\n"); XAAMSG("\tOffscreen Pixmaps\n");
@ -43,4 +44,3 @@ index 1b7c154..f3c8f56 100644
infoRec->Flags &= ~OFFSCREEN_PIXMAPS; infoRec->Flags &= ~OFFSCREEN_PIXMAPS;
-- --
1.5.4.3 1.5.4.3