Hello community, here is the log from the commit of package xorg-x11-server for openSUSE:Factory checked in at 2014-07-19 08:16:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-07-13 14:06:26.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xorg-x11-server.new/xorg-x11-server.changes 2014-07-19 08:16:23.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Jul 17 15:50:10 UTC 2014 - tobias.johannes.klausm...@mni.thm.de + +- Update to version 1.16.0 (final): + + Glamor integration. This GL-based X acceleration subsystem now + offers reasonable performance that avoids software fall backs much + of the time. + + XWayland. This provides an X server integrated into a Wayland + window system. It uses Glamor for rendering, and so avoids most of + the performance problems inherent in window system layering. + + systemd integration. This provides for systemd-based launching and + management which improves boot performance and reliability + + Elimination of thousands of compiler warnings. We've been slowly + adding more and more compiler flags to the stock X build to warn us + of unsafe coding practices. Version 1.16 finally addresses the + enormous list of these warnings. + + Glamor for Xephyr. This X-on-X implementation now serves as the + primary development environment for our new 2D acceleration + subsystem, permitting rapid development and testing on a single + machine. + + Non-PCI device support. Many graphics devices are not enumerated + with the standard PCI APIs; now the X server can auto-detect and + configure them as it does in more conventional systems. + +------------------------------------------------------------------- Old: ---- xorg-server-1.15.99.904.tar.bz2 New: ---- xorg-server-1.16.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-server.spec ++++++ --- /var/tmp/diff_new_pack.Q9P0WS/_old 2014-07-19 08:16:25.000000000 +0200 +++ /var/tmp/diff_new_pack.Q9P0WS/_new 2014-07-19 08:16:25.000000000 +0200 @@ -18,7 +18,7 @@ Name: xorg-x11-server -%define dirsuffix 1.15.99.904 +%define dirsuffix 1.16.0 Summary: X License: MIT ++++++ xorg-server-1.15.99.904.tar.bz2 -> xorg-server-1.16.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/ChangeLog new/xorg-server-1.16.0/ChangeLog --- old/xorg-server-1.15.99.904/ChangeLog 2014-07-08 01:33:55.000000000 +0200 +++ new/xorg-server-1.16.0/ChangeLog 2014-07-17 09:04:51.000000000 +0200 @@ -1,3 +1,134 @@ +commit 8b36e1ec8dd9f53e9f4e10422c2100844e9e549c +Author: Keith Packard <kei...@keithp.com> +Date: Thu Jul 17 00:03:33 2014 -0700 + + Update to version 1.16.0 + + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 4dbb641bb2d4037f107b58b31e80963dc8b72c0e +Author: Hans de Goede <hdego...@redhat.com> +Date: Mon Jul 14 14:01:47 2014 +0200 + + config_odev_add_attribute*: Check for right attribute type + + Don't allow setting string attributes to integers and vice versa. + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 25eca7ce35973577c8d85704c270f7fb53e6732e +Author: Hans de Goede <hdego...@redhat.com> +Date: Mon Jul 14 14:01:46 2014 +0200 + + Fix ODEV_ATTRIB_DRIVER overlapping with ODEV_ATTRIB_FD + + Looks like the value of ODEV_ATTRIB_DRIVER was not updated when the patch + adding it got rebased on top of a newer server version. + + This fixes the xserver crashing when systemd-logind integration is used. + + https://bugzilla.redhat.com/show_bug.cgi?id=1118540 + + Signed-off-by: Hans de Goede <hdego...@redhat.com> + Reviewed-by: Keith Packard <kei...@keithp.com> + Signed-off-by: Keith Packard <kei...@keithp.com> + +commit 9a19bf06b5b409fa0d5b5932e29cd4c5545052c5 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Jul 14 15:05:58 2014 +1000 + + Revert "dix: fix up coordinate scaling when external monitors are present" + + This reverts commit d90b5f83010248be65b2039b0b2d0b9e6a4e93cf. + + Reverting for two reasons: + * the scaling does not work on devices that don't advertise resolution, and + the default resolution used (100 units/mm) is higher than most devices, + resulting in a significant slowdown of the touchpads. + * the scaling is still affected by resolution changing. The patch worked + before acceleration but since it maps into resolution-dependent dx/dy + coordinates the acceleration may distort the movement after the fact. So the + same input data generates different movements depending on the resolution. + This can't easily be fixed for all affected devices as synaptics has its own + velocity calculation method whereas wacom doesn't. So anything in the server + won't work for both at the same time. + + Revert this for now, until a more integrated solution can be implemented. + +commit acc0b5edd1dc560b5c39dc44872b46581ec23903 +Author: Aaron Plattner <aplatt...@nvidia.com> +Date: Fri Jul 11 15:56:35 2014 -0700 + + xfree86: Only support one sysconfigdir + + When the X server is compiled with --prefix set to something other than /usr, + then it ends up with a nonstandard sysconfigdir in its .pc file. This causes + various other components to install their xorg.conf.d snippets there. + + However, the X server first looks for /usr/share/X11/xorg.conf.d before looking + in sysconfigdir. That means that if the system administrator installed anything + that created that path, the user's custom sysconfigdir is not searched. + + Rather than doing that, just look in the configured sysconfdir and nowhere else. + + Signed-off-by: Aaron Plattner <aplatt...@nvidia.com> + Reviewed-by: Julien Cristau <jcris...@debian.org> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 578b9283bcc129d0a35fabe2637c7622085ef1e8 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Jul 10 10:39:50 2014 +1000 + + xfree86: don't force the screensaver off on DPMS unblank, merely suggest it + + Commit 41d4beb2616ceb3f1a1b8694733e85bae70de59a added symmetry to the + screensaver/DPMS invocations so that one (en|dis)ables the other. Having + dependencies between DPMS and the screensaver is subject to further arguments, + but in this particular case using SCREENSAVER_FORCER is detrimental. + SCREENSAVER_FORCER(ScreenSaverReset) resets the idle time for all + devices on DPMS unblank. + + It prevents at least one use-case that GNOME tries to implement: + GNOME displays a notification before suspending. If the display is + currently blanked, GNOME lights it up to display the message. With the + original patch in place DPMS unblank also resets the device idle times, thus + restarting the timeout ad infinitum. + + Switch this to a more suggestive SCREENSAVER_OFF(ScreenSaverReset). This keeps + the symmetry in blanking mode (DPMS and screensaver turn each other on/off as + expected) but does not reset the idle time on the devices. + + https://bugzilla.gnome.org/show_bug.cgi?id=731241 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Hans de Goede <hdego...@redhat.com> + Reviewed-By: Egbert Eich <e...@freedesktop.org> + +commit daa1a9d22db8e83d1933d8403acf72626199ee2a +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Jul 7 08:27:44 2014 +1000 + + os: prevent negative array index access (#80890) + + If an empty string is provided to LogMessageVerbSigSafe, the length of the + printed string is 0. + + Read-only access only and the only effect it had was adding a linebreak or not. + + X.Org Bug 80890 <http://bugs.freedesktop.org/show_bug.cgi?id=80890> + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 9de3cc8daa4c6e877d30a0e8ccfe0cc159f1dbe3 +Merge: 9308eaf a549987 +Author: Keith Packard <kei...@keithp.com> +Date: Mon Jul 7 16:53:07 2014 -0700 + + Merge remote-tracking branch 'jturney/master' + commit 9308eafb7d303739b81634ed2ee0da88554fd429 Author: Keith Packard <kei...@keithp.com> Date: Mon Jul 7 16:28:26 2014 -0700 @@ -133,6 +264,19 @@ Signed-off-by: Keith Packard <kei...@keithp.com> Reviewed-by: Julien Cristau <jcris...@debian.org> +commit a5499870e2f88822f52b1b54cad0db69856597c0 +Author: Yaakov Selkowitz <yselkow...@users.sourceforge.net> +Date: Sun Apr 6 04:47:15 2014 -0500 + + hw/xwin: link dynamically and export symbols + + With my patch to fix shared libXfont to work correctly on Cygwin/Win32, + there is no need for -static anymore. But, XWin.exe must export its + symbols in order for them to override libXfont's stubs. + + Signed-off-by: Yaakov Selkowitz <yselkow...@users.sourceforge.net> + Reviewed-by: Jon TURNEY <jon.tur...@dronecode.org.uk> + commit a3b44ad8db1fa2f3b81c1ff9498f31c5323edd37 Author: Thierry Reding <tred...@nvidia.com> Date: Wed Jun 25 16:03:29 2014 +0200 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/config/config.c new/xorg-server-1.16.0/config/config.c --- old/xorg-server-1.15.99.904/config/config.c 2014-06-02 22:45:48.000000000 +0200 +++ new/xorg-server-1.16.0/config/config.c 2014-07-16 20:57:12.000000000 +0200 @@ -172,12 +172,38 @@ return oa; } +static int config_odev_get_attribute_type(int attrib) +{ + switch (attrib) { + case ODEV_ATTRIB_PATH: + case ODEV_ATTRIB_SYSPATH: + case ODEV_ATTRIB_BUSID: + return ODEV_ATTRIB_STRING; + case ODEV_ATTRIB_FD: + case ODEV_ATTRIB_MAJOR: + case ODEV_ATTRIB_MINOR: + return ODEV_ATTRIB_INT; + case ODEV_ATTRIB_DRIVER: + return ODEV_ATTRIB_STRING; + default: + LogMessage(X_ERROR, "Error %s called for unknown attribute %d\n", + __func__, attrib); + return ODEV_ATTRIB_UNKNOWN; + } +} + Bool config_odev_add_attribute(struct OdevAttributes *attribs, int attrib, const char *attrib_name) { struct OdevAttribute *oa; + if (config_odev_get_attribute_type(attrib) != ODEV_ATTRIB_STRING) { + LogMessage(X_ERROR, "Error %s called for non string attrib %d\n", + __func__, attrib); + return FALSE; + } + oa = config_odev_find_or_add_attribute(attribs, attrib); free(oa->attrib_name); oa->attrib_name = XNFstrdup(attrib_name); @@ -191,6 +217,12 @@ { struct OdevAttribute *oa; + if (config_odev_get_attribute_type(attrib) != ODEV_ATTRIB_INT) { + LogMessage(X_ERROR, "Error %s called for non integer attrib %d\n", + __func__, attrib); + return FALSE; + } + oa = config_odev_find_or_add_attribute(attribs, attrib); oa->attrib_value = attrib_value; oa->attrib_type = ODEV_ATTRIB_INT; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/configure new/xorg-server-1.16.0/configure --- old/xorg-server-1.15.99.904/configure 2014-07-08 01:31:04.000000000 +0200 +++ new/xorg-server-1.16.0/configure 2014-07-17 09:04:39.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xorg-server 1.15.99.904. +# Generated by GNU Autoconf 2.69 for xorg-server 1.16.0. # # Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>. # @@ -651,8 +651,8 @@ # Identity of this package. PACKAGE_NAME='xorg-server' PACKAGE_TARNAME='xorg-server' -PACKAGE_VERSION='1.15.99.904' -PACKAGE_STRING='xorg-server 1.15.99.904' +PACKAGE_VERSION='1.16.0' +PACKAGE_STRING='xorg-server 1.16.0' PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg' PACKAGE_URL='' @@ -2048,7 +2048,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorg-server 1.15.99.904 to adapt to many kinds of systems. +\`configure' configures xorg-server 1.16.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -2118,7 +2118,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorg-server 1.15.99.904:";; + short | recursive ) echo "Configuration of xorg-server 1.16.0:";; esac cat <<\_ACEOF @@ -2562,7 +2562,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorg-server configure 1.15.99.904 +xorg-server configure 1.16.0 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3271,7 +3271,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorg-server $as_me 1.15.99.904, which was +It was created by xorg-server $as_me 1.16.0, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3619,8 +3619,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -RELEASE_DATE="2014-07-07" -RELEASE_NAME="Netarts Bay Oysters" +RELEASE_DATE="2014-07-16" +RELEASE_NAME="Marionberry Pie" am__api_version='1.14' @@ -4138,7 +4138,7 @@ # Define the identity of the package. PACKAGE='xorg-server' - VERSION='1.15.99.904' + VERSION='1.16.0' cat >>confdefs.h <<_ACEOF @@ -32793,7 +32793,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorg-server $as_me 1.15.99.904, which was +This file was extended by xorg-server $as_me 1.16.0, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -32859,7 +32859,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xorg-server config.status 1.15.99.904 +xorg-server config.status 1.16.0 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/configure.ac new/xorg-server-1.16.0/configure.ac --- old/xorg-server-1.15.99.904/configure.ac 2014-07-08 01:21:49.000000000 +0200 +++ new/xorg-server-1.16.0/configure.ac 2014-07-17 09:00:51.000000000 +0200 @@ -26,9 +26,9 @@ dnl Process this file with autoconf to create configure. AC_PREREQ(2.60) -AC_INIT([xorg-server], 1.15.99.904, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) -RELEASE_DATE="2014-07-07" -RELEASE_NAME="Netarts Bay Oysters" +AC_INIT([xorg-server], 1.16.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) +RELEASE_DATE="2014-07-16" +RELEASE_NAME="Marionberry Pie" AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/dix/getevents.c new/xorg-server-1.16.0/dix/getevents.c --- old/xorg-server-1.15.99.904/dix/getevents.c 2014-06-23 23:18:03.000000000 +0200 +++ new/xorg-server-1.16.0/dix/getevents.c 2014-07-14 11:52:32.000000000 +0200 @@ -770,65 +770,27 @@ } -/* FIXME: relative events from devices with absolute axis ranges is - fundamentally broken. We map the device coordinate range into the screen - range, but don't really account for device resolution in that. - - what we do here is a hack to make touchpads usable. for a given relative - motion vector in device coordinates: - 1. calculate physical movement on the device in metres - 2. calculate pixel vector that is the same physical movement on the - screen (times some magic number to provide sensible base speed) - 3. calculate what percentage this vector is of the current screen - width/height - 4. calculate equivalent vector in % on the device's min/max axis range - 5. Use that device vector as the actual motion vector - - e.g. 10/50mm on the device, 10/50mm on the screen are 30/100 pixels, - 30/100 pixels are 1/3% of the width, 1/3% of the device is a vector of - 20/80 -> use 20/80 as dx/dy. - - dx/dy is then applied to the current position in device coordinates, - mapped to screen coordinates and thus the movement on the screen reflects - the motion direction on the device. - */ static void scale_for_device_resolution(DeviceIntPtr dev, ValuatorMask *mask) { - double x, y; + double y; ValuatorClassPtr v = dev->valuator; int xrange = v->axes[0].max_value - v->axes[0].min_value + 1; int yrange = v->axes[1].max_value - v->axes[1].min_value + 1; - /* Assume 100 units/m for devices without resolution */ - int xres = 100000, yres = 100000; + double screen_ratio = 1.0 * screenInfo.width/screenInfo.height; + double device_ratio = 1.0 * xrange/yrange; + double resolution_ratio = 1.0; + double ratio; - /* If we have multiple screens with different dpi, it gets complicated: - we have to map which screen we're on and then take the dpi of that - screen to be somewhat accurate. */ - const ScreenPtr s = screenInfo.screens[0]; - const double screen_res = 1000.0 * s->width/s->mmWidth; /* units/m */ - - /* some magic multiplier, so unaccelerated movement of x mm on the - device reflects x * magic mm on the screen */ - const double magic = 4; - - if (v->axes[0].resolution != 0 && v->axes[1].resolution != 0) { - xres = v->axes[0].resolution; - yres = v->axes[1].resolution; - } + if (!valuator_mask_fetch_double(mask, 1, &y)) + return; - if (valuator_mask_isset(mask, 0)) { - x = valuator_mask_get_double(mask, 0); - x = magic * x/xres * screen_res/screenInfo.width * xrange; - valuator_mask_set_double(mask, 0, x); - } + if (v->axes[0].resolution != 0 && v->axes[1].resolution != 0) + resolution_ratio = 1.0 * v->axes[0].resolution/v->axes[1].resolution; - if (valuator_mask_isset(mask, 1)) { - y = valuator_mask_get_double(mask, 1); - y = magic * y/yres * screen_res/screenInfo.height * yrange; - valuator_mask_set_double(mask, 1, y); - } + ratio = device_ratio/resolution_ratio/screen_ratio; + valuator_mask_set_double(mask, 1, y / ratio); } /** @@ -842,6 +804,15 @@ { int i; Bool clip_xy = IsMaster(dev) || !IsFloating(dev); + ValuatorClassPtr v = dev->valuator; + + /* for abs devices in relative mode, we've just scaled wrong, since we + mapped the device's shape into the screen shape. Undo this. */ + if ((flags & POINTER_ABSOLUTE) == 0 && v && v->numAxes > 1 && + v->axes[0].min_value < v->axes[0].max_value && + v->axes[1].min_value < v->axes[1].max_value) { + scale_for_device_resolution(dev, mask); + } /* calc other axes, clip, drop back into valuators */ for (i = 0; i < valuator_mask_size(mask); i++) { @@ -1470,21 +1441,10 @@ set_raw_valuators(raw, &mask, raw->valuators.data); } else { - ValuatorClassPtr v = pDev->valuator; - transformRelative(pDev, &mask); - /* for abs devices in relative mode, we've just scaled wrong, since we - mapped the device's shape into the screen shape. Undo this. */ - if (v && v->numAxes > 1 && - v->axes[0].min_value < v->axes[0].max_value && - v->axes[1].min_value < v->axes[1].max_value) { - scale_for_device_resolution(pDev, &mask); - } - if (flags & POINTER_ACCELERATE) accelPointer(pDev, &mask, ms); - if ((flags & POINTER_NORAW) == 0 && raw) set_raw_valuators(raw, &mask, raw->valuators.data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/hw/xfree86/common/xf86Config.c new/xorg-server-1.16.0/hw/xfree86/common/xf86Config.c --- old/xorg-server-1.15.99.904/hw/xfree86/common/xf86Config.c 2014-06-05 07:22:57.000000000 +0200 +++ new/xorg-server-1.16.0/hw/xfree86/common/xf86Config.c 2014-07-14 11:52:32.000000000 +0200 @@ -103,7 +103,7 @@ "/etc/X11/%X," "%C/X11/%X" #endif #ifndef SYS_CONFIGDIRPATH -#define SYS_CONFIGDIRPATH "/usr/share/X11/%X," "%D/X11/%X" +#define SYS_CONFIGDIRPATH "%D/X11/%X" #endif #ifndef PROJECTROOT #define PROJECTROOT "/usr/X11R6" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/hw/xfree86/common/xf86DPMS.c new/xorg-server-1.16.0/hw/xfree86/common/xf86DPMS.c --- old/xorg-server-1.15.99.904/hw/xfree86/common/xf86DPMS.c 2014-03-03 22:56:37.000000000 +0100 +++ new/xorg-server-1.16.0/hw/xfree86/common/xf86DPMS.c 2014-07-14 11:52:32.000000000 +0200 @@ -166,7 +166,7 @@ return rc; } } else if (!xf86IsUnblank(screenIsSaved)) { - rc = dixSaveScreens(client, SCREEN_SAVER_FORCER, ScreenSaverReset); + rc = dixSaveScreens(client, SCREEN_SAVER_OFF, ScreenSaverReset); if (rc != Success) return rc; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/hw/xwin/Makefile.am new/xorg-server-1.16.0/hw/xwin/Makefile.am --- old/xorg-server-1.15.99.904/hw/xwin/Makefile.am 2014-04-16 22:24:00.000000000 +0200 +++ new/xorg-server-1.16.0/hw/xwin/Makefile.am 2014-07-08 01:53:07.000000000 +0200 @@ -155,7 +155,7 @@ $(top_builddir)/Xi/libXistubs.la XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS) XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) -XWin_LDFLAGS = -mwindows -static -Wl,--disable-stdcall-fixup +XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG) .rc.o: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/hw/xwin/Makefile.in new/xorg-server-1.16.0/hw/xwin/Makefile.in --- old/xorg-server-1.15.99.904/hw/xwin/Makefile.in 2014-07-08 01:31:10.000000000 +0200 +++ new/xorg-server-1.16.0/hw/xwin/Makefile.in 2014-07-17 09:04:45.000000000 +0200 @@ -805,7 +805,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/miext/rootless XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(XSERVER_LIBS) XWin_LDADD = $(MULTIWINDOW_LIBS) $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS) -XWin_LDFLAGS = -mwindows -static -Wl,--disable-stdcall-fixup +XWin_LDFLAGS = -mwindows -Wl,--disable-stdcall-fixup $(LD_EXPORT_SYMBOLS_FLAG) BUILT_SOURCES = winprefsyacc.h winprefsyacc.c winprefslex.c CLEANFILES = $(BUILT_SOURCES) AM_YFLAGS = -d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/include/hotplug.h new/xorg-server-1.16.0/include/hotplug.h --- old/xorg-server-1.15.99.904/include/hotplug.h 2014-07-08 01:11:29.000000000 +0200 +++ new/xorg-server-1.16.0/include/hotplug.h 2014-07-16 20:57:12.000000000 +0200 @@ -32,7 +32,7 @@ extern _X_EXPORT void config_init(void); extern _X_EXPORT void config_fini(void); -enum { ODEV_ATTRIB_STRING, ODEV_ATTRIB_INT }; +enum { ODEV_ATTRIB_UNKNOWN = -1, ODEV_ATTRIB_STRING = 0, ODEV_ATTRIB_INT }; struct OdevAttribute { struct xorg_list member; @@ -88,7 +88,7 @@ /* Minor number of the device node pointed to by ODEV_ATTRIB_PATH */ #define ODEV_ATTRIB_MINOR 6 /* kernel driver name */ -#define ODEV_ATTRIB_DRIVER 4 +#define ODEV_ATTRIB_DRIVER 7 typedef void (*config_odev_probe_proc_ptr)(struct OdevAttributes *attribs); void config_odev_probe(config_odev_probe_proc_ptr probe_callback); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/os/Makefile.in new/xorg-server-1.16.0/os/Makefile.in --- old/xorg-server-1.15.99.904/os/Makefile.in 2014-07-08 01:31:11.000000000 +0200 +++ new/xorg-server-1.16.0/os/Makefile.in 2014-07-17 09:04:46.000000000 +0200 @@ -87,7 +87,7 @@ @SPECIAL_DTRACE_OBJECTS_TRUE@noinst_PROGRAMS = os.O$(EXEEXT) subdir = os DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am strcasecmp.c \ - strlcat.c strlcpy.c strndup.c strcasestr.c \ + strndup.c strcasestr.c strlcat.c strlcpy.c \ $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/ac_define_dir.m4 \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorg-server-1.15.99.904/os/log.c new/xorg-server-1.16.0/os/log.c --- old/xorg-server-1.15.99.904/os/log.c 2014-06-05 07:22:57.000000000 +0200 +++ new/xorg-server-1.16.0/os/log.c 2014-07-14 11:52:32.000000000 +0200 @@ -697,7 +697,7 @@ if (sizeof(buf) - len == 1) buf[len - 1] = '\n'; - newline = (buf[len - 1] == '\n'); + newline = (len > 0 && buf[len - 1] == '\n'); LogSWrite(verb, buf, len, newline); } -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
