Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2013-08-12 11:08:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-07-03 10:28:10.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2013-08-12 11:08:20.000000000 +0200 @@ -1,0 +2,40 @@ +Fri Aug 9 15:08:34 UTC 2013 - [email protected] + +- Delete N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch: + This patch is no longer appicable. The code has been reworked completely + thus the problem fixed with this most likely no longer exists. +- Delete N_Use-external-tool-for-creating-backtraces-on-crashes.patch: + This feature has multiple issues, there is no reason to keep the patch + around. + +------------------------------------------------------------------- +Fri Aug 9 13:25:41 UTC 2013 - [email protected] + +- Remove the unused Xvnc packages +- Remove the now unused vnc macro +- Remove the Xvnc patches: + + Patch17: n_VNC-Add-support-for-VNC.patch + + Patch18: n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch + + Patch19: n_VNC-Fix-crash-when-no-depth-translation-is-required.patch + + Patch20: n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch + + Patch21: n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch + + Patch22: n_VNC-Fix-crash-due-to-unset-input-device-names.patch + + Patch23: n_Xvnc-pthread.diff + + Patch24: n_VNC-Add-proto.diff + +------------------------------------------------------------------- +Thu Aug 8 19:51:35 UTC 2013 - [email protected] + +- n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch: + At SUSE we want to perfer the fbdev driver over the VESA driver + at autoconfiguration as it is expected that fbdev will work in + allmost all situations where no native driver can be found - + even under UEFI and with secure boot. + replaces: N_autoconfig_fallback_fbdev_first.diff + +------------------------------------------------------------------- +Thu Aug 8 15:55:14 UTC 2013 - [email protected] + +- removed N_vidmode-sig11.diff (fixed upstream already) + +------------------------------------------------------------------- Old: ---- N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch N_Use-external-tool-for-creating-backtraces-on-crashes.patch N_autoconfig_fallback_fbdev_first.diff N_vidmode-sig11.diff n_VNC-Add-proto.diff n_VNC-Add-support-for-VNC.patch n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch n_VNC-Fix-crash-due-to-unset-input-device-names.patch n_VNC-Fix-crash-when-no-depth-translation-is-required.patch n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch New: ---- n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.246qYz/_old 2013-08-12 11:08:21.000000000 +0200 +++ /var/tmp/diff_new_pack.246qYz/_new 2013-08-12 11:08:21.000000000 +0200 @@ -19,7 +19,7 @@ Name: xorg-x11-server %define dirsuffix 1.14.2 -%define vnc 0 + Summary: X License: GPL-2.0+ and MIT Group: System/X11/Servers/XF86_4 @@ -91,10 +91,7 @@ %if 0%{?suse_version} >= 1130 BuildRequires: pkgconfig(libudev) >= 143 %endif -%if %vnc -BuildRequires: libjpeg-devel -BuildRequires: pkgconfig(vncproto) -%endif + Version: 7.6_%{dirsuffix} Release: 0 Url: http://xorg.freedesktop.org/ @@ -116,24 +113,7 @@ Obsoletes: xorg-x11-server-glx # Xvfb requires keyboard files as well (bnc#797124) Requires: xkeyboard-config -%if %vnc -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch17: n_VNC-Add-support-for-VNC.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch18: n_VNC-Readd-timeout-when-vnc-viewer-connection-breaks.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch19: n_VNC-Fix-crash-when-no-depth-translation-is-required.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch20: n_VNC-Don-t-let-VNC-access-the-framebuffer-directly-an.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch21: n_VNC-Enable-use-of-all-keyboard-layouts-independent-o.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch22: n_VNC-Fix-crash-due-to-unset-input-device-names.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch23: n_Xvnc-pthread.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch24: n_VNC-Add-proto.diff -%endif + # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch45: N_bug-197858_dpms.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -149,13 +129,9 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch112: N_fix-dpi-values.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch123: N_vidmode-sig11.diff -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch125: N_0001-Xinput-Catch-missing-configlayout-when-deleting-dev.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch127: N_dpms_screensaver.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch143: N_autoconfig_fallback_fbdev_first.diff +Patch143: n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch145: N_driver-autoconfig.diff # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines @@ -173,8 +149,6 @@ # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch213: N_xorg-server-xdmcp.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines -Patch220: N_Use-external-tool-for-creating-backtraces-on-crashes.patch -# PATCH-MISSING-TAG -- See http://wiki.opensuse.org/openSUSE:Packaging_Patches_guidelines Patch222: N_sync-fix.patch Patch226: u_vgaHW-no-legacy.patch @@ -232,27 +206,6 @@ %description sdk This package contains the X.Org Server SDK. -%if %vnc - -%package -n xorg-x11-Xvnc -Summary: VNC Server for the X Window System -Group: System/X11/Servers/XF86_4 -Requires: xkbcomp -Requires: xkeyboard-config -Requires: xorg-x11-fonts-core -Provides: XFree86-Xvnc -Provides: vnc:/usr/X11R6/bin/Xvnc -Obsoletes: XFree86-Xvnc -%ifarch ia64 -Provides: vnc-x86 -Obsoletes: vnc-x86 -%endif - -%description -n xorg-x11-Xvnc -An X Window System server for Virtual Network Computing (VNC). - -%endif - %prep %setup -q -n xorg-server-%{dirsuffix} -a4 # Early verification if the ABI Defines are correct. Let's not waste build cycles if the Provides are wrong at the end. @@ -261,18 +214,7 @@ %patch0 -p1 %patch2 %patch16 -p1 -%if %vnc -### Needs to be rebased -#%patch17 -p1 -#%patch18 -p1 -#%patch19 -p1 -#%patch20 -p1 -#%patch21 -p1 -#%patch22 -p1 -#%patch23 -p1 -#%patch24 -p1 -%endif ### Needs to be rebased #%patch45 -p0 %patch77 @@ -281,11 +223,8 @@ %patch103 %patch106 -p1 %patch112 -p0 -%patch123 -p0 -### disabled for now -#%patch125 -p1 %patch127 -p1 -%patch143 -p0 +%patch143 -p1 %patch145 -p0 ### disabled for now #%patch162 -p1 @@ -296,8 +235,6 @@ ### disabled for now #%patch211 -p1 %patch213 -p1 -### Disable backtrace generation patch for now -#%patch220 -p1 ### patch222 might not be applicable anymore #%patch222 -p1 %patch226 -p0 @@ -336,9 +273,6 @@ --enable-config-udev \ %endif %endif -%if %vnc - --disable-xcliplist \ -%endif --with-log-dir="/var/log" \ --with-os-name="openSUSE" \ --with-os-vendor="SUSE LINUX" \ @@ -385,14 +319,6 @@ %else rm -f %{buildroot}%{_datadir}/aclocal/*.m4 %endif -%if %vnc -mkdir -p %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services -cat > %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} << EOF -## Name: VNC Server -## Description: Opens ports for VNC Server -TCP="5801 5901" -EOF -%endif %ifarch s390 s390x rm -f %{buildroot}%{_sysconfdir}/X11/10-evdev.conf make -C hw/xfree86/parser @@ -508,12 +434,5 @@ %{_datadir}/aclocal/*.m4 %endif %{_sysconfdir}/rpm/macros.xorg-server -%if %vnc - -%files -n xorg-x11-Xvnc -%defattr(-, root, root) -%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} -#%{_bindir}/Xvnc -%endif %changelog ++++++ n_autoconf-On-Linux-give-fbdev-driver-a-higher-precedence-than-vesa.patch ++++++ From: Egbert Eich <Egbert Eich [email protected]> Date: Thu Aug 8 21:43:44 2013 +0200 Subject: [PATCH]autoconf: On Linux give fbdev driver a higher precedence than vesa Patch-Mainline: never Git-commit: ccda2310eedf55215de792cdd5a793e3bf58fed1 Git-repo: References: Signed-off-by: Egbert Eich <[email protected]> At SUSE we want to perfer the fbdev driver over the VESA driver at autoconfiguration as it is expected that fbdev will work in allmost all situations where no native driver can be found - even under UEFI and with secure boot. Signed-off-by: Egbert Eich <Egbert Eich [email protected]> --- hw/xfree86/common/xf86AutoConfig.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/hw/xfree86/common/xf86AutoConfig.c b/hw/xfree86/common/xf86AutoConfig.c index 2da792e..252fe37 100644 --- a/hw/xfree86/common/xf86AutoConfig.c +++ b/hw/xfree86/common/xf86AutoConfig.c @@ -277,26 +277,26 @@ listPossibleVideoDrivers(char *matches[], int nmatches) if (i < (nmatches - 1)) i = xf86PciMatchDriver(matches, nmatches); #endif + +#if defined(__linux__) + matches[i++] = xnfstrdup("modesetting"); +#endif /* Fallback to platform default hardware */ if (i < (nmatches - 1)) { -#if defined(__i386__) || defined(__amd64__) || defined(__hurd__) - matches[i++] = xnfstrdup("vesa"); -#elif defined(__sparc__) && !defined(sun) +#if defined(__sparc__) && !defined(sun) matches[i++] = xnfstrdup("sunffb"); +#else + matches[i++] = xnfstrdup("fbdev"); #endif } -#if defined(__linux__) - matches[i++] = xnfstrdup("modesetting"); -#endif - #if !defined(sun) /* Fallback to platform default frame buffer driver */ if (i < (nmatches - 1)) { #if !defined(__linux__) && defined(__sparc__) matches[i++] = xnfstrdup("wsfb"); -#else - matches[i++] = xnfstrdup("fbdev"); +#elif defined(__i386__) || defined(__amd64__) || defined(__hurd__) + matches[i++] = xnfstrdup("vesa"); #endif } #endif /* !sun */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
