From 466f25112dc0c4cec85ef7ccc46165cd1b23aa5a Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Sep 26 2007 19:12:51 +0000 Subject: * Wed Sep 26 2007 Adam Jackson 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. --- diff --git a/xorg-x11-server-1.0.1-fpic-libxf86config.patch b/xorg-x11-server-1.0.1-fpic-libxf86config.patch index a6a35f9..ec14027 100644 --- a/xorg-x11-server-1.0.1-fpic-libxf86config.patch +++ b/xorg-x11-server-1.0.1-fpic-libxf86config.patch @@ -5,7 +5,7 @@ Extensions.c -AM_CFLAGS = $(XORG_CFLAGS) -+AM_CFLAGS = $(XORG_CFLAGS) -fPIC ++AM_CFLAGS = $(XORG_CFLAGS) -fPIC -fvisibility=hidden EXTRA_DIST = \ Configint.h \ diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 1019345..8603959 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -9,7 +9,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.3.0.0 -Release: 25%{?dist} +Release: 26%{?dist} URL: http://www.x.org License: MIT/X11 Group: User Interface/X @@ -70,6 +70,7 @@ Patch2009: xserver-1.3.0-arm-iopl.patch Patch2010: xserver-1.3.0-idletime.patch Patch2012: xserver-1.3.0-add-really-slow-bcopy.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. 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 %patch2012 -p1 -b .slow-bcopy %patch2013 -p1 -b .fontpath-doc +%patch2014 -p1 -b .intel %patch2500 -p1 -b .unbreak-domains %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-pie ? aclocal ; automake -a ; autoconf -%configure \ +%configure --enable-maintainer-mode \ %{enable_xorg} \ --disable-xprint --enable-xvfb --enable-xnest --enable-dmx \ --enable-kdrive --enable-xephyr \ @@ -604,6 +606,15 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 26 2007 Adam Jackson 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 1.3.0.0-25 - 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 diff --git a/xserver-1.3.0-intel-by-default.patch b/xserver-1.3.0-intel-by-default.patch new file mode 100644 index 0000000..dfcc631 --- /dev/null +++ b/xserver-1.3.0-intel-by-default.patch @@ -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"; diff --git a/xserver-1.3.0-randr-updates.patch b/xserver-1.3.0-randr-updates.patch index e492afe..20f01be 100644 --- a/xserver-1.3.0-randr-updates.patch +++ b/xserver-1.3.0-randr-updates.patch @@ -300,7 +300,7 @@ index 2d8a7ad..064ff16 100644 + scrn->options, + config->options); + config->debug_modes = xf86ReturnOptValBool (config->options, -+ OPTION_MODEDEBUG, FALSE); ++ OPTION_MODEDEBUG, TRUE); + if (scrn->display->virtualX) width = scrn->display->virtualX;