From 379416ab6b96690499c86346fd223bdd1dcb52c4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Mon, 28 Feb 2011 09:23:48 +1000 Subject: [PATCH 1/2] xserver 1.10.0 server-1.9-99.901-xkb-repeat-issues.patch: drop, merged xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8 xserver-1.6.99-default-modes.patch: drop, see dc498b4 xserver-1.7.1-multilib.patch: drop, see a16e282 ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0 --- .gitignore | 1 + sources | 2 +- xorg-x11-server.spec | 30 +++++++------- xserver-1.4.99-pic-libxf86config.patch | 25 ------------ xserver-1.6.99-default-modes.patch | 26 ------------ xserver-1.6.99-right-of.patch | 24 +++++------ xserver-1.7.1-multilib.patch | 55 -------------------------- 7 files changed, 29 insertions(+), 134 deletions(-) delete mode 100644 xserver-1.4.99-pic-libxf86config.patch delete mode 100644 xserver-1.6.99-default-modes.patch delete mode 100644 xserver-1.7.1-multilib.patch diff --git a/.gitignore b/.gitignore index 59f4f11..92ad03a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xorg-server-1.9.1.tar.bz2 /xorg-server-20101125.tar.xz /xorg-server-20101201.tar.xz +/xorg-server-1.10.0.tar.bz2 diff --git a/sources b/sources index f32b492..82413a4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a10a02ef4eaae212974b410eeb54a3e3 xorg-server-20101201.tar.xz +57c143c5cfa507680933b6c4904f829c xorg-server-1.10.0.tar.bz2 diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index d116758..8692e13 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -17,20 +17,20 @@ # because rpm is a terrible language. HTFU. %define ansic_major 0 %define ansic_minor 4 -%define videodrv_major 9 +%define videodrv_major 10 %define videodrv_minor 0 %define xinput_major 12 -%define xinput_minor 0 -%define extension_major 4 +%define xinput_minor 2 +%define extension_major 5 %define extension_minor 0 %define pkgname xorg-server -%define gitdate 20101201 +#define gitdate 20110225 Summary: X.Org X11 X server Name: xorg-x11-server -Version: 1.9.99.1 -Release: 4%{?gitdate:.%{gitdate}}%{dist} +Version: 1.10.0 +Release: 1%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -58,8 +58,6 @@ Source20: http://svn.exactcode.de/t2/trunk/package/xorg/xorg-server/xvfb-run.sh # for requires generation in drivers Source30: xserver-sdk-abi-requires -Patch5: xserver-1.4.99-pic-libxf86config.patch - # OpenGL compositing manager feature/optimization patches. # FIXME: who calls this? #Patch103: xserver-1.5.0-bg-none-root.patch @@ -77,10 +75,8 @@ Patch6016: xserver-1.6.1-nouveau.patch # ajax needs to upstream this Patch6027: xserver-1.6.0-displayfd.patch Patch6030: xserver-1.6.99-right-of.patch -Patch6033: xserver-1.6.99-default-modes.patch #Patch6044: xserver-1.6.99-hush-prerelease-warning.patch -Patch6049: xserver-1.7.1-multilib.patch # Use vesa for VirtualBox, since we don't ship vboxvideo and the # fallback to vesa when module is missing seems broken @@ -89,10 +85,6 @@ Patch6053: xserver-1.8-disable-vboxvideo.patch # misc Patch7005: xserver-1.9.0-qxl-fallback.patch -# 537708 xmodmap Mode_switch gets stuck on -# http://patchwork.freedesktop.org/patch/3653/ -Patch7006: xserver-1.9.99.901-xkb-repeat-issues.patch - %define moduledir %{_libdir}/xorg/modules %define drimoduledir %{_libdir}/dri %define sdkdir %{_includedir}/xorg @@ -392,7 +384,6 @@ install -m 755 %{SOURCE30} $RPM_BUILD_ROOT%{_bindir} %define xserver_source_dir %{_datadir}/xorg-x11-server-source %define inst_srcdir %{buildroot}/%{xserver_source_dir} mkdir -p %{inst_srcdir}/{doc/xml{,/dtrace},Xext,xkb,GL,hw/{xquartz/bundle,xfree86/common}} -cp cpprules.in %{inst_srcdir} cp {,%{inst_srcdir}/}doc/xml/xmlrules.in cp {,%{inst_srcdir}/}doc/xml/xmlrules-noinst.in cp {,%{inst_srcdir}/}doc/xml/xmlrules-inst.in @@ -490,6 +481,7 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man4/fbdevhw.4* %{_mandir}/man4/exa.4* %{_mandir}/man5/xorg.conf.5* +%{_mandir}/man5/xorg.conf.d.5* %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_datadir}/X11/xorg.conf.d %{_datadir}/X11/xorg.conf.d/10-evdev.conf @@ -552,6 +544,14 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Fri Feb 25 2011 Peter Hutterer 1.9.99.902-1 +- xserver 1.10.0 +- server-1.9-99.901-xkb-repeat-issues.patch: drop, merged +- xserver-1.4.99-pic-libxf86config.patch: drop, see 60801ff8 +- xserver-1.6.99-default-modes.patch: drop, see dc498b4 +- xserver-1.7.1-multilib.patch: drop, see a16e282 +- ABI bumps: xinput to 12.2, extension to 5.0, video to 10.0 + * Tue Feb 08 2011 Fedora Release Engineering - 1.9.99.1-4.20101201 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/xserver-1.4.99-pic-libxf86config.patch b/xserver-1.4.99-pic-libxf86config.patch deleted file mode 100644 index b8123d2..0000000 --- a/xserver-1.4.99-pic-libxf86config.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 81b45563f169cb131fe22042c1f4b3b24a49d82f Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Mon, 10 Dec 2007 11:26:57 -0500 -Subject: [PATCH] Build libxf86config with -fPIC. - ---- - hw/xfree86/parser/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am -index caf7079..3bda51e 100644 ---- a/hw/xfree86/parser/Makefile.am -+++ b/hw/xfree86/parser/Makefile.am -@@ -32,7 +32,7 @@ libxf86config_internal_la_SOURCES = \ - - libxf86config_a_SOURCES = \ - $(INTERNAL_SOURCES) --libxf86config_a_CFLAGS = $(AM_CFLAGS) -+libxf86config_a_CFLAGS = $(AM_CFLAGS) -fPIC - - AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS) \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ --- -1.7.3.2 - diff --git a/xserver-1.6.99-default-modes.patch b/xserver-1.6.99-default-modes.patch deleted file mode 100644 index e2d646d..0000000 --- a/xserver-1.6.99-default-modes.patch +++ /dev/null @@ -1,26 +0,0 @@ -From db7547ab7f43f36f2eb38bc9ea29cbfa691ed7f0 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 4 Mar 2010 15:18:38 +1000 -Subject: [PATCH] tweak default mode list yet again - ---- - hw/xfree86/modes/xf86Crtc.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) - -diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 5875731..adae031 100644 ---- a/hw/xfree86/modes/xf86Crtc.c -+++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1621,6 +1621,9 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY) - } - - output_modes = (*output->funcs->get_modes) (output); -+ -+ /* if the driver found modes, don't second-guess it */ -+ add_default_modes = (output_modes == NULL); - - edid_monitor = output->MonInfo; - --- -1.7.3.2 - diff --git a/xserver-1.6.99-right-of.patch b/xserver-1.6.99-right-of.patch index 3a1d075..c437a94 100644 --- a/xserver-1.6.99-right-of.patch +++ b/xserver-1.6.99-right-of.patch @@ -1,4 +1,4 @@ -From 2cf7928ed74cbd94e423788a8341bf9a647d0dd9 Mon Sep 17 00:00:00 2001 +From ebc70eaa0f7a60e7fb88f3173b3e86a78ab9be79 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 28 Jul 2009 11:07:13 -0400 Subject: [PATCH] RANDR: right-of placement by default @@ -11,7 +11,7 @@ allows for servers like RN50 where two heads are disjoint. - airlied] 2 files changed, 74 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86str.h b/hw/xfree86/common/xf86str.h -index ce6b07f..dbac7c5 100644 +index 0493dc5..d66e373 100644 --- a/hw/xfree86/common/xf86str.h +++ b/hw/xfree86/common/xf86str.h @@ -496,10 +496,13 @@ typedef struct _confdrirec { @@ -21,7 +21,7 @@ index ce6b07f..dbac7c5 100644 -#define NUM_RESERVED_INTS 16 +#define NUM_RESERVED_INTS 15 #define NUM_RESERVED_POINTERS 14 - #define NUM_RESERVED_FUNCS 11 + #define NUM_RESERVED_FUNCS 10 +/* let clients know they can use this */ +#define XF86_SCRN_HAS_PREFER_CLONE 1 @@ -29,7 +29,7 @@ index ce6b07f..dbac7c5 100644 typedef pointer (*funcPointer)(void); /* flags for depth 24 pixmap options */ -@@ -665,7 +668,6 @@ typedef void xf86SetOverscanProc (ScrnInfoPtr, int); +@@ -659,7 +662,6 @@ typedef void xf86ModeSetProc (ScrnInfoPtr); * are to be dependent on compile-time defines. */ @@ -37,7 +37,7 @@ index ce6b07f..dbac7c5 100644 typedef struct _ScrnInfoRec { int driverVersion; char * driverName; /* canonical name used in */ -@@ -767,6 +769,9 @@ typedef struct _ScrnInfoRec { +@@ -761,6 +763,9 @@ typedef struct _ScrnInfoRec { ClockRangePtr clockRanges; int adjustFlags; @@ -48,10 +48,10 @@ index ce6b07f..dbac7c5 100644 * These can be used when the minor ABI version is incremented. * The NUM_* parameters must be reduced appropriately to keep the diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c -index 7fc2a60..5875731 100644 +index b5e9dc2..38ce9d0 100644 --- a/hw/xfree86/modes/xf86Crtc.c +++ b/hw/xfree86/modes/xf86Crtc.c -@@ -1139,6 +1139,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) +@@ -1169,6 +1169,15 @@ xf86InitialOutputPositions (ScrnInfoPtr scrn, DisplayModePtr *modes) int o; int min_x, min_y; @@ -67,7 +67,7 @@ index 7fc2a60..5875731 100644 for (o = 0; o < config->num_output; o++) { xf86OutputPtr output = config->output[o]; -@@ -2023,6 +2032,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) +@@ -2052,6 +2061,57 @@ bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect) return match; } @@ -125,7 +125,7 @@ index 7fc2a60..5875731 100644 static Bool xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, DisplayModePtr *modes, Bool *enabled, -@@ -2080,13 +2140,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, +@@ -2109,13 +2169,9 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config, * biggest mode for its aspect ratio, assuming one exists. */ if (!ret) do { @@ -140,7 +140,7 @@ index 7fc2a60..5875731 100644 break; p = -1; -@@ -2380,6 +2436,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) +@@ -2409,6 +2465,8 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) } else { if (xf86TargetUserpref(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using user preference for initial modes\n"); @@ -149,7 +149,7 @@ index 7fc2a60..5875731 100644 else if (xf86TargetPreferred(scrn, config, modes, enabled, width, height)) xf86DrvMsg(i, X_INFO, "Using exact sizes for initial modes\n"); else if (xf86TargetAspect(scrn, config, modes, enabled, width, height)) -@@ -2397,8 +2455,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) +@@ -2426,8 +2484,10 @@ xf86InitialConfiguration (ScrnInfoPtr scrn, Bool canGrow) config->output[o]->name); else xf86DrvMsg (scrn->scrnIndex, X_INFO, @@ -163,5 +163,5 @@ index 7fc2a60..5875731 100644 /* -- -1.7.3.2 +1.7.4 diff --git a/xserver-1.7.1-multilib.patch b/xserver-1.7.1-multilib.patch deleted file mode 100644 index 8e0d0a0..0000000 --- a/xserver-1.7.1-multilib.patch +++ /dev/null @@ -1,55 +0,0 @@ -From d9b6e996135efb8a8e23605665aab5c3c1f0f941 Mon Sep 17 00:00:00 2001 -From: Adam Jackson -Date: Thu, 29 Oct 2009 19:04:10 -0400 -Subject: [PATCH] multilib fix for -devel subpackage - ---- - include/colormapst.h | 4 ++-- - include/xorg-server.h.in | 7 ++++--- - 2 files changed, 6 insertions(+), 5 deletions(-) - -diff --git a/include/colormapst.h b/include/colormapst.h -index 0ba5bd0..d24ea58 100644 ---- a/include/colormapst.h -+++ b/include/colormapst.h -@@ -103,12 +103,12 @@ typedef struct _ColormapRec - { - VisualPtr pVisual; - short class; /* PseudoColor or DirectColor */ --#if defined(_XSERVER64) -+#ifdef __LP64__ - short pad0; - XID pad1; - #endif - XID mid; /* client's name for colormap */ --#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) -+#if defined(__LP64__) && (X_BYTE_ORDER == X_LITTLE_ENDIAN) - XID pad2; - #endif - ScreenPtr pScreen; /* screen map is associated with */ -diff --git a/include/xorg-server.h.in b/include/xorg-server.h.in -index 76cab16..d12fd23 100644 ---- a/include/xorg-server.h.in -+++ b/include/xorg-server.h.in -@@ -157,9 +157,6 @@ - /* Name of X server */ - #undef __XSERVERNAME__ - --/* Define to 1 if unsigned long is 64 bits. */ --#undef _XSERVER64 -- - /* Building vgahw module */ - #undef WITH_VGAHW - -@@ -187,4 +184,8 @@ - /* X Access Control Extension */ - #undef XACE - -+#ifdef __LP64__ -+#define _XSERVER64 1 -+#endif -+ - #endif /* _XORG_SERVER_H_ */ --- -1.7.3.2 - From 2c6c5a5d65e07e480dfdd9d24c87a3c48595e274 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 9 Mar 2011 10:55:14 -0500 Subject: [PATCH 2/2] disable fs caps --- xorg-x11-server.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec index 8692e13..8f006c4 100644 --- a/xorg-x11-server.spec +++ b/xorg-x11-server.spec @@ -30,7 +30,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.10.0 -Release: 1%{?gitdate:.%{gitdate}}%{dist} +Release: 2%{?gitdate:.%{gitdate}}%{dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -429,9 +429,10 @@ rm -rf $RPM_BUILD_ROOT %dir %{_localstatedir}/lib/xkb %{_localstatedir}/lib/xkb/README.compiled -%if 0%{?fedora} < 15 +%if 1 %define Xorgperms %attr(4711, root, root) %else +# disable until module loading is audited %define Xorgperms %attr(0711,root,root) %caps(cap_sys_admin,cap_sys_rawio,cap_dac_override=pe) %endif @@ -544,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT %{xserver_source_dir} %changelog +* Wed Mar 09 2011 Adam Jackson 1.10.0-2 +- Disable filesystem caps in paranoia until module loading is audited + * Fri Feb 25 2011 Peter Hutterer 1.9.99.902-1 - xserver 1.10.0 - server-1.9-99.901-xkb-repeat-issues.patch: drop, merged