Hello community,
here is the log from the commit of package xorgxrdp for openSUSE:Factory checked in at 2017-09-05 15:16:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xorgxrdp (Old)
and /work/SRC/openSUSE:Factory/.xorgxrdp.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xorgxrdp"
Tue Sep 5 15:16:28 2017 rev:2 rq:520593 version:0.2.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/xorgxrdp/xorgxrdp.changes 2017-08-24 18:38:15.548903050 +0200
+++ /work/SRC/openSUSE:Factory/.xorgxrdp.new/xorgxrdp.changes 2017-09-05 15:16:31.514230635 +0200
@@ -1,0 +2,15 @@
+Mon Sep 4 05:20:53 UTC 2017 - fezhang@suse.com
+
+- exclude s390x arch
+- specfile cleanup
+
+-------------------------------------------------------------------
+Wed Aug 16 05:23:06 UTC 2017 - ftake@geeko.jp
+
+- update to 0.2.3
+ + fix X programs crash when reconnecting to xrdp with different
+ screen size
+- fix build error for Leap 42.3
+ + Use libXfont-devel instead of libXfont2-devel
+
+-------------------------------------------------------------------
Old:
----
xorgxrdp-0.2.2.tar.gz
xorgxrdp-0.2.2.tar.gz.asc
New:
----
xorgxrdp-0.2.3.tar.gz
xorgxrdp-0.2.3.tar.gz.asc
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xorgxrdp.spec ++++++
--- /var/tmp/diff_new_pack.OY8NEd/_old 2017-09-05 15:16:32.758055798 +0200
+++ /var/tmp/diff_new_pack.OY8NEd/_new 2017-09-05 15:16:32.758055798 +0200
@@ -1,7 +1,7 @@
#
# spec file for package xorgxrdp
#
-# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,30 +15,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: xorgxrdp
-Version: 0.2.2
+Version: 0.2.3
Release: 0
-License: X11
Summary: Xorg drivers for xrdp
-Url: https://github.com/neutrinolabs/xorgxrdp
+License: X11
Group: System/X11/Utilities
+Url: https://github.com/neutrinolabs/xorgxrdp
Source0: https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
Source1: https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
Source2: %{name}.keyring
BuildRequires: autoconf
BuildRequires: automake
-BuildRequires: nasm
BuildRequires: libtool
-# For 42.3 and Tumbleweed, use libXfont2-devel
-%if 0%{?sle_version} && 0%{?sle_version} <= 120200
-BuildRequires: libXfont-devel
-%else
-BuildRequires: libXfont2-devel
-%endif
+BuildRequires: nasm
BuildRequires: xorg-x11-server-sdk
BuildRequires: xrdp-devel
Requires: xrdp >= 0.9.1
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+# For 42.x keep to use libXfont-devel
+%if 0%{?suse_version} > 1320
+BuildRequires: libXfont2-devel
+%else
+BuildRequires: libXfont-devel
+%endif
+ExcludeArch: s390x
%description
This package contains Xorg driver modules for xrdp
@@ -52,11 +53,10 @@
make %{?_smp_mflags}
%install
-make install DESTDIR=%{buildroot} %{?_smp_mflags}
-find %{buildroot}/%{_libdir} -name "*.la" -type f -delete -print
+%make_install
+find %{buildroot} -type f -name "*.la" -delete -print
%files
-%defattr(-,root,root)
%doc README.md COPYING
%{_libdir}/xorg/modules/drivers/xrdpdev_drv.so
%dir %{_libdir}/xorg/modules/input
++++++ xorgxrdp-0.2.2.tar.gz -> xorgxrdp-0.2.3.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/Makefile.in new/xorgxrdp-0.2.3/Makefile.in
--- old/xorgxrdp-0.2.2/Makefile.in 2017-06-21 05:01:53.000000000 +0200
+++ new/xorgxrdp-0.2.3/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -583,7 +583,7 @@
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
- tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
@@ -609,7 +609,7 @@
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
- shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
+ shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
@@ -627,7 +627,7 @@
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
@@ -637,7 +637,7 @@
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
- GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
+ eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/README.md new/xorgxrdp-0.2.3/README.md
--- old/xorgxrdp-0.2.2/README.md 2017-06-21 04:33:44.000000000 +0200
+++ new/xorgxrdp-0.2.3/README.md 2017-07-13 08:45:00.000000000 +0200
@@ -1,6 +1,6 @@
[](https://travis-ci.org/neutrinolabs/xorgxrdp)
-*Current Version:* 0.2.2
+*Current Version:* 0.2.3
# xorgxrdp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/aclocal.m4 new/xorgxrdp-0.2.3/aclocal.m4
--- old/xorgxrdp-0.2.2/aclocal.m4 2017-06-21 05:01:52.000000000 +0200
+++ new/xorgxrdp-0.2.3/aclocal.m4 2017-07-13 08:48:26.000000000 +0200
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.15 -*- Autoconf -*-
+# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -364,7 +364,7 @@
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
])dnl PKG_HAVE_DEFINE_WITH_MODULES
-# Copyright (C) 2002-2014 Free Software Foundation, Inc.
+# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -379,7 +379,7 @@
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
-m4_if([$1], [1.15], [],
+m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
@@ -395,14 +395,14 @@
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.15])dnl
+[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -454,7 +454,7 @@
# AM_CONDITIONAL -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -485,7 +485,7 @@
Usually this means the macro was only invoked conditionally.]])
fi])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -676,7 +676,7 @@
# Generate code to set up dependency tracking. -*- Autoconf -*-
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -752,7 +752,7 @@
# Do all the work for Automake. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -949,7 +949,7 @@
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -970,7 +970,7 @@
fi
AC_SUBST([install_sh])])
-# Copyright (C) 2003-2014 Free Software Foundation, Inc.
+# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -991,7 +991,7 @@
# Check to see how 'make' treats includes. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1041,7 +1041,7 @@
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
-# Copyright (C) 1997-2014 Free Software Foundation, Inc.
+# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1080,7 +1080,7 @@
# Helper functions for option handling. -*- Autoconf -*-
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1109,7 +1109,7 @@
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1156,7 +1156,7 @@
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1175,7 +1175,7 @@
# Check to make sure that the build environment is sane. -*- Autoconf -*-
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1256,7 +1256,7 @@
rm -f conftest.file
])
-# Copyright (C) 2009-2014 Free Software Foundation, Inc.
+# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1316,7 +1316,7 @@
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
-# Copyright (C) 2001-2014 Free Software Foundation, Inc.
+# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1344,7 +1344,7 @@
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
-# Copyright (C) 2006-2014 Free Software Foundation, Inc.
+# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@@ -1363,7 +1363,7 @@
# Check how to create a tarball. -*- Autoconf -*-
-# Copyright (C) 2004-2014 Free Software Foundation, Inc.
+# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/compile new/xorgxrdp-0.2.3/compile
--- old/xorgxrdp-0.2.2/compile 2017-06-21 05:01:53.000000000 +0200
+++ new/xorgxrdp-0.2.3/compile 2017-07-13 08:48:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# Written by Tom Tromey .
#
# This program is free software; you can redistribute it and/or modify
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -342,6 +343,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/configure new/xorgxrdp-0.2.3/configure
--- old/xorgxrdp-0.2.2/configure 2017-06-21 05:01:52.000000000 +0200
+++ new/xorgxrdp-0.2.3/configure 2017-07-13 08:48:27.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for xorgxrdp 0.2.2.
+# Generated by GNU Autoconf 2.69 for xorgxrdp 0.2.3.
#
# Report bugs to .
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='xorgxrdp'
PACKAGE_TARNAME='xorgxrdp'
-PACKAGE_VERSION='0.2.2'
-PACKAGE_STRING='xorgxrdp 0.2.2'
+PACKAGE_VERSION='0.2.3'
+PACKAGE_STRING='xorgxrdp 0.2.3'
PACKAGE_BUGREPORT='xrdp-devel@googlegroups.com'
PACKAGE_URL=''
@@ -1335,7 +1335,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 xorgxrdp 0.2.2 to adapt to many kinds of systems.
+\`configure' configures xorgxrdp 0.2.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1405,7 +1405,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xorgxrdp 0.2.2:";;
+ short | recursive ) echo "Configuration of xorgxrdp 0.2.3:";;
esac
cat <<\_ACEOF
@@ -1529,7 +1529,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xorgxrdp configure 0.2.2
+xorgxrdp configure 0.2.3
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1807,7 +1807,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xorgxrdp $as_me 0.2.2, which was
+It was created by xorgxrdp $as_me 0.2.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2672,7 +2672,7 @@
# Define the identity of the package.
PACKAGE='xorgxrdp'
- VERSION='0.2.2'
+ VERSION='0.2.3'
cat >>confdefs.h <<_ACEOF
@@ -13521,7 +13521,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xorgxrdp $as_me 0.2.2, which was
+This file was extended by xorgxrdp $as_me 0.2.3, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -13587,7 +13587,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-xorgxrdp config.status 0.2.2
+xorgxrdp config.status 0.2.3
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/xorgxrdp-0.2.2/configure.ac new/xorgxrdp-0.2.3/configure.ac
--- old/xorgxrdp-0.2.2/configure.ac 2017-06-21 04:33:44.000000000 +0200
+++ new/xorgxrdp-0.2.3/configure.ac 2017-07-13 08:45:00.000000000 +0200
@@ -1,7 +1,7 @@
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.65)
-AC_INIT([xorgxrdp], [0.2.2], [xrdp-devel@googlegroups.com])
+AC_INIT([xorgxrdp], [0.2.3], [xrdp-devel@googlegroups.com])
AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.11 foreign parallel-tests])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/depcomp new/xorgxrdp-0.2.3/depcomp
--- old/xorgxrdp-0.2.2/depcomp 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/depcomp 2017-07-13 08:48:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2013-05-30.07; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2017 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -786,6 +786,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/install-sh new/xorgxrdp-0.2.3/install-sh
--- old/xorgxrdp-0.2.2/install-sh 2017-06-21 05:01:53.000000000 +0200
+++ new/xorgxrdp-0.2.3/install-sh 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2013-12-25.23; # UTC
+scriptversion=2016-01-11.22; # UTC
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -496,6 +496,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/missing new/xorgxrdp-0.2.3/missing
--- old/xorgxrdp-0.2.2/missing 2017-06-21 05:01:53.000000000 +0200
+++ new/xorgxrdp-0.2.3/missing 2017-07-13 08:48:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -210,6 +210,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/module/Makefile.in new/xorgxrdp-0.2.3/module/Makefile.in
--- old/xorgxrdp-0.2.2/module/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/module/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/module/amd64/Makefile.in new/xorgxrdp-0.2.3/module/amd64/Makefile.in
--- old/xorgxrdp-0.2.2/module/amd64/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/module/amd64/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/module/rdpRandR.c new/xorgxrdp-0.2.3/module/rdpRandR.c
--- old/xorgxrdp-0.2.2/module/rdpRandR.c 2017-06-14 02:29:25.000000000 +0200
+++ new/xorgxrdp-0.2.3/module/rdpRandR.c 2017-07-13 08:45:00.000000000 +0200
@@ -389,6 +389,42 @@
}
/******************************************************************************/
+static RROutputPtr
+rdpRRUpdateOutput(rdpPtr dev, int x, int y, int width, int height, int index)
+{
+ RRModePtr mode;
+ RRCrtcPtr crtc;
+ RROutputPtr output;
+ xRRModeInfo modeInfo;
+ char name[64];
+ const int vfreq = 50;
+
+ sprintf (name, "%dx%d", width, height);
+ memset (&modeInfo, 0, sizeof(modeInfo));
+ modeInfo.width = width;
+ modeInfo.height = height;
+ modeInfo.hTotal = width;
+ modeInfo.vTotal = height;
+ modeInfo.dotClock = vfreq * width * height;
+ modeInfo.nameLength = strlen(name);
+ mode = RRModeGet(&modeInfo, name);
+ if (mode == 0)
+ {
+ LLOGLN(0, ("rdpRRAddOutput: RRModeGet failed"));
+ return 0;
+ }
+ output = dev->output[index];
+ if (!RROutputSetModes(output, &mode, 1, 0))
+ {
+ LLOGLN(0, ("rdpRRAddOutput: RROutputSetModes failed"));
+ }
+ crtc = dev->crtc[index];
+ RRCrtcNotify(crtc, mode, x, y, RR_Rotate_0, NULL, 1, &output);
+ RROutputChanged(output, 1);
+ return output;
+}
+
+/******************************************************************************/
static void
RRSetPrimaryOutput(rrScrPrivPtr pScrPriv, RROutputPtr output)
{
@@ -417,52 +453,93 @@
{
rrScrPrivPtr pRRScrPriv;
int index;
+ int left;
+ int top;
int width;
int height;
char text[256];
RROutputPtr output;
pRRScrPriv = rrGetScrPriv(dev->pScreen);
-
- LLOGLN(0, ("rdpRRSetRdpOutputs: numCrtcs %d", pRRScrPriv->numCrtcs));
- while (pRRScrPriv->numCrtcs > 0)
- {
- RRCrtcDestroy(pRRScrPriv->crtcs[0]);
- }
- LLOGLN(0, ("rdpRRSetRdpOutputs: numOutputs %d", pRRScrPriv->numOutputs));
- while (pRRScrPriv->numOutputs > 0)
- {
- RROutputDestroy(pRRScrPriv->outputs[0]);
- }
-
- if (dev->monitorCount == 0)
- {
- rdpRRAddOutput(dev, "rdp0", 0, 0, dev->width, dev->height);
+ LLOGLN(0, ("rdpRRSetRdpOutputs: numCrtcs %d monitorCount %d",
+ pRRScrPriv->numCrtcs, dev->monitorCount));
+ if (dev->monitorCount <= 0)
+ {
+ left = 0;
+ top = 0;
+ width = dev->width;
+ height = dev->height;
+ if (pRRScrPriv->numCrtcs > 0)
+ {
+ /* update */
+ LLOGLN(0, ("rdpRRSetRdpOutputs: update output %d "
+ "left %d top %d width %d height %d",
+ 0, left, top, width, height));
+ output = rdpRRUpdateOutput(dev,
+ left, top, width, height, 0);
+ }
+ else
+ {
+ /* add */
+ LLOGLN(0, ("rdpRRSetRdpOutputs: add output %d "
+ "left %d top %d width %d height %d",
+ 0, left, top, width, height));
+ snprintf(text, 255, "rdp%d", 0);
+ output = rdpRRAddOutput(dev, text,
+ left, top, width, height);
+ }
+ /* remove any entra */
+ for (index = pRRScrPriv->numCrtcs; index > 1; index--)
+ {
+ RRCrtcDestroy(pRRScrPriv->crtcs[index - 1]);
+ }
+ for (index = pRRScrPriv->numOutputs; index > 1; index--)
+ {
+ RROutputDestroy(pRRScrPriv->outputs[index - 1]);
+ }
}
else
{
for (index = 0; index < dev->monitorCount; index++)
{
- snprintf(text, 255, "rdp%d", index);
+ left = dev->minfo[index].left;
+ top = dev->minfo[index].top;
width = dev->minfo[index].right - dev->minfo[index].left + 1;
height = dev->minfo[index].bottom - dev->minfo[index].top + 1;
- output = rdpRRAddOutput(dev, text,
- dev->minfo[index].left,
- dev->minfo[index].top,
- width, height);
+ if (index < pRRScrPriv->numCrtcs)
+ {
+ /* update */
+ LLOGLN(0, ("rdpRRSetRdpOutputs: update output %d "
+ "left %d top %d width %d height %d",
+ index, left, top, width, height));
+ output = rdpRRUpdateOutput(dev,
+ left, top, width, height, index);
+ }
+ else
+ {
+ /* add */
+ LLOGLN(0, ("rdpRRSetRdpOutputs: add output %d "
+ "left %d top %d width %d height %d",
+ index, left, top, width, height));
+ snprintf(text, 255, "rdp%d", index);
+ output = rdpRRAddOutput(dev, text,
+ left, top, width, height);
+ }
if ((output != 0) && (dev->minfo[index].is_primary))
{
RRSetPrimaryOutput(pRRScrPriv, output);
}
}
+ /* remove any entra */
+ for (index = pRRScrPriv->numCrtcs; index > dev->monitorCount; index--)
+ {
+ RRCrtcDestroy(pRRScrPriv->crtcs[index - 1]);
+ }
+ for (index = pRRScrPriv->numOutputs; index > dev->monitorCount; index--)
+ {
+ RROutputDestroy(pRRScrPriv->outputs[index - 1]);
+ }
}
-#if 0
- for (index = 0; index < pRRScrPriv->numOutputs; index++)
- {
- RROutputSetCrtcs(pRRScrPriv->outputs[index], pRRScrPriv->crtcs,
- pRRScrPriv->numCrtcs);
- }
-#endif
return 0;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/module/x86/Makefile.in new/xorgxrdp-0.2.3/module/x86/Makefile.in
--- old/xorgxrdp-0.2.2/module/x86/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/module/x86/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/test-driver new/xorgxrdp-0.2.3/test-driver
--- old/xorgxrdp-0.2.2/test-driver 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/test-driver 2017-07-13 08:48:28.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# test-driver - basic testsuite driver script.
-scriptversion=2013-07-13.22; # UTC
+scriptversion=2016-01-11.22; # UTC
-# Copyright (C) 2011-2014 Free Software Foundation, Inc.
+# Copyright (C) 2011-2017 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -143,6 +143,6 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/tests/Makefile.in new/xorgxrdp-0.2.3/tests/Makefile.in
--- old/xorgxrdp-0.2.2/tests/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/tests/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/tests/yuv2rgb/Makefile.in new/xorgxrdp-0.2.3/tests/yuv2rgb/Makefile.in
--- old/xorgxrdp-0.2.2/tests/yuv2rgb/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/tests/yuv2rgb/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/xrdpdev/Makefile.in new/xorgxrdp-0.2.3/xrdpdev/Makefile.in
--- old/xorgxrdp-0.2.2/xrdpdev/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/xrdpdev/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/xrdpkeyb/Makefile.in new/xorgxrdp-0.2.3/xrdpkeyb/Makefile.in
--- old/xorgxrdp-0.2.2/xrdpkeyb/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/xrdpkeyb/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xorgxrdp-0.2.2/xrdpmouse/Makefile.in new/xorgxrdp-0.2.3/xrdpmouse/Makefile.in
--- old/xorgxrdp-0.2.2/xrdpmouse/Makefile.in 2017-06-21 05:01:54.000000000 +0200
+++ new/xorgxrdp-0.2.3/xrdpmouse/Makefile.in 2017-07-13 08:48:28.000000000 +0200
@@ -1,7 +1,7 @@
-# Makefile.in generated by automake 1.15 from Makefile.am.
+# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
-# Copyright (C) 1994-2014 Free Software Foundation, Inc.
+# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
