From fc8facff40f7b1d5e738df2e1f4b1cb24efdc24d Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Jul 01 2008 15:09:08 +0000 Subject: xserver 1.5RC5. --- diff --git a/.cvsignore b/.cvsignore index 845087f..5f54598 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xorg-server-20080612.tar.bz2 +xorg-server-20080701.tar.bz2 diff --git a/commitid b/commitid index 3388349..60b4e5c 100644 --- a/commitid +++ b/commitid @@ -1 +1 @@ -53a84d75c65f75c629c6610a2ec4093507cea3f7 +ccb373f2fb910db57a3dfcef8a03779f1023470c diff --git a/sources b/sources index 212093e..dbfab21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -067f2f0fdbcac0f8a7cd4f4ee046a2c8 xorg-server-20080612.tar.bz2 +a0e25d1c6ed0ed945e4a84b6b288f6fe xorg-server-20080701.tar.bz2 diff --git a/xorg-x11-server-Red-Hat-extramodes.patch b/xorg-x11-server-Red-Hat-extramodes.patch deleted file mode 100644 index 17dd2c3..0000000 --- a/xorg-x11-server-Red-Hat-extramodes.patch +++ /dev/null @@ -1,87 +0,0 @@ -From: Adam Jackson -Date: Sun, 28 Oct 2007 09:37:52 +0100 -Subject: [PATCH] Fedora extra modes list - ---- ---- xorg-server-1.2.0/hw/xfree86/common/extramodes.Red-Hat-extramodes 2007-01-22 22:13:15.000000000 -0500 -+++ xorg-server-1.2.0/hw/xfree86/common/extramodes 2007-02-05 18:26:19.000000000 -0500 -@@ -3,21 +3,75 @@ - // - // $XFree86: xc/programs/Xserver/hw/xfree86/etc/extramodes,v 1.5 2002/06/05 19:43:05 dawes Exp $ - // -+// NOTE: Please keep all video modes sorted in order of X res, then Y res for -+// ease of maintenance and readability. - - # 832x624 @ 75Hz (74.55Hz) (fix if the official/Apple spec is different) hsync: 49.725kHz - ModeLine "832x624" 57.284 832 864 928 1152 624 625 628 667 -Hsync -Vsync - --# 1152x768 @ 54.8Hz (Titanium PowerBook) hsync: 44.2kHz --ModeLine "1152x768" 64.995 1152 1178 1314 1472 768 771 777 806 +hsync +vsync - -+# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz -+Modeline "1152x864" 81.62 1152 1216 1336 1520 864 865 868 895 -HSync +Vsync -+ -+# 1152x864 @ 70.00 Hz (GTF) hsync: 63.00 kHz; pclk: 96.77 MHz -+Modeline "1152x864" 96.77 1152 1224 1344 1536 864 865 868 900 -HSync +Vsync -+ -+# 1152x864 @ 75.00 Hz (GTF) hsync: 67.65 kHz; pclk: 104.99 MHz -+Modeline "1152x864" 104.99 1152 1224 1352 1552 864 865 868 902 -HSync +Vsync -+ -+# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz -+Modeline "1152x864" 119.65 1152 1224 1352 1552 864 865 868 907 -HSync +Vsync -+ -+# 1152x864 @ 85Hz (Red Hat custom modeline) -+ModeLine "1152x864" 121.5 1152 1216 1344 1568 864 865 868 911 +hsync -vsync -+ -+# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz -+Modeline "1152x864" 143.47 1152 1232 1360 1568 864 865 868 915 -HSync +Vsync -+ -+# 1360x768 59.96 Hz (CVT) hsync: 47.37 kHz; pclk: 72.00 MHz -+Modeline "1360x768" 72.00 1360 1408 1440 1520 768 771 781 790 +hsync -vsync -+ -+# 1360x768 59.80 Hz (CVT) hsync: 47.72 kHz; pclk: 84.75 MHz -+Modeline "1360x768" 84.75 1360 1432 1568 1776 768 771 781 798 -hsync +vsync -+ - # 1400x1050 @ 60Hz (VESA GTF) hsync: 65.5kHz - ModeLine "1400x1050" 122.0 1400 1488 1640 1880 1050 1052 1064 1082 +hsync +vsync - -+# 1400x1050 @ 70.00 Hz (GTF) hsync: 76.51 kHz; pclk: 145.06 MHz -+Modeline "1400x1050" 145.06 1400 1496 1648 1896 1050 1051 1054 1093 -HSync +Vsync -+ - # 1400x1050 @ 75Hz (VESA GTF) hsync: 82.2kHz - ModeLine "1400x1050" 155.8 1400 1464 1784 1912 1050 1052 1064 1090 +hsync +vsync - --# 1600x1024 @ 60Hz (SGI 1600SW) hsync: 64.0kHz --Modeline "1600x1024" 106.910 1600 1620 1640 1670 1024 1027 1030 1067 -hsync -vsync -+# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz -+Modeline "1400x1050" 179.26 1400 1504 1656 1912 1050 1051 1054 1103 -HSync +Vsync -+ -+# 1440x900 @ 60.00 Hz (CVT) field rate 59.89 Hz; hsync: 55.93 kHz; pclk: 106.50 MHz -+Modeline "1440x900" 106.50 1440 1520 1672 1904 900 903 909 934 -HSync +Vsync -+ -+# 1600x1024 for SGI 1600 SW -+ModeLine "1600x1024" 103.125 1600 1600 1656 1664 1024 1024 1029 1030 +Hsync +Vsync -+ -+# 1680x1050 59.88 Hz (CVT 1.76MA-R) hsync: 64.67 kHz; pclk: 119.00 MHz -+Modeline "1680x1050" 119.00 1680 1728 1760 1840 1050 1053 1059 1080 +hsync -vsync -+ -+# 1680x1050 59.95 Hz (CVT 1.76MA) hsync: 65.29 kHz; pclk: 146.25 MHz -+Modeline "1680x1050" 146.25 1680 1784 1960 2240 1050 1053 1059 1089 -hsync +vsync -+ -+# 1680x1050 69.88 Hz (CVT) hsync: 76.58 kHz; pclk: 174.00 MHz -+Modeline "1680x1050" 174.00 1680 1800 1976 2272 1050 1053 1059 1096 -hsync +vsync -+ -+# 1680x1050 74.89 Hz (CVT 1.76MA) hsync: 82.31 kHz; pclk: 187.00 MHz -+Modeline "1680x1050" 187.00 1680 1800 1976 2272 1050 1053 1059 1099 -hsync +vsync -+ -+# 1680x1050 84.94 Hz (CVT 1.76MA) hsync: 93.86 kHz; pclk: 214.75 MHz -+Modeline "1680x1050" 214.75 1680 1808 1984 2288 1050 1053 1059 1105 -hsync +vsync -+ -+# 1920x1080 59.93 Hz (CVT 2.07M9-R) hsync: 66.59 kHz; pclk: 138.50 MHz -+Modeline "1920x1080" 138.50 1920 1968 2000 2080 1080 1083 1088 1111 +hsync -vsync -+ -+# 1920x1200 59.95 Hz (CVT 2.30MA-R) hsync: 74.04 kHz; pclk: 154.00 MHz -+Modeline "1920x1200" 154.00 1920 1968 2000 2080 1200 1203 1209 1235 +hsync -vsync - - # 1920x1440 @ 85Hz (VESA GTF) hsync: 128.5kHz - Modeline "1920x1440" 341.35 1920 2072 2288 2656 1440 1441 1444 1512 -hsync +vsync diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 06b2ba6..e6e17b0 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -15,12 +15,12 @@ # RHEL5 bugfix sync %define pkgname xorg-server -%define gitdate 20080612 +%define gitdate 20080701 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.4.99.902 -Release: 3.%{gitdate}%{?dist} +Version: 1.4.99.905 +Release: 1.%{gitdate}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -42,12 +42,15 @@ Patch101: xserver-1.4.99-dont-backfill-bg-none.patch # Red Hat specific tweaking, not intended for upstream # XXX move these to the end of the list -Patch1001: xorg-x11-server-Red-Hat-extramodes.patch +# dropme +#Patch1001: xorg-x11-server-Red-Hat-extramodes.patch Patch1003: xserver-1.4.99-pic-libxf86config.patch -Patch1004: xserver-1.4.99-selinux-awareness.patch +# maybe? +#Patch1004: xserver-1.4.99-selinux-awareness.patch Patch1005: xserver-1.4.99-builtin-fonts.patch Patch1010: xserver-1.3.0-no-prerelease-warning.patch -Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch +# rebase for GL/glx -> glx move +#Patch1014: xserver-1.4.99-xaa-evict-pixmaps.patch Patch2013: xserver-1.4.99-document-fontpath-correctly.patch @@ -58,9 +61,9 @@ Patch5001: xserver-1.4.99-alloca-poison.patch Patch5002: xserver-1.4.99-ssh-isnt-local.patch Patch5007: xserver-1.5.0-bad-fbdev-thats-mine.patch -Patch5008: xserver-1.5.0-xaa-sucks.patch +#Patch5008: xserver-1.5.0-xaa-sucks.patch Patch5009: xserver-1.5.0-no-evdev-keyboards-kthnx.patch -Patch5010: xserver-1.5.0-fix-single-aspect.patch +#Patch5010: xserver-1.5.0-fix-single-aspect.patch %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri @@ -111,8 +114,9 @@ BuildRequires: libXv-devel # openssl? really? BuildRequires: pixman-devel libpciaccess-devel openssl-devel byacc flex -BuildRequires: mesa-libGL-devel >= 7.1-0.21 -BuildRequires: mesa-source >= 7.1-0.21 +BuildRequires: mesa-libGL-devel >= 7.1-0.36 +# should be useless now... +# BuildRequires: mesa-source >= 7.1-0.36 # XXX silly... BuildRequires: libdrm-devel >= 2.4.0 %if %{with_hw_servers} @@ -310,7 +314,6 @@ export CFLAGS="${RPM_OPT_FLAGS} -Wstrict-overflow" --disable-xorgcfg \ --disable-record \ --enable-install-libxf86config \ - --with-mesa-source=%{_datadir}/mesa/source \ --enable-xselinux \ --with-dri-driver-path=%{drimoduledir} \ ${CONFIGURE} @@ -336,7 +339,6 @@ install -m 0444 hw/xfree86/common/{vesa,extra}modes $RPM_BUILD_ROOT%{_datadir}/x mkdir -p %{inst_srcdir}/{Xext,xkb,GL,hw/xfree86/{common,utils/xorgconfig}} cp cpprules.in %{inst_srcdir} cp xkb/README.compiled %{inst_srcdir}/xkb -cp GL/symlink-mesa.sh %{inst_srcdir}/GL cp hw/xfree86/{xorgconf.cpp,Options} %{inst_srcdir}/hw/xfree86 cp hw/xfree86/common/{vesamodes,extramodes} %{inst_srcdir}/hw/xfree86/common cp hw/xfree86/utils/xorgconfig/Cards{,98} %{inst_srcdir}/hw/xfree86/utils/xorgconfig/ @@ -418,7 +420,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/xorg/modules %dir %{_libdir}/xorg/modules/drivers %dir %{_libdir}/xorg/modules/extensions -%{_libdir}/xorg/modules/extensions/libGLcore.so %{_libdir}/xorg/modules/extensions/libglx.so %{_libdir}/xorg/modules/extensions/libdri.so %{_libdir}/xorg/modules/extensions/libdri2.so @@ -511,6 +512,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jun 30 2008 Adam Jackson 1.4.99.905-1.20080701 +- 1.5RC5. + * Thu Jun 12 2008 Dave Airlie 1.4.99.902-3.20080612 - xserver-1.5.0-fix-single-aspect.patch - fix 2560x1600 on my monitor. diff --git a/xserver-1.4.99-selinux-awareness.patch b/xserver-1.4.99-selinux-awareness.patch deleted file mode 100644 index 3b8ba19..0000000 --- a/xserver-1.4.99-selinux-awareness.patch +++ /dev/null @@ -1,48 +0,0 @@ -From d4112defb9ab2b099c67a0a7c2ae7ac772d67751 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 7 Jan 2008 15:41:22 -0500 -Subject: [PATCH] Link GL subsystem against libselinux. - ---- - configure.ac | 4 +++- - hw/xfree86/dixmods/Makefile.am | 2 +- - 2 files changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0742040..ed6d062 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -360,6 +360,8 @@ case $host_cpu in - esac - AC_SUBST(GLX_ARCH_DEFINES) - -+SYS_LIBS="${SYS_LIBS} -lselinux" -+ - dnl BSD *_video.c selection - AM_CONDITIONAL(ALPHA_VIDEO, [test "x$ALPHA_VIDEO" = xyes]) - AM_CONDITIONAL(ARM_VIDEO, [test "x$ARM_VIDEO" = xyes]) -@@ -1211,7 +1213,7 @@ AC_MSG_RESULT([$XNEST]) - AM_CONDITIONAL(XNEST, [test "x$XNEST" = xyes]) - - if test "x$XNEST" = xyes; then -- XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB" -+ XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB $DIX_LIB $OS_LIB $CONFIG_LIB $XSERVER_LIBS" - XNEST_SYS_LIBS="$XNESTMODULES_LIBS" - AC_SUBST([XNEST_LIBS]) - AC_SUBST([XNEST_SYS_LIBS]) -diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am -index efc5f4a..1b9ecfd 100644 ---- a/hw/xfree86/dixmods/Makefile.am -+++ b/hw/xfree86/dixmods/Makefile.am -@@ -50,7 +50,7 @@ INCLUDES = @XORG_INCS@ \ - -I$(top_srcdir)/GL/glx - - libGLcore_la_LDFLAGS = -avoid-version --libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -+libGLcore_la_LIBADD = $(top_builddir)/GL/mesa/libGLcore.la -lselinux - libGLcore_la_SOURCES = GLcoremodule.c - - libafb_la_LDFLAGS = -avoid-version --- -1.5.3.7 - diff --git a/xserver-1.4.99-xaa-evict-pixmaps.patch b/xserver-1.4.99-xaa-evict-pixmaps.patch deleted file mode 100644 index edf099b..0000000 --- a/xserver-1.4.99-xaa-evict-pixmaps.patch +++ /dev/null @@ -1,78 +0,0 @@ -From fb3008787193b79909fe922577794f7d4a656922 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 1 Nov 2007 15:18:31 -0400 -Subject: [PATCH] Add pixmap eviction call for XAA. - -DRI drivers without zero-copy EXT_texture_from_pixmap need to copy the -texture image out of video memory to bind it. Ick. Add a hack to -evict XAA pixmaps and disable the pixmap cache when the first texture -is bound. ---- - GL/glx/glxdri.c | 16 ++++++++++++++++ - hw/xfree86/xaa/xaaInit.c | 24 ++++++++++++++++++++++++ - 2 files changed, 40 insertions(+), 0 deletions(-) - -diff --git a/GL/glx/glxdri.c b/GL/glx/glxdri.c -index c0da07b..6c4faed 100644 ---- a/GL/glx/glxdri.c -+++ b/GL/glx/glxdri.c -@@ -360,6 +360,22 @@ - - pixmap = (PixmapPtr) glxPixmap->pDraw; - -+ if (!screen->texOffsetStart) { -+ /* When the GLX_EXT_texture_from_pixmap is used, as it's -+ * implemented here, we want to pull pixmap out of video memory -+ * and into host memory. */ -+ extern void XAAEvictPixmaps(void); -+ static int evictedPixmaps = 0; -+ -+ if (!evictedPixmaps) { -+ __glXDRIenterServer(GL_FALSE); -+ if (dlsym(RTLD_DEFAULT, "XAAEvictPixmaps")) -+ XAAEvictPixmaps(); -+ __glXDRIleaveServer(GL_FALSE); -+ evictedPixmaps = TRUE; -+ } -+ } -+ - if (screen->texOffsetStart && screen->texOffset) { - __GLXDRIdrawable **texOffsetOverride = screen->texOffsetOverride; - int i, firstEmpty = 16; -diff --git a/hw/xfree86/xaa/xaaInit.c b/hw/xfree86/xaa/xaaInit.c ---- a/hw/xfree86/xaa/xaaInit.c -+++ b/hw/xfree86/xaa/xaaInit.c -@@ -88,6 +88,30 @@ - xfree(infoRec); - } - -+void -+XAAEvictPixmaps(void) -+{ -+ XAAScreenPtr pScreenPriv; -+ XAAInfoRecPtr infoRec; -+ ScreenPtr pScreen; -+ int i; -+ -+ xf86MsgVerb(X_INFO, 3, "XAA: Evicting pixmaps\n"); -+ -+ for (i = 0; i < screenInfo.numScreens; i++) { -+ pScreen = screenInfo.screens[i]; -+ infoRec = GET_XAAINFORECPTR_FROM_SCREEN(pScreen); -+ -+ pScreenPriv = dixLookupPrivate(&pScreen->devPrivates, XAAScreenKey); -+ infoRec = pScreenPriv->AccelInfoRec; -+ -+ infoRec->offscreenDepths = 0; -+ infoRec->Flags &= ~OFFSCREEN_PIXMAPS; -+ -+ XAAMoveOutOffscreenPixmaps(pScreen); -+ XAAInvalidatePixmapCache(pScreen); -+ } -+} - - Bool - XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) --- -1.5.3.4 - diff --git a/xserver-1.5.0-fix-single-aspect.patch b/xserver-1.5.0-fix-single-aspect.patch deleted file mode 100644 index afd1c21..0000000 --- a/xserver-1.5.0-fix-single-aspect.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 21248705bbd9876ea6d2d78a85bedc4904c63899 Mon Sep 17 00:00:00 2001 -From: Dave Airlie -Date: Thu, 12 Jun 2008 14:54:56 +1000 -Subject: [PATCH] modes: make aspect choosing work on single output case. - -In the single output enabled case we never enter the loop and test -never gets set and so we fail to match a good mode. - -This was causing my 2560x1600 to end up at 2048x1536. ---- - hw/xfree86/modes/xf86Crtc.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 855d646..02c447d 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1854,6 +1854,7 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) - - nextEnabledOutput(config, enabled, &o); - while ((mode = nextAspectMode(config->output[o], mode, aspect))) { -+ test = mode; - for (p = o; nextEnabledOutput(config, enabled, &p); ) { - test = xf86OutputFindClosestMode(config->output[p], mode); - if (!test) --- -1.5.5.1 - diff --git a/xserver-1.5.0-xaa-sucks.patch b/xserver-1.5.0-xaa-sucks.patch deleted file mode 100644 index 8b17791..0000000 --- a/xserver-1.5.0-xaa-sucks.patch +++ /dev/null @@ -1,46 +0,0 @@ -From a01ca030c7a1f38e411281d888f0acf2c3fb40f3 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 13 Mar 2008 13:38:02 -0400 -Subject: [PATCH] Disable XAA offscreen pixmaps by default. - -Say Option "XaaOffscreenPixmaps" to turn them back on. ---- - hw/xfree86/xaa/xaaInitAccel.c | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c -index 1b7c154..f3c8f56 100644 ---- a/hw/xfree86/xaa/xaaInitAccel.c -+++ b/hw/xfree86/xaa/xaaInitAccel.c -@@ -43,7 +43,8 @@ typedef enum { - XAAOPT_WRITE_BITMAP, - XAAOPT_WRITE_PIXMAP, - XAAOPT_PIXMAP_CACHE, -- XAAOPT_OFFSCREEN_PIXMAPS -+ XAAOPT_OFFSCREEN_PIXMAPS, -+ XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE - } XAAOpts; - - static const OptionInfoRec XAAOptions[] = { -@@ -89,6 +90,8 @@ static const OptionInfoRec XAAOptions[] = { - OPTV_BOOLEAN, {0}, FALSE }, - {XAAOPT_OFFSCREEN_PIXMAPS, "XaaNoOffscreenPixmaps", - OPTV_BOOLEAN, {0}, FALSE }, -+ {XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE, "XaaOffscreenPixmaps", -+ OPTV_BOOLEAN, {0}, FALSE }, - { -1, NULL, - OPTV_NONE, {0}, FALSE } - }; -@@ -532,8 +532,8 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec) - #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0) - - if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy && -- !xf86ReturnOptValBool(options, XAAOPT_OFFSCREEN_PIXMAPS, -- FALSE)) { -+ xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE)) -+ { - XAAMSG("\tOffscreen Pixmaps\n"); - } else { - infoRec->Flags &= ~OFFSCREEN_PIXMAPS; --- -1.5.4.3