Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2015-02-10 20:17:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xorg-x11-server (Old) and /work/SRC/openSUSE:Factory/.xorg-x11-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorg-x11-server" Changes: -------- --- /work/SRC/openSUSE:Factory/xorg-x11-server/xorg-x11-server.changes 2014-11-26 10:35:36.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2015-02-10 20:17:43.000000000 +0100 @@ -1,0 +2,31 @@ +Fri Feb 6 14:39:07 UTC 2015 - [email protected] + +- u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch + Fix sdksyms.sh to work with gcc5 (bnc#916580). + +------------------------------------------------------------------- +Thu Feb 5 16:32:50 UTC 2015 - [email protected] + +- Update to version 1.17.0: + + Continued work to strip out stale code and clean up the server. + Thousands of lines of unnecessary code have disappeared yet again. + + The modesetting driver has been merged into the server code base, + simplifying ongoing maintenance by coupling it to the X server + ABI/API release schedule. This now includes DRI2 support (so that GLX + works correctly) along with Glamor support (which handles DRI3). + + Lots of Glamor improvements, including a rewrite of the core protocol + rendering functions. +- Remove upstream patches: + + Patch130: U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch + + Patch131: U_fb-Fix-invalid-bpp-for-24bit-depth-window.patch + + Patch200: U_kdrive_extend_screen_option_syntax.patch + + Patch201: U_ephyr_enable_screen_window_placement.patch + + Patch202: U_ephyr_add_output_option_support.patch + +------------------------------------------------------------------- +Thu Feb 5 13:37:11 UTC 2015 - [email protected] + +- Add xorg-x11-server-source package that contains patched xserver + sources used to build xorg-x11-Xvnc. + +------------------------------------------------------------------- Old: ---- U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch U_ephyr_add_output_option_support.patch U_ephyr_enable_screen_window_placement.patch U_kdrive_extend_screen_option_syntax.patch xorg-server-1.16.2.tar.bz2 New: ---- u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch xorg-server-1.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.itYxez/_old 2015-02-10 20:17:45.000000000 +0100 +++ /var/tmp/diff_new_pack.itYxez/_new 2015-02-10 20:17:45.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package xorg-x11-server # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.16.2 +%define dirsuffix 1.17.0 Summary: X License: MIT @@ -75,6 +75,7 @@ BuildRequires: pkgconfig(xcb-icccm) BuildRequires: pkgconfig(xcb-image) BuildRequires: pkgconfig(xcb-keysyms) +BuildRequires: pkgconfig(xcb-renderutil) BuildRequires: pkgconfig(xcmiscproto) >= 1.2.0 BuildRequires: pkgconfig(xdmcp) BuildRequires: pkgconfig(xext) >= 1.0.99.4 @@ -133,6 +134,9 @@ Obsoletes: glamor < %{version} Obsoletes: glamor-egl < %{version} +Provides: xf86-video-modesetting = %{version} +Obsoletes: xf86-video-modesetting < %{version} + # Xvfb requires keyboard files as well (bnc#797124) Requires: xkeyboard-config @@ -156,7 +160,7 @@ Patch110: u_connection-avoid-crash-when-CloseWellKnownConnections-gets-called-twice.patch Patch111: u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch Patch112: u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch -Patch130: U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch +Patch113: u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch Patch1000: n_xserver-optimus-autoconfig-hack.patch @@ -164,10 +168,6 @@ Patch1211: b_0001-Prevent-XSync-Alarms-from-senslessly-calling-CheckTr.patch Patch1222: b_sync-fix.patch -Patch200: U_kdrive_extend_screen_option_syntax.patch -Patch201: U_ephyr_enable_screen_window_placement.patch -Patch202: U_ephyr_add_output_option_support.patch - %description This package contains the X.Org Server. @@ -216,6 +216,13 @@ %description sdk This package contains the X.Org Server SDK. +%package source +Summary: Source code of X.Org server +Group: Development/Sources + +%description source +This package contains patched sources of X.Org Server. + %prep %setup -q -n xorg-server-%{dirsuffix} -a3 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end. @@ -241,7 +248,8 @@ %patch110 -p1 %patch111 -p1 %patch112 -p1 -%patch130 -p1 +%patch113 -p1 + %patch1000 -p1 ### disabled for now @@ -251,9 +259,7 @@ ### patch222 might not be applicable anymore #%patch1222 -p1 -%patch200 -p1 -%patch201 -p1 -%patch202 -p1 +find . -type f \! -name '*.orig' \! -path ./source-file-list > source-file-list %build autoreconf -fi @@ -363,6 +369,9 @@ %endif %endif +mkdir -p %{buildroot}/usr/src/xserver +xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list + %post %ifnarch s390 s390x %{fillup_only -an displaymanager} @@ -475,4 +484,7 @@ %endif %{_sysconfdir}/rpm/macros.xorg-server +%files source +/usr/src/xserver + %changelog ++++++ u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch ++++++ --- /var/tmp/diff_new_pack.itYxez/_old 2015-02-10 20:17:45.000000000 +0100 +++ /var/tmp/diff_new_pack.itYxez/_new 2015-02-10 20:17:45.000000000 +0100 @@ -51,7 +51,7 @@ + } } - void + #pragma GCC diagnostic push @@ -194,7 +201,7 @@ xf86OpenConsole(void) /* * now get the VT. This _must_ succeed, or else fail completely. ++++++ u_symbols-Fix-sdksyms.sh-to-cope-with-gcc5.patch ++++++ From: Egbert Eich <[email protected]> Date: Fri Feb 6 14:56:57 2015 +0100 Subject: [PATCH]symbols: Fix sdksyms.sh to cope with gcc5 Patch-mainline: to be upstreamed References: bnc#916580 Signed-off-by: Egbert Eich <[email protected]> Gcc5 adds additional lines stating line numbers before and after __attribute__() which need to be skipped. Signed-off-by: Egbert Eich <[email protected]> --- hw/xfree86/sdksyms.sh | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh index d9a4478..2936669 100755 --- a/hw/xfree86/sdksyms.sh +++ b/hw/xfree86/sdksyms.sh @@ -353,13 +353,25 @@ BEGIN { if (sdk) { n = 3; + # skip line numbers GCC 5 adds before __attribute__ + while ($n == "" || $0 ~ /^# [0-9]+ "/) { + getline; + n = 1; + } + # skip attribute, if any while ($n ~ /^(__attribute__|__global)/ || # skip modifiers, if any $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || # skip pointer - $n ~ /^[a-zA-Z0-9_]*\*$/) + $n ~ /^[a-zA-Z0-9_]*\*$/) { n++; + # skip line numbers GCC 5 adds after __attribute__ + while ($n == "" || $0 ~ /^# [0-9]+ "/) { + getline; + n = 1; + } + } # type specifier may not be set, as in # extern _X_EXPORT unsigned name(...) ++++++ u_xorg-server-xdmcp.patch ++++++ --- /var/tmp/diff_new_pack.itYxez/_old 2015-02-10 20:17:45.000000000 +0100 +++ /var/tmp/diff_new_pack.itYxez/_new 2015-02-10 20:17:45.000000000 +0100 @@ -18,12 +18,12 @@ +++ xorg-server-1.12.1/os/access.c @@ -714,7 +714,9 @@ DefineSelf(int fd) - /* + /* * ignore 'localhost' entries as they're not useful - * on the other end of the wire + * on the other end of the wire and because on hosts -+ * with shared home dirs they'll result in conflicting -+ * entries in ~/.Xauthority ++ * with shared home dirs they'll result in conflicting ++ * entries in ~/.Xauthority */ if (ifr->ifa_flags & IFF_LOOPBACK) continue; @@ -32,13 +32,13 @@ IN6_IS_ADDR_LOOPBACK((struct in6_addr *) addr)) continue; + -+ /* Ignore IPv6 link local addresses (fe80::/10), because -+ * they need a scope identifier, which we have no way -+ * of telling to the other end. -+ */ -+ if (family == FamilyInternet6 && -+ IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr)) -+ continue; ++ /* Ignore IPv6 link local addresses (fe80::/10), because ++ * they need a scope identifier, which we have no way ++ * of telling to the other end. ++ */ ++ if (family == FamilyInternet6 && ++ IN6_IS_ADDR_LINKLOCAL((struct in6_addr *)addr)) ++ continue; #endif XdmcpRegisterConnection(family, (char *) addr, len); #if defined(IPv6) && defined(AF_INET6) ++++++ ux_xserver_xvfb-randr.patch ++++++ --- /var/tmp/diff_new_pack.itYxez/_old 2015-02-10 20:17:45.000000000 +0100 +++ /var/tmp/diff_new_pack.itYxez/_new 2015-02-10 20:17:45.000000000 +0100 @@ -188,5 +188,5 @@ + return FALSE; + pScreen->InstallColormap = vfbInstallColormap; - pScreen->UninstallColormap = vfbUninstallColormap; - pScreen->ListInstalledColormaps = vfbListInstalledColormaps; + + pScreen->SaveScreen = vfbSaveScreen; ++++++ xorg-server-1.16.2.tar.bz2 -> xorg-server-1.17.0.tar.bz2 ++++++ ++++ 115925 lines of diff (skipped) ++++++ xorg-server-provides ++++++ --- /var/tmp/diff_new_pack.itYxez/_old 2015-02-10 20:17:50.000000000 +0100 +++ /var/tmp/diff_new_pack.itYxez/_new 2015-02-10 20:17:50.000000000 +0100 @@ -1,4 +1,4 @@ Provides: X11_ABI_XINPUT = 21.0 -Provides: X11_ABI_VIDEODRV = 18.0 +Provides: X11_ABI_VIDEODRV = 19.0 Provides: X11_ABI_ANSIC = 0.4 -Provides: X11_ABI_EXTENSION = 8.0 +Provides: X11_ABI_EXTENSION = 9.0 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
