* Wed Sep 26 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-26

- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
  have too much information than too little.
- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
  with hidden symbols to shrink pyf86config a bit.
- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
  without a config file.
- Enable maintainer mode when building so I swear at autotools less.
This commit is contained in:
Adam Jackson 2007-09-26 19:12:51 +00:00
parent 1d8f821ba4
commit 9eb1fe64bb
4 changed files with 27 additions and 4 deletions

View File

@ -5,7 +5,7 @@
Extensions.c Extensions.c
-AM_CFLAGS = $(XORG_CFLAGS) -AM_CFLAGS = $(XORG_CFLAGS)
+AM_CFLAGS = $(XORG_CFLAGS) -fPIC +AM_CFLAGS = $(XORG_CFLAGS) -fPIC -fvisibility=hidden
EXTRA_DIST = \ EXTRA_DIST = \
Configint.h \ Configint.h \

View File

@ -9,7 +9,7 @@
Summary: X.Org X11 X server Summary: X.Org X11 X server
Name: xorg-x11-server Name: xorg-x11-server
Version: 1.3.0.0 Version: 1.3.0.0
Release: 25%{?dist} Release: 26%{?dist}
URL: http://www.x.org URL: http://www.x.org
License: MIT/X11 License: MIT/X11
Group: User Interface/X Group: User Interface/X
@ -70,6 +70,7 @@ Patch2009: xserver-1.3.0-arm-iopl.patch
Patch2010: xserver-1.3.0-idletime.patch Patch2010: xserver-1.3.0-idletime.patch
Patch2012: xserver-1.3.0-add-really-slow-bcopy.patch Patch2012: xserver-1.3.0-add-really-slow-bcopy.patch
Patch2013: xserver-1.3.0-document-fontpath-correctly.patch Patch2013: xserver-1.3.0-document-fontpath-correctly.patch
Patch2014: xserver-1.3.0-intel-by-default.patch
# assorted PCI layer shenanigans. oh the pain. # assorted PCI layer shenanigans. oh the pain.
Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch Patch2500: xorg-x11-server-1.2.99-unbreak-domain.patch
@ -329,6 +330,7 @@ Xserver source code needed to build VNC server (Xvnc)
%patch2010 -p1 -b .idletime %patch2010 -p1 -b .idletime
%patch2012 -p1 -b .slow-bcopy %patch2012 -p1 -b .slow-bcopy
%patch2013 -p1 -b .fontpath-doc %patch2013 -p1 -b .fontpath-doc
%patch2014 -p1 -b .intel
%patch2500 -p1 -b .unbreak-domains %patch2500 -p1 -b .unbreak-domains
%patch2501 -p1 -b .pci-bus-count %patch2501 -p1 -b .pci-bus-count
@ -348,7 +350,7 @@ Xserver source code needed to build VNC server (Xvnc)
# --with-rgb-path should be superfluous now ? # --with-rgb-path should be superfluous now ?
# --with-pie ? # --with-pie ?
aclocal ; automake -a ; autoconf aclocal ; automake -a ; autoconf
%configure \ %configure --enable-maintainer-mode \
%{enable_xorg} \ %{enable_xorg} \
--disable-xprint --enable-xvfb --enable-xnest --enable-dmx \ --disable-xprint --enable-xvfb --enable-xnest --enable-dmx \
--enable-kdrive --enable-xephyr \ --enable-kdrive --enable-xephyr \
@ -604,6 +606,15 @@ rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Wed Sep 26 2007 Adam Jackson <ajax@redhat.com> 1.3.0.0-26
- xserver-1.3.0-randr-updates.patch: Default ModeDebug to TRUE, better to
have too much information than too little.
- xorg-x11-server-1.0.1-fpic-libxf86config.patch: Build the parser library
with hidden symbols to shrink pyf86config a bit.
- xserver-1.3.0-intel-by-default.patch: Use intel, not i810, when starting
without a config file.
- Enable maintainer mode when building so I swear at autotools less.
* Wed Sep 26 2007 Dave Airlie <airlied@redhat.com> 1.3.0.0-25 * Wed Sep 26 2007 Dave Airlie <airlied@redhat.com> 1.3.0.0-25
- xserver-1.3.0-randr-updates.patch: Backport randr from server git - xserver-1.3.0-randr-updates.patch: Backport randr from server git
This contains a lot of fixes since 1.3.0 went out, and saves This contains a lot of fixes since 1.3.0 went out, and saves

View File

@ -0,0 +1,12 @@
diff -up xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c
--- xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c.jx 2006-11-16 13:01:24.000000000 -0500
+++ xorg-server-1.3.0.0/hw/xfree86/common/xf86AutoConfig.c 2007-09-26 10:08:20.000000000 -0400
@@ -175,7 +175,7 @@ videoPtrToDriverName(pciVideoPtr info)
case 0x8086:
if ((info->chipType == 0x00d1) || (info->chipType == 0x7800))
return "i740";
- else return "i810";
+ else return "intel";
case 0x102b: return "mga";
case 0x10c8: return "neomagic";
case 0x105d: return "i128";

View File

@ -300,7 +300,7 @@ index 2d8a7ad..064ff16 100644
+ scrn->options, + scrn->options,
+ config->options); + config->options);
+ config->debug_modes = xf86ReturnOptValBool (config->options, + config->debug_modes = xf86ReturnOptValBool (config->options,
+ OPTION_MODEDEBUG, FALSE); + OPTION_MODEDEBUG, TRUE);
+ +
if (scrn->display->virtualX) if (scrn->display->virtualX)
width = scrn->display->virtualX; width = scrn->display->virtualX;