diff -Nru mutter-3.28.4/aclocal.m4 mutter-3.28.4+git20200505/aclocal.m4 --- mutter-3.28.4/aclocal.m4 2019-05-14 17:55:17.000000000 +0000 +++ mutter-3.28.4+git20200505/aclocal.m4 2020-05-05 19:17:58.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -20,7 +20,7 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002-2018 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, @@ -32,10 +32,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' +[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.16.1], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,14 +51,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.16.1])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-2018 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, @@ -110,7 +110,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -141,7 +141,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 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, @@ -332,12 +332,13 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 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, # with or without modifications, as long as this notice is preserved. + # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -345,41 +346,49 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - AS_CASE([$CONFIG_FILES], - [*\'*], [eval set x "$CONFIG_FILES"], - [*], [set x $CONFIG_FILES]) + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`AS_DIRNAME(["$am_mf"])` - am_filepart=`AS_BASENAME(["$am_mf"])` - AM_RUN_LOG([cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles]) || am_rc=$? + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking).]) - fi - AS_UNSET([am_dirpart]) - AS_UNSET([am_filepart]) - AS_UNSET([am_mf]) - AS_UNSET([am_rc]) - rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -388,17 +397,18 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking is enabled. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -485,8 +495,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -553,7 +563,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -595,7 +605,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 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, @@ -616,7 +626,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 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, @@ -638,7 +648,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2018 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, @@ -673,7 +683,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -681,42 +691,49 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. +# Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' +[am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) - AS_CASE([$?:`cat confinc.out 2>/dev/null`], - ['0:this is the am__doit target'], - [AS_CASE([$s], - [BSD], [am__include='.include' am__quote='"'], - [am__include='include' am__quote=''])]) - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -AC_MSG_RESULT([${_am_result}]) -AC_SUBST([am__include])]) -AC_SUBST([am__quote])]) +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -755,7 +772,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -784,7 +801,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 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, @@ -831,7 +848,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 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, @@ -850,7 +867,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -931,7 +948,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 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, @@ -991,7 +1008,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 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, @@ -1019,7 +1036,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 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, @@ -1038,7 +1055,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 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 -Nru mutter-3.28.4/build-aux/compile mutter-3.28.4+git20200505/build-aux/compile --- mutter-3.28.4/build-aux/compile 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/compile 2020-05-05 19:18:00.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,8 +255,7 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -340,9 +339,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/build-aux/config.guess mutter-3.28.4+git20200505/build-aux/config.guess --- mutter-3.28.4/build-aux/config.guess 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/config.guess 2020-05-05 19:18:00.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,6 +84,8 @@ exit 1 fi +trap 'exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -94,39 +96,34 @@ # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 -trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 - -set_cc_for_build() { - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -141,7 +138,7 @@ # We could probably try harder. LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -202,7 +199,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -240,7 +237,7 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -392,15 +389,20 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - case `isainfo -b` in - 32) - echo i386-pc-solaris2"$UNAME_REL" - ;; - 64) - echo x86_64-pc-solaris2"$UNAME_REL" - ;; - esac + eval "$set_cc_for_build" + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -480,7 +482,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -577,7 +579,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -658,7 +660,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,7 +700,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -724,7 +726,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -838,17 +840,6 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi - else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf - fi - exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -903,8 +894,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -931,7 +922,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -980,7 +971,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1055,7 +1046,11 @@ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1294,7 +1289,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1367,7 +1362,6 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else @@ -1479,7 +1473,7 @@ exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/build-aux/config.sub mutter-3.28.4+git20200505/build-aux/config.sub --- mutter-3.28.4/build-aux/config.sub 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/config.sub 2020-05-05 19:18:00.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -110,1159 +110,1223 @@ exit 1;; esac -# Split fields of configuration type -IFS="-" read -r field1 field2 field3 field4 <&2 - exit 1 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. ;; - *-*-*-*) - basic_machine=$field1-$field2 - os=$field3-$field4 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - os=linux-android - ;; - *) - basic_machine=$field1-$field2 - os=$field3 - ;; - esac + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*) - # A lone config we happen to match not fitting any patern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - os= - ;; - *) - basic_machine=$field1 - os=$field2 - ;; - esac - ;; - esac + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - os=bsd - ;; - a29khif) - basic_machine=a29k-amd - os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=scout - ;; - alliant) - basic_machine=fx80-alliant - os= - ;; - altos | altos3068) - basic_machine=m68k-altos - os= - ;; - am29k) - basic_machine=a29k-none - os=bsd - ;; - amdahl) - basic_machine=580-amdahl - os=sysv - ;; - amiga) - basic_machine=m68k-unknown - os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=bsd - ;; - aros) - basic_machine=i386-pc - os=aros - ;; - aux) - basic_machine=m68k-apple - os=aux - ;; - balance) - basic_machine=ns32k-sequent - os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=linux - ;; - cegcc) - basic_machine=arm-unknown - os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=bsd - ;; - convex-c2) - basic_machine=c2-convex - os=bsd - ;; - convex-c32) - basic_machine=c32-convex - os=bsd - ;; - convex-c34) - basic_machine=c34-convex - os=bsd - ;; - convex-c38) - basic_machine=c38-convex - os=bsd - ;; - cray) - basic_machine=j90-cray - os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - os= - ;; - da30) - basic_machine=m68k-da30 - os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - os= - ;; - delta88) - basic_machine=m88k-motorola - os=sysv3 - ;; - dicos) - basic_machine=i686-pc - os=dicos - ;; - djgpp) - basic_machine=i586-pc - os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=ose - ;; - gmicro) - basic_machine=tron-gmicro - os=sysv - ;; - go32) - basic_machine=i386-pc - os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=hms - ;; - harris) - basic_machine=m88k-harris - os=sysv3 - ;; - hp300) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=proelf - ;; - i386mach) - basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; - isi68 | isi) - basic_machine=m68k-isi - os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=sysv - ;; - merlin) - basic_machine=ns32k-utek - os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - os=coff - ;; - morphos) - basic_machine=powerpc-unknown - os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=moxiebox - ;; - msdos) - basic_machine=i386-pc - os=msdos - ;; - msys) - basic_machine=i686-pc - os=msys - ;; - mvs) - basic_machine=i370-ibm - os=mvs - ;; - nacl) - basic_machine=le32-unknown - os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=newsos - ;; - news1000) - basic_machine=m68030-sony - os=newsos - ;; - necv70) - basic_machine=v70-nec - os=sysv - ;; - nh3000) - basic_machine=m68k-harris - os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=cxux - ;; - nindy960) - basic_machine=i960-intel - os=nindy - ;; - mon960) - basic_machine=i960-intel - os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=ose - ;; - os68k) - basic_machine=m68k-none - os=os68k - ;; - paragon) - basic_machine=i860-intel - os=osf - ;; - parisc) - basic_machine=hppa-unknown - os=linux - ;; - pw32) - basic_machine=i586-unknown - os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=rdos - ;; - rdos32) - basic_machine=i386-pc - os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=coff - ;; - sa29200) - basic_machine=a29k-amd - os=udi - ;; - sei) - basic_machine=mips-sei - os=seiux - ;; - sequent) - basic_machine=i386-sequent - os= - ;; - sps7) - basic_machine=m68k-bull - os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - os= - ;; - stratus) - basic_machine=i860-stratus - os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - os= - ;; - sun2os3) - basic_machine=m68000-sun - os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - os= - ;; - sun3os3) - basic_machine=m68k-sun - os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - os= - ;; - sun4os3) - basic_machine=sparc-sun - os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - os= - ;; - sv1) - basic_machine=sv1-cray - os=unicos - ;; - symmetry) - basic_machine=i386-sequent - os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=unicos - ;; - t90) - basic_machine=t90-cray - os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - os=tpf - ;; - udi29k) - basic_machine=a29k-amd - os=udi - ;; - ultra3) - basic_machine=a29k-nyu - os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=none - ;; - vaxv) - basic_machine=vax-dec - os=sysv - ;; - vms) - basic_machine=vax-dec - os=vms - ;; - vxworks960) - basic_machine=i960-wrs - os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=vxworks - ;; - xbox) - basic_machine=i686-pc - os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - os=unicos - ;; - *) - basic_machine=$1 - os= - ;; - esac + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint ;; esac -# Decode 1-component or ad-hoc basic machines +# Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown ;; - op50n) - cpu=hppa1.1 - vendor=oki + c54x) + basic_machine=tic54x-unknown ;; - op60c) - cpu=hppa1.1 - vendor=oki + c55x) + basic_machine=tic55x-unknown ;; - ibm*) - cpu=i370 - vendor=ibm + c6x) + basic_machine=tic6x-unknown ;; - orion105) - cpu=clipper - vendor=highlevel + leon|leon[3-9]) + basic_machine=sparc-$basic_machine ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown ;; + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att + basic_machine=m68000-att ;; 3b*) - cpu=we32k - vendor=att + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; bluegene*) - cpu=powerpc - vendor=ibm - os=cnk + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec ;; decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - os=tops10 + basic_machine=pdp10-dec + os=-tops10 ;; decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - os=tops20 + basic_machine=pdp10-dec + os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx ;; dpx2*) - cpu=m68k - vendor=bull - os=sysv3 + basic_machine=m68k-bull + os=-sysv3 ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon ;; elxsi) - cpu=elxsi - vendor=elxsi - os=${os:-bsd} + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose ;; fx2800) - cpu=i860 - vendor=alliant + basic_machine=i860-alliant ;; genix) - cpu=ns32k - vendor=ns + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 ;; h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp + basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp + basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv32 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv4 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - os=${os:-unicos} + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta ;; iris | iris4d) - cpu=mips - vendor=sgi + basic_machine=mips-sgi case $os in - irix*) + -irix*) ;; *) - os=irix4 + os=-irix4 ;; esac ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) - cpu=m68000 - vendor=convergent + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - os=mint + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos ;; news-3600 | risc-news) - cpu=mips - vendor=sony - os=newsos + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv ;; next | m*-next) - cpu=m68k - vendor=next + basic_machine=m68k-next case $os in - nextstep* ) + -nextstep* ) ;; - ns2*) - os=nextstep2 + -ns2*) + os=-nextstep2 ;; *) - os=nextstep3 + os=-nextstep3 ;; esac ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) - cpu=np1 - vendor=gould + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem ;; op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - os=proelf + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k ;; pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; pbd) - cpu=sparc - vendor=tti + basic_machine=sparc-tti ;; pbb) - cpu=m68k - vendor=tti + basic_machine=m68k-tti ;; - pc532) - cpu=ns32k - vendor=pc532 + pc532 | pc532-*) + basic_machine=ns32k-pc532 ;; - pn) - cpu=pn - vendor=gould + pc98) + basic_machine=i386-pc ;; - power) - cpu=power - vendor=ibm + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ps2) - cpu=i386 - vendor=ibm + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc ;; - rm[46]00) - cpu=mips - vendor=siemens + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - sde) - cpu=mipsisa32 - vendor=sde - os=${os:-elf} + pentium4) + basic_machine=i786-pc ;; - simso-wrs) - cpu=sparclite - vendor=wrs - os=vxworks + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - tower | tower-32) - cpu=m68k - vendor=ncr + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w65) - cpu=w65 - vendor=wdc + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - os=proelf + pn) + basic_machine=pn-gould ;; - none) - cpu=none - vendor=none + power) basic_machine=power-ibm ;; - leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine + ppc | ppcbe) basic_machine=powerpc-unknown ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - - *-*) - IFS="-" read -r cpu vendor <&2 - exit 1 - ;; - esac + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; - commodore*) - vendor=cbm + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1270,245 +1334,199 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if [ x"$os" != x"" ] then case $os in # First match some system type aliases that might get confused # with valid system types. - # solaris* is a basic system type, with this one exception. - auroraux) - os=auroraux + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux ;; - bluegene*) - os=cnk - ;; - solaris1 | solaris1.*) + -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - solaris) - os=solaris2 + -solaris) + os=-solaris2 ;; - unixware*) - os=sysv4.2uw + -unixware*) + os=-sysv4.2uw ;; - gnu/linux*) + -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - es1800*) - os=ose - ;; - # Some version numbers need modification - chorusos*) - os=chorusos - ;; - isc) - os=isc2.2 - ;; - sco6) - os=sco5v6 - ;; - sco5) - os=sco3.2v5 - ;; - sco4) - os=sco3.2v4 - ;; - sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - ;; - sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - scout) - # Don't match below - ;; - sco*) - os=sco3.2v2 - ;; - psos*) - os=psos + -es1800*) + os=-ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ - | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ - | linux-newlib* | linux-musl* | linux-uclibc* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* \ - | morphos* | superux* | rtmk* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd*) + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - qnx*) - case $cpu in - x86 | i*86) + -qnx*) + case $basic_machine in + x86-* | i*86-*) ;; *) - os=nto-$os + os=-nto$os ;; esac ;; - hiux*) - os=hiuxwe2 + -nto-qnx*) ;; - nto-qnx*) - ;; - nto*) + -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - sim | xray | os68k* | v88r* \ - | windows* | osx | abug | netware* | os9* \ - | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) - ;; - linux-dietlibc) - os=linux-dietlibc + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; - linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - lynx*178) - os=lynxos178 - ;; - lynx*5) - os=lynxos5 - ;; - lynx*) - os=lynxos - ;; - mac*) + -mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - opened*) - os=openedition + -linux-dietlibc) + os=-linux-dietlibc ;; - os400*) - os=os400 + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - sunos5*) + -sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - sunos6*) + -sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - wince*) - os=wince + -opened*) + os=-openedition ;; - utek*) - os=bsd + -os400*) + os=-os400 ;; - dynix*) - os=bsd + -wince*) + os=-wince ;; - acis*) - os=aos + -utek*) + os=-bsd ;; - atheos*) - os=atheos + -dynix*) + os=-bsd ;; - syllable*) - os=syllable + -acis*) + os=-aos ;; - 386bsd) - os=bsd + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable ;; - ctix* | uts*) - os=sysv + -386bsd) + os=-bsd ;; - nova*) - os=rtmk-nova + -ctix* | -uts*) + os=-sysv ;; - ns2) - os=nextstep2 + -nova*) + os=-rtmk-nova ;; - nsk*) - os=nsk + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. - sinix5.*) + -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - sinix*) - os=sysv4 + -sinix*) + os=-sysv4 ;; - tpf*) - os=tpf + -tpf*) + os=-tpf ;; - triton*) - os=sysv3 + -triton*) + os=-sysv3 ;; - oss*) - os=sysv3 + -oss*) + os=-sysv3 ;; - svr4*) - os=sysv4 + -svr4*) + os=-sysv4 ;; - svr3) - os=sysv3 + -svr3) + os=-sysv3 ;; - sysvr4) - os=sysv4 + -sysvr4) + os=-sysv4 ;; - # This must come after sysvr4. - sysv*) + # This must come after -sysvr4. + -sysv*) ;; - ose*) - os=ose + -ose*) + os=-ose ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) - os=mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint ;; - zvmoe) - os=zvmoe + -zvmoe) + os=-zvmoe ;; - dicos*) - os=dicos + -dicos*) + os=-dicos ;; - pikeos*) + -pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $cpu in + case $basic_machine in arm*) - os=eabi + os=-eabi ;; *) - os=elf + os=-elf ;; esac ;; - nacl*) - ;; - ios) + -nacl*) ;; - none) + -ios) ;; - *-eabi) + -none) ;; *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1525,265 +1543,258 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $cpu-$vendor in +case $basic_machine in score-*) - os=elf + os=-elf ;; spu-*) - os=elf + os=-elf ;; *-acorn) - os=riscix1.2 + os=-riscix1.2 ;; arm*-rebel) - os=linux + os=-linux ;; arm*-semi) - os=aout + os=-aout ;; c4x-* | tic4x-*) - os=coff + os=-coff ;; c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix + os=-elf ;; hexagon-*) - os=elf + os=-elf ;; tic54x-*) - os=coff + os=-coff ;; tic55x-*) - os=coff + os=-coff ;; tic6x-*) - os=coff + os=-coff ;; # This must come before the *-dec entry. pdp10-*) - os=tops20 + os=-tops20 ;; pdp11-*) - os=none + os=-none ;; *-dec | vax-*) - os=ultrix4.2 + os=-ultrix4.2 ;; m68*-apollo) - os=domain + os=-domain ;; i386-sun) - os=sunos4.0.2 + os=-sunos4.0.2 ;; m68000-sun) - os=sunos3 + os=-sunos3 ;; m68*-cisco) - os=aout + os=-aout ;; mep-*) - os=elf + os=-elf ;; mips*-cisco) - os=elf + os=-elf ;; mips*-*) - os=elf + os=-elf ;; or32-*) - os=coff + os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 + os=-sysv3 ;; sparc-* | *-sun) - os=sunos4.1.1 + os=-sunos4.1.1 ;; pru-*) - os=elf + os=-elf ;; *-be) - os=beos + os=-beos ;; *-ibm) - os=aix + os=-aix ;; *-knuth) - os=mmixware + os=-mmixware ;; *-wec) - os=proelf + os=-proelf ;; *-winbond) - os=proelf + os=-proelf ;; *-oki) - os=proelf + os=-proelf ;; *-hp) - os=hpux + os=-hpux ;; *-hitachi) - os=hiux + os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv + os=-sysv ;; *-cbm) - os=amigaos + os=-amigaos ;; *-dg) - os=dgux + os=-dgux ;; *-dolphin) - os=sysv3 + os=-sysv3 ;; m68k-ccur) - os=rtu + os=-rtu ;; m88k-omron*) - os=luna + os=-luna ;; *-next) - os=nextstep + os=-nextstep ;; *-sequent) - os=ptx + os=-ptx ;; *-crds) - os=unos + os=-unos ;; *-ns) - os=genix + os=-genix ;; i370-*) - os=mvs + os=-mvs ;; *-gould) - os=sysv + os=-sysv ;; *-highlevel) - os=bsd + os=-bsd ;; *-encore) - os=bsd + os=-bsd ;; *-sgi) - os=irix + os=-irix ;; *-siemens) - os=sysv4 + os=-sysv4 ;; *-masscomp) - os=rtu + os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=uxpv + os=-uxpv ;; *-rom68k) - os=coff + os=-coff ;; *-*bug) - os=coff + os=-coff ;; *-apple) - os=macos + os=-macos ;; *-atari*) - os=mint - ;; - *-wrs) - os=vxworks + os=-mint ;; *) - os=none + os=-none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) +vendor=unknown +case $basic_machine in + *-unknown) case $os in - riscix*) + -riscix*) vendor=acorn ;; - sunos*) + -sunos*) vendor=sun ;; - cnk*|-aix*) + -cnk*|-aix*) vendor=ibm ;; - beos*) + -beos*) vendor=be ;; - hpux*) + -hpux*) vendor=hp ;; - mpeix*) + -mpeix*) vendor=hp ;; - hiux*) + -hiux*) vendor=hitachi ;; - unos*) + -unos*) vendor=crds ;; - dgux*) + -dgux*) vendor=dg ;; - luna*) + -luna*) vendor=omron ;; - genix*) + -genix*) vendor=ns ;; - clix*) - vendor=intergraph - ;; - mvs* | opened*) + -mvs* | -opened*) vendor=ibm ;; - os400*) + -os400*) vendor=ibm ;; - ptx*) + -ptx*) vendor=sequent ;; - tpf*) + -tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; - aux*) + -aux*) vendor=apple ;; - hms*) + -hms*) vendor=hitachi ;; - mpw* | macos*) + -mpw* | -macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; - vos*) + -vos*) vendor=stratus ;; esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$cpu-$vendor-$os" +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/build-aux/depcomp mutter-3.28.4+git20200505/build-aux/depcomp --- mutter-3.28.4/build-aux/depcomp 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/depcomp 2020-05-05 19:18:00.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2018 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 @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.28.4/build-aux/install-sh mutter-3.28.4+git20200505/build-aux/install-sh --- mutter-3.28.4/build-aux/install-sh 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/install-sh 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -#!/usr/bin/sh +#!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,18 +271,15 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename. + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dstbase=`basename "$src"` - case $dst in - */) dst=$dst$dstbase;; - *) dst=$dst/$dstbase;; - esac + dst=$dstdir/`basename "$src"` dstdir_status=0 else dstdir=`dirname "$dst"` @@ -291,11 +288,6 @@ fi fi - case $dstdir in - */) dstdirslash=$dstdir;; - *) dstdirslash=$dstdir/;; - esac - obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -332,16 +324,14 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -444,8 +434,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=${dstdirslash}_inst.$$_ - rmtmp=${dstdirslash}_rm.$$_ + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -510,9 +500,9 @@ done # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/build-aux/ltmain.sh mutter-3.28.4+git20200505/build-aux/ltmain.sh --- mutter-3.28.4/build-aux/ltmain.sh 2019-05-14 17:30:08.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/ltmain.sh 2020-05-05 19:17:54.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2124,7 +2124,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -7274,10 +7274,11 @@ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*) + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7570,7 +7571,10 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7889,19 +7893,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8825,6 +8829,9 @@ revision=$number_minor lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; esac ;; no) diff -Nru mutter-3.28.4/build-aux/missing mutter-3.28.4+git20200505/build-aux/missing --- mutter-3.28.4/build-aux/missing 2019-05-14 17:30:14.000000000 +0000 +++ mutter-3.28.4+git20200505/build-aux/missing 2020-05-05 19:18:00.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/clutter/aclocal.m4 mutter-3.28.4+git20200505/clutter/aclocal.m4 --- mutter-3.28.4/clutter/aclocal.m4 2019-05-14 17:55:53.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/aclocal.m4 2020-05-05 19:17:52.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -20,9 +20,224 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +# Increment this whenever this file is changed. +#serial 1 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main (void) +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -296,291 +511,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES - -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -# Increment this whenever this file is changed. -#serial 3 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl - -dnl We can't use PKG_PREREQ because that needs 0.29. -m4_ifndef([PKG_PROG_PKG_CONFIG], - [pkg.m4 version 0.28 or later is required]) - -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - min_glib_version=ifelse([$1], [], [2.0.0], [$1]) - pkg_config_args="glib-2.0 >= $min_glib_version" - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - dnl For GLIB_CFLAGS and GLIB_LIBS - PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) - - dnl For the tools - PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) - PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) - PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) - PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) - - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main (void) -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - rm -f conf.glibtest -]) - -# Copyright (C) 2002-2018 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, @@ -592,10 +523,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' +[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.16.1], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -611,14 +542,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.16.1])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-2018 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, @@ -670,7 +601,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -701,7 +632,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 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, @@ -892,12 +823,13 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 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, # with or without modifications, as long as this notice is preserved. + # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -905,41 +837,49 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - AS_CASE([$CONFIG_FILES], - [*\'*], [eval set x "$CONFIG_FILES"], - [*], [set x $CONFIG_FILES]) + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`AS_DIRNAME(["$am_mf"])` - am_filepart=`AS_BASENAME(["$am_mf"])` - AM_RUN_LOG([cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles]) || am_rc=$? + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking).]) - fi - AS_UNSET([am_dirpart]) - AS_UNSET([am_filepart]) - AS_UNSET([am_mf]) - AS_UNSET([am_rc]) - rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -948,17 +888,18 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking is enabled. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -1045,8 +986,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1113,7 +1054,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1155,7 +1096,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 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, @@ -1176,7 +1117,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 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, @@ -1197,7 +1138,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -1205,42 +1146,49 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. +# Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' +[am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) - AS_CASE([$?:`cat confinc.out 2>/dev/null`], - ['0:this is the am__doit target'], - [AS_CASE([$s], - [BSD], [am__include='.include' am__quote='"'], - [am__include='include' am__quote=''])]) - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -AC_MSG_RESULT([${_am_result}]) -AC_SUBST([am__include])]) -AC_SUBST([am__quote])]) +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -1279,7 +1227,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -1308,7 +1256,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 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, @@ -1355,7 +1303,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 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, @@ -1374,7 +1322,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -1455,7 +1403,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 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, @@ -1515,7 +1463,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 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, @@ -1543,7 +1491,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 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, @@ -1562,7 +1510,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 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 -Nru mutter-3.28.4/clutter/build/autotools/libtool.m4 mutter-3.28.4+git20200505/clutter/build/autotools/libtool.m4 --- mutter-3.28.4/clutter/build/autotools/libtool.m4 2019-05-14 17:30:03.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/autotools/libtool.m4 2020-05-05 19:17:49.000000000 +0000 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2867,9 +2866,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2878,7 +2874,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2890,6 +2886,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3549,7 +3557,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4427,7 +4435,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4939,6 +4947,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5001,6 +5012,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5255,7 +5269,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5776,6 +5790,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5797,7 +5812,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -Nru mutter-3.28.4/clutter/build/autotools/Makefile.in mutter-3.28.4+git20200505/clutter/build/autotools/Makefile.in --- mutter-3.28.4/clutter/build/autotools/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/autotools/Makefile.in 2020-05-05 19:17:53.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -311,6 +311,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -349,8 +350,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -374,10 +375,7 @@ cscope cscopelist: -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/clutter/build/compile mutter-3.28.4+git20200505/clutter/build/compile --- mutter-3.28.4/clutter/build/compile 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/compile 2020-05-05 19:17:53.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,8 +255,7 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -340,9 +339,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/clutter/build/config.guess mutter-3.28.4+git20200505/clutter/build/config.guess --- mutter-3.28.4/clutter/build/config.guess 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/config.guess 2020-05-05 19:17:53.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,6 +84,8 @@ exit 1 fi +trap 'exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -94,39 +96,34 @@ # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 -trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 - -set_cc_for_build() { - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -141,7 +138,7 @@ # We could probably try harder. LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -202,7 +199,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -240,7 +237,7 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -392,15 +389,20 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - case `isainfo -b` in - 32) - echo i386-pc-solaris2"$UNAME_REL" - ;; - 64) - echo x86_64-pc-solaris2"$UNAME_REL" - ;; - esac + eval "$set_cc_for_build" + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -480,7 +482,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -577,7 +579,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -658,7 +660,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,7 +700,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -724,7 +726,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -838,17 +840,6 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi - else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf - fi - exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -903,8 +894,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -931,7 +922,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -980,7 +971,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1055,7 +1046,11 @@ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1294,7 +1289,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1367,7 +1362,6 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else @@ -1479,7 +1473,7 @@ exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/clutter/build/config.sub mutter-3.28.4+git20200505/clutter/build/config.sub --- mutter-3.28.4/clutter/build/config.sub 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/config.sub 2020-05-05 19:17:53.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -110,1159 +110,1223 @@ exit 1;; esac -# Split fields of configuration type -IFS="-" read -r field1 field2 field3 field4 <&2 - exit 1 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. ;; - *-*-*-*) - basic_machine=$field1-$field2 - os=$field3-$field4 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - os=linux-android - ;; - *) - basic_machine=$field1-$field2 - os=$field3 - ;; - esac + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*) - # A lone config we happen to match not fitting any patern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - os= - ;; - *) - basic_machine=$field1 - os=$field2 - ;; - esac - ;; - esac + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - os=bsd - ;; - a29khif) - basic_machine=a29k-amd - os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=scout - ;; - alliant) - basic_machine=fx80-alliant - os= - ;; - altos | altos3068) - basic_machine=m68k-altos - os= - ;; - am29k) - basic_machine=a29k-none - os=bsd - ;; - amdahl) - basic_machine=580-amdahl - os=sysv - ;; - amiga) - basic_machine=m68k-unknown - os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=bsd - ;; - aros) - basic_machine=i386-pc - os=aros - ;; - aux) - basic_machine=m68k-apple - os=aux - ;; - balance) - basic_machine=ns32k-sequent - os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=linux - ;; - cegcc) - basic_machine=arm-unknown - os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=bsd - ;; - convex-c2) - basic_machine=c2-convex - os=bsd - ;; - convex-c32) - basic_machine=c32-convex - os=bsd - ;; - convex-c34) - basic_machine=c34-convex - os=bsd - ;; - convex-c38) - basic_machine=c38-convex - os=bsd - ;; - cray) - basic_machine=j90-cray - os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - os= - ;; - da30) - basic_machine=m68k-da30 - os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - os= - ;; - delta88) - basic_machine=m88k-motorola - os=sysv3 - ;; - dicos) - basic_machine=i686-pc - os=dicos - ;; - djgpp) - basic_machine=i586-pc - os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=ose - ;; - gmicro) - basic_machine=tron-gmicro - os=sysv - ;; - go32) - basic_machine=i386-pc - os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=hms - ;; - harris) - basic_machine=m88k-harris - os=sysv3 - ;; - hp300) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=proelf - ;; - i386mach) - basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; - isi68 | isi) - basic_machine=m68k-isi - os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=sysv - ;; - merlin) - basic_machine=ns32k-utek - os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - os=coff - ;; - morphos) - basic_machine=powerpc-unknown - os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=moxiebox - ;; - msdos) - basic_machine=i386-pc - os=msdos - ;; - msys) - basic_machine=i686-pc - os=msys - ;; - mvs) - basic_machine=i370-ibm - os=mvs - ;; - nacl) - basic_machine=le32-unknown - os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=newsos - ;; - news1000) - basic_machine=m68030-sony - os=newsos - ;; - necv70) - basic_machine=v70-nec - os=sysv - ;; - nh3000) - basic_machine=m68k-harris - os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=cxux - ;; - nindy960) - basic_machine=i960-intel - os=nindy - ;; - mon960) - basic_machine=i960-intel - os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=ose - ;; - os68k) - basic_machine=m68k-none - os=os68k - ;; - paragon) - basic_machine=i860-intel - os=osf - ;; - parisc) - basic_machine=hppa-unknown - os=linux - ;; - pw32) - basic_machine=i586-unknown - os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=rdos - ;; - rdos32) - basic_machine=i386-pc - os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=coff - ;; - sa29200) - basic_machine=a29k-amd - os=udi - ;; - sei) - basic_machine=mips-sei - os=seiux - ;; - sequent) - basic_machine=i386-sequent - os= - ;; - sps7) - basic_machine=m68k-bull - os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - os= - ;; - stratus) - basic_machine=i860-stratus - os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - os= - ;; - sun2os3) - basic_machine=m68000-sun - os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - os= - ;; - sun3os3) - basic_machine=m68k-sun - os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - os= - ;; - sun4os3) - basic_machine=sparc-sun - os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - os= - ;; - sv1) - basic_machine=sv1-cray - os=unicos - ;; - symmetry) - basic_machine=i386-sequent - os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=unicos - ;; - t90) - basic_machine=t90-cray - os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - os=tpf - ;; - udi29k) - basic_machine=a29k-amd - os=udi - ;; - ultra3) - basic_machine=a29k-nyu - os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=none - ;; - vaxv) - basic_machine=vax-dec - os=sysv - ;; - vms) - basic_machine=vax-dec - os=vms - ;; - vxworks960) - basic_machine=i960-wrs - os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=vxworks - ;; - xbox) - basic_machine=i686-pc - os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - os=unicos - ;; - *) - basic_machine=$1 - os= - ;; - esac + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint ;; esac -# Decode 1-component or ad-hoc basic machines +# Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown ;; - op50n) - cpu=hppa1.1 - vendor=oki + c54x) + basic_machine=tic54x-unknown ;; - op60c) - cpu=hppa1.1 - vendor=oki + c55x) + basic_machine=tic55x-unknown ;; - ibm*) - cpu=i370 - vendor=ibm + c6x) + basic_machine=tic6x-unknown ;; - orion105) - cpu=clipper - vendor=highlevel + leon|leon[3-9]) + basic_machine=sparc-$basic_machine ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown ;; + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att + basic_machine=m68000-att ;; 3b*) - cpu=we32k - vendor=att + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; bluegene*) - cpu=powerpc - vendor=ibm - os=cnk + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec ;; decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - os=tops10 + basic_machine=pdp10-dec + os=-tops10 ;; decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - os=tops20 + basic_machine=pdp10-dec + os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx ;; dpx2*) - cpu=m68k - vendor=bull - os=sysv3 + basic_machine=m68k-bull + os=-sysv3 ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon ;; elxsi) - cpu=elxsi - vendor=elxsi - os=${os:-bsd} + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose ;; fx2800) - cpu=i860 - vendor=alliant + basic_machine=i860-alliant ;; genix) - cpu=ns32k - vendor=ns + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 ;; h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp + basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp + basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv32 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv4 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - os=${os:-unicos} + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta ;; iris | iris4d) - cpu=mips - vendor=sgi + basic_machine=mips-sgi case $os in - irix*) + -irix*) ;; *) - os=irix4 + os=-irix4 ;; esac ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) - cpu=m68000 - vendor=convergent + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - os=mint + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos ;; news-3600 | risc-news) - cpu=mips - vendor=sony - os=newsos + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv ;; next | m*-next) - cpu=m68k - vendor=next + basic_machine=m68k-next case $os in - nextstep* ) + -nextstep* ) ;; - ns2*) - os=nextstep2 + -ns2*) + os=-nextstep2 ;; *) - os=nextstep3 + os=-nextstep3 ;; esac ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) - cpu=np1 - vendor=gould + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem ;; op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - os=proelf + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k ;; pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; pbd) - cpu=sparc - vendor=tti + basic_machine=sparc-tti ;; pbb) - cpu=m68k - vendor=tti + basic_machine=m68k-tti ;; - pc532) - cpu=ns32k - vendor=pc532 + pc532 | pc532-*) + basic_machine=ns32k-pc532 ;; - pn) - cpu=pn - vendor=gould + pc98) + basic_machine=i386-pc ;; - power) - cpu=power - vendor=ibm + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ps2) - cpu=i386 - vendor=ibm + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc ;; - rm[46]00) - cpu=mips - vendor=siemens + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - sde) - cpu=mipsisa32 - vendor=sde - os=${os:-elf} + pentium4) + basic_machine=i786-pc ;; - simso-wrs) - cpu=sparclite - vendor=wrs - os=vxworks + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - tower | tower-32) - cpu=m68k - vendor=ncr + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w65) - cpu=w65 - vendor=wdc + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - os=proelf + pn) + basic_machine=pn-gould ;; - none) - cpu=none - vendor=none + power) basic_machine=power-ibm ;; - leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine + ppc | ppcbe) basic_machine=powerpc-unknown ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - - *-*) - IFS="-" read -r cpu vendor <&2 - exit 1 - ;; - esac + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; - commodore*) - vendor=cbm + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1270,245 +1334,199 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if [ x"$os" != x"" ] then case $os in # First match some system type aliases that might get confused # with valid system types. - # solaris* is a basic system type, with this one exception. - auroraux) - os=auroraux + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux ;; - bluegene*) - os=cnk - ;; - solaris1 | solaris1.*) + -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - solaris) - os=solaris2 + -solaris) + os=-solaris2 ;; - unixware*) - os=sysv4.2uw + -unixware*) + os=-sysv4.2uw ;; - gnu/linux*) + -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - es1800*) - os=ose - ;; - # Some version numbers need modification - chorusos*) - os=chorusos - ;; - isc) - os=isc2.2 - ;; - sco6) - os=sco5v6 - ;; - sco5) - os=sco3.2v5 - ;; - sco4) - os=sco3.2v4 - ;; - sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - ;; - sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - scout) - # Don't match below - ;; - sco*) - os=sco3.2v2 - ;; - psos*) - os=psos + -es1800*) + os=-ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ - | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ - | linux-newlib* | linux-musl* | linux-uclibc* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* \ - | morphos* | superux* | rtmk* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd*) + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - qnx*) - case $cpu in - x86 | i*86) + -qnx*) + case $basic_machine in + x86-* | i*86-*) ;; *) - os=nto-$os + os=-nto$os ;; esac ;; - hiux*) - os=hiuxwe2 + -nto-qnx*) ;; - nto-qnx*) - ;; - nto*) + -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - sim | xray | os68k* | v88r* \ - | windows* | osx | abug | netware* | os9* \ - | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) - ;; - linux-dietlibc) - os=linux-dietlibc + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; - linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - lynx*178) - os=lynxos178 - ;; - lynx*5) - os=lynxos5 - ;; - lynx*) - os=lynxos - ;; - mac*) + -mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - opened*) - os=openedition + -linux-dietlibc) + os=-linux-dietlibc ;; - os400*) - os=os400 + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - sunos5*) + -sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - sunos6*) + -sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - wince*) - os=wince + -opened*) + os=-openedition ;; - utek*) - os=bsd + -os400*) + os=-os400 ;; - dynix*) - os=bsd + -wince*) + os=-wince ;; - acis*) - os=aos + -utek*) + os=-bsd ;; - atheos*) - os=atheos + -dynix*) + os=-bsd ;; - syllable*) - os=syllable + -acis*) + os=-aos ;; - 386bsd) - os=bsd + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable ;; - ctix* | uts*) - os=sysv + -386bsd) + os=-bsd ;; - nova*) - os=rtmk-nova + -ctix* | -uts*) + os=-sysv ;; - ns2) - os=nextstep2 + -nova*) + os=-rtmk-nova ;; - nsk*) - os=nsk + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. - sinix5.*) + -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - sinix*) - os=sysv4 + -sinix*) + os=-sysv4 ;; - tpf*) - os=tpf + -tpf*) + os=-tpf ;; - triton*) - os=sysv3 + -triton*) + os=-sysv3 ;; - oss*) - os=sysv3 + -oss*) + os=-sysv3 ;; - svr4*) - os=sysv4 + -svr4*) + os=-sysv4 ;; - svr3) - os=sysv3 + -svr3) + os=-sysv3 ;; - sysvr4) - os=sysv4 + -sysvr4) + os=-sysv4 ;; - # This must come after sysvr4. - sysv*) + # This must come after -sysvr4. + -sysv*) ;; - ose*) - os=ose + -ose*) + os=-ose ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) - os=mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint ;; - zvmoe) - os=zvmoe + -zvmoe) + os=-zvmoe ;; - dicos*) - os=dicos + -dicos*) + os=-dicos ;; - pikeos*) + -pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $cpu in + case $basic_machine in arm*) - os=eabi + os=-eabi ;; *) - os=elf + os=-elf ;; esac ;; - nacl*) - ;; - ios) + -nacl*) ;; - none) + -ios) ;; - *-eabi) + -none) ;; *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1525,265 +1543,258 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $cpu-$vendor in +case $basic_machine in score-*) - os=elf + os=-elf ;; spu-*) - os=elf + os=-elf ;; *-acorn) - os=riscix1.2 + os=-riscix1.2 ;; arm*-rebel) - os=linux + os=-linux ;; arm*-semi) - os=aout + os=-aout ;; c4x-* | tic4x-*) - os=coff + os=-coff ;; c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix + os=-elf ;; hexagon-*) - os=elf + os=-elf ;; tic54x-*) - os=coff + os=-coff ;; tic55x-*) - os=coff + os=-coff ;; tic6x-*) - os=coff + os=-coff ;; # This must come before the *-dec entry. pdp10-*) - os=tops20 + os=-tops20 ;; pdp11-*) - os=none + os=-none ;; *-dec | vax-*) - os=ultrix4.2 + os=-ultrix4.2 ;; m68*-apollo) - os=domain + os=-domain ;; i386-sun) - os=sunos4.0.2 + os=-sunos4.0.2 ;; m68000-sun) - os=sunos3 + os=-sunos3 ;; m68*-cisco) - os=aout + os=-aout ;; mep-*) - os=elf + os=-elf ;; mips*-cisco) - os=elf + os=-elf ;; mips*-*) - os=elf + os=-elf ;; or32-*) - os=coff + os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 + os=-sysv3 ;; sparc-* | *-sun) - os=sunos4.1.1 + os=-sunos4.1.1 ;; pru-*) - os=elf + os=-elf ;; *-be) - os=beos + os=-beos ;; *-ibm) - os=aix + os=-aix ;; *-knuth) - os=mmixware + os=-mmixware ;; *-wec) - os=proelf + os=-proelf ;; *-winbond) - os=proelf + os=-proelf ;; *-oki) - os=proelf + os=-proelf ;; *-hp) - os=hpux + os=-hpux ;; *-hitachi) - os=hiux + os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv + os=-sysv ;; *-cbm) - os=amigaos + os=-amigaos ;; *-dg) - os=dgux + os=-dgux ;; *-dolphin) - os=sysv3 + os=-sysv3 ;; m68k-ccur) - os=rtu + os=-rtu ;; m88k-omron*) - os=luna + os=-luna ;; *-next) - os=nextstep + os=-nextstep ;; *-sequent) - os=ptx + os=-ptx ;; *-crds) - os=unos + os=-unos ;; *-ns) - os=genix + os=-genix ;; i370-*) - os=mvs + os=-mvs ;; *-gould) - os=sysv + os=-sysv ;; *-highlevel) - os=bsd + os=-bsd ;; *-encore) - os=bsd + os=-bsd ;; *-sgi) - os=irix + os=-irix ;; *-siemens) - os=sysv4 + os=-sysv4 ;; *-masscomp) - os=rtu + os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=uxpv + os=-uxpv ;; *-rom68k) - os=coff + os=-coff ;; *-*bug) - os=coff + os=-coff ;; *-apple) - os=macos + os=-macos ;; *-atari*) - os=mint - ;; - *-wrs) - os=vxworks + os=-mint ;; *) - os=none + os=-none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) +vendor=unknown +case $basic_machine in + *-unknown) case $os in - riscix*) + -riscix*) vendor=acorn ;; - sunos*) + -sunos*) vendor=sun ;; - cnk*|-aix*) + -cnk*|-aix*) vendor=ibm ;; - beos*) + -beos*) vendor=be ;; - hpux*) + -hpux*) vendor=hp ;; - mpeix*) + -mpeix*) vendor=hp ;; - hiux*) + -hiux*) vendor=hitachi ;; - unos*) + -unos*) vendor=crds ;; - dgux*) + -dgux*) vendor=dg ;; - luna*) + -luna*) vendor=omron ;; - genix*) + -genix*) vendor=ns ;; - clix*) - vendor=intergraph - ;; - mvs* | opened*) + -mvs* | -opened*) vendor=ibm ;; - os400*) + -os400*) vendor=ibm ;; - ptx*) + -ptx*) vendor=sequent ;; - tpf*) + -tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; - aux*) + -aux*) vendor=apple ;; - hms*) + -hms*) vendor=hitachi ;; - mpw* | macos*) + -mpw* | -macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; - vos*) + -vos*) vendor=stratus ;; esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$cpu-$vendor-$os" +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/clutter/build/depcomp mutter-3.28.4+git20200505/clutter/build/depcomp --- mutter-3.28.4/clutter/build/depcomp 2019-05-14 17:30:08.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/depcomp 2020-05-05 19:17:54.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2018 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 @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.28.4/clutter/build/install-sh mutter-3.28.4+git20200505/clutter/build/install-sh --- mutter-3.28.4/clutter/build/install-sh 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/install-sh 2020-05-05 19:17:53.000000000 +0000 @@ -1,7 +1,7 @@ -#!/usr/bin/sh +#!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,18 +271,15 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename. + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dstbase=`basename "$src"` - case $dst in - */) dst=$dst$dstbase;; - *) dst=$dst/$dstbase;; - esac + dst=$dstdir/`basename "$src"` dstdir_status=0 else dstdir=`dirname "$dst"` @@ -291,11 +288,6 @@ fi fi - case $dstdir in - */) dstdirslash=$dstdir;; - *) dstdirslash=$dstdir/;; - esac - obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -332,16 +324,14 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -444,8 +434,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=${dstdirslash}_inst.$$_ - rmtmp=${dstdirslash}_rm.$$_ + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -510,9 +500,9 @@ done # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/clutter/build/ltmain.sh mutter-3.28.4+git20200505/clutter/build/ltmain.sh --- mutter-3.28.4/clutter/build/ltmain.sh 2019-05-14 17:30:03.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/ltmain.sh 2020-05-05 19:17:49.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2124,7 +2124,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -7274,10 +7274,11 @@ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*) + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7570,7 +7571,10 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7889,19 +7893,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8825,6 +8829,9 @@ revision=$number_minor lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; esac ;; no) diff -Nru mutter-3.28.4/clutter/build/Makefile.in mutter-3.28.4+git20200505/clutter/build/Makefile.in --- mutter-3.28.4/clutter/build/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/Makefile.in 2020-05-05 19:17:53.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -162,7 +162,7 @@ CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) am__DIST_COMMON = $(srcdir)/Makefile.in compile config.guess \ - config.sub depcomp install-sh ltmain.sh missing + config.sub install-sh ltmain.sh missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -372,6 +372,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -401,8 +402,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -519,10 +520,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/clutter/build/missing mutter-3.28.4+git20200505/clutter/build/missing --- mutter-3.28.4/clutter/build/missing 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/missing 2020-05-05 19:17:53.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/clutter/build/test-driver mutter-3.28.4+git20200505/clutter/build/test-driver --- mutter-3.28.4/clutter/build/test-driver 2019-05-14 17:30:07.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/build/test-driver 2020-05-05 19:17:54.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2018 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 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 @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,9 +140,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/clutter/clutter/Makefile.in mutter-3.28.4+git20200505/clutter/clutter/Makefile.in --- mutter-3.28.4/clutter/clutter/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/clutter/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -519,149 +519,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/clutter-action.Plo \ - ./$(DEPDIR)/clutter-actor-box.Plo \ - ./$(DEPDIR)/clutter-actor-meta.Plo \ - ./$(DEPDIR)/clutter-actor.Plo \ - ./$(DEPDIR)/clutter-align-constraint.Plo \ - ./$(DEPDIR)/clutter-animatable.Plo \ - ./$(DEPDIR)/clutter-backend.Plo \ - ./$(DEPDIR)/clutter-base-types.Plo \ - ./$(DEPDIR)/clutter-bezier.Plo \ - ./$(DEPDIR)/clutter-bin-layout.Plo \ - ./$(DEPDIR)/clutter-bind-constraint.Plo \ - ./$(DEPDIR)/clutter-binding-pool.Plo \ - ./$(DEPDIR)/clutter-blur-effect.Plo \ - ./$(DEPDIR)/clutter-box-layout.Plo \ - ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo \ - ./$(DEPDIR)/clutter-cairo.Plo ./$(DEPDIR)/clutter-canvas.Plo \ - ./$(DEPDIR)/clutter-child-meta.Plo \ - ./$(DEPDIR)/clutter-click-action.Plo \ - ./$(DEPDIR)/clutter-clone.Plo ./$(DEPDIR)/clutter-color.Plo \ - ./$(DEPDIR)/clutter-colorize-effect.Plo \ - ./$(DEPDIR)/clutter-constraint.Plo \ - ./$(DEPDIR)/clutter-container.Plo \ - ./$(DEPDIR)/clutter-content.Plo \ - ./$(DEPDIR)/clutter-deform-effect.Plo \ - ./$(DEPDIR)/clutter-desaturate-effect.Plo \ - ./$(DEPDIR)/clutter-device-manager.Plo \ - ./$(DEPDIR)/clutter-drag-action.Plo \ - ./$(DEPDIR)/clutter-drop-action.Plo \ - ./$(DEPDIR)/clutter-easing.Plo ./$(DEPDIR)/clutter-effect.Plo \ - ./$(DEPDIR)/clutter-enum-types.Plo \ - ./$(DEPDIR)/clutter-event-translator.Plo \ - ./$(DEPDIR)/clutter-event.Plo ./$(DEPDIR)/clutter-feature.Plo \ - ./$(DEPDIR)/clutter-fixed-layout.Plo \ - ./$(DEPDIR)/clutter-flatten-effect.Plo \ - ./$(DEPDIR)/clutter-flow-layout.Plo \ - ./$(DEPDIR)/clutter-gesture-action.Plo \ - ./$(DEPDIR)/clutter-grid-layout.Plo \ - ./$(DEPDIR)/clutter-id-pool.Plo ./$(DEPDIR)/clutter-image.Plo \ - ./$(DEPDIR)/clutter-input-device-tool.Plo \ - ./$(DEPDIR)/clutter-input-device.Plo \ - ./$(DEPDIR)/clutter-input-focus.Plo \ - ./$(DEPDIR)/clutter-input-method.Plo \ - ./$(DEPDIR)/clutter-interval.Plo \ - ./$(DEPDIR)/clutter-keyframe-transition.Plo \ - ./$(DEPDIR)/clutter-keysyms-table.Plo \ - ./$(DEPDIR)/clutter-layout-manager.Plo \ - ./$(DEPDIR)/clutter-layout-meta.Plo \ - ./$(DEPDIR)/clutter-main.Plo ./$(DEPDIR)/clutter-marshal.Plo \ - ./$(DEPDIR)/clutter-master-clock-default.Plo \ - ./$(DEPDIR)/clutter-master-clock.Plo \ - ./$(DEPDIR)/clutter-offscreen-effect.Plo \ - ./$(DEPDIR)/clutter-page-turn-effect.Plo \ - ./$(DEPDIR)/clutter-paint-node.Plo \ - ./$(DEPDIR)/clutter-paint-nodes.Plo \ - ./$(DEPDIR)/clutter-paint-volume.Plo \ - ./$(DEPDIR)/clutter-pan-action.Plo \ - ./$(DEPDIR)/clutter-path-constraint.Plo \ - ./$(DEPDIR)/clutter-path.Plo \ - ./$(DEPDIR)/clutter-property-transition.Plo \ - ./$(DEPDIR)/clutter-rotate-action.Plo \ - ./$(DEPDIR)/clutter-script-parser.Plo \ - ./$(DEPDIR)/clutter-script.Plo \ - ./$(DEPDIR)/clutter-scriptable.Plo \ - ./$(DEPDIR)/clutter-scroll-actor.Plo \ - ./$(DEPDIR)/clutter-settings.Plo \ - ./$(DEPDIR)/clutter-shader-effect.Plo \ - ./$(DEPDIR)/clutter-shader-types.Plo \ - ./$(DEPDIR)/clutter-snap-constraint.Plo \ - ./$(DEPDIR)/clutter-stage-manager.Plo \ - ./$(DEPDIR)/clutter-stage-view.Plo \ - ./$(DEPDIR)/clutter-stage-window.Plo \ - ./$(DEPDIR)/clutter-stage.Plo \ - ./$(DEPDIR)/clutter-swipe-action.Plo \ - ./$(DEPDIR)/clutter-tap-action.Plo \ - ./$(DEPDIR)/clutter-test-utils.Plo \ - ./$(DEPDIR)/clutter-text-buffer.Plo \ - ./$(DEPDIR)/clutter-text.Plo ./$(DEPDIR)/clutter-timeline.Plo \ - ./$(DEPDIR)/clutter-transition-group.Plo \ - ./$(DEPDIR)/clutter-transition.Plo \ - ./$(DEPDIR)/clutter-units.Plo ./$(DEPDIR)/clutter-util.Plo \ - ./$(DEPDIR)/clutter-virtual-input-device.Plo \ - ./$(DEPDIR)/clutter-zoom-action.Plo \ - cally/$(DEPDIR)/cally-actor.Plo \ - cally/$(DEPDIR)/cally-clone.Plo \ - cally/$(DEPDIR)/cally-group.Plo \ - cally/$(DEPDIR)/cally-rectangle.Plo \ - cally/$(DEPDIR)/cally-root.Plo cally/$(DEPDIR)/cally-stage.Plo \ - cally/$(DEPDIR)/cally-text.Plo \ - cally/$(DEPDIR)/cally-texture.Plo \ - cally/$(DEPDIR)/cally-util.Plo cally/$(DEPDIR)/cally.Plo \ - cogl/$(DEPDIR)/clutter-stage-cogl.Plo \ - deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo \ - deprecated/$(DEPDIR)/clutter-alpha.Plo \ - deprecated/$(DEPDIR)/clutter-animation.Plo \ - deprecated/$(DEPDIR)/clutter-animator.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-path.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo \ - deprecated/$(DEPDIR)/clutter-behaviour.Plo \ - deprecated/$(DEPDIR)/clutter-box.Plo \ - deprecated/$(DEPDIR)/clutter-cairo-texture.Plo \ - deprecated/$(DEPDIR)/clutter-frame-source.Plo \ - deprecated/$(DEPDIR)/clutter-group.Plo \ - deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo \ - deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo \ - deprecated/$(DEPDIR)/clutter-list-model.Plo \ - deprecated/$(DEPDIR)/clutter-media.Plo \ - deprecated/$(DEPDIR)/clutter-model.Plo \ - deprecated/$(DEPDIR)/clutter-rectangle.Plo \ - deprecated/$(DEPDIR)/clutter-score.Plo \ - deprecated/$(DEPDIR)/clutter-shader.Plo \ - deprecated/$(DEPDIR)/clutter-state.Plo \ - deprecated/$(DEPDIR)/clutter-table-layout.Plo \ - deprecated/$(DEPDIR)/clutter-texture.Plo \ - deprecated/$(DEPDIR)/clutter-timeout-interval.Plo \ - deprecated/$(DEPDIR)/clutter-timeout-pool.Plo \ - egl/$(DEPDIR)/clutter-backend-eglnative.Plo \ - evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo \ - evdev/$(DEPDIR)/clutter-event-evdev.Plo \ - evdev/$(DEPDIR)/clutter-input-device-evdev.Plo \ - evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo \ - evdev/$(DEPDIR)/clutter-seat-evdev.Plo \ - evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo \ - evdev/$(DEPDIR)/clutter-xkb-utils.Plo \ - wayland/$(DEPDIR)/clutter-wayland-surface.Plo \ - x11/$(DEPDIR)/clutter-backend-x11.Plo \ - x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo \ - x11/$(DEPDIR)/clutter-device-manager-xi2.Plo \ - x11/$(DEPDIR)/clutter-event-x11.Plo \ - x11/$(DEPDIR)/clutter-input-device-core-x11.Plo \ - x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo \ - x11/$(DEPDIR)/clutter-input-device-xi2.Plo \ - x11/$(DEPDIR)/clutter-keymap-x11.Plo \ - x11/$(DEPDIR)/clutter-stage-x11.Plo \ - x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo \ - x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo \ - x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo \ - x11/xsettings/$(DEPDIR)/xsettings-client.Plo \ - x11/xsettings/$(DEPDIR)/xsettings-common.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -910,6 +768,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1583,8 +1442,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(srcdir)/Makefile.am.marshal $(srcdir)/Makefile.am.enums $(am__empty): @@ -1849,164 +1708,158 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-box.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-meta.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-align-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-animatable.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-backend.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-base-types.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bezier.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bin-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bind-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-binding-pool.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-blur-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-box-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-brightness-contrast-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-cairo.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-canvas.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-child-meta.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-click-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-clone.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-color.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-colorize-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-container.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-content.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-deform-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-desaturate-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-device-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drag-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drop-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-easing.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-enum-types.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event-translator.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-feature.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-fixed-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flatten-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flow-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-gesture-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-grid-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-id-pool.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-image.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device-tool.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-focus.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-method.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-interval.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keyframe-transition.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keysyms-table.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-meta.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-main.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-marshal.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock-default.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-offscreen-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-page-turn-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-node.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-nodes.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-volume.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-pan-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-property-transition.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-rotate-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script-parser.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scriptable.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scroll-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-settings.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-effect.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-types.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-snap-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-view.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-window.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-swipe-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-tap-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-test-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-timeline.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-units.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-virtual-input-device.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-zoom-action.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-clone.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-rectangle.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-root.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-stage.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-text.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@cogl/$(DEPDIR)/clutter-stage-cogl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-alpha.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animation.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animator.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-path.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-box.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-cairo-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-frame-source.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-list-model.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-media.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-model.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-rectangle.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-score.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-shader.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-state.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-table-layout.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-interval.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-pool.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@egl/$(DEPDIR)/clutter-backend-eglnative.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-event-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-seat-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-xkb-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/clutter-wayland-surface.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-backend-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-xi2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-event-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-core-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-xi2.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-keymap-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-stage-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-client.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-common.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-box.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor-meta.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-align-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-animatable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-backend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-base-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bezier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bin-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-bind-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-binding-pool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-blur-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-box-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-brightness-contrast-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-cairo.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-canvas.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-child-meta.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-click-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-clone.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-color.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-colorize-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-container.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-content.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-deform-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-desaturate-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-device-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drag-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-drop-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-easing.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-enum-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event-translator.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-event.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-feature.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-fixed-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flatten-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-flow-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-gesture-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-grid-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-id-pool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-image.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device-tool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-focus.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-input-method.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-interval.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keyframe-transition.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-keysyms-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-layout-meta.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-marshal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-master-clock.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-offscreen-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-page-turn-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-node.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-nodes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-paint-volume.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-pan-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-path.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-property-transition.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-rotate-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script-parser.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-script.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scriptable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-scroll-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-settings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-effect.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-shader-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-snap-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-view.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage-window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-stage.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-swipe-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-tap-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-test-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-text.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-timeline.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-transition.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-units.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-virtual-input-device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/clutter-zoom-action.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-clone.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-rectangle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-root.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-stage.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-text.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cally/$(DEPDIR)/cally.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@cogl/$(DEPDIR)/clutter-stage-cogl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-alpha.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animation.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-animator.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-path.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-behaviour.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-box.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-cairo-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-frame-source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-list-model.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-media.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-model.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-rectangle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-score.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-shader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-state.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-table-layout.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-interval.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/clutter-timeout-pool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@egl/$(DEPDIR)/clutter-backend-eglnative.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-event-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-seat-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@evdev/$(DEPDIR)/clutter-xkb-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/clutter-wayland-surface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-backend-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-device-manager-xi2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-event-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-core-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-input-device-xi2.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-keymap-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-stage-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-client.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/xsettings/$(DEPDIR)/xsettings-common.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -2329,10 +2182,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -2427,158 +2277,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/clutter-action.Plo - -rm -f ./$(DEPDIR)/clutter-actor-box.Plo - -rm -f ./$(DEPDIR)/clutter-actor-meta.Plo - -rm -f ./$(DEPDIR)/clutter-actor.Plo - -rm -f ./$(DEPDIR)/clutter-align-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-animatable.Plo - -rm -f ./$(DEPDIR)/clutter-backend.Plo - -rm -f ./$(DEPDIR)/clutter-base-types.Plo - -rm -f ./$(DEPDIR)/clutter-bezier.Plo - -rm -f ./$(DEPDIR)/clutter-bin-layout.Plo - -rm -f ./$(DEPDIR)/clutter-bind-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-binding-pool.Plo - -rm -f ./$(DEPDIR)/clutter-blur-effect.Plo - -rm -f ./$(DEPDIR)/clutter-box-layout.Plo - -rm -f ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo - -rm -f ./$(DEPDIR)/clutter-cairo.Plo - -rm -f ./$(DEPDIR)/clutter-canvas.Plo - -rm -f ./$(DEPDIR)/clutter-child-meta.Plo - -rm -f ./$(DEPDIR)/clutter-click-action.Plo - -rm -f ./$(DEPDIR)/clutter-clone.Plo - -rm -f ./$(DEPDIR)/clutter-color.Plo - -rm -f ./$(DEPDIR)/clutter-colorize-effect.Plo - -rm -f ./$(DEPDIR)/clutter-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-container.Plo - -rm -f ./$(DEPDIR)/clutter-content.Plo - -rm -f ./$(DEPDIR)/clutter-deform-effect.Plo - -rm -f ./$(DEPDIR)/clutter-desaturate-effect.Plo - -rm -f ./$(DEPDIR)/clutter-device-manager.Plo - -rm -f ./$(DEPDIR)/clutter-drag-action.Plo - -rm -f ./$(DEPDIR)/clutter-drop-action.Plo - -rm -f ./$(DEPDIR)/clutter-easing.Plo - -rm -f ./$(DEPDIR)/clutter-effect.Plo - -rm -f ./$(DEPDIR)/clutter-enum-types.Plo - -rm -f ./$(DEPDIR)/clutter-event-translator.Plo - -rm -f ./$(DEPDIR)/clutter-event.Plo - -rm -f ./$(DEPDIR)/clutter-feature.Plo - -rm -f ./$(DEPDIR)/clutter-fixed-layout.Plo - -rm -f ./$(DEPDIR)/clutter-flatten-effect.Plo - -rm -f ./$(DEPDIR)/clutter-flow-layout.Plo - -rm -f ./$(DEPDIR)/clutter-gesture-action.Plo - -rm -f ./$(DEPDIR)/clutter-grid-layout.Plo - -rm -f ./$(DEPDIR)/clutter-id-pool.Plo - -rm -f ./$(DEPDIR)/clutter-image.Plo - -rm -f ./$(DEPDIR)/clutter-input-device-tool.Plo - -rm -f ./$(DEPDIR)/clutter-input-device.Plo - -rm -f ./$(DEPDIR)/clutter-input-focus.Plo - -rm -f ./$(DEPDIR)/clutter-input-method.Plo - -rm -f ./$(DEPDIR)/clutter-interval.Plo - -rm -f ./$(DEPDIR)/clutter-keyframe-transition.Plo - -rm -f ./$(DEPDIR)/clutter-keysyms-table.Plo - -rm -f ./$(DEPDIR)/clutter-layout-manager.Plo - -rm -f ./$(DEPDIR)/clutter-layout-meta.Plo - -rm -f ./$(DEPDIR)/clutter-main.Plo - -rm -f ./$(DEPDIR)/clutter-marshal.Plo - -rm -f ./$(DEPDIR)/clutter-master-clock-default.Plo - -rm -f ./$(DEPDIR)/clutter-master-clock.Plo - -rm -f ./$(DEPDIR)/clutter-offscreen-effect.Plo - -rm -f ./$(DEPDIR)/clutter-page-turn-effect.Plo - -rm -f ./$(DEPDIR)/clutter-paint-node.Plo - -rm -f ./$(DEPDIR)/clutter-paint-nodes.Plo - -rm -f ./$(DEPDIR)/clutter-paint-volume.Plo - -rm -f ./$(DEPDIR)/clutter-pan-action.Plo - -rm -f ./$(DEPDIR)/clutter-path-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-path.Plo - -rm -f ./$(DEPDIR)/clutter-property-transition.Plo - -rm -f ./$(DEPDIR)/clutter-rotate-action.Plo - -rm -f ./$(DEPDIR)/clutter-script-parser.Plo - -rm -f ./$(DEPDIR)/clutter-script.Plo - -rm -f ./$(DEPDIR)/clutter-scriptable.Plo - -rm -f ./$(DEPDIR)/clutter-scroll-actor.Plo - -rm -f ./$(DEPDIR)/clutter-settings.Plo - -rm -f ./$(DEPDIR)/clutter-shader-effect.Plo - -rm -f ./$(DEPDIR)/clutter-shader-types.Plo - -rm -f ./$(DEPDIR)/clutter-snap-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-stage-manager.Plo - -rm -f ./$(DEPDIR)/clutter-stage-view.Plo - -rm -f ./$(DEPDIR)/clutter-stage-window.Plo - -rm -f ./$(DEPDIR)/clutter-stage.Plo - -rm -f ./$(DEPDIR)/clutter-swipe-action.Plo - -rm -f ./$(DEPDIR)/clutter-tap-action.Plo - -rm -f ./$(DEPDIR)/clutter-test-utils.Plo - -rm -f ./$(DEPDIR)/clutter-text-buffer.Plo - -rm -f ./$(DEPDIR)/clutter-text.Plo - -rm -f ./$(DEPDIR)/clutter-timeline.Plo - -rm -f ./$(DEPDIR)/clutter-transition-group.Plo - -rm -f ./$(DEPDIR)/clutter-transition.Plo - -rm -f ./$(DEPDIR)/clutter-units.Plo - -rm -f ./$(DEPDIR)/clutter-util.Plo - -rm -f ./$(DEPDIR)/clutter-virtual-input-device.Plo - -rm -f ./$(DEPDIR)/clutter-zoom-action.Plo - -rm -f cally/$(DEPDIR)/cally-actor.Plo - -rm -f cally/$(DEPDIR)/cally-clone.Plo - -rm -f cally/$(DEPDIR)/cally-group.Plo - -rm -f cally/$(DEPDIR)/cally-rectangle.Plo - -rm -f cally/$(DEPDIR)/cally-root.Plo - -rm -f cally/$(DEPDIR)/cally-stage.Plo - -rm -f cally/$(DEPDIR)/cally-text.Plo - -rm -f cally/$(DEPDIR)/cally-texture.Plo - -rm -f cally/$(DEPDIR)/cally-util.Plo - -rm -f cally/$(DEPDIR)/cally.Plo - -rm -f cogl/$(DEPDIR)/clutter-stage-cogl.Plo - -rm -f deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-alpha.Plo - -rm -f deprecated/$(DEPDIR)/clutter-animation.Plo - -rm -f deprecated/$(DEPDIR)/clutter-animator.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-path.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour.Plo - -rm -f deprecated/$(DEPDIR)/clutter-box.Plo - -rm -f deprecated/$(DEPDIR)/clutter-cairo-texture.Plo - -rm -f deprecated/$(DEPDIR)/clutter-frame-source.Plo - -rm -f deprecated/$(DEPDIR)/clutter-group.Plo - -rm -f deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-list-model.Plo - -rm -f deprecated/$(DEPDIR)/clutter-media.Plo - -rm -f deprecated/$(DEPDIR)/clutter-model.Plo - -rm -f deprecated/$(DEPDIR)/clutter-rectangle.Plo - -rm -f deprecated/$(DEPDIR)/clutter-score.Plo - -rm -f deprecated/$(DEPDIR)/clutter-shader.Plo - -rm -f deprecated/$(DEPDIR)/clutter-state.Plo - -rm -f deprecated/$(DEPDIR)/clutter-table-layout.Plo - -rm -f deprecated/$(DEPDIR)/clutter-texture.Plo - -rm -f deprecated/$(DEPDIR)/clutter-timeout-interval.Plo - -rm -f deprecated/$(DEPDIR)/clutter-timeout-pool.Plo - -rm -f egl/$(DEPDIR)/clutter-backend-eglnative.Plo - -rm -f evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-event-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-input-device-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-seat-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-xkb-utils.Plo - -rm -f wayland/$(DEPDIR)/clutter-wayland-surface.Plo - -rm -f x11/$(DEPDIR)/clutter-backend-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-device-manager-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-event-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-core-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-keymap-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-stage-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo - -rm -f x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo - -rm -f x11/xsettings/$(DEPDIR)/xsettings-client.Plo - -rm -f x11/xsettings/$(DEPDIR)/xsettings-common.Plo + -rm -rf ./$(DEPDIR) cally/$(DEPDIR) cogl/$(DEPDIR) deprecated/$(DEPDIR) egl/$(DEPDIR) evdev/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) x11/xsettings/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-hdr distclean-tags @@ -2632,158 +2331,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/clutter-action.Plo - -rm -f ./$(DEPDIR)/clutter-actor-box.Plo - -rm -f ./$(DEPDIR)/clutter-actor-meta.Plo - -rm -f ./$(DEPDIR)/clutter-actor.Plo - -rm -f ./$(DEPDIR)/clutter-align-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-animatable.Plo - -rm -f ./$(DEPDIR)/clutter-backend.Plo - -rm -f ./$(DEPDIR)/clutter-base-types.Plo - -rm -f ./$(DEPDIR)/clutter-bezier.Plo - -rm -f ./$(DEPDIR)/clutter-bin-layout.Plo - -rm -f ./$(DEPDIR)/clutter-bind-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-binding-pool.Plo - -rm -f ./$(DEPDIR)/clutter-blur-effect.Plo - -rm -f ./$(DEPDIR)/clutter-box-layout.Plo - -rm -f ./$(DEPDIR)/clutter-brightness-contrast-effect.Plo - -rm -f ./$(DEPDIR)/clutter-cairo.Plo - -rm -f ./$(DEPDIR)/clutter-canvas.Plo - -rm -f ./$(DEPDIR)/clutter-child-meta.Plo - -rm -f ./$(DEPDIR)/clutter-click-action.Plo - -rm -f ./$(DEPDIR)/clutter-clone.Plo - -rm -f ./$(DEPDIR)/clutter-color.Plo - -rm -f ./$(DEPDIR)/clutter-colorize-effect.Plo - -rm -f ./$(DEPDIR)/clutter-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-container.Plo - -rm -f ./$(DEPDIR)/clutter-content.Plo - -rm -f ./$(DEPDIR)/clutter-deform-effect.Plo - -rm -f ./$(DEPDIR)/clutter-desaturate-effect.Plo - -rm -f ./$(DEPDIR)/clutter-device-manager.Plo - -rm -f ./$(DEPDIR)/clutter-drag-action.Plo - -rm -f ./$(DEPDIR)/clutter-drop-action.Plo - -rm -f ./$(DEPDIR)/clutter-easing.Plo - -rm -f ./$(DEPDIR)/clutter-effect.Plo - -rm -f ./$(DEPDIR)/clutter-enum-types.Plo - -rm -f ./$(DEPDIR)/clutter-event-translator.Plo - -rm -f ./$(DEPDIR)/clutter-event.Plo - -rm -f ./$(DEPDIR)/clutter-feature.Plo - -rm -f ./$(DEPDIR)/clutter-fixed-layout.Plo - -rm -f ./$(DEPDIR)/clutter-flatten-effect.Plo - -rm -f ./$(DEPDIR)/clutter-flow-layout.Plo - -rm -f ./$(DEPDIR)/clutter-gesture-action.Plo - -rm -f ./$(DEPDIR)/clutter-grid-layout.Plo - -rm -f ./$(DEPDIR)/clutter-id-pool.Plo - -rm -f ./$(DEPDIR)/clutter-image.Plo - -rm -f ./$(DEPDIR)/clutter-input-device-tool.Plo - -rm -f ./$(DEPDIR)/clutter-input-device.Plo - -rm -f ./$(DEPDIR)/clutter-input-focus.Plo - -rm -f ./$(DEPDIR)/clutter-input-method.Plo - -rm -f ./$(DEPDIR)/clutter-interval.Plo - -rm -f ./$(DEPDIR)/clutter-keyframe-transition.Plo - -rm -f ./$(DEPDIR)/clutter-keysyms-table.Plo - -rm -f ./$(DEPDIR)/clutter-layout-manager.Plo - -rm -f ./$(DEPDIR)/clutter-layout-meta.Plo - -rm -f ./$(DEPDIR)/clutter-main.Plo - -rm -f ./$(DEPDIR)/clutter-marshal.Plo - -rm -f ./$(DEPDIR)/clutter-master-clock-default.Plo - -rm -f ./$(DEPDIR)/clutter-master-clock.Plo - -rm -f ./$(DEPDIR)/clutter-offscreen-effect.Plo - -rm -f ./$(DEPDIR)/clutter-page-turn-effect.Plo - -rm -f ./$(DEPDIR)/clutter-paint-node.Plo - -rm -f ./$(DEPDIR)/clutter-paint-nodes.Plo - -rm -f ./$(DEPDIR)/clutter-paint-volume.Plo - -rm -f ./$(DEPDIR)/clutter-pan-action.Plo - -rm -f ./$(DEPDIR)/clutter-path-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-path.Plo - -rm -f ./$(DEPDIR)/clutter-property-transition.Plo - -rm -f ./$(DEPDIR)/clutter-rotate-action.Plo - -rm -f ./$(DEPDIR)/clutter-script-parser.Plo - -rm -f ./$(DEPDIR)/clutter-script.Plo - -rm -f ./$(DEPDIR)/clutter-scriptable.Plo - -rm -f ./$(DEPDIR)/clutter-scroll-actor.Plo - -rm -f ./$(DEPDIR)/clutter-settings.Plo - -rm -f ./$(DEPDIR)/clutter-shader-effect.Plo - -rm -f ./$(DEPDIR)/clutter-shader-types.Plo - -rm -f ./$(DEPDIR)/clutter-snap-constraint.Plo - -rm -f ./$(DEPDIR)/clutter-stage-manager.Plo - -rm -f ./$(DEPDIR)/clutter-stage-view.Plo - -rm -f ./$(DEPDIR)/clutter-stage-window.Plo - -rm -f ./$(DEPDIR)/clutter-stage.Plo - -rm -f ./$(DEPDIR)/clutter-swipe-action.Plo - -rm -f ./$(DEPDIR)/clutter-tap-action.Plo - -rm -f ./$(DEPDIR)/clutter-test-utils.Plo - -rm -f ./$(DEPDIR)/clutter-text-buffer.Plo - -rm -f ./$(DEPDIR)/clutter-text.Plo - -rm -f ./$(DEPDIR)/clutter-timeline.Plo - -rm -f ./$(DEPDIR)/clutter-transition-group.Plo - -rm -f ./$(DEPDIR)/clutter-transition.Plo - -rm -f ./$(DEPDIR)/clutter-units.Plo - -rm -f ./$(DEPDIR)/clutter-util.Plo - -rm -f ./$(DEPDIR)/clutter-virtual-input-device.Plo - -rm -f ./$(DEPDIR)/clutter-zoom-action.Plo - -rm -f cally/$(DEPDIR)/cally-actor.Plo - -rm -f cally/$(DEPDIR)/cally-clone.Plo - -rm -f cally/$(DEPDIR)/cally-group.Plo - -rm -f cally/$(DEPDIR)/cally-rectangle.Plo - -rm -f cally/$(DEPDIR)/cally-root.Plo - -rm -f cally/$(DEPDIR)/cally-stage.Plo - -rm -f cally/$(DEPDIR)/cally-text.Plo - -rm -f cally/$(DEPDIR)/cally-texture.Plo - -rm -f cally/$(DEPDIR)/cally-util.Plo - -rm -f cally/$(DEPDIR)/cally.Plo - -rm -f cogl/$(DEPDIR)/clutter-stage-cogl.Plo - -rm -f deprecated/$(DEPDIR)/clutter-actor-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-alpha.Plo - -rm -f deprecated/$(DEPDIR)/clutter-animation.Plo - -rm -f deprecated/$(DEPDIR)/clutter-animator.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-depth.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-ellipse.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-opacity.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-path.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-rotate.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour-scale.Plo - -rm -f deprecated/$(DEPDIR)/clutter-behaviour.Plo - -rm -f deprecated/$(DEPDIR)/clutter-box.Plo - -rm -f deprecated/$(DEPDIR)/clutter-cairo-texture.Plo - -rm -f deprecated/$(DEPDIR)/clutter-frame-source.Plo - -rm -f deprecated/$(DEPDIR)/clutter-group.Plo - -rm -f deprecated/$(DEPDIR)/clutter-input-device-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-layout-manager-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/clutter-list-model.Plo - -rm -f deprecated/$(DEPDIR)/clutter-media.Plo - -rm -f deprecated/$(DEPDIR)/clutter-model.Plo - -rm -f deprecated/$(DEPDIR)/clutter-rectangle.Plo - -rm -f deprecated/$(DEPDIR)/clutter-score.Plo - -rm -f deprecated/$(DEPDIR)/clutter-shader.Plo - -rm -f deprecated/$(DEPDIR)/clutter-state.Plo - -rm -f deprecated/$(DEPDIR)/clutter-table-layout.Plo - -rm -f deprecated/$(DEPDIR)/clutter-texture.Plo - -rm -f deprecated/$(DEPDIR)/clutter-timeout-interval.Plo - -rm -f deprecated/$(DEPDIR)/clutter-timeout-pool.Plo - -rm -f egl/$(DEPDIR)/clutter-backend-eglnative.Plo - -rm -f evdev/$(DEPDIR)/clutter-device-manager-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-event-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-input-device-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-input-device-tool-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-seat-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-virtual-input-device-evdev.Plo - -rm -f evdev/$(DEPDIR)/clutter-xkb-utils.Plo - -rm -f wayland/$(DEPDIR)/clutter-wayland-surface.Plo - -rm -f x11/$(DEPDIR)/clutter-backend-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-device-manager-core-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-device-manager-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-event-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-core-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-tool-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-input-device-xi2.Plo - -rm -f x11/$(DEPDIR)/clutter-keymap-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-stage-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-virtual-input-device-x11.Plo - -rm -f x11/$(DEPDIR)/clutter-x11-texture-pixmap.Plo - -rm -f x11/$(DEPDIR)/clutter-xkb-a11y-x11.Plo - -rm -f x11/xsettings/$(DEPDIR)/xsettings-client.Plo - -rm -f x11/xsettings/$(DEPDIR)/xsettings-common.Plo + -rm -rf ./$(DEPDIR) cally/$(DEPDIR) cogl/$(DEPDIR) deprecated/$(DEPDIR) egl/$(DEPDIR) evdev/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) x11/xsettings/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2813,13 +2361,12 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-hdr distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-cally_includeHEADERS \ - install-clutter_deprecatedHEADERS \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-hdr distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-cally_includeHEADERS install-clutter_deprecatedHEADERS \ install-clutter_includeHEADERS \ install-clutteregl_includeHEADERS \ install-clutterevdev_includeHEADERS \ diff -Nru mutter-3.28.4/clutter/configure mutter-3.28.4+git20200505/clutter/configure --- mutter-3.28.4/clutter/configure 2019-05-14 17:55:55.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/configure 2020-05-05 19:17:53.000000000 +0000 @@ -749,6 +749,7 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE +am__quote am__include DEPDIR OBJEXT @@ -824,6 +825,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -842,8 +844,7 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -am__quote' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -889,12 +890,6 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -GLIB_CFLAGS -GLIB_LIBS -GLIB_GENMARSHAL -GOBJECT_QUERY -GLIB_MKENUMS -GLIB_COMPILE_RESOURCES XMKMF LIBWACOM_CFLAGS LIBWACOM_LIBS @@ -942,6 +937,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1194,6 +1190,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1331,7 +1336,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1484,6 +1489,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1596,17 +1602,6 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - GLIB_GENMARSHAL - value of glib_genmarshal for glib-2.0, overriding pkg-config - GOBJECT_QUERY - value of gobject_query for glib-2.0, overriding pkg-config - GLIB_MKENUMS - value of glib_mkenums for glib-2.0, overriding pkg-config - GLIB_COMPILE_RESOURCES - value of glib_compile_resources for gio-2.0, overriding - pkg-config XMKMF Path to xmkmf, Makefile generator for X Window System LIBWACOM_CFLAGS C compiler flags for LIBWACOM, overriding pkg-config @@ -2501,7 +2496,7 @@ -am__api_version='1.16' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3008,8 +3003,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3176,7 +3171,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3502,45 +3497,45 @@ ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } -cat > confinc.mk << 'END' + +am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - case $?:`cat confinc.out 2>/dev/null` in #( - '0:this is the am__doit target') : - case $s in #( - BSD) : - am__include='.include' am__quote='"' ;; #( - *) : - am__include='include' am__quote='' ;; -esac ;; #( - *) : +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD ;; -esac - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -5779,7 +5774,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -9471,6 +9466,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -9725,7 +9723,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -10395,6 +10393,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -10416,7 +10415,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -11511,9 +11510,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -11522,7 +11518,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -11534,6 +11530,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -12828,9 +12836,6 @@ # Checks for typedefs, structures, and compiler characteristics. - - - # Check whether --enable-glibtest was given. if test "${enable_glibtest+set}" = set; then : enableval=$enable_glibtest; @@ -12839,8 +12844,7 @@ fi - min_glib_version=2.53.2 - pkg_config_args="glib-2.0 >= $min_glib_version" + pkg_config_args=glib-2.0 for module in . gobject gio gthread gmodule-no-export do case "$module" in @@ -12990,171 +12994,7 @@ PKG_CONFIG=no fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } - -if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_config_args" 2>&1` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_config_args" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - - -if test -n "$GLIB_GENMARSHAL"; then - pkg_cv_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_GENMARSHAL=`$PKG_CONFIG --variable="glib_genmarshal" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_GENMARSHAL=$pkg_cv_GLIB_GENMARSHAL - -if test "x$GLIB_GENMARSHAL" = x""; then : - -fi - -if test -n "$GOBJECT_QUERY"; then - pkg_cv_GOBJECT_QUERY="$GOBJECT_QUERY" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GOBJECT_QUERY=`$PKG_CONFIG --variable="gobject_query" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GOBJECT_QUERY=$pkg_cv_GOBJECT_QUERY - -if test "x$GOBJECT_QUERY" = x""; then : - -fi - -if test -n "$GLIB_MKENUMS"; then - pkg_cv_GLIB_MKENUMS="$GLIB_MKENUMS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_MKENUMS=`$PKG_CONFIG --variable="glib_mkenums" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_MKENUMS=$pkg_cv_GLIB_MKENUMS - -if test "x$GLIB_MKENUMS" = x""; then : - -fi - -if test -n "$GLIB_COMPILE_RESOURCES"; then - pkg_cv_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable="glib_compile_resources" "gio-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_COMPILE_RESOURCES=$pkg_cv_GLIB_COMPILE_RESOURCES - -if test "x$GLIB_COMPILE_RESOURCES" = x""; then : - -fi - + min_glib_version=2.53.2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } @@ -13173,6 +13013,13 @@ fi if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -13334,6 +13181,12 @@ GLIB_COMPILE_RESOURCES="" as_fn_error $? "glib-2.0 is required" "$LINENO" 5 fi + + + + + + rm -f conf.glibtest @@ -16139,7 +15992,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -17049,35 +16902,29 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - case $CONFIG_FILES in #( - *\'*) : - eval set x "$CONFIG_FILES" ;; #( - *) : - set x $CONFIG_FILES ;; #( - *) : - ;; -esac + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`$as_dirname -- "$am_mf" || -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$am_mf" : 'X\(//\)[^/]' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -17095,48 +16942,53 @@ q } s/.*/./; q'` - am_filepart=`$as_basename -- "$am_mf" || -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q } - /^X\/\(\/\/\)$/{ + /^X\(\/\/\)[^/].*/{ s//\1/ q } - /^X\/\(\/\).*/{ + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` - { echo "$as_me:$LINENO: cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles" >&5 - (cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } || am_rc=$? + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking). -See \`config.log' for more details" "$LINENO" 5; } - fi - { am_dirpart=; unset am_dirpart;} - { am_filepart=; unset am_filepart;} - { am_mf=; unset am_mf;} - { am_rc=; unset am_rc;} - rm -f conftest-deps.mk } ;; "libtool":C) @@ -17154,7 +17006,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -Nru mutter-3.28.4/clutter/examples/Makefile.in mutter-3.28.4+git20200505/clutter/examples/Makefile.in --- mutter-3.28.4/clutter/examples/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/examples/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -243,16 +243,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/actor-model.Po \ - ./$(DEPDIR)/basic-actor.Po ./$(DEPDIR)/bin-layout.Po \ - ./$(DEPDIR)/box-layout.Po ./$(DEPDIR)/canvas.Po \ - ./$(DEPDIR)/constraints.Po ./$(DEPDIR)/drag-action.Po \ - ./$(DEPDIR)/drop-action.Po ./$(DEPDIR)/easing-modes.Po \ - ./$(DEPDIR)/flow-layout.Po ./$(DEPDIR)/grid-layout.Po \ - ./$(DEPDIR)/image-content.Po ./$(DEPDIR)/layout-manager.Po \ - ./$(DEPDIR)/pan-action.Po ./$(DEPDIR)/rounded-rectangle.Po \ - ./$(DEPDIR)/scroll-actor.Po ./$(DEPDIR)/threads.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -492,6 +483,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -536,8 +528,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -632,29 +624,23 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-model.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic-actor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canvas.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraints.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drag-action.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drop-action.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/easing-modes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-content.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout-manager.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pan-action.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rounded-rectangle.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scroll-actor.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-model.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/basic-actor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/bin-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/box-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/canvas.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/constraints.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drag-action.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/drop-action.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/easing-modes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flow-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/grid-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image-content.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/layout-manager.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pan-action.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rounded-rectangle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/scroll-actor.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/threads.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -735,10 +721,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -808,23 +791,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/actor-model.Po - -rm -f ./$(DEPDIR)/basic-actor.Po - -rm -f ./$(DEPDIR)/bin-layout.Po - -rm -f ./$(DEPDIR)/box-layout.Po - -rm -f ./$(DEPDIR)/canvas.Po - -rm -f ./$(DEPDIR)/constraints.Po - -rm -f ./$(DEPDIR)/drag-action.Po - -rm -f ./$(DEPDIR)/drop-action.Po - -rm -f ./$(DEPDIR)/easing-modes.Po - -rm -f ./$(DEPDIR)/flow-layout.Po - -rm -f ./$(DEPDIR)/grid-layout.Po - -rm -f ./$(DEPDIR)/image-content.Po - -rm -f ./$(DEPDIR)/layout-manager.Po - -rm -f ./$(DEPDIR)/pan-action.Po - -rm -f ./$(DEPDIR)/rounded-rectangle.Po - -rm -f ./$(DEPDIR)/scroll-actor.Po - -rm -f ./$(DEPDIR)/threads.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -870,23 +837,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/actor-model.Po - -rm -f ./$(DEPDIR)/basic-actor.Po - -rm -f ./$(DEPDIR)/bin-layout.Po - -rm -f ./$(DEPDIR)/box-layout.Po - -rm -f ./$(DEPDIR)/canvas.Po - -rm -f ./$(DEPDIR)/constraints.Po - -rm -f ./$(DEPDIR)/drag-action.Po - -rm -f ./$(DEPDIR)/drop-action.Po - -rm -f ./$(DEPDIR)/easing-modes.Po - -rm -f ./$(DEPDIR)/flow-layout.Po - -rm -f ./$(DEPDIR)/grid-layout.Po - -rm -f ./$(DEPDIR)/image-content.Po - -rm -f ./$(DEPDIR)/layout-manager.Po - -rm -f ./$(DEPDIR)/pan-action.Po - -rm -f ./$(DEPDIR)/rounded-rectangle.Po - -rm -f ./$(DEPDIR)/scroll-actor.Po - -rm -f ./$(DEPDIR)/threads.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -907,9 +858,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.28.4/clutter/Makefile.in mutter-3.28.4+git20200505/clutter/Makefile.in --- mutter-3.28.4/clutter/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/Makefile.in 2020-05-05 19:17:53.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -144,7 +144,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir distdir-am dist dist-all distcheck + cscope distdir dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -394,6 +394,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -437,8 +438,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -565,10 +566,7 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru mutter-3.28.4/clutter/tests/accessibility/Makefile.in mutter-3.28.4+git20200505/clutter/tests/accessibility/Makefile.in --- mutter-3.28.4/clutter/tests/accessibility/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/accessibility/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -163,13 +163,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/cally-atkcomponent-example.Po \ - ./$(DEPDIR)/cally-atkeditabletext-example.Po \ - ./$(DEPDIR)/cally-atkevents-example.Po \ - ./$(DEPDIR)/cally-atktext-example.Po \ - ./$(DEPDIR)/cally-clone-example.Po \ - ./$(DEPDIR)/cally-examples-util.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -408,6 +402,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -465,8 +460,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -513,18 +508,12 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkcomponent-example.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkeditabletext-example.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkevents-example.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atktext-example.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-clone-example.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-examples-util.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkcomponent-example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkeditabletext-example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atkevents-example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-atktext-example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-clone-example.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cally-examples-util.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -605,10 +594,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -680,12 +666,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/cally-atkcomponent-example.Po - -rm -f ./$(DEPDIR)/cally-atkeditabletext-example.Po - -rm -f ./$(DEPDIR)/cally-atkevents-example.Po - -rm -f ./$(DEPDIR)/cally-atktext-example.Po - -rm -f ./$(DEPDIR)/cally-clone-example.Po - -rm -f ./$(DEPDIR)/cally-examples-util.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -731,12 +712,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/cally-atkcomponent-example.Po - -rm -f ./$(DEPDIR)/cally-atkeditabletext-example.Po - -rm -f ./$(DEPDIR)/cally-atkevents-example.Po - -rm -f ./$(DEPDIR)/cally-atktext-example.Po - -rm -f ./$(DEPDIR)/cally-clone-example.Po - -rm -f ./$(DEPDIR)/cally-examples-util.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -757,7 +733,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.28.4/clutter/tests/conform/Makefile.in mutter-3.28.4+git20200505/clutter/tests/conform/Makefile.in --- mutter-3.28.4/clutter/tests/conform/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/conform/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -141,32 +141,6 @@ CONFIG_HEADER = $(top_builddir)/clutter/clutter-build-config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__EXEEXT_1 = -am__EXEEXT_2 = actor-anchors$(EXEEXT) actor-destroy$(EXEEXT) \ - actor-graph$(EXEEXT) actor-invariants$(EXEEXT) \ - actor-iter$(EXEEXT) actor-layout$(EXEEXT) actor-meta$(EXEEXT) \ - actor-offscreen-limit-max-size$(EXEEXT) \ - actor-offscreen-redirect$(EXEEXT) actor-paint-opacity$(EXEEXT) \ - actor-pick$(EXEEXT) actor-shader-effect$(EXEEXT) \ - actor-size$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_3 = binding-pool$(EXEEXT) color$(EXEEXT) \ - events-touch$(EXEEXT) interval$(EXEEXT) model$(EXEEXT) \ - script-parser$(EXEEXT) units$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_4 = text$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_5 = animator$(EXEEXT) behaviours$(EXEEXT) group$(EXEEXT) \ - rectangle$(EXEEXT) texture$(EXEEXT) $(am__EXEEXT_1) -am__EXEEXT_6 = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ - $(am__EXEEXT_5) -am__EXEEXT_7 = $(am__EXEEXT_6) -@ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_8 = $(am__EXEEXT_7) -@ENABLE_INSTALLED_TESTS_TRUE@am__EXEEXT_9 = $(am__EXEEXT_6) -am__installdirs = "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_testdir)" \ - "$(DESTDIR)$(installed_test_metadir)" \ - "$(DESTDIR)$(installed_testdir)" -@ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_10 = $(am__EXEEXT_7) -PROGRAMS = $(installed_test_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -194,7 +168,33 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } +am__installdirs = "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_testdir)" \ + "$(DESTDIR)$(installed_test_metadir)" \ + "$(DESTDIR)$(installed_testdir)" LTLIBRARIES = $(installed_test_LTLIBRARIES) $(noinst_LTLIBRARIES) +am__EXEEXT_1 = +am__EXEEXT_2 = actor-anchors$(EXEEXT) actor-destroy$(EXEEXT) \ + actor-graph$(EXEEXT) actor-invariants$(EXEEXT) \ + actor-iter$(EXEEXT) actor-layout$(EXEEXT) actor-meta$(EXEEXT) \ + actor-offscreen-limit-max-size$(EXEEXT) \ + actor-offscreen-redirect$(EXEEXT) actor-paint-opacity$(EXEEXT) \ + actor-pick$(EXEEXT) actor-shader-effect$(EXEEXT) \ + actor-size$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_3 = binding-pool$(EXEEXT) color$(EXEEXT) \ + events-touch$(EXEEXT) interval$(EXEEXT) model$(EXEEXT) \ + script-parser$(EXEEXT) units$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_4 = text$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_5 = animator$(EXEEXT) behaviours$(EXEEXT) group$(EXEEXT) \ + rectangle$(EXEEXT) texture$(EXEEXT) $(am__EXEEXT_1) +am__EXEEXT_6 = $(am__EXEEXT_2) $(am__EXEEXT_3) $(am__EXEEXT_4) \ + $(am__EXEEXT_5) +am__EXEEXT_7 = $(am__EXEEXT_6) +@ENABLE_ALWAYS_BUILD_TESTS_FALSE@am__EXEEXT_8 = $(am__EXEEXT_7) +@ENABLE_INSTALLED_TESTS_TRUE@am__EXEEXT_9 = $(am__EXEEXT_6) +@ENABLE_ALWAYS_BUILD_TESTS_TRUE@am__EXEEXT_10 = $(am__EXEEXT_7) +PROGRAMS = $(installed_test_PROGRAMS) $(noinst_PROGRAMS) actor_anchors_SOURCES = actor-anchors.c actor_anchors_OBJECTS = actor-anchors.$(OBJEXT) actor_anchors_LDADD = $(LDADD) @@ -373,22 +373,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/actor-anchors.Po \ - ./$(DEPDIR)/actor-destroy.Po ./$(DEPDIR)/actor-graph.Po \ - ./$(DEPDIR)/actor-invariants.Po ./$(DEPDIR)/actor-iter.Po \ - ./$(DEPDIR)/actor-layout.Po ./$(DEPDIR)/actor-meta.Po \ - ./$(DEPDIR)/actor-offscreen-limit-max-size.Po \ - ./$(DEPDIR)/actor-offscreen-redirect.Po \ - ./$(DEPDIR)/actor-paint-opacity.Po ./$(DEPDIR)/actor-pick.Po \ - ./$(DEPDIR)/actor-shader-effect.Po ./$(DEPDIR)/actor-size.Po \ - ./$(DEPDIR)/animator.Po ./$(DEPDIR)/behaviours.Po \ - ./$(DEPDIR)/binding-pool.Po ./$(DEPDIR)/color.Po \ - ./$(DEPDIR)/events-touch.Po ./$(DEPDIR)/group.Po \ - ./$(DEPDIR)/interval.Po ./$(DEPDIR)/model.Po \ - ./$(DEPDIR)/rectangle.Po ./$(DEPDIR)/script-parser.Po \ - ./$(DEPDIR)/text.Po ./$(DEPDIR)/texture.Po \ - ./$(DEPDIR)/units.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -811,6 +796,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -970,8 +956,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_srcdir)/build/autotools/glib-tap.mk $(am__empty): @@ -984,6 +970,63 @@ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): +clean-checkLTLIBRARIES: + -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) + @list='$(check_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES) + @$(NORMAL_INSTALL) + @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + list2=; for p in $$list; do \ + if test -f $$p; then \ + list2="$$list2 $$p"; \ + else :; fi; \ + done; \ + test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(installed_testdir)'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(installed_testdir)"; \ + } + +uninstall-installed_testLTLIBRARIES: + @$(NORMAL_UNINSTALL) + @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ + for p in $$list; do \ + $(am__strip_dir) \ + echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installed_testdir)/$$f'"; \ + $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installed_testdir)/$$f"; \ + done + +clean-installed_testLTLIBRARIES: + -test -z "$(installed_test_LTLIBRARIES)" || rm -f $(installed_test_LTLIBRARIES) + @list='$(installed_test_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +clean-noinstLTLIBRARIES: + -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) + @list='$(noinst_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ echo " rm -f" $$list; \ @@ -1051,63 +1094,6 @@ echo " rm -f" $$list; \ rm -f $$list -clean-checkLTLIBRARIES: - -test -z "$(check_LTLIBRARIES)" || rm -f $(check_LTLIBRARIES) - @list='$(check_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -install-installed_testLTLIBRARIES: $(installed_test_LTLIBRARIES) - @$(NORMAL_INSTALL) - @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(MKDIR_P) '$(DESTDIR)$(installed_testdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(installed_testdir)" || exit 1; \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(installed_testdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(installed_testdir)"; \ - } - -uninstall-installed_testLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(installed_test_LTLIBRARIES)'; test -n "$(installed_testdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(installed_testdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(installed_testdir)/$$f"; \ - done - -clean-installed_testLTLIBRARIES: - -test -z "$(installed_test_LTLIBRARIES)" || rm -f $(installed_test_LTLIBRARIES) - @list='$(installed_test_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - -clean-noinstLTLIBRARIES: - -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES) - @list='$(noinst_LTLIBRARIES)'; \ - locs=`for p in $$list; do echo $$p; done | \ - sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ - sort -u`; \ - test -z "$$locs" || { \ - echo rm -f $${locs}; \ - rm -f $${locs}; \ - } - actor-anchors$(EXEEXT): $(actor_anchors_OBJECTS) $(actor_anchors_DEPENDENCIES) $(EXTRA_actor_anchors_DEPENDENCIES) @rm -f actor-anchors$(EXEEXT) $(AM_V_CCLD)$(LINK) $(actor_anchors_OBJECTS) $(actor_anchors_LDADD) $(LIBS) @@ -1253,38 +1239,32 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-anchors.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-destroy.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-graph.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-invariants.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-iter.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-meta.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-limit-max-size.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-redirect.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-paint-opacity.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-pick.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-shader-effect.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-size.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animator.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/behaviours.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binding-pool.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events-touch.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interval.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script-parser.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/units.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-anchors.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-destroy.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-graph.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-invariants.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-iter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-meta.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-limit-max-size.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-offscreen-redirect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-paint-opacity.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-pick.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-shader-effect.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/actor-size.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animator.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/behaviours.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/binding-pool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/color.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/events-touch.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/group.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interval.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/model.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rectangle.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script-parser.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/units.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1530,7 +1510,7 @@ fi; \ $$success || exit 1 -check-TESTS: $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) $(check_DATA) +check-TESTS: @list='$(RECHECK_LOGS)'; test -z "$$list" || rm -f $$list @list='$(RECHECK_LOGS:.log=.trs)'; test -z "$$list" || rm -f $$list @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @@ -1540,7 +1520,7 @@ log_list=`echo $$log_list`; trs_list=`echo $$trs_list`; \ $(MAKE) $(AM_MAKEFLAGS) $(TEST_SUITE_LOG) TEST_LOGS="$$log_list"; \ exit $$?; -recheck: all $(check_PROGRAMS) $(check_LTLIBRARIES) $(check_SCRIPTS) $(check_DATA) +recheck: all $(check_LTLIBRARIES) $(check_PROGRAMS) $(check_SCRIPTS) $(check_DATA) @test -z "$(TEST_SUITE_LOG)" || rm -f $(TEST_SUITE_LOG) @set +e; $(am__set_TESTS_bases); \ bases=`for i in $$bases; do echo $$i; done \ @@ -1748,10 +1728,7 @@ @am__EXEEXT_TRUE@ $(am__common_driver_flags) $(AM_TEST_LOG_DRIVER_FLAGS) $(TEST_LOG_DRIVER_FLAGS) -- $(TEST_LOG_COMPILE) \ @am__EXEEXT_TRUE@ "$$tst" $(AM_TESTS_FD_REDIRECT) -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1782,12 +1759,12 @@ fi; \ done check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) $(check_LTLIBRARIES) \ + $(MAKE) $(AM_MAKEFLAGS) $(check_LTLIBRARIES) $(check_PROGRAMS) \ $(check_SCRIPTS) $(check_DATA) $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-am -all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(DATA) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(DATA) installdirs: for dir in "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_testdir)" "$(DESTDIR)$(installed_test_metadir)" "$(DESTDIR)$(installed_testdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ @@ -1838,32 +1815,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/actor-anchors.Po - -rm -f ./$(DEPDIR)/actor-destroy.Po - -rm -f ./$(DEPDIR)/actor-graph.Po - -rm -f ./$(DEPDIR)/actor-invariants.Po - -rm -f ./$(DEPDIR)/actor-iter.Po - -rm -f ./$(DEPDIR)/actor-layout.Po - -rm -f ./$(DEPDIR)/actor-meta.Po - -rm -f ./$(DEPDIR)/actor-offscreen-limit-max-size.Po - -rm -f ./$(DEPDIR)/actor-offscreen-redirect.Po - -rm -f ./$(DEPDIR)/actor-paint-opacity.Po - -rm -f ./$(DEPDIR)/actor-pick.Po - -rm -f ./$(DEPDIR)/actor-shader-effect.Po - -rm -f ./$(DEPDIR)/actor-size.Po - -rm -f ./$(DEPDIR)/animator.Po - -rm -f ./$(DEPDIR)/behaviours.Po - -rm -f ./$(DEPDIR)/binding-pool.Po - -rm -f ./$(DEPDIR)/color.Po - -rm -f ./$(DEPDIR)/events-touch.Po - -rm -f ./$(DEPDIR)/group.Po - -rm -f ./$(DEPDIR)/interval.Po - -rm -f ./$(DEPDIR)/model.Po - -rm -f ./$(DEPDIR)/rectangle.Po - -rm -f ./$(DEPDIR)/script-parser.Po - -rm -f ./$(DEPDIR)/text.Po - -rm -f ./$(DEPDIR)/texture.Po - -rm -f ./$(DEPDIR)/units.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1912,32 +1864,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/actor-anchors.Po - -rm -f ./$(DEPDIR)/actor-destroy.Po - -rm -f ./$(DEPDIR)/actor-graph.Po - -rm -f ./$(DEPDIR)/actor-invariants.Po - -rm -f ./$(DEPDIR)/actor-iter.Po - -rm -f ./$(DEPDIR)/actor-layout.Po - -rm -f ./$(DEPDIR)/actor-meta.Po - -rm -f ./$(DEPDIR)/actor-offscreen-limit-max-size.Po - -rm -f ./$(DEPDIR)/actor-offscreen-redirect.Po - -rm -f ./$(DEPDIR)/actor-paint-opacity.Po - -rm -f ./$(DEPDIR)/actor-pick.Po - -rm -f ./$(DEPDIR)/actor-shader-effect.Po - -rm -f ./$(DEPDIR)/actor-size.Po - -rm -f ./$(DEPDIR)/animator.Po - -rm -f ./$(DEPDIR)/behaviours.Po - -rm -f ./$(DEPDIR)/binding-pool.Po - -rm -f ./$(DEPDIR)/color.Po - -rm -f ./$(DEPDIR)/events-touch.Po - -rm -f ./$(DEPDIR)/group.Po - -rm -f ./$(DEPDIR)/interval.Po - -rm -f ./$(DEPDIR)/model.Po - -rm -f ./$(DEPDIR)/rectangle.Po - -rm -f ./$(DEPDIR)/script-parser.Po - -rm -f ./$(DEPDIR)/text.Po - -rm -f ./$(DEPDIR)/texture.Po - -rm -f ./$(DEPDIR)/units.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1962,17 +1889,16 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-TESTS \ - check-am clean clean-checkLTLIBRARIES clean-checkPROGRAMS \ - clean-generic clean-installed_testLTLIBRARIES \ - clean-installed_testPROGRAMS clean-libtool \ - clean-noinstLTLIBRARIES clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-installed_testLTLIBRARIES \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ + clean-checkLTLIBRARIES clean-checkPROGRAMS clean-generic \ + clean-installed_testLTLIBRARIES clean-installed_testPROGRAMS \ + clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-installed_testLTLIBRARIES \ install-installed_testPROGRAMS install-installed_testSCRIPTS \ install-installed_test_metaDATA install-man \ install-nobase_installed_testDATA install-pdf install-pdf-am \ diff -Nru mutter-3.28.4/clutter/tests/interactive/Makefile.in mutter-3.28.4+git20200505/clutter/tests/interactive/Makefile.in --- mutter-3.28.4/clutter/tests/interactive/Makefile.in 2019-05-14 17:55:55.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/interactive/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -211,57 +211,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test_interactive-test-actors.Po \ - ./$(DEPDIR)/test_interactive-test-animation.Po \ - ./$(DEPDIR)/test_interactive-test-animator.Po \ - ./$(DEPDIR)/test_interactive-test-bind-constraint.Po \ - ./$(DEPDIR)/test_interactive-test-binding-pool.Po \ - ./$(DEPDIR)/test_interactive-test-cairo-clock.Po \ - ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po \ - ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po \ - ./$(DEPDIR)/test_interactive-test-content.Po \ - ./$(DEPDIR)/test_interactive-test-devices.Po \ - ./$(DEPDIR)/test_interactive-test-easing.Po \ - ./$(DEPDIR)/test_interactive-test-events.Po \ - ./$(DEPDIR)/test_interactive-test-fbo.Po \ - ./$(DEPDIR)/test_interactive-test-grab.Po \ - ./$(DEPDIR)/test_interactive-test-image.Po \ - ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po \ - ./$(DEPDIR)/test_interactive-test-layout.Po \ - ./$(DEPDIR)/test_interactive-test-main.Po \ - ./$(DEPDIR)/test_interactive-test-multistage.Po \ - ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po \ - ./$(DEPDIR)/test_interactive-test-path-constraint.Po \ - ./$(DEPDIR)/test_interactive-test-pixmap.Po \ - ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po \ - ./$(DEPDIR)/test_interactive-test-scale.Po \ - ./$(DEPDIR)/test_interactive-test-script.Po \ - ./$(DEPDIR)/test_interactive-test-scrolling.Po \ - ./$(DEPDIR)/test_interactive-test-shader-effects.Po \ - ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po \ - ./$(DEPDIR)/test_interactive-test-stage-sizing.Po \ - ./$(DEPDIR)/test_interactive-test-state-animator.Po \ - ./$(DEPDIR)/test_interactive-test-state-script.Po \ - ./$(DEPDIR)/test_interactive-test-state.Po \ - ./$(DEPDIR)/test_interactive-test-swipe-action.Po \ - ./$(DEPDIR)/test_interactive-test-table-layout.Po \ - ./$(DEPDIR)/test_interactive-test-text-field.Po \ - ./$(DEPDIR)/test_interactive-test-text.Po \ - ./$(DEPDIR)/test_interactive-test-texture-async.Po \ - ./$(DEPDIR)/test_interactive-test-texture-material.Po \ - ./$(DEPDIR)/test_interactive-test-texture-quality.Po \ - ./$(DEPDIR)/test_interactive-test-texture-slicing.Po \ - ./$(DEPDIR)/test_interactive-test-touch-events.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -494,6 +444,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -581,8 +532,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -615,62 +566,56 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-actors.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animation.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animator.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-bind-constraint.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-binding-pool.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-clock.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-flowers.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-content.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-devices.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-easing.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-events.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-fbo.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-grab.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-image.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-keyframe-transition.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-main.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-multistage.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-paint-wrapper.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-path-constraint.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-pixmap.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-rotate-zoom.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scale.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-script.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scrolling.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-shader-effects.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-sizing.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-animator.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-script.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-swipe-action.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-table-layout.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text-field.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-async.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-material.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-quality.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-slicing.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-touch-events.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-actors.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animation.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-animator.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-bind-constraint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-binding-pool.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-clock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cairo-flowers.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-content.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-devices.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-easing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-events.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-fbo.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-grab.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-image.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-keyframe-transition.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-multistage.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-paint-wrapper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-path-constraint.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-pixmap.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-rotate-zoom.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scale.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-script.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-scrolling.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-shader-effects.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-stage-sizing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-animator.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state-script.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-state.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-swipe-action.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-table-layout.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text-field.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-async.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-material.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-quality.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-texture-slicing.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_interactive-test-touch-events.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -1451,10 +1396,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1529,56 +1471,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test_interactive-test-actors.Po - -rm -f ./$(DEPDIR)/test_interactive-test-animation.Po - -rm -f ./$(DEPDIR)/test_interactive-test-animator.Po - -rm -f ./$(DEPDIR)/test_interactive-test-bind-constraint.Po - -rm -f ./$(DEPDIR)/test_interactive-test-binding-pool.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cairo-clock.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po - -rm -f ./$(DEPDIR)/test_interactive-test-content.Po - -rm -f ./$(DEPDIR)/test_interactive-test-devices.Po - -rm -f ./$(DEPDIR)/test_interactive-test-easing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-events.Po - -rm -f ./$(DEPDIR)/test_interactive-test-fbo.Po - -rm -f ./$(DEPDIR)/test_interactive-test-grab.Po - -rm -f ./$(DEPDIR)/test_interactive-test-image.Po - -rm -f ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po - -rm -f ./$(DEPDIR)/test_interactive-test-layout.Po - -rm -f ./$(DEPDIR)/test_interactive-test-main.Po - -rm -f ./$(DEPDIR)/test_interactive-test-multistage.Po - -rm -f ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po - -rm -f ./$(DEPDIR)/test_interactive-test-path-constraint.Po - -rm -f ./$(DEPDIR)/test_interactive-test-pixmap.Po - -rm -f ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po - -rm -f ./$(DEPDIR)/test_interactive-test-scale.Po - -rm -f ./$(DEPDIR)/test_interactive-test-script.Po - -rm -f ./$(DEPDIR)/test_interactive-test-scrolling.Po - -rm -f ./$(DEPDIR)/test_interactive-test-shader-effects.Po - -rm -f ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po - -rm -f ./$(DEPDIR)/test_interactive-test-stage-sizing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state-animator.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state-script.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state.Po - -rm -f ./$(DEPDIR)/test_interactive-test-swipe-action.Po - -rm -f ./$(DEPDIR)/test_interactive-test-table-layout.Po - -rm -f ./$(DEPDIR)/test_interactive-test-text-field.Po - -rm -f ./$(DEPDIR)/test_interactive-test-text.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-async.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-material.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-quality.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-slicing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-touch-events.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1624,56 +1517,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test_interactive-test-actors.Po - -rm -f ./$(DEPDIR)/test_interactive-test-animation.Po - -rm -f ./$(DEPDIR)/test_interactive-test-animator.Po - -rm -f ./$(DEPDIR)/test_interactive-test-bind-constraint.Po - -rm -f ./$(DEPDIR)/test_interactive-test-binding-pool.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cairo-clock.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cairo-flowers.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-multitexture.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-offscreen.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-point-sprites.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-arbfp.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-shader-glsl.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-convert.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-foreign.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-polygon.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-tex-tile.Po - -rm -f ./$(DEPDIR)/test_interactive-test-cogl-vertex-buffer.Po - -rm -f ./$(DEPDIR)/test_interactive-test-content.Po - -rm -f ./$(DEPDIR)/test_interactive-test-devices.Po - -rm -f ./$(DEPDIR)/test_interactive-test-easing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-events.Po - -rm -f ./$(DEPDIR)/test_interactive-test-fbo.Po - -rm -f ./$(DEPDIR)/test_interactive-test-grab.Po - -rm -f ./$(DEPDIR)/test_interactive-test-image.Po - -rm -f ./$(DEPDIR)/test_interactive-test-keyframe-transition.Po - -rm -f ./$(DEPDIR)/test_interactive-test-layout.Po - -rm -f ./$(DEPDIR)/test_interactive-test-main.Po - -rm -f ./$(DEPDIR)/test_interactive-test-multistage.Po - -rm -f ./$(DEPDIR)/test_interactive-test-paint-wrapper.Po - -rm -f ./$(DEPDIR)/test_interactive-test-path-constraint.Po - -rm -f ./$(DEPDIR)/test_interactive-test-pixmap.Po - -rm -f ./$(DEPDIR)/test_interactive-test-rotate-zoom.Po - -rm -f ./$(DEPDIR)/test_interactive-test-scale.Po - -rm -f ./$(DEPDIR)/test_interactive-test-script.Po - -rm -f ./$(DEPDIR)/test_interactive-test-scrolling.Po - -rm -f ./$(DEPDIR)/test_interactive-test-shader-effects.Po - -rm -f ./$(DEPDIR)/test_interactive-test-stage-read-pixels.Po - -rm -f ./$(DEPDIR)/test_interactive-test-stage-sizing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state-animator.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state-script.Po - -rm -f ./$(DEPDIR)/test_interactive-test-state.Po - -rm -f ./$(DEPDIR)/test_interactive-test-swipe-action.Po - -rm -f ./$(DEPDIR)/test_interactive-test-table-layout.Po - -rm -f ./$(DEPDIR)/test_interactive-test-text-field.Po - -rm -f ./$(DEPDIR)/test_interactive-test-text.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-async.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-material.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-quality.Po - -rm -f ./$(DEPDIR)/test_interactive-test-texture-slicing.Po - -rm -f ./$(DEPDIR)/test_interactive-test-touch-events.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1694,7 +1538,7 @@ .MAKE: all check check-am install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool clean-local \ cscopelist-am ctags ctags-am distclean distclean-compile \ distclean-generic distclean-libtool distclean-tags distdir dvi \ diff -Nru mutter-3.28.4/clutter/tests/Makefile.in mutter-3.28.4+git20200505/clutter/tests/Makefile.in --- mutter-3.28.4/clutter/tests/Makefile.in 2019-05-14 17:55:54.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -371,6 +371,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -401,8 +402,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -519,10 +520,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/clutter/tests/micro-bench/Makefile.in mutter-3.28.4+git20200505/clutter/tests/micro-bench/Makefile.in --- mutter-3.28.4/clutter/tests/micro-bench/Makefile.in 2019-05-14 17:55:55.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/micro-bench/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -153,10 +153,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test-cogl-perf.Po \ - ./$(DEPDIR)/test-picking.Po ./$(DEPDIR)/test-random-text.Po \ - ./$(DEPDIR)/test-text-perf.Po ./$(DEPDIR)/test-text.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -391,6 +388,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -445,8 +443,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -493,17 +491,11 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cogl-perf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-random-text.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-cogl-perf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-random-text.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -584,10 +576,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -658,11 +647,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test-cogl-perf.Po - -rm -f ./$(DEPDIR)/test-picking.Po - -rm -f ./$(DEPDIR)/test-random-text.Po - -rm -f ./$(DEPDIR)/test-text-perf.Po - -rm -f ./$(DEPDIR)/test-text.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -708,11 +693,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test-cogl-perf.Po - -rm -f ./$(DEPDIR)/test-picking.Po - -rm -f ./$(DEPDIR)/test-random-text.Po - -rm -f ./$(DEPDIR)/test-text-perf.Po - -rm -f ./$(DEPDIR)/test-text.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -733,7 +714,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.28.4/clutter/tests/performance/Makefile.in mutter-3.28.4+git20200505/clutter/tests/performance/Makefile.in --- mutter-3.28.4/clutter/tests/performance/Makefile.in 2019-05-14 17:55:55.000000000 +0000 +++ mutter-3.28.4+git20200505/clutter/tests/performance/Makefile.in 2020-05-05 19:17:54.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -164,12 +164,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/clutter depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test-picking.Po \ - ./$(DEPDIR)/test-state-hidden.Po \ - ./$(DEPDIR)/test-state-interactive.Po \ - ./$(DEPDIR)/test-state-mini.Po ./$(DEPDIR)/test-state-pick.Po \ - ./$(DEPDIR)/test-state.Po ./$(DEPDIR)/test-text-perf.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -406,6 +401,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -460,8 +456,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -516,19 +512,13 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-hidden.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-interactive.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-mini.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-pick.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-picking.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-hidden.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-interactive.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-mini.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state-pick.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-state.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-text-perf.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -609,10 +599,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -683,13 +670,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test-picking.Po - -rm -f ./$(DEPDIR)/test-state-hidden.Po - -rm -f ./$(DEPDIR)/test-state-interactive.Po - -rm -f ./$(DEPDIR)/test-state-mini.Po - -rm -f ./$(DEPDIR)/test-state-pick.Po - -rm -f ./$(DEPDIR)/test-state.Po - -rm -f ./$(DEPDIR)/test-text-perf.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -735,13 +716,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test-picking.Po - -rm -f ./$(DEPDIR)/test-state-hidden.Po - -rm -f ./$(DEPDIR)/test-state-interactive.Po - -rm -f ./$(DEPDIR)/test-state-mini.Po - -rm -f ./$(DEPDIR)/test-state-pick.Po - -rm -f ./$(DEPDIR)/test-state.Po - -rm -f ./$(DEPDIR)/test-text-perf.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -762,7 +737,7 @@ .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool cscopelist-am \ ctags ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.28.4/cogl/aclocal.m4 mutter-3.28.4+git20200505/cogl/aclocal.m4 --- mutter-3.28.4/cogl/aclocal.m4 2019-05-14 17:55:29.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/aclocal.m4 2020-05-05 19:17:43.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.16.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15.1 -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -20,9 +20,224 @@ If you have problems, you may need to regenerate the build system entirely. To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) +# Configure paths for GLIB +# Owen Taylor 1997-2001 + +# Increment this whenever this file is changed. +#serial 1 + +dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) +dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, +dnl gthread, or gio is specified in MODULES, pass to pkg-config +dnl +AC_DEFUN([AM_PATH_GLIB_2_0], +[dnl +dnl Get the cflags and libraries from pkg-config +dnl +AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], + , enable_glibtest=yes) + + pkg_config_args=glib-2.0 + for module in . $4 + do + case "$module" in + gmodule) + pkg_config_args="$pkg_config_args gmodule-2.0" + ;; + gmodule-no-export) + pkg_config_args="$pkg_config_args gmodule-no-export-2.0" + ;; + gobject) + pkg_config_args="$pkg_config_args gobject-2.0" + ;; + gthread) + pkg_config_args="$pkg_config_args gthread-2.0" + ;; + gio*) + pkg_config_args="$pkg_config_args $module-2.0" + ;; + esac + done + + PKG_PROG_PKG_CONFIG([0.16]) + + no_glib="" + + if test "x$PKG_CONFIG" = x ; then + no_glib=yes + PKG_CONFIG=no + fi + + min_glib_version=ifelse([$1], ,2.0.0,$1) + AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) + + if test x$PKG_CONFIG != xno ; then + ## don't try to run the test against uninstalled libtool libs + if $PKG_CONFIG --uninstalled $pkg_config_args; then + echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" + enable_glibtest=no + fi + + if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then + : + else + no_glib=yes + fi + fi + + if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` + glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_glibtest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$GLIB_LIBS $LIBS" +dnl +dnl Now check if the installed GLIB is sufficiently new. (Also sanity +dnl checks the results of pkg-config to some extent) +dnl + rm -f conf.glibtest + AC_TRY_RUN([ +#include +#include +#include + +int +main (void) +{ + unsigned int major, minor, micro; + + fclose (fopen ("conf.glibtest", "w")); + + if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_glib_version"); + exit(1); + } + + if ((glib_major_version != $glib_config_major_version) || + (glib_minor_version != $glib_config_minor_version) || + (glib_micro_version != $glib_config_micro_version)) + { + printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", + $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, + glib_major_version, glib_minor_version, glib_micro_version); + printf ("*** was found! If pkg-config was correct, then it is best\n"); + printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); + printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); + printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); + printf("*** required on your system.\n"); + printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); + printf("*** to point to the correct configuration files\n"); + } + else if ((glib_major_version != GLIB_MAJOR_VERSION) || + (glib_minor_version != GLIB_MINOR_VERSION) || + (glib_micro_version != GLIB_MICRO_VERSION)) + { + printf("*** GLIB header files (version %d.%d.%d) do not match\n", + GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); + printf("*** library (version %d.%d.%d)\n", + glib_major_version, glib_minor_version, glib_micro_version); + } + else + { + if ((glib_major_version > major) || + ((glib_major_version == major) && (glib_minor_version > minor)) || + ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", + glib_major_version, glib_minor_version, glib_micro_version); + printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", + major, minor, micro); + printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); + printf("***\n"); + printf("*** If you have already installed a sufficiently new version, this error\n"); + printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); + printf("*** being found. The easiest way to fix this is to remove the old version\n"); + printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); + printf("*** correct copy of pkg-config. (In this case, you will have to\n"); + printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); + printf("*** so that the correct libraries are found at run-time))\n"); + } + } + return 1; +} +],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_glib" = x ; then + AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$PKG_CONFIG" = "no" ; then + echo "*** A new enough version of pkg-config was not found." + echo "*** See http://www.freedesktop.org/software/pkgconfig/" + else + if test -f conf.glibtest ; then + : + else + echo "*** Could not run GLIB test program, checking why..." + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $GLIB_CFLAGS" + LIBS="$LIBS $GLIB_LIBS" + AC_TRY_LINK([ +#include +#include +], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding GLIB or finding the wrong" + echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + GLIB_CFLAGS="" + GLIB_LIBS="" + GLIB_GENMARSHAL="" + GOBJECT_QUERY="" + GLIB_MKENUMS="" + GLIB_COMPILE_RESOURCES="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) + rm -f conf.glibtest +]) +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -296,291 +511,7 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES - -# Configure paths for GLIB -# Owen Taylor 1997-2001 - -# Increment this whenever this file is changed. -#serial 3 - -dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, -dnl gthread, or gio is specified in MODULES, pass to pkg-config -dnl -AC_DEFUN([AM_PATH_GLIB_2_0], -[dnl -dnl Get the cflags and libraries from pkg-config -dnl - -dnl We can't use PKG_PREREQ because that needs 0.29. -m4_ifndef([PKG_PROG_PKG_CONFIG], - [pkg.m4 version 0.28 or later is required]) - -AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], - , enable_glibtest=yes) - - min_glib_version=ifelse([$1], [], [2.0.0], [$1]) - pkg_config_args="glib-2.0 >= $min_glib_version" - for module in . $4 - do - case "$module" in - gmodule) - pkg_config_args="$pkg_config_args gmodule-2.0" - ;; - gmodule-no-export) - pkg_config_args="$pkg_config_args gmodule-no-export-2.0" - ;; - gobject) - pkg_config_args="$pkg_config_args gobject-2.0" - ;; - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - gio*) - pkg_config_args="$pkg_config_args $module-2.0" - ;; - esac - done - - PKG_PROG_PKG_CONFIG([0.16]) - - no_glib="" - - if test "x$PKG_CONFIG" = x ; then - no_glib=yes - PKG_CONFIG=no - fi - - dnl For GLIB_CFLAGS and GLIB_LIBS - PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) - - dnl For the tools - PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) - PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) - PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) - PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) - - AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GLib found in PKG_CONFIG_PATH" - enable_glibtest=no - fi - - if $PKG_CONFIG --atleast-version $min_glib_version $pkg_config_args; then - : - else - no_glib=yes - fi - fi - - if test x"$no_glib" = x ; then - glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - glib_config_micro_version=`$PKG_CONFIG --modversion glib-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_glibtest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$GLIB_LIBS $LIBS" -dnl -dnl Now check if the installed GLIB is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.glibtest - AC_TRY_RUN([ -#include -#include -#include - -int -main (void) -{ - unsigned int major, minor, micro; - - fclose (fopen ("conf.glibtest", "w")); - - if (sscanf("$min_glib_version", "%u.%u.%u", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_glib_version"); - exit(1); - } - - if ((glib_major_version != $glib_config_major_version) || - (glib_minor_version != $glib_config_minor_version) || - (glib_micro_version != $glib_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion glib-2.0' returned %d.%d.%d, but GLIB (%d.%d.%d)\n", - $glib_config_major_version, $glib_config_minor_version, $glib_config_micro_version, - glib_major_version, glib_minor_version, glib_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GLib. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((glib_major_version != GLIB_MAJOR_VERSION) || - (glib_minor_version != GLIB_MINOR_VERSION) || - (glib_micro_version != GLIB_MICRO_VERSION)) - { - printf("*** GLIB header files (version %d.%d.%d) do not match\n", - GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - glib_major_version, glib_minor_version, glib_micro_version); - } - else - { - if ((glib_major_version > major) || - ((glib_major_version == major) && (glib_minor_version > minor)) || - ((glib_major_version == major) && (glib_minor_version == minor) && (glib_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GLIB (%u.%u.%u) was found.\n", - glib_major_version, glib_minor_version, glib_micro_version); - printf("*** You need a version of GLIB newer than %u.%u.%u. The latest version of\n", - major, minor, micro); - printf("*** GLIB is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GLIB, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_glib=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_glib" = x ; then - AC_MSG_RESULT(yes (version $glib_config_major_version.$glib_config_minor_version.$glib_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://www.freedesktop.org/software/pkgconfig/" - else - if test -f conf.glibtest ; then - : - else - echo "*** Could not run GLIB test program, checking why..." - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GLIB_CFLAGS" - LIBS="$LIBS $GLIB_LIBS" - AC_TRY_LINK([ -#include -#include -], [ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GLIB or finding the wrong" - echo "*** version of GLIB. If it is not finding GLIB, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GLIB is incorrectly installed."]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GLIB_CFLAGS="" - GLIB_LIBS="" - GLIB_GENMARSHAL="" - GOBJECT_QUERY="" - GLIB_MKENUMS="" - GLIB_COMPILE_RESOURCES="" - ifelse([$3], , :, [$3]) - fi - rm -f conf.glibtest -]) - -# Copyright (C) 2002-2018 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, @@ -592,10 +523,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.16' +[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.16.1], [], +m4_if([$1], [1.15.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -611,14 +542,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.16.1])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-2018 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, @@ -670,7 +601,7 @@ # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -701,7 +632,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2018 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, @@ -892,12 +823,13 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2018 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, # with or without modifications, as long as this notice is preserved. + # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], @@ -905,41 +837,49 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - AS_CASE([$CONFIG_FILES], - [*\'*], [eval set x "$CONFIG_FILES"], - [*], [set x $CONFIG_FILES]) + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`AS_ECHO(["$am_mf"]) | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`AS_DIRNAME(["$am_mf"])` - am_filepart=`AS_BASENAME(["$am_mf"])` - AM_RUN_LOG([cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles]) || am_rc=$? + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - AC_MSG_FAILURE([Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking).]) - fi - AS_UNSET([am_dirpart]) - AS_UNSET([am_filepart]) - AS_UNSET([am_mf]) - AS_UNSET([am_rc]) - rm -f conftest-deps.mk } ])# _AM_OUTPUT_DEPENDENCY_COMMANDS @@ -948,17 +888,18 @@ # ----------------------------- # This macro should only be invoked once -- use via AC_REQUIRE. # -# This code is only required when automatic dependency tracking is enabled. -# This creates each '.Po' and '.Plo' makefile fragment that we'll need in -# order to bootstrap the dependency handling code. +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], - [AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}"])]) + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -1045,8 +986,8 @@ AC_REQUIRE([AC_PROG_MKDIR_P])dnl # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target (and possibly the TAP driver). The # system "awk" is bad on some platforms. @@ -1113,7 +1054,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -1155,7 +1096,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2018 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, @@ -1176,7 +1117,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2018 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, @@ -1197,7 +1138,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -1205,42 +1146,49 @@ # AM_MAKE_INCLUDE() # ----------------- -# Check whether make has an 'include' directive that can support all -# the idioms we need for our automatic dependency tracking code. +# Check to see how make treats includes. AC_DEFUN([AM_MAKE_INCLUDE], -[AC_MSG_CHECKING([whether ${MAKE-make} supports the include directive]) -cat > confinc.mk << 'END' +[am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - AM_RUN_LOG([${MAKE-make} -f confmf.$s && cat confinc.out]) - AS_CASE([$?:`cat confinc.out 2>/dev/null`], - ['0:this is the am__doit target'], - [AS_CASE([$s], - [BSD], [am__include='.include' am__quote='"'], - [am__include='include' am__quote=''])]) - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -AC_MSG_RESULT([${_am_result}]) -AC_SUBST([am__include])]) -AC_SUBST([am__quote])]) +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2018 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, @@ -1279,7 +1227,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2018 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, @@ -1308,7 +1256,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2018 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, @@ -1355,7 +1303,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2018 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, @@ -1374,7 +1322,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2018 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, @@ -1455,7 +1403,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2018 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, @@ -1515,7 +1463,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2018 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, @@ -1543,7 +1491,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2018 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, @@ -1562,7 +1510,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2018 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 -Nru mutter-3.28.4/cogl/build/autotools/libtool.m4 mutter-3.28.4+git20200505/cogl/build/autotools/libtool.m4 --- mutter-3.28.4/cogl/build/autotools/libtool.m4 2019-05-14 17:29:53.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/autotools/libtool.m4 2020-05-05 19:17:39.000000000 +0000 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2867,9 +2866,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2878,7 +2874,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2890,6 +2886,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3549,7 +3557,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4427,7 +4435,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4939,6 +4947,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5001,6 +5012,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5255,7 +5269,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5776,6 +5790,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5797,7 +5812,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -Nru mutter-3.28.4/cogl/build/compile mutter-3.28.4+git20200505/cogl/build/compile --- mutter-3.28.4/cogl/build/compile 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/compile 2020-05-05 19:17:44.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2018-03-07.03; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2018 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,8 +255,7 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ - icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -340,9 +339,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/cogl/build/config.guess mutter-3.28.4+git20200505/cogl/build/config.guess --- mutter-3.28.4/cogl/build/config.guess 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/config.guess 2020-05-05 19:17:44.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-24' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -84,6 +84,8 @@ exit 1 fi +trap 'exit 1' 1 2 15 + # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires # temporary files to be created and, as you can see below, it is a @@ -94,39 +96,34 @@ # Portable tmp directory creation inspired by the Autoconf team. -tmp= -# shellcheck disable=SC2172 -trap 'test -z "$tmp" || rm -fr "$tmp"' 1 2 13 15 -trap 'exitcode=$?; test -z "$tmp" || rm -fr "$tmp"; exit $exitcode' 0 - -set_cc_for_build() { - : "${TMPDIR=/tmp}" - # shellcheck disable=SC2039 - { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || - { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir "$tmp" 2>/dev/null) ; } || - { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir "$tmp" 2>/dev/null) && echo "Warning: creating insecure temp directory" >&2 ; } || - { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } - dummy=$tmp/dummy - case ${CC_FOR_BUILD-},${HOST_CC-},${CC-} in - ,,) echo "int x;" > "$dummy.c" - for driver in cc gcc c89 c99 ; do - if ($driver -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then - CC_FOR_BUILD="$driver" - break - fi - done - if test x"$CC_FOR_BUILD" = x ; then - CC_FOR_BUILD=no_compiler_found - fi - ;; - ,,*) CC_FOR_BUILD=$CC ;; - ,*,*) CC_FOR_BUILD=$HOST_CC ;; - esac -} +set_cc_for_build=' +trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; +: ${TMPDIR=/tmp} ; + { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || + { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || + { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || + { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; +dummy=$tmp/dummy ; +tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; +case $CC_FOR_BUILD,$HOST_CC,$CC in + ,,) echo "int x;" > "$dummy.c" ; + for c in cc gcc c89 c99 ; do + if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then + CC_FOR_BUILD="$c"; break ; + fi ; + done ; + if test x"$CC_FOR_BUILD" = x ; then + CC_FOR_BUILD=no_compiler_found ; + fi + ;; + ,,*) CC_FOR_BUILD=$CC ;; + ,*,*) CC_FOR_BUILD=$HOST_CC ;; +esac ; set_cc_for_build= ;' # This is needed to find uname on a Pyramid OSx when run in the BSD universe. # (ghazi@noc.rutgers.edu 1994-08-24) -if test -f /.attbin/uname ; then +if (test -f /.attbin/uname) >/dev/null 2>&1 ; then PATH=$PATH:/.attbin ; export PATH fi @@ -141,7 +138,7 @@ # We could probably try harder. LIBC=gnu - set_cc_for_build + eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include #if defined(__UCLIBC__) @@ -202,7 +199,7 @@ os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) - set_cc_for_build + eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then @@ -240,7 +237,7 @@ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "$machine-${os}${release}${abi-}" + echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` @@ -392,15 +389,20 @@ echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) - UNAME_REL="`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" - case `isainfo -b` in - 32) - echo i386-pc-solaris2"$UNAME_REL" - ;; - 64) - echo x86_64-pc-solaris2"$UNAME_REL" - ;; - esac + eval "$set_cc_for_build" + SUN_ARCH=i386 + # If there is a compiler, see if it is configured for 64-bit objects. + # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. + # This test works for both compilers. + if [ "$CC_FOR_BUILD" != no_compiler_found ]; then + if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + SUN_ARCH=x86_64 + fi + fi + echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize @@ -480,7 +482,7 @@ echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include /* for printf() prototype */ @@ -577,7 +579,7 @@ exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include @@ -658,7 +660,7 @@ esac fi if [ "$HP_ARCH" = "" ]; then - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE @@ -698,7 +700,7 @@ esac if [ "$HP_ARCH" = hppa2.0w ] then - set_cc_for_build + eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler @@ -724,7 +726,7 @@ echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include int @@ -838,17 +840,6 @@ *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; - arm:FreeBSD:*:*) - UNAME_PROCESSOR=`uname -p` - set_cc_for_build - if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ - | grep -q __ARM_PCS_VFP - then - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabi - else - echo "${UNAME_PROCESSOR}"-unknown-freebsd"`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`"-gnueabihf - fi - exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in @@ -903,8 +894,8 @@ # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; - *:Minix:*:*) - echo "$UNAME_MACHINE"-unknown-minix + i*86:Minix:*:*) + echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -931,7 +922,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then @@ -980,7 +971,7 @@ echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) - set_cc_for_build + eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} @@ -1055,7 +1046,11 @@ echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) - echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + if objdump -f /bin/sh | grep -q elf32-x86-64; then + echo "$UNAME_MACHINE"-pc-linux-"$LIBC"x32 + else + echo "$UNAME_MACHINE"-pc-linux-"$LIBC" + fi exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" @@ -1294,7 +1289,7 @@ exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown - set_cc_for_build + eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi @@ -1367,7 +1362,6 @@ # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. - # shellcheck disable=SC2154 if test "$cputype" = 386; then UNAME_MACHINE=i386 else @@ -1479,7 +1473,7 @@ exit 1 # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/cogl/build/config.sub mutter-3.28.4+git20200505/cogl/build/config.sub --- mutter-3.28.4/cogl/build/config.sub 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/config.sub 2020-05-05 19:17:44.000000000 +0000 @@ -1,8 +1,8 @@ -#!/usr/bin/sh +#! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. -timestamp='2018-08-29' +timestamp='2018-02-22' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -110,1159 +110,1223 @@ exit 1;; esac -# Split fields of configuration type -IFS="-" read -r field1 field2 field3 field4 <&2 - exit 1 +# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). +# Here we must recognize all the valid KERNEL-OS combinations. +maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` +case $maybe_os in + nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ + linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ + knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ + kopensolaris*-gnu* | cloudabi*-eabi* | \ + storm-chaos* | os2-emx* | rtmk-nova*) + os=-$maybe_os + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` + ;; + android-linux) + os=-linux-android + basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown + ;; + *) + basic_machine=`echo "$1" | sed 's/-[^-]*$//'` + if [ "$basic_machine" != "$1" ] + then os=`echo "$1" | sed 's/.*-/-/'` + else os=; fi + ;; +esac + +### Let's recognize common machines as not being operating systems so +### that things like config.sub decstation-3100 work. We also +### recognize some manufacturers as not being operating systems, so we +### can provide default operating systems below. +case $os in + -sun*os*) + # Prevent following clause from handling this invalid input. ;; - *-*-*-*) - basic_machine=$field1-$field2 - os=$field3-$field4 + -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \ + -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \ + -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \ + -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ + -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ + -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ + -apple | -axis | -knuth | -cray | -microblaze*) + os= + basic_machine=$1 + ;; + -bluegene*) + os=-cnk + ;; + -sim | -cisco | -oki | -wec | -winbond) + os= + basic_machine=$1 + ;; + -scout) + ;; + -wrs) + os=-vxworks + basic_machine=$1 + ;; + -chorusos*) + os=-chorusos + basic_machine=$1 + ;; + -chorusrdb) + os=-chorusrdb + basic_machine=$1 + ;; + -hiux*) + os=-hiuxwe2 + ;; + -sco6) + os=-sco5v6 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco5) + os=-sco3.2v5 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco4) + os=-sco3.2v4 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*-*) - # Ambiguous whether COMPANY is present, or skipped and KERNEL-OS is two - # parts - maybe_os=$field2-$field3 - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc \ - | linux-newlib* | linux-musl* | linux-uclibc* | uclinux-uclibc* \ - | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* \ - | netbsd*-eabi* | kopensolaris*-gnu* | cloudabi*-eabi* \ - | storm-chaos* | os2-emx* | rtmk-nova*) - basic_machine=$field1 - os=$maybe_os - ;; - android-linux) - basic_machine=$field1-unknown - os=linux-android - ;; - *) - basic_machine=$field1-$field2 - os=$field3 - ;; - esac + -sco3.2.[4-9]*) + os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *-*) - # A lone config we happen to match not fitting any patern - case $field1-$field2 in - decstation-3100) - basic_machine=mips-dec - os= - ;; - *-*) - # Second component is usually, but not always the OS - case $field2 in - # Prevent following clause from handling this valid os - sun*os*) - basic_machine=$field1 - os=$field2 - ;; - # Manufacturers - dec* | mips* | sequent* | encore* | pc533* | sgi* | sony* \ - | att* | 7300* | 3300* | delta* | motorola* | sun[234]* \ - | unicom* | ibm* | next | hp | isi* | apollo | altos* \ - | convergent* | ncr* | news | 32* | 3600* | 3100* \ - | hitachi* | c[123]* | convex* | sun | crds | omron* | dg \ - | ultra | tti* | harris | dolphin | highlevel | gould \ - | cbm | ns | masscomp | apple | axis | knuth | cray \ - | microblaze* | sim | cisco \ - | oki | wec | wrs | winbond) - basic_machine=$field1-$field2 - os= - ;; - *) - basic_machine=$field1 - os=$field2 - ;; - esac - ;; - esac + -sco3.2v[4-9]*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; - *) - # Convert single-component short-hands not valid as part of - # multi-component configurations. - case $field1 in - 386bsd) - basic_machine=i386-pc - os=bsd - ;; - a29khif) - basic_machine=a29k-amd - os=udi - ;; - adobe68k) - basic_machine=m68010-adobe - os=scout - ;; - alliant) - basic_machine=fx80-alliant - os= - ;; - altos | altos3068) - basic_machine=m68k-altos - os= - ;; - am29k) - basic_machine=a29k-none - os=bsd - ;; - amdahl) - basic_machine=580-amdahl - os=sysv - ;; - amiga) - basic_machine=m68k-unknown - os= - ;; - amigaos | amigados) - basic_machine=m68k-unknown - os=amigaos - ;; - amigaunix | amix) - basic_machine=m68k-unknown - os=sysv4 - ;; - apollo68) - basic_machine=m68k-apollo - os=sysv - ;; - apollo68bsd) - basic_machine=m68k-apollo - os=bsd - ;; - aros) - basic_machine=i386-pc - os=aros - ;; - aux) - basic_machine=m68k-apple - os=aux - ;; - balance) - basic_machine=ns32k-sequent - os=dynix - ;; - blackfin) - basic_machine=bfin-unknown - os=linux - ;; - cegcc) - basic_machine=arm-unknown - os=cegcc - ;; - convex-c1) - basic_machine=c1-convex - os=bsd - ;; - convex-c2) - basic_machine=c2-convex - os=bsd - ;; - convex-c32) - basic_machine=c32-convex - os=bsd - ;; - convex-c34) - basic_machine=c34-convex - os=bsd - ;; - convex-c38) - basic_machine=c38-convex - os=bsd - ;; - cray) - basic_machine=j90-cray - os=unicos - ;; - crds | unos) - basic_machine=m68k-crds - os= - ;; - da30) - basic_machine=m68k-da30 - os= - ;; - decstation | pmax | pmin | dec3100 | decstatn) - basic_machine=mips-dec - os= - ;; - delta88) - basic_machine=m88k-motorola - os=sysv3 - ;; - dicos) - basic_machine=i686-pc - os=dicos - ;; - djgpp) - basic_machine=i586-pc - os=msdosdjgpp - ;; - ebmon29k) - basic_machine=a29k-amd - os=ebmon - ;; - es1800 | OSE68k | ose68k | ose | OSE) - basic_machine=m68k-ericsson - os=ose - ;; - gmicro) - basic_machine=tron-gmicro - os=sysv - ;; - go32) - basic_machine=i386-pc - os=go32 - ;; - h8300hms) - basic_machine=h8300-hitachi - os=hms - ;; - h8300xray) - basic_machine=h8300-hitachi - os=xray - ;; - h8500hms) - basic_machine=h8500-hitachi - os=hms - ;; - harris) - basic_machine=m88k-harris - os=sysv3 - ;; - hp300) - basic_machine=m68k-hp - ;; - hp300bsd) - basic_machine=m68k-hp - os=bsd - ;; - hp300hpux) - basic_machine=m68k-hp - os=hpux - ;; - hppaosf) - basic_machine=hppa1.1-hp - os=osf - ;; - hppro) - basic_machine=hppa1.1-hp - os=proelf - ;; - i386mach) - basic_machine=i386-mach - os=mach - ;; - vsta) - basic_machine=i386-pc - os=vsta - ;; - isi68 | isi) - basic_machine=m68k-isi - os=sysv - ;; - m68knommu) - basic_machine=m68k-unknown - os=linux - ;; - magnum | m3230) - basic_machine=mips-mips - os=sysv - ;; - merlin) - basic_machine=ns32k-utek - os=sysv - ;; - mingw64) - basic_machine=x86_64-pc - os=mingw64 - ;; - mingw32) - basic_machine=i686-pc - os=mingw32 - ;; - mingw32ce) - basic_machine=arm-unknown - os=mingw32ce - ;; - monitor) - basic_machine=m68k-rom68k - os=coff - ;; - morphos) - basic_machine=powerpc-unknown - os=morphos - ;; - moxiebox) - basic_machine=moxie-unknown - os=moxiebox - ;; - msdos) - basic_machine=i386-pc - os=msdos - ;; - msys) - basic_machine=i686-pc - os=msys - ;; - mvs) - basic_machine=i370-ibm - os=mvs - ;; - nacl) - basic_machine=le32-unknown - os=nacl - ;; - ncr3000) - basic_machine=i486-ncr - os=sysv4 - ;; - netbsd386) - basic_machine=i386-pc - os=netbsd - ;; - netwinder) - basic_machine=armv4l-rebel - os=linux - ;; - news | news700 | news800 | news900) - basic_machine=m68k-sony - os=newsos - ;; - news1000) - basic_machine=m68030-sony - os=newsos - ;; - necv70) - basic_machine=v70-nec - os=sysv - ;; - nh3000) - basic_machine=m68k-harris - os=cxux - ;; - nh[45]000) - basic_machine=m88k-harris - os=cxux - ;; - nindy960) - basic_machine=i960-intel - os=nindy - ;; - mon960) - basic_machine=i960-intel - os=mon960 - ;; - nonstopux) - basic_machine=mips-compaq - os=nonstopux - ;; - os400) - basic_machine=powerpc-ibm - os=os400 - ;; - OSE68000 | ose68000) - basic_machine=m68000-ericsson - os=ose - ;; - os68k) - basic_machine=m68k-none - os=os68k - ;; - paragon) - basic_machine=i860-intel - os=osf - ;; - parisc) - basic_machine=hppa-unknown - os=linux - ;; - pw32) - basic_machine=i586-unknown - os=pw32 - ;; - rdos | rdos64) - basic_machine=x86_64-pc - os=rdos - ;; - rdos32) - basic_machine=i386-pc - os=rdos - ;; - rom68k) - basic_machine=m68k-rom68k - os=coff - ;; - sa29200) - basic_machine=a29k-amd - os=udi - ;; - sei) - basic_machine=mips-sei - os=seiux - ;; - sequent) - basic_machine=i386-sequent - os= - ;; - sps7) - basic_machine=m68k-bull - os=sysv2 - ;; - st2000) - basic_machine=m68k-tandem - os= - ;; - stratus) - basic_machine=i860-stratus - os=sysv4 - ;; - sun2) - basic_machine=m68000-sun - os= - ;; - sun2os3) - basic_machine=m68000-sun - os=sunos3 - ;; - sun2os4) - basic_machine=m68000-sun - os=sunos4 - ;; - sun3) - basic_machine=m68k-sun - os= - ;; - sun3os3) - basic_machine=m68k-sun - os=sunos3 - ;; - sun3os4) - basic_machine=m68k-sun - os=sunos4 - ;; - sun4) - basic_machine=sparc-sun - os= - ;; - sun4os3) - basic_machine=sparc-sun - os=sunos3 - ;; - sun4os4) - basic_machine=sparc-sun - os=sunos4 - ;; - sun4sol2) - basic_machine=sparc-sun - os=solaris2 - ;; - sun386 | sun386i | roadrunner) - basic_machine=i386-sun - os= - ;; - sv1) - basic_machine=sv1-cray - os=unicos - ;; - symmetry) - basic_machine=i386-sequent - os=dynix - ;; - t3e) - basic_machine=alphaev5-cray - os=unicos - ;; - t90) - basic_machine=t90-cray - os=unicos - ;; - toad1) - basic_machine=pdp10-xkl - os=tops20 - ;; - tpf) - basic_machine=s390x-ibm - os=tpf - ;; - udi29k) - basic_machine=a29k-amd - os=udi - ;; - ultra3) - basic_machine=a29k-nyu - os=sym1 - ;; - v810 | necv810) - basic_machine=v810-nec - os=none - ;; - vaxv) - basic_machine=vax-dec - os=sysv - ;; - vms) - basic_machine=vax-dec - os=vms - ;; - vxworks960) - basic_machine=i960-wrs - os=vxworks - ;; - vxworks68) - basic_machine=m68k-wrs - os=vxworks - ;; - vxworks29k) - basic_machine=a29k-wrs - os=vxworks - ;; - xbox) - basic_machine=i686-pc - os=mingw32 - ;; - ymp) - basic_machine=ymp-cray - os=unicos - ;; - *) - basic_machine=$1 - os= - ;; - esac + -sco5v6*) + # Don't forget version if it is 3.2v4 or newer. + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -sco*) + os=-sco3.2v2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -udk*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -isc) + os=-isc2.2 + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -clix*) + basic_machine=clipper-intergraph + ;; + -isc*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` + ;; + -lynx*178) + os=-lynxos178 + ;; + -lynx*5) + os=-lynxos5 + ;; + -lynx*) + os=-lynxos + ;; + -ptx*) + basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` + ;; + -psos*) + os=-psos + ;; + -mint | -mint[0-9]*) + basic_machine=m68k-atari + os=-mint ;; esac -# Decode 1-component or ad-hoc basic machines +# Decode aliases for certain CPU-COMPANY combinations. case $basic_machine in - # Here we handle the default manufacturer of certain CPU types. It is in - # some cases the only manufacturer, in others, it is the most popular. - w89k) - cpu=hppa1.1 - vendor=winbond + # Recognize the basic CPU types without company name. + # Some are omitted here because they have special meanings below. + 1750a | 580 \ + | a29k \ + | aarch64 | aarch64_be \ + | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ + | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ + | am33_2.0 \ + | arc | arceb \ + | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ + | avr | avr32 \ + | ba \ + | be32 | be64 \ + | bfin \ + | c4x | c8051 | clipper \ + | d10v | d30v | dlx | dsp16xx \ + | e2k | epiphany \ + | fido | fr30 | frv | ft32 \ + | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ + | hexagon \ + | i370 | i860 | i960 | ia16 | ia64 \ + | ip2k | iq2000 \ + | k1om \ + | le32 | le64 \ + | lm32 \ + | m32c | m32r | m32rle | m68000 | m68k | m88k \ + | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ + | mips | mipsbe | mipseb | mipsel | mipsle \ + | mips16 \ + | mips64 | mips64el \ + | mips64octeon | mips64octeonel \ + | mips64orion | mips64orionel \ + | mips64r5900 | mips64r5900el \ + | mips64vr | mips64vrel \ + | mips64vr4100 | mips64vr4100el \ + | mips64vr4300 | mips64vr4300el \ + | mips64vr5000 | mips64vr5000el \ + | mips64vr5900 | mips64vr5900el \ + | mipsisa32 | mipsisa32el \ + | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ + | mipsisa64 | mipsisa64el \ + | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ + | mipsisa64sb1 | mipsisa64sb1el \ + | mipsisa64sr71k | mipsisa64sr71kel \ + | mipsr5900 | mipsr5900el \ + | mipstx39 | mipstx39el \ + | mn10200 | mn10300 \ + | moxie \ + | mt \ + | msp430 \ + | nds32 | nds32le | nds32be \ + | nios | nios2 | nios2eb | nios2el \ + | ns16k | ns32k \ + | open8 | or1k | or1knd | or32 \ + | pdp10 | pj | pjl \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ + | pru \ + | pyramid \ + | riscv32 | riscv64 \ + | rl78 | rx \ + | score \ + | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ + | sh64 | sh64le \ + | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ + | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | ubicom32 \ + | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ + | visium \ + | wasm32 \ + | x86 | xc16x | xstormy16 | xtensa \ + | z8k | z80) + basic_machine=$basic_machine-unknown ;; - op50n) - cpu=hppa1.1 - vendor=oki + c54x) + basic_machine=tic54x-unknown ;; - op60c) - cpu=hppa1.1 - vendor=oki + c55x) + basic_machine=tic55x-unknown ;; - ibm*) - cpu=i370 - vendor=ibm + c6x) + basic_machine=tic6x-unknown ;; - orion105) - cpu=clipper - vendor=highlevel + leon|leon[3-9]) + basic_machine=sparc-$basic_machine ;; - mac | mpw | mac-mpw) - cpu=m68k - vendor=apple + m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) + basic_machine=$basic_machine-unknown + os=-none ;; - pmac | pmac-mpw) - cpu=powerpc - vendor=apple + m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) + ;; + ms1) + basic_machine=mt-unknown + ;; + + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xgate) + basic_machine=$basic_machine-unknown + os=-none + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + + xscaleel) + basic_machine=armel-unknown ;; + # We use `pc' rather than `unknown' + # because (1) that's what they normally are, and + # (2) the word "unknown" tends to confuse beginning users. + i*86 | x86_64) + basic_machine=$basic_machine-pc + ;; + # Object if more than one company name word. + *-*-*) + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 + ;; + # Recognize the basic CPU types with company name. + 580-* \ + | a29k-* \ + | aarch64-* | aarch64_be-* \ + | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ + | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ + | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ + | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ + | avr-* | avr32-* \ + | ba-* \ + | be32-* | be64-* \ + | bfin-* | bs2000-* \ + | c[123]* | c30-* | [cjt]90-* | c4x-* \ + | c8051-* | clipper-* | craynv-* | cydra-* \ + | d10v-* | d30v-* | dlx-* \ + | e2k-* | elxsi-* \ + | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ + | h8300-* | h8500-* \ + | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ + | hexagon-* \ + | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ + | ip2k-* | iq2000-* \ + | k1om-* \ + | le32-* | le64-* \ + | lm32-* \ + | m32c-* | m32r-* | m32rle-* \ + | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ + | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ + | microblaze-* | microblazeel-* \ + | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ + | mips16-* \ + | mips64-* | mips64el-* \ + | mips64octeon-* | mips64octeonel-* \ + | mips64orion-* | mips64orionel-* \ + | mips64r5900-* | mips64r5900el-* \ + | mips64vr-* | mips64vrel-* \ + | mips64vr4100-* | mips64vr4100el-* \ + | mips64vr4300-* | mips64vr4300el-* \ + | mips64vr5000-* | mips64vr5000el-* \ + | mips64vr5900-* | mips64vr5900el-* \ + | mipsisa32-* | mipsisa32el-* \ + | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ + | mipsisa64-* | mipsisa64el-* \ + | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ + | mipsisa64sb1-* | mipsisa64sb1el-* \ + | mipsisa64sr71k-* | mipsisa64sr71kel-* \ + | mipsr5900-* | mipsr5900el-* \ + | mipstx39-* | mipstx39el-* \ + | mmix-* \ + | mt-* \ + | msp430-* \ + | nds32-* | nds32le-* | nds32be-* \ + | nios-* | nios2-* | nios2eb-* | nios2el-* \ + | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ + | or1k*-* \ + | orion-* \ + | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ + | pru-* \ + | pyramid-* \ + | riscv32-* | riscv64-* \ + | rl78-* | romp-* | rs6000-* | rx-* \ + | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ + | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ + | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ + | sparclite-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ + | tahoe-* \ + | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ + | tile*-* \ + | tron-* \ + | ubicom32-* \ + | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ + | vax-* \ + | visium-* \ + | wasm32-* \ + | we32k-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ + | xstormy16-* | xtensa*-* \ + | ymp-* \ + | z8k-* | z80-*) + ;; + # Recognize the basic CPU types without company name, with glob match. + xtensa*) + basic_machine=$basic_machine-unknown + ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. + 386bsd) + basic_machine=i386-pc + os=-bsd + ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) - cpu=m68000 - vendor=att + basic_machine=m68000-att ;; 3b*) - cpu=we32k - vendor=att + basic_machine=we32k-att + ;; + a29khif) + basic_machine=a29k-amd + os=-udi + ;; + abacus) + basic_machine=abacus-unknown + ;; + adobe68k) + basic_machine=m68010-adobe + os=-scout + ;; + alliant | fx80) + basic_machine=fx80-alliant + ;; + altos | altos3068) + basic_machine=m68k-altos + ;; + am29k) + basic_machine=a29k-none + os=-bsd + ;; + amd64) + basic_machine=x86_64-pc + ;; + amd64-*) + basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + amdahl) + basic_machine=580-amdahl + os=-sysv + ;; + amiga | amiga-*) + basic_machine=m68k-unknown + ;; + amigaos | amigados) + basic_machine=m68k-unknown + os=-amigaos + ;; + amigaunix | amix) + basic_machine=m68k-unknown + os=-sysv4 + ;; + apollo68) + basic_machine=m68k-apollo + os=-sysv + ;; + apollo68bsd) + basic_machine=m68k-apollo + os=-bsd + ;; + aros) + basic_machine=i386-pc + os=-aros + ;; + asmjs) + basic_machine=asmjs-unknown + ;; + aux) + basic_machine=m68k-apple + os=-aux + ;; + balance) + basic_machine=ns32k-sequent + os=-dynix + ;; + blackfin) + basic_machine=bfin-unknown + os=-linux + ;; + blackfin-*) + basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; bluegene*) - cpu=powerpc - vendor=ibm - os=cnk + basic_machine=powerpc-ibm + os=-cnk + ;; + c54x-*) + basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c55x-*) + basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c6x-*) + basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` + ;; + c90) + basic_machine=c90-cray + os=-unicos + ;; + cegcc) + basic_machine=arm-unknown + os=-cegcc + ;; + convex-c1) + basic_machine=c1-convex + os=-bsd + ;; + convex-c2) + basic_machine=c2-convex + os=-bsd + ;; + convex-c32) + basic_machine=c32-convex + os=-bsd + ;; + convex-c34) + basic_machine=c34-convex + os=-bsd + ;; + convex-c38) + basic_machine=c38-convex + os=-bsd + ;; + cray | j90) + basic_machine=j90-cray + os=-unicos + ;; + craynv) + basic_machine=craynv-cray + os=-unicosmp + ;; + cr16 | cr16-*) + basic_machine=cr16-unknown + os=-elf + ;; + crds | unos) + basic_machine=m68k-crds + ;; + crisv32 | crisv32-* | etraxfs*) + basic_machine=crisv32-axis + ;; + cris | cris-* | etrax*) + basic_machine=cris-axis + ;; + crx) + basic_machine=crx-unknown + os=-elf + ;; + da30 | da30-*) + basic_machine=m68k-da30 + ;; + decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn) + basic_machine=mips-dec ;; decsystem10* | dec10*) - cpu=pdp10 - vendor=dec - os=tops10 + basic_machine=pdp10-dec + os=-tops10 ;; decsystem20* | dec20*) - cpu=pdp10 - vendor=dec - os=tops20 + basic_machine=pdp10-dec + os=-tops20 ;; delta | 3300 | motorola-3300 | motorola-delta \ | 3300-motorola | delta-motorola) - cpu=m68k - vendor=motorola + basic_machine=m68k-motorola + ;; + delta88) + basic_machine=m88k-motorola + os=-sysv3 + ;; + dicos) + basic_machine=i686-pc + os=-dicos + ;; + djgpp) + basic_machine=i586-pc + os=-msdosdjgpp + ;; + dpx20 | dpx20-*) + basic_machine=rs6000-bull + os=-bosx ;; dpx2*) - cpu=m68k - vendor=bull - os=sysv3 + basic_machine=m68k-bull + os=-sysv3 ;; - encore | umax | mmax) - cpu=ns32k - vendor=encore + e500v[12]) + basic_machine=powerpc-unknown + os=$os"spe" + ;; + e500v[12]-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=$os"spe" + ;; + ebmon29k) + basic_machine=a29k-amd + os=-ebmon ;; elxsi) - cpu=elxsi - vendor=elxsi - os=${os:-bsd} + basic_machine=elxsi-elxsi + os=-bsd + ;; + encore | umax | mmax) + basic_machine=ns32k-encore + ;; + es1800 | OSE68k | ose68k | ose | OSE) + basic_machine=m68k-ericsson + os=-ose ;; fx2800) - cpu=i860 - vendor=alliant + basic_machine=i860-alliant ;; genix) - cpu=ns32k - vendor=ns + basic_machine=ns32k-ns + ;; + gmicro) + basic_machine=tron-gmicro + os=-sysv + ;; + go32) + basic_machine=i386-pc + os=-go32 ;; h3050r* | hiux*) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + h8300hms) + basic_machine=h8300-hitachi + os=-hms + ;; + h8300xray) + basic_machine=h8300-hitachi + os=-xray + ;; + h8500hms) + basic_machine=h8500-hitachi + os=-hms + ;; + harris) + basic_machine=m88k-harris + os=-sysv3 + ;; + hp300-*) + basic_machine=m68k-hp + ;; + hp300bsd) + basic_machine=m68k-hp + os=-bsd + ;; + hp300hpux) + basic_machine=m68k-hp + os=-hpux ;; hp3k9[0-9][0-9] | hp9[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k2[0-9][0-9] | hp9k31[0-9]) - cpu=m68000 - vendor=hp + basic_machine=m68000-hp ;; hp9k3[2-9][0-9]) - cpu=m68k - vendor=hp + basic_machine=m68k-hp ;; hp9k6[0-9][0-9] | hp6[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp ;; hp9k7[0-79][0-9] | hp7[0-79][0-9]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k78[0-9] | hp78[0-9]) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893) # FIXME: really hppa2.0-hp - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][13679] | hp8[0-9][13679]) - cpu=hppa1.1 - vendor=hp + basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) - cpu=hppa1.0 - vendor=hp + basic_machine=hppa1.0-hp + ;; + hppaosf) + basic_machine=hppa1.1-hp + os=-osf + ;; + hppro) + basic_machine=hppa1.1-hp + os=-proelf + ;; + i370-ibm* | ibm*) + basic_machine=i370-ibm ;; i*86v32) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv32 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv32 ;; i*86v4*) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv4 + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv4 ;; i*86v) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=sysv + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-sysv ;; i*86sol2) - cpu=`echo "$1" | sed -e 's/86.*/86/'` - vendor=pc - os=solaris2 - ;; - j90 | j90-cray) - cpu=j90 - vendor=cray - os=${os:-unicos} + basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` + os=-solaris2 + ;; + i386mach) + basic_machine=i386-mach + os=-mach + ;; + vsta) + basic_machine=i386-unknown + os=-vsta ;; iris | iris4d) - cpu=mips - vendor=sgi + basic_machine=mips-sgi case $os in - irix*) + -irix*) ;; *) - os=irix4 + os=-irix4 ;; esac ;; + isi68 | isi) + basic_machine=m68k-isi + os=-sysv + ;; + leon-*|leon[3-9]-*) + basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` + ;; + m68knommu) + basic_machine=m68k-unknown + os=-linux + ;; + m68knommu-*) + basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux + ;; + magnum | m3230) + basic_machine=mips-mips + os=-sysv + ;; + merlin) + basic_machine=ns32k-utek + os=-sysv + ;; + microblaze*) + basic_machine=microblaze-xilinx + ;; + mingw64) + basic_machine=x86_64-pc + os=-mingw64 + ;; + mingw32) + basic_machine=i686-pc + os=-mingw32 + ;; + mingw32ce) + basic_machine=arm-unknown + os=-mingw32ce + ;; miniframe) - cpu=m68000 - vendor=convergent + basic_machine=m68000-convergent + ;; + *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) + basic_machine=m68k-atari + os=-mint + ;; + mips3*-*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` + ;; + mips3*) + basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown + ;; + monitor) + basic_machine=m68k-rom68k + os=-coff + ;; + morphos) + basic_machine=powerpc-unknown + os=-morphos + ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; + msdos) + basic_machine=i386-pc + os=-msdos ;; - *mint | mint[0-9]* | *MiNT | *MiNT[0-9]*) - cpu=m68k - vendor=atari - os=mint + ms1-*) + basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` + ;; + msys) + basic_machine=i686-pc + os=-msys + ;; + mvs) + basic_machine=i370-ibm + os=-mvs + ;; + nacl) + basic_machine=le32-unknown + os=-nacl + ;; + ncr3000) + basic_machine=i486-ncr + os=-sysv4 + ;; + netbsd386) + basic_machine=i386-unknown + os=-netbsd + ;; + netwinder) + basic_machine=armv4l-rebel + os=-linux + ;; + news | news700 | news800 | news900) + basic_machine=m68k-sony + os=-newsos + ;; + news1000) + basic_machine=m68030-sony + os=-newsos ;; news-3600 | risc-news) - cpu=mips - vendor=sony - os=newsos + basic_machine=mips-sony + os=-newsos + ;; + necv70) + basic_machine=v70-nec + os=-sysv ;; next | m*-next) - cpu=m68k - vendor=next + basic_machine=m68k-next case $os in - nextstep* ) + -nextstep* ) ;; - ns2*) - os=nextstep2 + -ns2*) + os=-nextstep2 ;; *) - os=nextstep3 + os=-nextstep3 ;; esac ;; + nh3000) + basic_machine=m68k-harris + os=-cxux + ;; + nh[45]000) + basic_machine=m88k-harris + os=-cxux + ;; + nindy960) + basic_machine=i960-intel + os=-nindy + ;; + mon960) + basic_machine=i960-intel + os=-mon960 + ;; + nonstopux) + basic_machine=mips-compaq + os=-nonstopux + ;; np1) - cpu=np1 - vendor=gould + basic_machine=np1-gould + ;; + neo-tandem) + basic_machine=neo-tandem + ;; + nse-tandem) + basic_machine=nse-tandem + ;; + nsr-tandem) + basic_machine=nsr-tandem + ;; + nsv-tandem) + basic_machine=nsv-tandem + ;; + nsx-tandem) + basic_machine=nsx-tandem ;; op50n-* | op60c-*) - cpu=hppa1.1 - vendor=oki - os=proelf + basic_machine=hppa1.1-oki + os=-proelf + ;; + openrisc | openrisc-*) + basic_machine=or32-unknown + ;; + os400) + basic_machine=powerpc-ibm + os=-os400 + ;; + OSE68000 | ose68000) + basic_machine=m68000-ericsson + os=-ose + ;; + os68k) + basic_machine=m68k-none + os=-os68k ;; pa-hitachi) - cpu=hppa1.1 - vendor=hitachi - os=hiuxwe2 + basic_machine=hppa1.1-hitachi + os=-hiuxwe2 + ;; + paragon) + basic_machine=i860-intel + os=-osf + ;; + parisc) + basic_machine=hppa-unknown + os=-linux + ;; + parisc-*) + basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` + os=-linux ;; pbd) - cpu=sparc - vendor=tti + basic_machine=sparc-tti ;; pbb) - cpu=m68k - vendor=tti + basic_machine=m68k-tti ;; - pc532) - cpu=ns32k - vendor=pc532 + pc532 | pc532-*) + basic_machine=ns32k-pc532 ;; - pn) - cpu=pn - vendor=gould + pc98) + basic_machine=i386-pc ;; - power) - cpu=power - vendor=ibm + pc98-*) + basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - ps2) - cpu=i386 - vendor=ibm + pentium | p5 | k5 | k6 | nexgen | viac3) + basic_machine=i586-pc ;; - rm[46]00) - cpu=mips - vendor=siemens + pentiumpro | p6 | 6x86 | athlon | athlon_*) + basic_machine=i686-pc ;; - rtpc | rtpc-*) - cpu=romp - vendor=ibm + pentiumii | pentium2 | pentiumiii | pentium3) + basic_machine=i686-pc ;; - sde) - cpu=mipsisa32 - vendor=sde - os=${os:-elf} + pentium4) + basic_machine=i786-pc ;; - simso-wrs) - cpu=sparclite - vendor=wrs - os=vxworks + pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) + basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - tower | tower-32) - cpu=m68k - vendor=ncr + pentiumpro-* | p6-* | 6x86-* | athlon-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - vpp*|vx|vx-*) - cpu=f301 - vendor=fujitsu + pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) + basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w65) - cpu=w65 - vendor=wdc + pentium4-*) + basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - w89k-*) - cpu=hppa1.1 - vendor=winbond - os=proelf + pn) + basic_machine=pn-gould ;; - none) - cpu=none - vendor=none + power) basic_machine=power-ibm ;; - leon|leon[3-9]) - cpu=sparc - vendor=$basic_machine + ppc | ppcbe) basic_machine=powerpc-unknown ;; - leon-*|leon[3-9]-*) - cpu=sparc - vendor=`echo "$basic_machine" | sed 's/-.*//'` + ppc-* | ppcbe-*) + basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; - - *-*) - IFS="-" read -r cpu vendor <&2 - exit 1 - ;; - esac + echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 + exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. -case $vendor in - digital*) - vendor=dec +case $basic_machine in + *-digital*) + basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; - commodore*) - vendor=cbm + *-commodore*) + basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; @@ -1270,245 +1334,199 @@ # Decode manufacturer-specific aliases for certain operating systems. -if [ x$os != x ] +if [ x"$os" != x"" ] then case $os in # First match some system type aliases that might get confused # with valid system types. - # solaris* is a basic system type, with this one exception. - auroraux) - os=auroraux + # -solaris* is a basic system type, with this one exception. + -auroraux) + os=-auroraux ;; - bluegene*) - os=cnk - ;; - solaris1 | solaris1.*) + -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; - solaris) - os=solaris2 + -solaris) + os=-solaris2 ;; - unixware*) - os=sysv4.2uw + -unixware*) + os=-sysv4.2uw ;; - gnu/linux*) + -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) - es1800*) - os=ose - ;; - # Some version numbers need modification - chorusos*) - os=chorusos - ;; - isc) - os=isc2.2 - ;; - sco6) - os=sco5v6 - ;; - sco5) - os=sco3.2v5 - ;; - sco4) - os=sco3.2v4 - ;; - sco3.2.[4-9]*) - os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` - ;; - sco3.2v[4-9]* | sco5v6*) - # Don't forget version if it is 3.2v4 or newer. - ;; - scout) - # Don't match below - ;; - sco*) - os=sco3.2v2 - ;; - psos*) - os=psos + -es1800*) + os=-ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. - # sysv* is not here because it comes later, after sysvr4. - gnu* | bsd* | mach* | minix* | genix* | ultrix* | irix* \ - | *vms* | esix* | aix* | cnk* | sunos | sunos[34]*\ - | hpux* | unos* | osf* | luna* | dgux* | auroraux* | solaris* \ - | sym* | kopensolaris* | plan9* \ - | amigaos* | amigados* | msdos* | newsos* | unicos* | aof* \ - | aos* | aros* | cloudabi* | sortix* \ - | nindy* | vxsim* | vxworks* | ebmon* | hms* | mvs* \ - | clix* | riscos* | uniplus* | iris* | isc* | rtu* | xenix* \ - | knetbsd* | mirbsd* | netbsd* \ - | bitrig* | openbsd* | solidbsd* | libertybsd* \ - | ekkobsd* | kfreebsd* | freebsd* | riscix* | lynxos* \ - | bosx* | nextstep* | cxux* | aout* | elf* | oabi* \ - | ptx* | coff* | ecoff* | winnt* | domain* | vsta* \ - | udi* | eabi* | lites* | ieee* | go32* | aux* | hcos* \ - | chorusrdb* | cegcc* | glidix* \ - | cygwin* | msys* | pe* | moss* | proelf* | rtems* \ - | midipix* | mingw32* | mingw64* | linux-gnu* | linux-android* \ - | linux-newlib* | linux-musl* | linux-uclibc* \ - | uxpv* | beos* | mpeix* | udk* | moxiebox* \ - | interix* | uwin* | mks* | rhapsody* | darwin* \ - | openstep* | oskit* | conix* | pw32* | nonstopux* \ - | storm-chaos* | tops10* | tenex* | tops20* | its* \ - | os2* | vos* | palmos* | uclinux* | nucleus* \ - | morphos* | superux* | rtmk* | windiss* \ - | powermax* | dnix* | nx6 | nx7 | sei* | dragonfly* \ - | skyos* | haiku* | rdos* | toppers* | drops* | es* \ - | onefs* | tirtos* | phoenix* | fuchsia* | redox* | bme* \ - | midnightbsd*) + # -sysv* is not here because it comes later, after sysvr4. + -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ + | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ + | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ + | -sym* | -kopensolaris* | -plan9* \ + | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ + | -aos* | -aros* | -cloudabi* | -sortix* \ + | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ + | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ + | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ + | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ + | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ + | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ + | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ + | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ + | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ + | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ + | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ + | -linux-newlib* | -linux-musl* | -linux-uclibc* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ + | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ + | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ + | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ + | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ + | -morphos* | -superux* | -rtmk* | -windiss* \ + | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ + | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ + | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; - qnx*) - case $cpu in - x86 | i*86) + -qnx*) + case $basic_machine in + x86-* | i*86-*) ;; *) - os=nto-$os + os=-nto$os ;; esac ;; - hiux*) - os=hiuxwe2 + -nto-qnx*) ;; - nto-qnx*) - ;; - nto*) + -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; - sim | xray | os68k* | v88r* \ - | windows* | osx | abug | netware* | os9* \ - | macos* | mpw* | magic* | mmixware* | mon960* | lnews*) - ;; - linux-dietlibc) - os=linux-dietlibc + -sim | -xray | -os68k* | -v88r* \ + | -windows* | -osx | -abug | -netware* | -os9* \ + | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; - linux*) - os=`echo $os | sed -e 's|linux|linux-gnu|'` - ;; - lynx*178) - os=lynxos178 - ;; - lynx*5) - os=lynxos5 - ;; - lynx*) - os=lynxos - ;; - mac*) + -mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; - opened*) - os=openedition + -linux-dietlibc) + os=-linux-dietlibc ;; - os400*) - os=os400 + -linux*) + os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; - sunos5*) + -sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; - sunos6*) + -sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; - wince*) - os=wince + -opened*) + os=-openedition ;; - utek*) - os=bsd + -os400*) + os=-os400 ;; - dynix*) - os=bsd + -wince*) + os=-wince ;; - acis*) - os=aos + -utek*) + os=-bsd ;; - atheos*) - os=atheos + -dynix*) + os=-bsd ;; - syllable*) - os=syllable + -acis*) + os=-aos ;; - 386bsd) - os=bsd + -atheos*) + os=-atheos + ;; + -syllable*) + os=-syllable ;; - ctix* | uts*) - os=sysv + -386bsd) + os=-bsd ;; - nova*) - os=rtmk-nova + -ctix* | -uts*) + os=-sysv ;; - ns2) - os=nextstep2 + -nova*) + os=-rtmk-nova ;; - nsk*) - os=nsk + -ns2) + os=-nextstep2 + ;; + -nsk*) + os=-nsk ;; # Preserve the version number of sinix5. - sinix5.*) + -sinix5.*) os=`echo $os | sed -e 's|sinix|sysv|'` ;; - sinix*) - os=sysv4 + -sinix*) + os=-sysv4 ;; - tpf*) - os=tpf + -tpf*) + os=-tpf ;; - triton*) - os=sysv3 + -triton*) + os=-sysv3 ;; - oss*) - os=sysv3 + -oss*) + os=-sysv3 ;; - svr4*) - os=sysv4 + -svr4*) + os=-sysv4 ;; - svr3) - os=sysv3 + -svr3) + os=-sysv3 ;; - sysvr4) - os=sysv4 + -sysvr4) + os=-sysv4 ;; - # This must come after sysvr4. - sysv*) + # This must come after -sysvr4. + -sysv*) ;; - ose*) - os=ose + -ose*) + os=-ose ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) - os=mint + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) + os=-mint ;; - zvmoe) - os=zvmoe + -zvmoe) + os=-zvmoe ;; - dicos*) - os=dicos + -dicos*) + os=-dicos ;; - pikeos*) + -pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. - case $cpu in + case $basic_machine in arm*) - os=eabi + os=-eabi ;; *) - os=elf + os=-elf ;; esac ;; - nacl*) - ;; - ios) + -nacl*) ;; - none) + -ios) ;; - *-eabi) + -none) ;; *) + # Get rid of the `-' at the beginning of $os. + os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; @@ -1525,265 +1543,258 @@ # will signal an error saying that MANUFACTURER isn't an operating # system, and we'll never get to this point. -case $cpu-$vendor in +case $basic_machine in score-*) - os=elf + os=-elf ;; spu-*) - os=elf + os=-elf ;; *-acorn) - os=riscix1.2 + os=-riscix1.2 ;; arm*-rebel) - os=linux + os=-linux ;; arm*-semi) - os=aout + os=-aout ;; c4x-* | tic4x-*) - os=coff + os=-coff ;; c8051-*) - os=elf - ;; - clipper-intergraph) - os=clix + os=-elf ;; hexagon-*) - os=elf + os=-elf ;; tic54x-*) - os=coff + os=-coff ;; tic55x-*) - os=coff + os=-coff ;; tic6x-*) - os=coff + os=-coff ;; # This must come before the *-dec entry. pdp10-*) - os=tops20 + os=-tops20 ;; pdp11-*) - os=none + os=-none ;; *-dec | vax-*) - os=ultrix4.2 + os=-ultrix4.2 ;; m68*-apollo) - os=domain + os=-domain ;; i386-sun) - os=sunos4.0.2 + os=-sunos4.0.2 ;; m68000-sun) - os=sunos3 + os=-sunos3 ;; m68*-cisco) - os=aout + os=-aout ;; mep-*) - os=elf + os=-elf ;; mips*-cisco) - os=elf + os=-elf ;; mips*-*) - os=elf + os=-elf ;; or32-*) - os=coff + os=-coff ;; *-tti) # must be before sparc entry or we get the wrong os. - os=sysv3 + os=-sysv3 ;; sparc-* | *-sun) - os=sunos4.1.1 + os=-sunos4.1.1 ;; pru-*) - os=elf + os=-elf ;; *-be) - os=beos + os=-beos ;; *-ibm) - os=aix + os=-aix ;; *-knuth) - os=mmixware + os=-mmixware ;; *-wec) - os=proelf + os=-proelf ;; *-winbond) - os=proelf + os=-proelf ;; *-oki) - os=proelf + os=-proelf ;; *-hp) - os=hpux + os=-hpux ;; *-hitachi) - os=hiux + os=-hiux ;; i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent) - os=sysv + os=-sysv ;; *-cbm) - os=amigaos + os=-amigaos ;; *-dg) - os=dgux + os=-dgux ;; *-dolphin) - os=sysv3 + os=-sysv3 ;; m68k-ccur) - os=rtu + os=-rtu ;; m88k-omron*) - os=luna + os=-luna ;; *-next) - os=nextstep + os=-nextstep ;; *-sequent) - os=ptx + os=-ptx ;; *-crds) - os=unos + os=-unos ;; *-ns) - os=genix + os=-genix ;; i370-*) - os=mvs + os=-mvs ;; *-gould) - os=sysv + os=-sysv ;; *-highlevel) - os=bsd + os=-bsd ;; *-encore) - os=bsd + os=-bsd ;; *-sgi) - os=irix + os=-irix ;; *-siemens) - os=sysv4 + os=-sysv4 ;; *-masscomp) - os=rtu + os=-rtu ;; f30[01]-fujitsu | f700-fujitsu) - os=uxpv + os=-uxpv ;; *-rom68k) - os=coff + os=-coff ;; *-*bug) - os=coff + os=-coff ;; *-apple) - os=macos + os=-macos ;; *-atari*) - os=mint - ;; - *-wrs) - os=vxworks + os=-mint ;; *) - os=none + os=-none ;; esac fi # Here we handle the case where we know the os, and the CPU type, but not the # manufacturer. We pick the logical manufacturer. -case $vendor in - unknown) +vendor=unknown +case $basic_machine in + *-unknown) case $os in - riscix*) + -riscix*) vendor=acorn ;; - sunos*) + -sunos*) vendor=sun ;; - cnk*|-aix*) + -cnk*|-aix*) vendor=ibm ;; - beos*) + -beos*) vendor=be ;; - hpux*) + -hpux*) vendor=hp ;; - mpeix*) + -mpeix*) vendor=hp ;; - hiux*) + -hiux*) vendor=hitachi ;; - unos*) + -unos*) vendor=crds ;; - dgux*) + -dgux*) vendor=dg ;; - luna*) + -luna*) vendor=omron ;; - genix*) + -genix*) vendor=ns ;; - clix*) - vendor=intergraph - ;; - mvs* | opened*) + -mvs* | -opened*) vendor=ibm ;; - os400*) + -os400*) vendor=ibm ;; - ptx*) + -ptx*) vendor=sequent ;; - tpf*) + -tpf*) vendor=ibm ;; - vxsim* | vxworks* | windiss*) + -vxsim* | -vxworks* | -windiss*) vendor=wrs ;; - aux*) + -aux*) vendor=apple ;; - hms*) + -hms*) vendor=hitachi ;; - mpw* | macos*) + -mpw* | -macos*) vendor=apple ;; - *mint | mint[0-9]* | *MiNT | MiNT[0-9]*) + -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; - vos*) + -vos*) vendor=stratus ;; esac + basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac -echo "$cpu-$vendor-$os" +echo "$basic_machine$os" exit # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-functions 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" diff -Nru mutter-3.28.4/cogl/build/depcomp mutter-3.28.4+git20200505/cogl/build/depcomp --- mutter-3.28.4/cogl/build/depcomp 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/depcomp 2020-05-05 19:17:45.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # depcomp - compile a program generating dependencies as side-effects -scriptversion=2018-03-07.03; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2018 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 @@ -16,7 +16,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -783,7 +783,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -Nru mutter-3.28.4/cogl/build/install-sh mutter-3.28.4+git20200505/cogl/build/install-sh --- mutter-3.28.4/cogl/build/install-sh 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/install-sh 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -#!/usr/bin/sh +#!/bin/sh # install - install a program, script, or datafile -scriptversion=2018-03-11.20; # UTC +scriptversion=2014-09-12.12; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -271,18 +271,15 @@ fi dst=$dst_arg - # If destination is a directory, append the input filename. + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. if test -d "$dst"; then if test "$is_target_a_directory" = never; then echo "$0: $dst_arg: Is a directory" >&2 exit 1 fi dstdir=$dst - dstbase=`basename "$src"` - case $dst in - */) dst=$dst$dstbase;; - *) dst=$dst/$dstbase;; - esac + dst=$dstdir/`basename "$src"` dstdir_status=0 else dstdir=`dirname "$dst"` @@ -291,11 +288,6 @@ fi fi - case $dstdir in - */) dstdirslash=$dstdir;; - *) dstdirslash=$dstdir/;; - esac - obsolete_mkdir_used=false if test $dstdir_status != 0; then @@ -332,16 +324,14 @@ # is incompatible with FreeBSD 'install' when (umask & 300) != 0. ;; *) - # Note that $RANDOM variable is not portable (e.g. dash); Use it - # here however when possible just to lower collision chance. + # $RANDOM is not portable (e.g. dash); use it when possible to + # lower collision chance tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/a/b" "$tmpdir/a" "$tmpdir" 2>/dev/null; exit $ret' 0 - # Because "mkdir -p" follows existing symlinks and we likely work - # directly in world-writeable /tmp, make sure that the '$tmpdir' - # directory is successfully created first before we actually test - # 'mkdir -p' feature. + # As "mkdir -p" follows symlinks and we work in /tmp possibly; so + # create the $tmpdir first (and fail if unsuccessful) to make sure + # that nobody tries to guess the $tmpdir name. if (umask $mkdir_umask && $mkdirprog $mkdir_mode "$tmpdir" && exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1 @@ -444,8 +434,8 @@ else # Make a couple of temp file names in the proper directory. - dsttmp=${dstdirslash}_inst.$$_ - rmtmp=${dstdirslash}_rm.$$_ + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ # Trap to clean up those temp files at exit. trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 @@ -510,9 +500,9 @@ done # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/cogl/build/ltmain.sh mutter-3.28.4+git20200505/cogl/build/ltmain.sh --- mutter-3.28.4/cogl/build/ltmain.sh 2019-05-14 17:29:53.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/ltmain.sh 2020-05-05 19:17:39.000000000 +0000 @@ -31,7 +31,7 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4.6 +VERSION="2.4.6 Debian-2.4.6-2" package_revision=2.4.6 @@ -2068,12 +2068,12 @@ compiler: $LTCC compiler flags: $LTCFLAGS linker: $LD (gnu? $with_gnu_ld) - version: $progname (GNU libtool) 2.4.6 + version: $progname $scriptversion Debian-2.4.6-2 automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q` autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q` Report bugs to . -GNU libtool home page: . +GNU libtool home page: . General help using GNU software: ." exit 0 } @@ -2124,7 +2124,7 @@ # a configuration failure hint, and exit. func_fatal_configuration () { - func_fatal_error ${1+"$@"} \ + func__fatal_error ${1+"$@"} \ "See the $PACKAGE documentation for more information." \ "Fatal configuration error." } @@ -7274,10 +7274,11 @@ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization # -specs=* GCC specs files # -stdlib=* select c++ std lib with clang + # -fsanitize=* Clang/GCC memory and address sanitizer -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ - -specs=*) + -specs=*|-fsanitize=*) func_quote_for_eval "$arg" arg=$func_quote_for_eval_result func_append compile_command " $arg" @@ -7570,7 +7571,10 @@ case $pass in dlopen) libs=$dlfiles ;; dlpreopen) libs=$dlprefiles ;; - link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; + link) + libs="$deplibs %DEPLIBS%" + test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" + ;; esac fi if test lib,dlpreopen = "$linkmode,$pass"; then @@ -7889,19 +7893,19 @@ # It is a libtool convenience library, so add in its objects. func_append convenience " $ladir/$objdir/$old_library" func_append old_convenience " $ladir/$objdir/$old_library" + tmp_libs= + for deplib in $dependency_libs; do + deplibs="$deplib $deplibs" + if $opt_preserve_dup_deps; then + case "$tmp_libs " in + *" $deplib "*) func_append specialdeplibs " $deplib" ;; + esac + fi + func_append tmp_libs " $deplib" + done elif test prog != "$linkmode" && test lib != "$linkmode"; then func_fatal_error "'$lib' is not a convenience library" fi - tmp_libs= - for deplib in $dependency_libs; do - deplibs="$deplib $deplibs" - if $opt_preserve_dup_deps; then - case "$tmp_libs " in - *" $deplib "*) func_append specialdeplibs " $deplib" ;; - esac - fi - func_append tmp_libs " $deplib" - done continue fi # $pass = conv @@ -8825,6 +8829,9 @@ revision=$number_minor lt_irix_increment=no ;; + *) + func_fatal_configuration "$modename: unknown library version type '$version_type'" + ;; esac ;; no) diff -Nru mutter-3.28.4/cogl/build/missing mutter-3.28.4+git20200505/cogl/build/missing --- mutter-3.28.4/cogl/build/missing 2019-05-14 17:29:59.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/build/missing 2020-05-05 19:17:44.000000000 +0000 @@ -1,9 +1,9 @@ -#!/usr/bin/sh +#! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2018-03-07.03; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2018 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see . +# along with this program. If not, see . # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=https://www.perl.org/ -flex_URL=https://github.com/westes/flex -gnu_software_URL=https://www.gnu.org/software +perl_URL=http://www.perl.org/ +flex_URL=http://flex.sourceforge.net/ +gnu_software_URL=http://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'before-save-hook 'time-stamp) +# eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC0" +# time-stamp-time-zone: "UTC" # time-stamp-end: "; # UTC" # End: diff -Nru mutter-3.28.4/cogl/cogl/cogl-pipeline.c mutter-3.28.4+git20200505/cogl/cogl/cogl-pipeline.c --- mutter-3.28.4/cogl/cogl/cogl-pipeline.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/cogl/cogl-pipeline.c 2020-05-05 19:16:46.000000000 +0000 @@ -492,9 +492,6 @@ _cogl_bitmask_destroy (&uniforms_state->changed_mask); } - if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE) - g_slice_free (CoglPipelineBigState, pipeline->big_state); - if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS) { g_list_foreach (pipeline->layer_differences, @@ -508,6 +505,9 @@ if (pipeline->differences & COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS) _cogl_pipeline_snippet_list_free (&pipeline->big_state->fragment_snippets); + if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE) + g_slice_free (CoglPipelineBigState, pipeline->big_state); + g_list_free (pipeline->deprecated_get_layers_list); recursively_free_layer_caches (pipeline); diff -Nru mutter-3.28.4/cogl/cogl/Makefile.in mutter-3.28.4+git20200505/cogl/cogl/Makefile.in --- mutter-3.28.4/cogl/cogl/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/cogl/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -439,100 +439,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/cogl-atlas-texture.Plo \ - ./$(DEPDIR)/cogl-atlas.Plo \ - ./$(DEPDIR)/cogl-attribute-buffer.Plo \ - ./$(DEPDIR)/cogl-attribute.Plo \ - ./$(DEPDIR)/cogl-bitmap-conversion.Plo \ - ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo ./$(DEPDIR)/cogl-bitmap.Plo \ - ./$(DEPDIR)/cogl-bitmask.Plo ./$(DEPDIR)/cogl-blend-string.Plo \ - ./$(DEPDIR)/cogl-blit.Plo ./$(DEPDIR)/cogl-boxed-value.Plo \ - ./$(DEPDIR)/cogl-buffer.Plo ./$(DEPDIR)/cogl-clip-stack.Plo \ - ./$(DEPDIR)/cogl-closure-list.Plo ./$(DEPDIR)/cogl-color.Plo \ - ./$(DEPDIR)/cogl-config.Plo ./$(DEPDIR)/cogl-context.Plo \ - ./$(DEPDIR)/cogl-debug.Plo ./$(DEPDIR)/cogl-depth-state.Plo \ - ./$(DEPDIR)/cogl-display.Plo ./$(DEPDIR)/cogl-error.Plo \ - ./$(DEPDIR)/cogl-euler.Plo \ - ./$(DEPDIR)/cogl-feature-private.Plo \ - ./$(DEPDIR)/cogl-fence.Plo ./$(DEPDIR)/cogl-frame-info.Plo \ - ./$(DEPDIR)/cogl-framebuffer.Plo \ - ./$(DEPDIR)/cogl-gles2-context.Plo \ - ./$(DEPDIR)/cogl-glib-source.Plo \ - ./$(DEPDIR)/cogl-glsl-shader.Plo ./$(DEPDIR)/cogl-gpu-info.Plo \ - ./$(DEPDIR)/cogl-gtype.Plo ./$(DEPDIR)/cogl-index-buffer.Plo \ - ./$(DEPDIR)/cogl-indices.Plo ./$(DEPDIR)/cogl-journal.Plo \ - ./$(DEPDIR)/cogl-list.Plo ./$(DEPDIR)/cogl-magazine.Plo \ - ./$(DEPDIR)/cogl-matrix-stack.Plo ./$(DEPDIR)/cogl-matrix.Plo \ - ./$(DEPDIR)/cogl-memory-stack.Plo \ - ./$(DEPDIR)/cogl-meta-texture.Plo ./$(DEPDIR)/cogl-node.Plo \ - ./$(DEPDIR)/cogl-object.Plo \ - ./$(DEPDIR)/cogl-onscreen-template.Plo \ - ./$(DEPDIR)/cogl-onscreen.Plo ./$(DEPDIR)/cogl-output.Plo \ - ./$(DEPDIR)/cogl-pipeline-cache.Plo \ - ./$(DEPDIR)/cogl-pipeline-debug.Plo \ - ./$(DEPDIR)/cogl-pipeline-hash-table.Plo \ - ./$(DEPDIR)/cogl-pipeline-layer-state.Plo \ - ./$(DEPDIR)/cogl-pipeline-layer.Plo \ - ./$(DEPDIR)/cogl-pipeline-snippet.Plo \ - ./$(DEPDIR)/cogl-pipeline-state.Plo \ - ./$(DEPDIR)/cogl-pipeline.Plo \ - ./$(DEPDIR)/cogl-pixel-buffer.Plo \ - ./$(DEPDIR)/cogl-point-in-poly.Plo ./$(DEPDIR)/cogl-poll.Plo \ - ./$(DEPDIR)/cogl-primitive-texture.Plo \ - ./$(DEPDIR)/cogl-primitive.Plo ./$(DEPDIR)/cogl-primitives.Plo \ - ./$(DEPDIR)/cogl-profile.Plo ./$(DEPDIR)/cogl-quaternion.Plo \ - ./$(DEPDIR)/cogl-rectangle-map.Plo \ - ./$(DEPDIR)/cogl-renderer.Plo \ - ./$(DEPDIR)/cogl-sampler-cache.Plo \ - ./$(DEPDIR)/cogl-snippet.Plo ./$(DEPDIR)/cogl-spans.Plo \ - ./$(DEPDIR)/cogl-sub-texture.Plo \ - ./$(DEPDIR)/cogl-swap-chain.Plo \ - ./$(DEPDIR)/cogl-texture-2d-sliced.Plo \ - ./$(DEPDIR)/cogl-texture-2d.Plo \ - ./$(DEPDIR)/cogl-texture-3d.Plo \ - ./$(DEPDIR)/cogl-texture-rectangle.Plo \ - ./$(DEPDIR)/cogl-texture.Plo ./$(DEPDIR)/cogl-util.Plo \ - ./$(DEPDIR)/cogl-vector.Plo ./$(DEPDIR)/cogl-xlib-renderer.Plo \ - ./$(DEPDIR)/cogl-xlib.Plo ./$(DEPDIR)/cogl.Plo \ - deprecated/$(DEPDIR)/cogl-auto-texture.Plo \ - deprecated/$(DEPDIR)/cogl-clutter.Plo \ - deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo \ - deprecated/$(DEPDIR)/cogl-material-compat.Plo \ - deprecated/$(DEPDIR)/cogl-program.Plo \ - deprecated/$(DEPDIR)/cogl-shader.Plo \ - deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo \ - driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo \ - driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo \ - driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-texture-gl.Plo \ - driver/gl/$(DEPDIR)/cogl-util-gl.Plo \ - driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo \ - driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo \ - driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo \ - driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo \ - driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo \ - driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo \ - driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo \ - driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo \ - driver/nop/$(DEPDIR)/cogl-driver-nop.Plo \ - driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo \ - driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo \ - winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo \ - winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo \ - winsys/$(DEPDIR)/cogl-winsys-egl.Plo \ - winsys/$(DEPDIR)/cogl-winsys-glx.Plo \ - winsys/$(DEPDIR)/cogl-winsys-stub.Plo \ - winsys/$(DEPDIR)/cogl-winsys.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -610,7 +517,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -844,6 +751,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1118,8 +1026,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -1308,128 +1216,122 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-conversion.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-pixbuf.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmask.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blend-string.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blit.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-boxed-value.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-clip-stack.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-closure-list.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-color.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-config.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-context.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-debug.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-depth-state.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-display.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-error.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-euler.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-feature-private.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-fence.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-frame-info.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-framebuffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-context.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glib-source.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glsl-shader.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gpu-info.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gtype.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-index-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-indices.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-journal.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-list.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-magazine.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix-stack.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-memory-stack.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-meta-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-node.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-object.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen-template.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-output.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-cache.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-debug.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-hash-table.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer-state.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-snippet.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-state.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pixel-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-point-in-poly.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-poll.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitives.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-profile.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-quaternion.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-rectangle-map.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-renderer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sampler-cache.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-snippet.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-spans.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sub-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-swap-chain.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d-sliced.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-3d.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-rectangle.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-vector.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib-renderer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-auto-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-clutter.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-material-compat.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-program.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-shader.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-util-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-driver-nop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-glx.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-stub.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-atlas.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-attribute.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-conversion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap-pixbuf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-bitmask.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blend-string.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-blit.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-boxed-value.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-clip-stack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-closure-list.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-color.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-context.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-debug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-depth-state.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-display.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-error.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-euler.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-feature-private.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-fence.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-frame-info.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-framebuffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-context.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glib-source.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-glsl-shader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gpu-info.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gtype.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-index-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-indices.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-journal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-list.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-magazine.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix-stack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-matrix.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-memory-stack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-meta-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-node.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-object.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen-template.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-onscreen.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-output.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-debug.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-hash-table.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer-state.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-layer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-snippet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline-state.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pipeline.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-pixel-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-point-in-poly.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-poll.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitive.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-primitives.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-profile.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-quaternion.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-rectangle-map.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-renderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sampler-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-snippet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-spans.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-sub-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-swap-chain.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d-sliced.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-2d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-3d.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture-rectangle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-vector.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib-renderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-xlib.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-auto-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-clutter.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-material-compat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-program.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-shader.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-texture-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/$(DEPDIR)/cogl-util-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-driver-nop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-egl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-glx.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys-stub.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@winsys/$(DEPDIR)/cogl-winsys.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1713,10 +1615,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1832,122 +1731,7 @@ mostlyclean-am distclean: distclean-recursive - -rm -f ./$(DEPDIR)/cogl-atlas-texture.Plo - -rm -f ./$(DEPDIR)/cogl-atlas.Plo - -rm -f ./$(DEPDIR)/cogl-attribute-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-attribute.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap-conversion.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap.Plo - -rm -f ./$(DEPDIR)/cogl-bitmask.Plo - -rm -f ./$(DEPDIR)/cogl-blend-string.Plo - -rm -f ./$(DEPDIR)/cogl-blit.Plo - -rm -f ./$(DEPDIR)/cogl-boxed-value.Plo - -rm -f ./$(DEPDIR)/cogl-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-clip-stack.Plo - -rm -f ./$(DEPDIR)/cogl-closure-list.Plo - -rm -f ./$(DEPDIR)/cogl-color.Plo - -rm -f ./$(DEPDIR)/cogl-config.Plo - -rm -f ./$(DEPDIR)/cogl-context.Plo - -rm -f ./$(DEPDIR)/cogl-debug.Plo - -rm -f ./$(DEPDIR)/cogl-depth-state.Plo - -rm -f ./$(DEPDIR)/cogl-display.Plo - -rm -f ./$(DEPDIR)/cogl-error.Plo - -rm -f ./$(DEPDIR)/cogl-euler.Plo - -rm -f ./$(DEPDIR)/cogl-feature-private.Plo - -rm -f ./$(DEPDIR)/cogl-fence.Plo - -rm -f ./$(DEPDIR)/cogl-frame-info.Plo - -rm -f ./$(DEPDIR)/cogl-framebuffer.Plo - -rm -f ./$(DEPDIR)/cogl-gles2-context.Plo - -rm -f ./$(DEPDIR)/cogl-glib-source.Plo - -rm -f ./$(DEPDIR)/cogl-glsl-shader.Plo - -rm -f ./$(DEPDIR)/cogl-gpu-info.Plo - -rm -f ./$(DEPDIR)/cogl-gtype.Plo - -rm -f ./$(DEPDIR)/cogl-index-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-indices.Plo - -rm -f ./$(DEPDIR)/cogl-journal.Plo - -rm -f ./$(DEPDIR)/cogl-list.Plo - -rm -f ./$(DEPDIR)/cogl-magazine.Plo - -rm -f ./$(DEPDIR)/cogl-matrix-stack.Plo - -rm -f ./$(DEPDIR)/cogl-matrix.Plo - -rm -f ./$(DEPDIR)/cogl-memory-stack.Plo - -rm -f ./$(DEPDIR)/cogl-meta-texture.Plo - -rm -f ./$(DEPDIR)/cogl-node.Plo - -rm -f ./$(DEPDIR)/cogl-object.Plo - -rm -f ./$(DEPDIR)/cogl-onscreen-template.Plo - -rm -f ./$(DEPDIR)/cogl-onscreen.Plo - -rm -f ./$(DEPDIR)/cogl-output.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-cache.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-debug.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-hash-table.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-layer-state.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-layer.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-snippet.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-state.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline.Plo - -rm -f ./$(DEPDIR)/cogl-pixel-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-point-in-poly.Plo - -rm -f ./$(DEPDIR)/cogl-poll.Plo - -rm -f ./$(DEPDIR)/cogl-primitive-texture.Plo - -rm -f ./$(DEPDIR)/cogl-primitive.Plo - -rm -f ./$(DEPDIR)/cogl-primitives.Plo - -rm -f ./$(DEPDIR)/cogl-profile.Plo - -rm -f ./$(DEPDIR)/cogl-quaternion.Plo - -rm -f ./$(DEPDIR)/cogl-rectangle-map.Plo - -rm -f ./$(DEPDIR)/cogl-renderer.Plo - -rm -f ./$(DEPDIR)/cogl-sampler-cache.Plo - -rm -f ./$(DEPDIR)/cogl-snippet.Plo - -rm -f ./$(DEPDIR)/cogl-spans.Plo - -rm -f ./$(DEPDIR)/cogl-sub-texture.Plo - -rm -f ./$(DEPDIR)/cogl-swap-chain.Plo - -rm -f ./$(DEPDIR)/cogl-texture-2d-sliced.Plo - -rm -f ./$(DEPDIR)/cogl-texture-2d.Plo - -rm -f ./$(DEPDIR)/cogl-texture-3d.Plo - -rm -f ./$(DEPDIR)/cogl-texture-rectangle.Plo - -rm -f ./$(DEPDIR)/cogl-texture.Plo - -rm -f ./$(DEPDIR)/cogl-util.Plo - -rm -f ./$(DEPDIR)/cogl-vector.Plo - -rm -f ./$(DEPDIR)/cogl-xlib-renderer.Plo - -rm -f ./$(DEPDIR)/cogl-xlib.Plo - -rm -f ./$(DEPDIR)/cogl.Plo - -rm -f deprecated/$(DEPDIR)/cogl-auto-texture.Plo - -rm -f deprecated/$(DEPDIR)/cogl-clutter.Plo - -rm -f deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/cogl-material-compat.Plo - -rm -f deprecated/$(DEPDIR)/cogl-program.Plo - -rm -f deprecated/$(DEPDIR)/cogl-shader.Plo - -rm -f deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-texture-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-util-gl.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo - -rm -f driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo - -rm -f driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-driver-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo - -rm -f winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-egl.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-glx.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-stub.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys.Plo + -rm -rf ./$(DEPDIR) deprecated/$(DEPDIR) driver/gl/$(DEPDIR) driver/gl/gl/$(DEPDIR) driver/gl/gles/$(DEPDIR) driver/nop/$(DEPDIR) winsys/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1997,122 +1781,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f ./$(DEPDIR)/cogl-atlas-texture.Plo - -rm -f ./$(DEPDIR)/cogl-atlas.Plo - -rm -f ./$(DEPDIR)/cogl-attribute-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-attribute.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap-conversion.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap-pixbuf.Plo - -rm -f ./$(DEPDIR)/cogl-bitmap.Plo - -rm -f ./$(DEPDIR)/cogl-bitmask.Plo - -rm -f ./$(DEPDIR)/cogl-blend-string.Plo - -rm -f ./$(DEPDIR)/cogl-blit.Plo - -rm -f ./$(DEPDIR)/cogl-boxed-value.Plo - -rm -f ./$(DEPDIR)/cogl-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-clip-stack.Plo - -rm -f ./$(DEPDIR)/cogl-closure-list.Plo - -rm -f ./$(DEPDIR)/cogl-color.Plo - -rm -f ./$(DEPDIR)/cogl-config.Plo - -rm -f ./$(DEPDIR)/cogl-context.Plo - -rm -f ./$(DEPDIR)/cogl-debug.Plo - -rm -f ./$(DEPDIR)/cogl-depth-state.Plo - -rm -f ./$(DEPDIR)/cogl-display.Plo - -rm -f ./$(DEPDIR)/cogl-error.Plo - -rm -f ./$(DEPDIR)/cogl-euler.Plo - -rm -f ./$(DEPDIR)/cogl-feature-private.Plo - -rm -f ./$(DEPDIR)/cogl-fence.Plo - -rm -f ./$(DEPDIR)/cogl-frame-info.Plo - -rm -f ./$(DEPDIR)/cogl-framebuffer.Plo - -rm -f ./$(DEPDIR)/cogl-gles2-context.Plo - -rm -f ./$(DEPDIR)/cogl-glib-source.Plo - -rm -f ./$(DEPDIR)/cogl-glsl-shader.Plo - -rm -f ./$(DEPDIR)/cogl-gpu-info.Plo - -rm -f ./$(DEPDIR)/cogl-gtype.Plo - -rm -f ./$(DEPDIR)/cogl-index-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-indices.Plo - -rm -f ./$(DEPDIR)/cogl-journal.Plo - -rm -f ./$(DEPDIR)/cogl-list.Plo - -rm -f ./$(DEPDIR)/cogl-magazine.Plo - -rm -f ./$(DEPDIR)/cogl-matrix-stack.Plo - -rm -f ./$(DEPDIR)/cogl-matrix.Plo - -rm -f ./$(DEPDIR)/cogl-memory-stack.Plo - -rm -f ./$(DEPDIR)/cogl-meta-texture.Plo - -rm -f ./$(DEPDIR)/cogl-node.Plo - -rm -f ./$(DEPDIR)/cogl-object.Plo - -rm -f ./$(DEPDIR)/cogl-onscreen-template.Plo - -rm -f ./$(DEPDIR)/cogl-onscreen.Plo - -rm -f ./$(DEPDIR)/cogl-output.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-cache.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-debug.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-hash-table.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-layer-state.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-layer.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-snippet.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline-state.Plo - -rm -f ./$(DEPDIR)/cogl-pipeline.Plo - -rm -f ./$(DEPDIR)/cogl-pixel-buffer.Plo - -rm -f ./$(DEPDIR)/cogl-point-in-poly.Plo - -rm -f ./$(DEPDIR)/cogl-poll.Plo - -rm -f ./$(DEPDIR)/cogl-primitive-texture.Plo - -rm -f ./$(DEPDIR)/cogl-primitive.Plo - -rm -f ./$(DEPDIR)/cogl-primitives.Plo - -rm -f ./$(DEPDIR)/cogl-profile.Plo - -rm -f ./$(DEPDIR)/cogl-quaternion.Plo - -rm -f ./$(DEPDIR)/cogl-rectangle-map.Plo - -rm -f ./$(DEPDIR)/cogl-renderer.Plo - -rm -f ./$(DEPDIR)/cogl-sampler-cache.Plo - -rm -f ./$(DEPDIR)/cogl-snippet.Plo - -rm -f ./$(DEPDIR)/cogl-spans.Plo - -rm -f ./$(DEPDIR)/cogl-sub-texture.Plo - -rm -f ./$(DEPDIR)/cogl-swap-chain.Plo - -rm -f ./$(DEPDIR)/cogl-texture-2d-sliced.Plo - -rm -f ./$(DEPDIR)/cogl-texture-2d.Plo - -rm -f ./$(DEPDIR)/cogl-texture-3d.Plo - -rm -f ./$(DEPDIR)/cogl-texture-rectangle.Plo - -rm -f ./$(DEPDIR)/cogl-texture.Plo - -rm -f ./$(DEPDIR)/cogl-util.Plo - -rm -f ./$(DEPDIR)/cogl-vector.Plo - -rm -f ./$(DEPDIR)/cogl-xlib-renderer.Plo - -rm -f ./$(DEPDIR)/cogl-xlib.Plo - -rm -f ./$(DEPDIR)/cogl.Plo - -rm -f deprecated/$(DEPDIR)/cogl-auto-texture.Plo - -rm -f deprecated/$(DEPDIR)/cogl-clutter.Plo - -rm -f deprecated/$(DEPDIR)/cogl-framebuffer-deprecated.Plo - -rm -f deprecated/$(DEPDIR)/cogl-material-compat.Plo - -rm -f deprecated/$(DEPDIR)/cogl-program.Plo - -rm -f deprecated/$(DEPDIR)/cogl-shader.Plo - -rm -f deprecated/$(DEPDIR)/cogl-vertex-buffer.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-attribute-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-buffer-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-clip-stack-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-framebuffer-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-fragend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-opengl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-progend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-fixed.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-pipeline-vertend-glsl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-texture-2d-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-texture-gl.Plo - -rm -f driver/gl/$(DEPDIR)/cogl-util-gl.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-driver-gl.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-fragend-arbfp.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-pipeline-progend-fixed-arbfp.Plo - -rm -f driver/gl/gl/$(DEPDIR)/cogl-texture-driver-gl.Plo - -rm -f driver/gl/gles/$(DEPDIR)/cogl-driver-gles.Plo - -rm -f driver/gl/gles/$(DEPDIR)/cogl-texture-driver-gles.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-attribute-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-clip-stack-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-driver-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-framebuffer-nop.Plo - -rm -f driver/nop/$(DEPDIR)/cogl-texture-2d-nop.Plo - -rm -f winsys/$(DEPDIR)/cogl-texture-pixmap-x11.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-egl-x11.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-egl.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-glx.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys-stub.Plo - -rm -f winsys/$(DEPDIR)/cogl-winsys.Plo + -rm -rf ./$(DEPDIR) deprecated/$(DEPDIR) driver/gl/$(DEPDIR) driver/gl/gl/$(DEPDIR) driver/gl/gles/$(DEPDIR) driver/nop/$(DEPDIR) winsys/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -2139,8 +1808,8 @@ .MAKE: $(am__recursive_targets) all check install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--depfiles check check-am clean clean-generic clean-libtool \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool \ clean-mutterlibLTLIBRARIES cscopelist-am ctags ctags-am \ distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ diff -Nru mutter-3.28.4/cogl/cogl-gles2/Makefile.in mutter-3.28.4+git20200505/cogl/cogl-gles2/Makefile.in --- mutter-3.28.4/cogl/cogl-gles2/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/cogl-gles2/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -170,8 +170,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/cogl-gles2-api.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -407,6 +406,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -462,8 +462,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -519,13 +519,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-api.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cogl-gles2-api.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -651,10 +645,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -728,7 +719,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/cogl-gles2-api.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -775,7 +766,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/cogl-gles2-api.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -797,11 +788,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am \ install-coglgles2includeHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ diff -Nru mutter-3.28.4/cogl/cogl-pango/Makefile.in mutter-3.28.4+git20200505/cogl/cogl-pango/Makefile.in --- mutter-3.28.4/cogl/cogl-pango/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/cogl-pango/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -184,12 +184,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo \ - ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo \ - ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo \ - ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo \ - ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -425,6 +420,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -522,8 +518,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -579,17 +575,11 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -792,10 +782,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -870,11 +857,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -922,11 +905,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-display-list.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-fontmap.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-glyph-cache.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-pipeline-cache.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_pango_@LIBMUTTER_API_VERSION@_la-cogl-pango-render.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -949,11 +928,11 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am \ install-cogl_pangoheadersHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-girDATA install-html install-html-am install-info \ diff -Nru mutter-3.28.4/cogl/cogl-path/Makefile.in mutter-3.28.4+git20200505/cogl/cogl-path/Makefile.in --- mutter-3.28.4/cogl/cogl-path/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/cogl-path/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -212,18 +212,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo \ - ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo \ - tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -463,6 +452,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -584,8 +574,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_srcdir)/build/autotools/Makefile.am.enums $(am__empty): @@ -677,23 +667,17 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -918,10 +902,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1001,17 +982,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo + -rm -rf ./$(DEPDIR) tesselator/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1059,17 +1030,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path-enum-types.Plo - -rm -f ./$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-cogl-path.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-dict.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-geom.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-mesh.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-normal.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-priorityq.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-render.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-sweep.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tess.Plo - -rm -f tesselator/$(DEPDIR)/libmutter_cogl_path_@LIBMUTTER_API_VERSION@_la-tessmono.Plo + -rm -rf ./$(DEPDIR) tesselator/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1093,11 +1054,11 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-mutterlibLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-mutterlibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am \ install-cogl_pathheadersHEADERS install-data install-data-am \ install-dvi install-dvi-am install-exec install-exec-am \ install-html install-html-am install-info install-info-am \ diff -Nru mutter-3.28.4/cogl/configure mutter-3.28.4+git20200505/cogl/configure --- mutter-3.28.4/cogl/configure 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/configure 2020-05-05 19:17:43.000000000 +0000 @@ -778,6 +778,7 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE +am__quote am__include DEPDIR am__untar @@ -843,6 +844,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -861,8 +863,7 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -am__quote' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -920,12 +921,6 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -GLIB_CFLAGS -GLIB_LIBS -GLIB_GENMARSHAL -GOBJECT_QUERY -GLIB_MKENUMS -GLIB_COMPILE_RESOURCES WAYLAND_SERVER_CFLAGS WAYLAND_SERVER_LIBS DUMMY_CFLAGS @@ -975,6 +970,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1227,6 +1223,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1364,7 +1369,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1517,6 +1522,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1649,17 +1655,6 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - GLIB_GENMARSHAL - value of glib_genmarshal for glib-2.0, overriding pkg-config - GOBJECT_QUERY - value of gobject_query for glib-2.0, overriding pkg-config - GLIB_MKENUMS - value of glib_mkenums for glib-2.0, overriding pkg-config - GLIB_COMPILE_RESOURCES - value of glib_compile_resources for gio-2.0, overriding - pkg-config WAYLAND_SERVER_CFLAGS C compiler flags for WAYLAND_SERVER, overriding pkg-config WAYLAND_SERVER_LIBS @@ -4200,7 +4195,7 @@ # want to know if the user specified custom cflags or not. cflags_set=${CFLAGS+set} -am__api_version='1.16' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4626,45 +4621,45 @@ ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } -cat > confinc.mk << 'END' + +am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - case $?:`cat confinc.out 2>/dev/null` in #( - '0:this is the am__doit target') : - case $s in #( - BSD) : - am__include='.include' am__quote='"' ;; #( - *) : - am__include='include' am__quote='' ;; -esac ;; #( - *) : +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD ;; -esac - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -4767,8 +4762,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -5063,7 +5058,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -7614,7 +7609,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -11049,6 +11044,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -11303,7 +11301,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -11973,6 +11971,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -11994,7 +11993,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -13089,9 +13088,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -13100,7 +13096,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -13112,6 +13108,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -16006,7 +16014,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -16381,6 +16389,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs_CXX=no + ;; *) export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -17054,9 +17065,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -17065,7 +17073,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -17077,6 +17085,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -18267,7 +18287,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -19537,9 +19556,6 @@ COGL_EXTRA_CFLAGS="$COGL_EXTRA_CFLAGS ${DEPRECATED_CFLAGS#* }" - - - # Check whether --enable-glibtest was given. if test "${enable_glibtest+set}" = set; then : enableval=$enable_glibtest; @@ -19548,8 +19564,7 @@ fi - min_glib_version=2.32.0 - pkg_config_args="glib-2.0 >= $min_glib_version" + pkg_config_args=glib-2.0 for module in . gobject gthread gmodule-no-export do case "$module" in @@ -19699,171 +19714,7 @@ PKG_CONFIG=no fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } - -if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_config_args" 2>&1` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_config_args" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - - -if test -n "$GLIB_GENMARSHAL"; then - pkg_cv_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_GENMARSHAL=`$PKG_CONFIG --variable="glib_genmarshal" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_GENMARSHAL=$pkg_cv_GLIB_GENMARSHAL - -if test "x$GLIB_GENMARSHAL" = x""; then : - -fi - -if test -n "$GOBJECT_QUERY"; then - pkg_cv_GOBJECT_QUERY="$GOBJECT_QUERY" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GOBJECT_QUERY=`$PKG_CONFIG --variable="gobject_query" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GOBJECT_QUERY=$pkg_cv_GOBJECT_QUERY - -if test "x$GOBJECT_QUERY" = x""; then : - -fi - -if test -n "$GLIB_MKENUMS"; then - pkg_cv_GLIB_MKENUMS="$GLIB_MKENUMS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_MKENUMS=`$PKG_CONFIG --variable="glib_mkenums" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_MKENUMS=$pkg_cv_GLIB_MKENUMS - -if test "x$GLIB_MKENUMS" = x""; then : - -fi - -if test -n "$GLIB_COMPILE_RESOURCES"; then - pkg_cv_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable="glib_compile_resources" "gio-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_COMPILE_RESOURCES=$pkg_cv_GLIB_COMPILE_RESOURCES - -if test "x$GLIB_COMPILE_RESOURCES" = x""; then : - -fi - + min_glib_version=2.32.0 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } @@ -19882,6 +19733,13 @@ fi if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -20043,6 +19901,12 @@ GLIB_COMPILE_RESOURCES="" as_fn_error $? "glib-2.0 is required" "$LINENO" 5 fi + + + + + + rm -f conf.glibtest @@ -22704,7 +22568,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # The HP-UX ksh and POSIX shell print the target directory to stdout @@ -23718,35 +23582,29 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - case $CONFIG_FILES in #( - *\'*) : - eval set x "$CONFIG_FILES" ;; #( - *) : - set x $CONFIG_FILES ;; #( - *) : - ;; -esac + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`$as_dirname -- "$am_mf" || -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$am_mf" : 'X\(//\)[^/]' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -23764,48 +23622,53 @@ q } s/.*/./; q'` - am_filepart=`$as_basename -- "$am_mf" || -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q } - /^X\/\(\/\/\)$/{ + /^X\(\/\/\)[^/].*/{ s//\1/ q } - /^X\/\(\/\).*/{ + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` - { echo "$as_me:$LINENO: cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles" >&5 - (cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } || am_rc=$? + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking). -See \`config.log' for more details" "$LINENO" 5; } - fi - { am_dirpart=; unset am_dirpart;} - { am_filepart=; unset am_filepart;} - { am_mf=; unset am_mf;} - { am_rc=; unset am_rc;} - rm -f conftest-deps.mk } ;; "libtool":C) @@ -23823,7 +23686,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -Nru mutter-3.28.4/cogl/Makefile.in mutter-3.28.4+git20200505/cogl/Makefile.in --- mutter-3.28.4/cogl/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -145,7 +145,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir distdir-am dist dist-all distcheck + cscope distdir dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)cogl-config.h.in cogl-mutter-config.h.in # Read a list of newline-separated strings from the standard input, @@ -175,7 +175,7 @@ $(top_srcdir)/build/config.sub $(top_srcdir)/build/install-sh \ $(top_srcdir)/build/ltmain.sh $(top_srcdir)/build/missing \ build/compile build/config.guess build/config.sub \ - build/depcomp build/install-sh build/ltmain.sh build/missing + build/install-sh build/ltmain.sh build/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -402,6 +402,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -456,8 +457,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -607,10 +608,7 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ diff -Nru mutter-3.28.4/cogl/test-fixtures/Makefile.in mutter-3.28.4+git20200505/cogl/test-fixtures/Makefile.in --- mutter-3.28.4/cogl/test-fixtures/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/test-fixtures/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -133,8 +133,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -366,6 +365,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -406,8 +406,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -439,13 +439,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -536,10 +530,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -609,7 +600,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -655,7 +646,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/libtest_fixtures_la-test-utils.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -676,16 +667,16 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-man install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ tags tags-am uninstall uninstall-am diff -Nru mutter-3.28.4/cogl/tests/conform/Makefile.in mutter-3.28.4+git20200505/cogl/tests/conform/Makefile.in --- mutter-3.28.4/cogl/tests/conform/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/tests/conform/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -218,54 +218,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test_conformance-test-alpha-test.Po \ - ./$(DEPDIR)/test_conformance-test-alpha-textures.Po \ - ./$(DEPDIR)/test_conformance-test-atlas-migration.Po \ - ./$(DEPDIR)/test_conformance-test-backface-culling.Po \ - ./$(DEPDIR)/test_conformance-test-blend-strings.Po \ - ./$(DEPDIR)/test_conformance-test-blend.Po \ - ./$(DEPDIR)/test_conformance-test-color-hsl.Po \ - ./$(DEPDIR)/test_conformance-test-color-mask.Po \ - ./$(DEPDIR)/test_conformance-test-conform-main.Po \ - ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po \ - ./$(DEPDIR)/test_conformance-test-custom-attributes.Po \ - ./$(DEPDIR)/test_conformance-test-depth-test.Po \ - ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po \ - ./$(DEPDIR)/test_conformance-test-fence.Po \ - ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po \ - ./$(DEPDIR)/test_conformance-test-gles2-context.Po \ - ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po \ - ./$(DEPDIR)/test_conformance-test-layer-remove.Po \ - ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po \ - ./$(DEPDIR)/test_conformance-test-no-gl-header.Po \ - ./$(DEPDIR)/test_conformance-test-npot-texture.Po \ - ./$(DEPDIR)/test_conformance-test-offscreen.Po \ - ./$(DEPDIR)/test_conformance-test-path-clip.Po \ - ./$(DEPDIR)/test_conformance-test-path.Po \ - ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po \ - ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po \ - ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po \ - ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po \ - ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po \ - ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po \ - ./$(DEPDIR)/test_conformance-test-point-size.Po \ - ./$(DEPDIR)/test_conformance-test-point-sprite.Po \ - ./$(DEPDIR)/test_conformance-test-premult.Po \ - ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po \ - ./$(DEPDIR)/test_conformance-test-primitive.Po \ - ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po \ - ./$(DEPDIR)/test_conformance-test-snippets.Po \ - ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po \ - ./$(DEPDIR)/test_conformance-test-sub-texture.Po \ - ./$(DEPDIR)/test_conformance-test-texture-3d.Po \ - ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po \ - ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po \ - ./$(DEPDIR)/test_conformance-test-texture-rg.Po \ - ./$(DEPDIR)/test_conformance-test-version.Po \ - ./$(DEPDIR)/test_conformance-test-wrap-modes.Po \ - ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po \ - ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -525,6 +478,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -625,8 +579,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -706,59 +660,53 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-textures.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-atlas-migration.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-backface-culling.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend-strings.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-hsl.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-mask.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-conform-main.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-custom-attributes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-depth-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-euler-quaternion.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-fence.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-gles2-context.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-layer-remove.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-map-buffer-range.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-no-gl-header.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-npot-texture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-offscreen.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path-clip.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pixel-buffer.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size-attribute.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-sprite.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-premult.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-read-texture-formats.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-snippets.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sub-texture.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-3d.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-rg.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-version.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-modes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-write-texture-formats.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-alpha-textures.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-atlas-migration.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-backface-culling.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend-strings.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-blend.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-hsl.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-color-mask.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-conform-main.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-custom-attributes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-depth-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-euler-quaternion.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-fence.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-gles2-context.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-layer-remove.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-map-buffer-range.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-no-gl-header.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-npot-texture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-offscreen.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path-clip.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-path.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-pixel-buffer.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size-attribute.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-size.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-point-sprite.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-premult.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-primitive.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-read-texture-formats.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-snippets.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-sub-texture.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-3d.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-texture-rg.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-version.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-modes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_conformance-test-write-texture-formats.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -1542,10 +1490,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -1620,53 +1565,7 @@ clean-noinstPROGRAMS mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test_conformance-test-alpha-test.Po - -rm -f ./$(DEPDIR)/test_conformance-test-alpha-textures.Po - -rm -f ./$(DEPDIR)/test_conformance-test-atlas-migration.Po - -rm -f ./$(DEPDIR)/test_conformance-test-backface-culling.Po - -rm -f ./$(DEPDIR)/test_conformance-test-blend-strings.Po - -rm -f ./$(DEPDIR)/test_conformance-test-blend.Po - -rm -f ./$(DEPDIR)/test_conformance-test-color-hsl.Po - -rm -f ./$(DEPDIR)/test_conformance-test-color-mask.Po - -rm -f ./$(DEPDIR)/test_conformance-test-conform-main.Po - -rm -f ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-custom-attributes.Po - -rm -f ./$(DEPDIR)/test_conformance-test-depth-test.Po - -rm -f ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po - -rm -f ./$(DEPDIR)/test_conformance-test-fence.Po - -rm -f ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po - -rm -f ./$(DEPDIR)/test_conformance-test-gles2-context.Po - -rm -f ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po - -rm -f ./$(DEPDIR)/test_conformance-test-layer-remove.Po - -rm -f ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po - -rm -f ./$(DEPDIR)/test_conformance-test-no-gl-header.Po - -rm -f ./$(DEPDIR)/test_conformance-test-npot-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-offscreen.Po - -rm -f ./$(DEPDIR)/test_conformance-test-path-clip.Po - -rm -f ./$(DEPDIR)/test_conformance-test-path.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-size.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-sprite.Po - -rm -f ./$(DEPDIR)/test_conformance-test-premult.Po - -rm -f ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po - -rm -f ./$(DEPDIR)/test_conformance-test-primitive.Po - -rm -f ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po - -rm -f ./$(DEPDIR)/test_conformance-test-snippets.Po - -rm -f ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po - -rm -f ./$(DEPDIR)/test_conformance-test-sub-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-3d.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-rg.Po - -rm -f ./$(DEPDIR)/test_conformance-test-version.Po - -rm -f ./$(DEPDIR)/test_conformance-test-wrap-modes.Po - -rm -f ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po - -rm -f ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -1713,53 +1612,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test_conformance-test-alpha-test.Po - -rm -f ./$(DEPDIR)/test_conformance-test-alpha-textures.Po - -rm -f ./$(DEPDIR)/test_conformance-test-atlas-migration.Po - -rm -f ./$(DEPDIR)/test_conformance-test-backface-culling.Po - -rm -f ./$(DEPDIR)/test_conformance-test-blend-strings.Po - -rm -f ./$(DEPDIR)/test_conformance-test-blend.Po - -rm -f ./$(DEPDIR)/test_conformance-test-color-hsl.Po - -rm -f ./$(DEPDIR)/test_conformance-test-color-mask.Po - -rm -f ./$(DEPDIR)/test_conformance-test-conform-main.Po - -rm -f ./$(DEPDIR)/test_conformance-test-copy-replace-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-custom-attributes.Po - -rm -f ./$(DEPDIR)/test_conformance-test-depth-test.Po - -rm -f ./$(DEPDIR)/test_conformance-test-euler-quaternion.Po - -rm -f ./$(DEPDIR)/test_conformance-test-fence.Po - -rm -f ./$(DEPDIR)/test_conformance-test-framebuffer-get-bits.Po - -rm -f ./$(DEPDIR)/test_conformance-test-gles2-context.Po - -rm -f ./$(DEPDIR)/test_conformance-test-just-vertex-shader.Po - -rm -f ./$(DEPDIR)/test_conformance-test-layer-remove.Po - -rm -f ./$(DEPDIR)/test_conformance-test-map-buffer-range.Po - -rm -f ./$(DEPDIR)/test_conformance-test-no-gl-header.Po - -rm -f ./$(DEPDIR)/test_conformance-test-npot-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-offscreen.Po - -rm -f ./$(DEPDIR)/test_conformance-test-path-clip.Po - -rm -f ./$(DEPDIR)/test_conformance-test-path.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-cache-unrefs-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-shader-state.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-uniforms.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pipeline-user-matrix.Po - -rm -f ./$(DEPDIR)/test_conformance-test-pixel-buffer.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-size-attribute.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-size.Po - -rm -f ./$(DEPDIR)/test_conformance-test-point-sprite.Po - -rm -f ./$(DEPDIR)/test_conformance-test-premult.Po - -rm -f ./$(DEPDIR)/test_conformance-test-primitive-and-journal.Po - -rm -f ./$(DEPDIR)/test_conformance-test-primitive.Po - -rm -f ./$(DEPDIR)/test_conformance-test-read-texture-formats.Po - -rm -f ./$(DEPDIR)/test_conformance-test-snippets.Po - -rm -f ./$(DEPDIR)/test_conformance-test-sparse-pipeline.Po - -rm -f ./$(DEPDIR)/test_conformance-test-sub-texture.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-3d.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-get-set-data.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-no-allocate.Po - -rm -f ./$(DEPDIR)/test_conformance-test-texture-rg.Po - -rm -f ./$(DEPDIR)/test_conformance-test-version.Po - -rm -f ./$(DEPDIR)/test_conformance-test-wrap-modes.Po - -rm -f ./$(DEPDIR)/test_conformance-test-wrap-rectangle-textures.Po - -rm -f ./$(DEPDIR)/test_conformance-test-write-texture-formats.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -1781,22 +1634,22 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-insttestPROGRAMS clean-libtool \ - clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am \ - install-insttestDATA install-insttestPROGRAMS install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-testmetaDATA installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-insttestDATA \ - uninstall-insttestPROGRAMS uninstall-testmetaDATA +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-insttestPROGRAMS clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-insttestDATA \ + install-insttestPROGRAMS install-man install-pdf \ + install-pdf-am install-ps install-ps-am install-strip \ + install-testmetaDATA installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-insttestDATA uninstall-insttestPROGRAMS \ + uninstall-testmetaDATA .PRECIOUS: Makefile diff -Nru mutter-3.28.4/cogl/tests/data/Makefile.in mutter-3.28.4+git20200505/cogl/tests/data/Makefile.in --- mutter-3.28.4/cogl/tests/data/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/tests/data/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -312,6 +312,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -342,8 +343,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -367,10 +368,7 @@ cscope cscopelist: -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/cogl/tests/Makefile.in mutter-3.28.4+git20200505/cogl/tests/Makefile.in --- mutter-3.28.4/cogl/tests/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/tests/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -174,7 +174,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -405,6 +405,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -439,8 +440,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -615,10 +616,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/cogl/tests/micro-perf/Makefile.in mutter-3.28.4+git20200505/cogl/tests/micro-perf/Makefile.in --- mutter-3.28.4/cogl/tests/micro-perf/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/tests/micro-perf/Makefile.in 2020-05-05 19:17:44.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -134,8 +134,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test-journal.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -367,6 +366,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -413,8 +413,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -445,13 +445,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-journal.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test-journal.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -535,10 +529,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -608,7 +599,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test-journal.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -654,7 +645,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test-journal.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -675,9 +666,9 @@ .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.28.4/cogl/tests/unit/Makefile.in mutter-3.28.4+git20200505/cogl/tests/unit/Makefile.in --- mutter-3.28.4/cogl/tests/unit/Makefile.in 2019-05-14 17:55:31.000000000 +0000 +++ mutter-3.28.4+git20200505/cogl/tests/unit/Makefile.in 2020-05-05 19:17:45.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -136,8 +136,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/test_unit-test-unit-main.Po +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -369,6 +368,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -430,8 +430,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -462,13 +462,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unit-test-unit-main.Po@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_unit-test-unit-main.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -566,10 +560,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -641,7 +632,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/test_unit-test-unit-main.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -687,7 +678,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/test_unit-test-unit-main.Po + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -708,9 +699,9 @@ .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-noinstPROGRAMS cscopelist-am \ - ctags ctags-am distclean distclean-compile distclean-generic \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ distclean-libtool distclean-tags distdir dvi dvi-am html \ html-am info info-am install install-am install-data \ install-data-am install-dvi install-dvi-am install-exec \ diff -Nru mutter-3.28.4/configure mutter-3.28.4+git20200505/configure --- mutter-3.28.4/configure 2019-05-14 17:55:19.000000000 +0000 +++ mutter-3.28.4+git20200505/configure 2020-05-05 19:17:59.000000000 +0000 @@ -760,6 +760,7 @@ AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE +am__quote am__include DEPDIR OBJEXT @@ -819,6 +820,7 @@ docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -837,8 +839,7 @@ PACKAGE_TARNAME PACKAGE_NAME PATH_SEPARATOR -SHELL -am__quote' +SHELL' ac_subst_files='' ac_user_opts=' enable_option_checking @@ -890,13 +891,6 @@ PKG_CONFIG PKG_CONFIG_PATH PKG_CONFIG_LIBDIR -GLIB_CFLAGS -GLIB_LIBS -GLIB_GENMARSHAL -GOBJECT_QUERY -GLIB_MKENUMS -GLIB_COMPILE_RESOURCES -GLIB_COMPILE_SCHEMAS MUTTER_CFLAGS MUTTER_LIBS ELOGIND_CFLAGS @@ -948,6 +942,7 @@ sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -1200,6 +1195,15 @@ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1337,7 +1341,7 @@ for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1490,6 +1494,7 @@ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -1613,19 +1618,6 @@ directories to add to pkg-config's search path PKG_CONFIG_LIBDIR path overriding pkg-config's built-in search path - GLIB_CFLAGS C compiler flags for GLIB, overriding pkg-config - GLIB_LIBS linker flags for GLIB, overriding pkg-config - GLIB_GENMARSHAL - value of glib_genmarshal for glib-2.0, overriding pkg-config - GOBJECT_QUERY - value of gobject_query for glib-2.0, overriding pkg-config - GLIB_MKENUMS - value of glib_mkenums for glib-2.0, overriding pkg-config - GLIB_COMPILE_RESOURCES - value of glib_compile_resources for gio-2.0, overriding - pkg-config - GLIB_COMPILE_SCHEMAS - value of glib_compile_schemas for gio-2.0, overriding pkg-config MUTTER_CFLAGS C compiler flags for MUTTER, overriding pkg-config MUTTER_LIBS linker flags for MUTTER, overriding pkg-config @@ -2521,7 +2513,7 @@ subdirs="$subdirs cogl clutter" -am__api_version='1.16' +am__api_version='1.15' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3037,8 +3029,8 @@ # For better backward compatibility. To be removed once Automake 1.9.x # dies out for good. For more background, see: -# -# +# +# mkdir_p='$(MKDIR_P)' # We need awk for the "check" target (and possibly the TAP driver). The @@ -3205,7 +3197,7 @@ Aborting the configuration process, to ensure you take notice of the issue. You can download and install GNU coreutils to get an 'rm' implementation -that behaves properly: . +that behaves properly: . If you want to complete the configuration process using your problematic 'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM @@ -3283,45 +3275,45 @@ ac_config_commands="$ac_config_commands depfiles" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} supports the include directive" >&5 -$as_echo_n "checking whether ${MAKE-make} supports the include directive... " >&6; } -cat > confinc.mk << 'END' + +am_make=${MAKE-make} +cat > confinc << 'END' am__doit: - @echo this is the am__doit target >confinc.out + @echo this is the am__doit target .PHONY: am__doit END +# If we don't find an include directive, just comment out the code. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5 +$as_echo_n "checking for style of include used by $am_make... " >&6; } am__include="#" am__quote= -# BSD make does it like this. -echo '.include "confinc.mk" # ignored' > confmf.BSD -# Other make implementations (GNU, Solaris 10, AIX) do it like this. -echo 'include confinc.mk # ignored' > confmf.GNU -_am_result=no -for s in GNU BSD; do - { echo "$as_me:$LINENO: ${MAKE-make} -f confmf.$s && cat confinc.out" >&5 - (${MAKE-make} -f confmf.$s && cat confinc.out) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } - case $?:`cat confinc.out 2>/dev/null` in #( - '0:this is the am__doit target') : - case $s in #( - BSD) : - am__include='.include' am__quote='"' ;; #( - *) : - am__include='include' am__quote='' ;; -esac ;; #( - *) : +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD ;; -esac - if test "$am__include" != "#"; then - _am_result="yes ($s style)" - break - fi -done -rm -f confinc.* confmf.* -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${_am_result}" >&5 -$as_echo "${_am_result}" >&6; } + esac +fi + + +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5 +$as_echo "$_am_result" >&6; } +rm -f confinc confmf # Check whether --enable-dependency-tracking was given. if test "${enable_dependency_tracking+set}" = set; then : @@ -8148,7 +8140,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$' else @@ -11572,6 +11564,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + link_all_deplibs=no + ;; esac ld_shlibs=yes @@ -11826,7 +11821,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -12496,6 +12491,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + link_all_deplibs=no else archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -12517,7 +12513,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else @@ -13612,9 +13608,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -13623,7 +13616,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -13635,6 +13628,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -15790,9 +15795,6 @@ fi # Sets GLIB_GENMARSHAL and GLIB_MKENUMS - - - # Check whether --enable-glibtest was given. if test "${enable_glibtest+set}" = set; then : enableval=$enable_glibtest; @@ -15801,8 +15803,7 @@ fi - min_glib_version=2.53.2 - pkg_config_args="glib-2.0 >= $min_glib_version" + pkg_config_args=glib-2.0 for module in . do case "$module" in @@ -15952,171 +15953,7 @@ PKG_CONFIG=no fi - -pkg_failed=no -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB" >&5 -$as_echo_n "checking for GLIB... " >&6; } - -if test -n "$GLIB_CFLAGS"; then - pkg_cv_GLIB_CFLAGS="$GLIB_CFLAGS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_CFLAGS=`$PKG_CONFIG --cflags "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -if test -n "$GLIB_LIBS"; then - pkg_cv_GLIB_LIBS="$GLIB_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"\$pkg_config_args\""; } >&5 - ($PKG_CONFIG --exists --print-errors "$pkg_config_args") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_LIBS=`$PKG_CONFIG --libs "$pkg_config_args" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi - - - -if test $pkg_failed = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then - _pkg_short_errors_supported=yes -else - _pkg_short_errors_supported=no -fi - if test $_pkg_short_errors_supported = yes; then - GLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$pkg_config_args" 2>&1` - else - GLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$pkg_config_args" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$GLIB_PKG_ERRORS" >&5 - - : -elif test $pkg_failed = untried; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - : -else - GLIB_CFLAGS=$pkg_cv_GLIB_CFLAGS - GLIB_LIBS=$pkg_cv_GLIB_LIBS - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - : -fi - - -if test -n "$GLIB_GENMARSHAL"; then - pkg_cv_GLIB_GENMARSHAL="$GLIB_GENMARSHAL" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_GENMARSHAL=`$PKG_CONFIG --variable="glib_genmarshal" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_GENMARSHAL=$pkg_cv_GLIB_GENMARSHAL - -if test "x$GLIB_GENMARSHAL" = x""; then : - -fi - -if test -n "$GOBJECT_QUERY"; then - pkg_cv_GOBJECT_QUERY="$GOBJECT_QUERY" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GOBJECT_QUERY=`$PKG_CONFIG --variable="gobject_query" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GOBJECT_QUERY=$pkg_cv_GOBJECT_QUERY - -if test "x$GOBJECT_QUERY" = x""; then : - -fi - -if test -n "$GLIB_MKENUMS"; then - pkg_cv_GLIB_MKENUMS="$GLIB_MKENUMS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "glib-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_MKENUMS=`$PKG_CONFIG --variable="glib_mkenums" "glib-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_MKENUMS=$pkg_cv_GLIB_MKENUMS - -if test "x$GLIB_MKENUMS" = x""; then : - -fi - -if test -n "$GLIB_COMPILE_RESOURCES"; then - pkg_cv_GLIB_COMPILE_RESOURCES="$GLIB_COMPILE_RESOURCES" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable="glib_compile_resources" "gio-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_COMPILE_RESOURCES=$pkg_cv_GLIB_COMPILE_RESOURCES - -if test "x$GLIB_COMPILE_RESOURCES" = x""; then : - -fi - + min_glib_version=2.53.2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GLIB - version >= $min_glib_version" >&5 $as_echo_n "checking for GLIB - version >= $min_glib_version... " >&6; } @@ -16135,6 +15972,13 @@ fi if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'` glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -16296,6 +16140,12 @@ GLIB_COMPILE_RESOURCES="" : fi + + + + + + rm -f conf.glibtest @@ -16334,8 +16184,6 @@ - - # Check whether --enable-schemas-compile was given. if test "${enable_schemas_compile+set}" = set; then : enableval=$enable_schemas_compile; case ${enableval} in @@ -16468,32 +16316,10 @@ fi gsettingsschemadir=${datadir}/glib-2.0/schemas - if test x$cross_compiling != xyes; then : - -if test -n "$GLIB_COMPILE_SCHEMAS"; then - pkg_cv_GLIB_COMPILE_SCHEMAS="$GLIB_COMPILE_SCHEMAS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gio-2.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "gio-2.0") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then - pkg_cv_GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable="glib_compile_schemas" "gio-2.0" 2>/dev/null` - test "x$?" != "x0" && pkg_failed=yes -else - pkg_failed=yes -fi - else - pkg_failed=untried -fi -GLIB_COMPILE_SCHEMAS=$pkg_cv_GLIB_COMPILE_SCHEMAS - -if test "x$GLIB_COMPILE_SCHEMAS" = x""; then : - -fi -else - # Extract the first word of "glib-compile-schemas", so it can be a program name with args. + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + # Extract the first word of "glib-compile-schemas", so it can be a program name with args. set dummy glib-compile-schemas; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } @@ -16533,7 +16359,7 @@ fi -fi + fi if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then as_fn_error $? "glib-compile-schemas not found." "$LINENO" 5 @@ -19440,7 +19266,7 @@ # # INIT-COMMANDS # -AMDEP_TRUE="$AMDEP_TRUE" MAKE="${MAKE-make}" +AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir" # Capture the value of obsolete ALL_LINGUAS because we need it to compute # POFILES, UPDATEPOFILES, DUMMYPOFILES, GMOFILES, CATALOGS. But hide it # from automake < 1.5. @@ -20352,35 +20178,29 @@ # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. - # TODO: see whether this extra hack can be removed once we start - # requiring Autoconf 2.70 or later. - case $CONFIG_FILES in #( - *\'*) : - eval set x "$CONFIG_FILES" ;; #( - *) : - set x $CONFIG_FILES ;; #( - *) : - ;; -esac + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac shift - # Used to flag and report bootstrapping failures. - am_rc=0 - for am_mf + for mf do # Strip MF so we end up with the name of the file. - am_mf=`$as_echo "$am_mf" | sed -e 's/:.*$//'` - # Check whether this is an Automake generated Makefile which includes - # dependency-tracking related rules and includes. - # Grep'ing the whole file directly is not great: AIX grep has a line + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line # limit of 2048, but all sed's we know have understand at least 4000. - sed -n 's,^am--depfiles:.*,X,p' "$am_mf" | grep X >/dev/null 2>&1 \ - || continue - am_dirpart=`$as_dirname -- "$am_mf" || -$as_expr X"$am_mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$am_mf" : 'X\(//\)[^/]' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$am_mf" | + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`$as_dirname -- "$mf" || +$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$mf" : 'X\(//\)[^/]' \| \ + X"$mf" : 'X\(//\)$' \| \ + X"$mf" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$mf" | sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q @@ -20398,48 +20218,53 @@ q } s/.*/./; q'` - am_filepart=`$as_basename -- "$am_mf" || -$as_expr X/"$am_mf" : '.*/\([^/][^/]*\)/*$' \| \ - X"$am_mf" : 'X\(//\)$' \| \ - X"$am_mf" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$am_mf" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`$as_dirname -- "$file" || +$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$file" : 'X\(//\)[^/]' \| \ + X"$file" : 'X\(//\)$' \| \ + X"$file" : 'X\(/\)' \| . 2>/dev/null || +$as_echo X"$file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/ q } - /^X\/\(\/\/\)$/{ + /^X\(\/\/\)[^/].*/{ s//\1/ q } - /^X\/\(\/\).*/{ + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ s//\1/ q } s/.*/./; q'` - { echo "$as_me:$LINENO: cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles" >&5 - (cd "$am_dirpart" \ - && sed -e '/# am--include-marker/d' "$am_filepart" \ - | $MAKE -f - am--depfiles) >&5 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } || am_rc=$? + as_dir=$dirpart/$fdir; as_fn_mkdir_p + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done done - if test $am_rc -ne 0; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the - '--disable-dependency-tracking' option to at least be able to build - the package (albeit without support for automatic dependency tracking). -See \`config.log' for more details" "$LINENO" 5; } - fi - { am_dirpart=; unset am_dirpart;} - { am_filepart=; unset am_filepart;} - { am_mf=; unset am_mf;} - { am_rc=; unset am_rc;} - rm -f conftest-deps.mk } ;; "po-directories":C) @@ -20571,7 +20396,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -Nru mutter-3.28.4/data/Makefile.in mutter-3.28.4+git20200505/data/Makefile.in --- mutter-3.28.4/data/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/data/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -340,6 +340,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -394,8 +395,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -482,10 +483,7 @@ cscope cscopelist: -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/debian/changelog mutter-3.28.4+git20200505/debian/changelog --- mutter-3.28.4/debian/changelog 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/changelog 2020-09-23 19:29:30.000000000 +0000 @@ -1,3 +1,44 @@ +mutter (3.28.4+git20200505-0ubuntu18.04.2) bionic; urgency=medium + + * debian/patches: Cherry-pick patch to make mutter compile with newer mesa + (LP: #1896825) + + -- Marco Trevisan (Treviño) Wed, 23 Sep 2020 21:29:30 +0200 + +mutter (3.28.4+git20200505-0ubuntu18.04.1) bionic; urgency=medium + + * New upstream git snapsnot + - monitor-manager: use MonitorsConfig to track switch_config + - monitor-manager: Don't use switch-config when ensuring configuration + - core: Avoid consecutive workspace changes in window construction + - core: propagate the effective on-all-workspaces setting to transient window + - window: Really propagate effective on-all-workspaces setting to transients + - monitor-config-manager: Fallback to closed laptop lid configuration + (LP: #1793496) + * debian/control*: update VCS informations to point to ubuntu salsa branch + * d/p/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch, + d/p/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch, + d/p/screen-Destroy-window-actors-after-windows-while-unmanagi.patch, + d/p/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch, + d/p/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch, + d/p/test-runner-Add-assert_focused-command.patch, + d/p/test-runner-Add-dispatch-command.patch, + d/p/test-runner-Add-sleep-command.patch, + d/p/tests-Add-accept_focus-command-to-runner-and-client.patch, + d/p/tests-Add-can_take_focus-command-to-runner-and-client.patch, + d/p/tests-Verify-focused-window-in-closed-transient-tests.patch, + d/p/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch, + d/p/window-Emit-an-error-and-return-when-trying-to-activate-a.patch, + d/p/window-x11-Accept-any-focusable-window-as-fallback-focus.patch, + d/p/window-x11-Don-t-double-check-for-unmanaging-windows.patch, + d/p/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch, + d/p/window-x11-Focus-the-default-window-with-delay-while-wait.patch, + d/p/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch, + d/p/workspace-Focus-only-ancestors-that-are-focusable.patch: + - Dropped, included in the git snapshot already + + -- Marco Trevisan (Treviño) Tue, 05 May 2020 21:50:40 +0200 + mutter (3.28.4-0ubuntu18.04.2) bionic; urgency=medium [ Marco Trevisan (Treviño) ] diff -Nru mutter-3.28.4/debian/control mutter-3.28.4+git20200505/debian/control --- mutter-3.28.4/debian/control 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/control 2020-09-23 19:29:30.000000000 +0000 @@ -60,10 +60,10 @@ zenity Rules-Requires-Root: no Standards-Version: 4.1.5 -XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/mutter XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/mutter -Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/mutter -b ubuntu/bionic +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/mutter +Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b ubuntu/bionic +Vcs-Browser: https://salsa.debian.org/gnome-team/mutter/tree/ubuntu/bionic Package: mutter Architecture: any diff -Nru mutter-3.28.4/debian/control.in mutter-3.28.4+git20200505/debian/control.in --- mutter-3.28.4/debian/control.in 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/control.in 2020-09-23 19:29:30.000000000 +0000 @@ -56,10 +56,10 @@ zenity Rules-Requires-Root: no Standards-Version: 4.1.5 -XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/mutter XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/mutter -Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/mutter -b ubuntu/bionic +XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/mutter +Vcs-Git: https://salsa.debian.org/gnome-team/mutter.git -b ubuntu/bionic +Vcs-Browser: https://salsa.debian.org/gnome-team/mutter/tree/ubuntu/bionic Package: mutter Architecture: any diff -Nru mutter-3.28.4/debian/patches/EGL-Include-EGL-eglmesaext.h.patch mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch --- mutter-3.28.4/debian/patches/EGL-Include-EGL-eglmesaext.h.patch 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/EGL-Include-EGL-eglmesaext.h.patch 2020-09-23 19:29:30.000000000 +0000 @@ -0,0 +1,93 @@ +From: "Jan Alexander Steffens (heftig)" +Date: Sun, 20 Oct 2019 12:04:31 +0200 +Subject: EGL: Include EGL/eglmesaext.h + +The eglext.h shipped by libglvnd does not include the Mesa extensions, +unlike the header shipped in Mesa. + +Fixes https://gitlab.gnome.org/GNOME/mutter/issues/876 + +Origin: https://gitlab.gnome.org/GNOME/mutter/commits/gnome-3-28 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1896825 +--- + cogl/configure.ac | 13 ++++++++++--- + src/backends/meta-egl-ext.h | 1 + + src/backends/meta-egl.c | 1 + + src/backends/meta-egl.h | 1 + + 4 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/cogl/configure.ac b/cogl/configure.ac +index 3be282f..7c72d81 100644 +--- a/cogl/configure.ac ++++ b/cogl/configure.ac +@@ -485,9 +485,10 @@ AS_IF([test "x$enable_gles1" = "xyes"], + [AC_MSG_ERROR([Unable to locate EGL header])]) + AC_SUBST([COGL_EGL_INCLUDES]) + +- AC_CHECK_HEADERS([EGL/eglext.h], ++ AC_CHECK_HEADERS([EGL/eglext.h EGL/eglmesaext.h], + [COGL_EGL_INCLUDES="$COGL_EGL_INCLUDE +-#include "], ++#include ++#include "], + [], + [$COGL_EGL_INCLUDES]) + +@@ -749,6 +750,11 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + [], + [AC_MSG_ERROR([Unable to locate required EGL headers])], + [#include ]) ++ AC_CHECK_HEADERS( ++ [EGL/eglmesaext.h], ++ [], ++ [AC_MSG_ERROR([Unable to locate required EGL headers])], ++ [#include ]) + + AC_CHECK_LIB(EGL, [eglInitialize], + [COGL_EXTRA_LDFLAGS="$COGL_EXTRA_LDFLAGS -lEGL"], +@@ -759,7 +765,8 @@ AS_IF([test "x$NEED_EGL" = "xyes" && test "x$EGL_CHECKED" != "xyes"], + ) + + COGL_EGL_INCLUDES="#include +-#include " ++#include ++#include " + AC_SUBST([COGL_EGL_INCLUDES]) + ]) + +diff --git a/src/backends/meta-egl-ext.h b/src/backends/meta-egl-ext.h +index 8705e7d..db0b74f 100644 +--- a/src/backends/meta-egl-ext.h ++++ b/src/backends/meta-egl-ext.h +@@ -29,6 +29,7 @@ + + #include + #include ++#include + + /* + * This is a little different to the tests shipped with EGL implementations, +diff --git a/src/backends/meta-egl.c b/src/backends/meta-egl.c +index 755ec49..bd253c9 100644 +--- a/src/backends/meta-egl.c ++++ b/src/backends/meta-egl.c +@@ -31,6 +31,7 @@ + + #include + #include ++#include + #include + #include + #include +diff --git a/src/backends/meta-egl.h b/src/backends/meta-egl.h +index 060c7cd..2fef264 100644 +--- a/src/backends/meta-egl.h ++++ b/src/backends/meta-egl.h +@@ -27,6 +27,7 @@ + + #include + #include ++#include + #include + + #define META_EGL_ERROR meta_egl_error_quark () diff -Nru mutter-3.28.4/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch mutter-3.28.4+git20200505/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch --- mutter-3.28.4/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,37 +0,0 @@ -From: =?utf-8?q?Jonas_=C3=85dahl?= -Date: Thu, 11 Oct 2018 15:16:26 +0200 -Subject: monitor-manager: Don't use switch-config when ensuring configuration - -Switch-configs are only to be used in certain circumstances (see -meta_monitor_manager_can_switch_config()) so when ensuring -configuration and attempting to create a linear configuration, use the -linear configuration constructor function directly without going via the -switch config method, otherwise we might incorrectly fall back to the -fallback configuration (only enable primary monitor). - -This is a regression introduced by 6267732bec97773. - -Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/342 - -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1772811 -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/262 -Applied-Upstream: yes, 3.32.0 ---- - src/backends/meta-monitor-manager.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c -index 96d794a..fecbfda 100644 ---- a/src/backends/meta-monitor-manager.c -+++ b/src/backends/meta-monitor-manager.c -@@ -582,9 +582,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager) - g_clear_object (&config); - } - -- config = -- meta_monitor_config_manager_create_for_switch_config (manager->config_manager, -- META_MONITOR_SWITCH_CONFIG_ALL_LINEAR); -+ config = meta_monitor_config_manager_create_linear (manager->config_manager); - if (config) - { - if (!meta_monitor_manager_apply_monitors_config (manager, diff -Nru mutter-3.28.4/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch mutter-3.28.4+git20200505/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch --- mutter-3.28.4/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,198 +0,0 @@ -From: Daniel Drake -Date: Thu, 30 Aug 2018 08:34:53 +0800 -Subject: monitor-manager: use MonitorsConfig to track switch_config - -When constructing MetaMonitorsConfig objects, store which type -of switch_config they are for (or UNKNOWN if it is not such -type of config). - -Stop unconditionally setting current_switch_config to UNKNOWN when -handling monitors changed events. Instead, set it to the switch_config -type stored in the MonitorsConfig in the codepath that updates logical -state. In addition to being called in the hotplug case along the same -code flow that generates monitors changed events, this is also called -in the coldplug case where a secondary monitor was connected before -mutter was started. - -When creating the default linear display config, create it as a -switch_config so that internal state gets updated to represent -linear mode when this config is used. - -The previous behaviour of unconditionally resetting current_switch_config -to UNKNOWN was breaking the internal state machine for display config -switching, causing misbehaviour in gnome-shell's switchMonitor UI when -using display switch hotkeys. The lack of internal tracking when the -displays are already in the default "Join Displays" linear mode was -then causing the first display switch hotkey press to do nothing -(it would attempt to select "Join Displays" mode, but that was already -active). - -Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/281 -https://gitlab.gnome.org/GNOME/mutter/merge_requests/213 - -Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1772811 -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/213 -Applied-Upstream: yes, 3.30.1 ---- - src/backends/meta-monitor-config-manager.c | 36 +++++++++++++++++++++++++----- - src/backends/meta-monitor-config-manager.h | 7 ++++++ - src/backends/meta-monitor-manager.c | 25 ++++++++++++++++----- - 3 files changed, 56 insertions(+), 12 deletions(-) - -diff --git a/src/backends/meta-monitor-config-manager.c b/src/backends/meta-monitor-config-manager.c -index 197892b..28818ed 100644 ---- a/src/backends/meta-monitor-config-manager.c -+++ b/src/backends/meta-monitor-config-manager.c -@@ -1007,6 +1007,7 @@ meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager - MetaMonitorSwitchConfigType config_type) - { - MetaMonitorManager *monitor_manager = config_manager->monitor_manager; -+ MetaMonitorsConfig *config; - - if (!meta_monitor_manager_can_switch_config (monitor_manager)) - return NULL; -@@ -1014,18 +1015,27 @@ meta_monitor_config_manager_create_for_switch_config (MetaMonitorConfigManager - switch (config_type) - { - case META_MONITOR_SWITCH_CONFIG_ALL_MIRROR: -- return create_for_switch_config_all_mirror (config_manager); -+ config = create_for_switch_config_all_mirror (config_manager); -+ break; - case META_MONITOR_SWITCH_CONFIG_ALL_LINEAR: -- return meta_monitor_config_manager_create_linear (config_manager); -+ config = meta_monitor_config_manager_create_linear (config_manager); -+ break; - case META_MONITOR_SWITCH_CONFIG_EXTERNAL: -- return create_for_switch_config_external (config_manager); -+ config = create_for_switch_config_external (config_manager); -+ break; - case META_MONITOR_SWITCH_CONFIG_BUILTIN: -- return create_for_switch_config_builtin (config_manager); -+ config = create_for_switch_config_builtin (config_manager); -+ break; - case META_MONITOR_SWITCH_CONFIG_UNKNOWN: -+ default: - g_warn_if_reached (); -- break; -+ return NULL; - } -- return NULL; -+ -+ if (config) -+ meta_monitors_config_set_switch_config (config, config_type); -+ -+ return config; - } - - void -@@ -1217,6 +1227,19 @@ meta_monitors_config_key_equal (gconstpointer data_a, - return TRUE; - } - -+MetaMonitorSwitchConfigType -+meta_monitors_config_get_switch_config (MetaMonitorsConfig *config) -+{ -+ return config->switch_config; -+} -+ -+void -+meta_monitors_config_set_switch_config (MetaMonitorsConfig *config, -+ MetaMonitorSwitchConfigType switch_config) -+{ -+ config->switch_config = switch_config; -+} -+ - MetaMonitorsConfig * - meta_monitors_config_new_full (GList *logical_monitor_configs, - GList *disabled_monitor_specs, -@@ -1232,6 +1255,7 @@ meta_monitors_config_new_full (GList *logical_monitor_con - disabled_monitor_specs); - config->layout_mode = layout_mode; - config->flags = flags; -+ config->switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; - - return config; - } -diff --git a/src/backends/meta-monitor-config-manager.h b/src/backends/meta-monitor-config-manager.h -index 269d8e1..9007074 100644 ---- a/src/backends/meta-monitor-config-manager.h -+++ b/src/backends/meta-monitor-config-manager.h -@@ -69,6 +69,8 @@ struct _MetaMonitorsConfig - MetaMonitorsConfigFlag flags; - - MetaLogicalMonitorLayoutMode layout_mode; -+ -+ MetaMonitorSwitchConfigType switch_config; - }; - - #define META_TYPE_MONITORS_CONFIG (meta_monitors_config_get_type ()) -@@ -124,6 +126,11 @@ MetaMonitorsConfig * meta_monitors_config_new (MetaMonitorManager *mon - MetaLogicalMonitorLayoutMode layout_mode, - MetaMonitorsConfigFlag flags); - -+MetaMonitorSwitchConfigType meta_monitors_config_get_switch_config (MetaMonitorsConfig *config); -+ -+void meta_monitors_config_set_switch_config (MetaMonitorsConfig *config, -+ MetaMonitorSwitchConfigType switch_config); -+ - unsigned int meta_monitors_config_key_hash (gconstpointer config_key); - - gboolean meta_monitors_config_key_equal (gconstpointer config_key_a, -diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c -index ec18600..96d794a 100644 ---- a/src/backends/meta-monitor-manager.c -+++ b/src/backends/meta-monitor-manager.c -@@ -582,7 +582,9 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager) - g_clear_object (&config); - } - -- config = meta_monitor_config_manager_create_linear (manager->config_manager); -+ config = -+ meta_monitor_config_manager_create_for_switch_config (manager->config_manager, -+ META_MONITOR_SWITCH_CONFIG_ALL_LINEAR); - if (config) - { - if (!meta_monitor_manager_apply_monitors_config (manager, -@@ -2652,8 +2654,6 @@ meta_monitor_manager_read_current_state (MetaMonitorManager *manager) - static void - meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager) - { -- manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; -- - meta_backend_monitors_changed (manager->backend); - - g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0); -@@ -2710,10 +2710,17 @@ meta_monitor_manager_update_logical_state (MetaMonitorManager *manager, - MetaMonitorsConfig *config) - { - if (config) -- manager->layout_mode = config->layout_mode; -+ { -+ manager->layout_mode = config->layout_mode; -+ manager->current_switch_config = -+ meta_monitors_config_get_switch_config (config); -+ } - else -- manager->layout_mode = -- meta_monitor_manager_get_default_layout_mode (manager); -+ { -+ manager->layout_mode = -+ meta_monitor_manager_get_default_layout_mode (manager); -+ manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; -+ } - - meta_monitor_manager_rebuild_logical_monitors (manager, config); - } -@@ -2755,6 +2762,12 @@ void - meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager, - MetaMonitorsConfig *config) - { -+ if (config) -+ manager->current_switch_config = -+ meta_monitors_config_get_switch_config (config); -+ else -+ manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; -+ - manager->layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL; - - meta_monitor_manager_rebuild_logical_monitors_derived (manager, config); diff -Nru mutter-3.28.4/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch mutter-3.28.4+git20200505/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch --- mutter-3.28.4/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/screen-Destroy-window-actors-after-windows-while-unmanagi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,106 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 25 Jun 2019 20:22:23 +0200 -Subject: screen: Destroy window actors after windows while unmanaging - compositor - -After commit 2e64457f4 we destroy window actors as part of compositor -destruction, however this might emit 'actor-removed' signals on window groups -that the shell could use to access to resources that are already free'd at this -point (like the destroyed screen, in gnome-shell's Panel._updateSolidStyle()). - -So, move the actor destructions under in a new function and destroy the window -actors as part of compositor unmanage step, just after that all the windows are -unmanaged (as they need to have an actor around). - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/652 - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/653 -Bug-Ubuntu: https://launchpad.net/bugs/1832869 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/652 -Applied-Upstream: 3.28.5 ---- - src/compositor/compositor-private.h | 2 ++ - src/compositor/compositor.c | 30 +++++++++++++++++------------- - src/core/screen.c | 3 +++ - 3 files changed, 22 insertions(+), 13 deletions(-) - -diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h -index 4669bc5..4582792 100644 ---- a/src/compositor/compositor-private.h -+++ b/src/compositor/compositor-private.h -@@ -73,4 +73,6 @@ MetaCloseDialog * meta_compositor_create_close_dialog (MetaCompositor *composito - MetaInhibitShortcutsDialog * meta_compositor_create_inhibit_shortcuts_dialog (MetaCompositor *compositor, - MetaWindow *window); - -+void meta_compositor_unmanage_window_actors (MetaCompositor *compositor); -+ - #endif /* META_COMPOSITOR_PRIVATE_H */ -diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c -index 2545d2c..6d04533 100644 ---- a/src/compositor/compositor.c -+++ b/src/compositor/compositor.c -@@ -145,19 +145,6 @@ meta_compositor_destroy (MetaCompositor *compositor) - clutter_threads_remove_repaint_func (compositor->pre_paint_func_id); - clutter_threads_remove_repaint_func (compositor->post_paint_func_id); - -- if (compositor->top_window_actor) -- { -- g_signal_handlers_disconnect_by_func (compositor->top_window_actor, -- on_top_window_actor_destroyed, -- compositor); -- compositor->top_window_actor = NULL; -- } -- -- g_clear_pointer (&compositor->window_group, clutter_actor_destroy); -- g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy); -- g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy); -- g_clear_pointer (&compositor->windows, g_list_free); -- - if (compositor->have_x11_sync_object) - meta_sync_ring_destroy (); - } -@@ -610,6 +597,23 @@ meta_compositor_unmanage (MetaCompositor *compositor) - } - } - -+void -+meta_compositor_unmanage_window_actors (MetaCompositor *compositor) -+{ -+ if (compositor->top_window_actor) -+ { -+ g_signal_handlers_disconnect_by_func (compositor->top_window_actor, -+ on_top_window_actor_destroyed, -+ compositor); -+ compositor->top_window_actor = NULL; -+ } -+ -+ g_clear_pointer (&compositor->window_group, clutter_actor_destroy); -+ g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy); -+ g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy); -+ g_clear_pointer (&compositor->windows, g_list_free); -+} -+ - /** - * meta_shape_cow_for_window: - * @compositor: A #MetaCompositor -diff --git a/src/core/screen.c b/src/core/screen.c -index d7623f3..2e59754 100644 ---- a/src/core/screen.c -+++ b/src/core/screen.c -@@ -41,6 +41,7 @@ - #include "stack.h" - #include - #include -+#include "compositor-private.h" - #include "core.h" - #include "meta-cursor-tracker-private.h" - #include "boxes-private.h" -@@ -844,6 +845,8 @@ meta_screen_free (MetaScreen *screen, - - meta_display_unmanage_windows_for_screen (display, screen, timestamp); - -+ meta_compositor_unmanage_window_actors (display->compositor); -+ - meta_prefs_remove_listener (prefs_changed_callback, screen); - - meta_screen_ungrab_keys (screen); diff -Nru mutter-3.28.4/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch mutter-3.28.4+git20200505/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch --- mutter-3.28.4/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 25 Jun 2019 20:22:54 +0200 -Subject: screen: Unset the active workspace and remove workspaces on free - -Related to https://gitlab.gnome.org/GNOME/mutter/issues/652 - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/653 -Bug-Ubuntu: https://launchpad.net/bugs/1832869 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/652 -Applied-Upstream: 3.28.5 ---- - src/core/screen.c | 11 +++++++++++ - 1 file changed, 11 insertions(+) - -diff --git a/src/core/screen.c b/src/core/screen.c -index 2e59754..11f3bad 100644 ---- a/src/core/screen.c -+++ b/src/core/screen.c -@@ -836,6 +836,7 @@ meta_screen_free (MetaScreen *screen, - guint32 timestamp) - { - MetaDisplay *display; -+ GList *l; - - display = screen->display; - -@@ -877,6 +878,16 @@ meta_screen_free (MetaScreen *screen, - - g_free (screen->screen_name); - -+ screen->active_workspace = NULL; -+ -+ for (l = screen->workspaces; l;) -+ { -+ MetaWorkspace *workspace = l->data; -+ l = l->next; -+ -+ meta_workspace_remove (workspace); -+ } -+ - g_object_unref (screen); - } - diff -Nru mutter-3.28.4/debian/patches/series mutter-3.28.4+git20200505/debian/patches/series --- mutter-3.28.4/debian/patches/series 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/series 2020-09-23 19:29:30.000000000 +0000 @@ -1,26 +1,8 @@ +EGL-Include-EGL-eglmesaext.h.patch theme-use-gtk_render_icon_suface-to-paint-button-icon.patch theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch clutter-Fix-offscreen-effect-painting-of-clones.patch bgo768531_workaround-startup-notifications.patch -monitor-manager-use-MonitorsConfig-to-track-switch_config.patch -monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch -screen-Destroy-window-actors-after-windows-while-unmanagi.patch -screen-Unset-the-active-workspace-and-remove-workspaces-o.patch -workspace-Focus-only-ancestors-that-are-focusable.patch -tests-Add-accept_focus-command-to-runner-and-client.patch -tests-Add-can_take_focus-command-to-runner-and-client.patch -tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch -test-runner-Add-assert_focused-command.patch -tests-Verify-focused-window-in-closed-transient-tests.patch -test-runner-Add-sleep-command.patch -test-runner-Add-dispatch-command.patch -window-x11-Focus-the-default-window-with-delay-while-wait.patch -window-Emit-an-error-and-return-when-trying-to-activate-a.patch -window-x11-Don-t-double-check-for-unmanaging-windows.patch -window-x11-Accept-any-focusable-window-as-fallback-focus.patch -stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch -window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch -window-x11-Focus-a-window-in-the-active-workspace-as-take.patch lp1763892-a-renderer-native-Add-hardware-presentation-timing.patch lp1763892-b-renderer-native-Advertise-_FEATURE_SWAP_THROTTLE.patch debian/synaptics-support.patch diff -Nru mutter-3.28.4/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch mutter-3.28.4+git20200505/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch --- mutter-3.28.4/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,134 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 3 Jul 2019 18:48:07 +0200 -Subject: stack: Add a function to get a sorted list of focus candidates - -Use a static function if a window can be the default focus window, and use such -function to return a filtered list of the stack. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 - -(cherry picked from commit 2439255f32b4e775d4427c92a6797b8bd33e7d5a) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-Ubuntu: https://launchpad.net/bugs/1834583 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Applied-Upstream: 3.28.5 ---- - src/core/stack.c | 55 ++++++++++++++++++++++++++++++++++++++++++------------- - src/core/stack.h | 15 +++++++++++++++ - 2 files changed, 57 insertions(+), 13 deletions(-) - -diff --git a/src/core/stack.c b/src/core/stack.c -index fc51aa1..3a0130f 100644 ---- a/src/core/stack.c -+++ b/src/core/stack.c -@@ -1176,6 +1176,27 @@ window_contains_point (MetaWindow *window, - return POINT_IN_RECT (root_x, root_y, rect); - } - -+static gboolean -+window_can_get_default_focus (MetaWindow *window) -+{ -+ if (window->unmaps_pending > 0) -+ return FALSE; -+ -+ if (window->unmanaging) -+ return FALSE; -+ -+ if (!(window->input || window->take_focus)) -+ return FALSE; -+ -+ if (!meta_window_should_be_showing (window)) -+ return FALSE; -+ -+ if (window->type == META_WINDOW_DOCK) -+ return FALSE; -+ -+ return TRUE; -+} -+ - static MetaWindow* - get_default_focus_window (MetaStack *stack, - MetaWorkspace *workspace, -@@ -1203,24 +1224,12 @@ get_default_focus_window (MetaStack *stack, - if (window == not_this_one) - continue; - -- if (window->unmaps_pending > 0) -- continue; -- -- if (window->unmanaging) -- continue; -- -- if (!(window->input || window->take_focus)) -- continue; -- -- if (!meta_window_should_be_showing (window)) -+ if (!window_can_get_default_focus (window)) - continue; - - if (must_be_at_point && !window_contains_point (window, root_x, root_y)) - continue; - -- if (window->type == META_WINDOW_DOCK) -- continue; -- - return window; - } - -@@ -1275,6 +1284,26 @@ meta_stack_list_windows (MetaStack *stack, - return workspace_windows; - } - -+GList * -+meta_stack_get_default_focus_candidates (MetaStack *stack, -+ MetaWorkspace *workspace) -+{ -+ GList *windows = meta_stack_list_windows (stack, workspace); -+ GList *l; -+ -+ for (l = windows; l;) -+ { -+ GList *next = l->next; -+ -+ if (!window_can_get_default_focus (l->data)) -+ windows = g_list_delete_link (windows, l); -+ -+ l = next; -+ } -+ -+ return windows; -+} -+ - int - meta_stack_windows_cmp (MetaStack *stack, - MetaWindow *window_a, -diff --git a/src/core/stack.h b/src/core/stack.h -index e82be0a..8cd7c68 100644 ---- a/src/core/stack.h -+++ b/src/core/stack.h -@@ -337,6 +337,21 @@ MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack *stack, - int root_x, - int root_y); - -+/** -+ * meta_stack_get_default_focus_candidates: -+ * @stack: The stack to examine. -+ * @workspace: If not %NULL, only windows on this workspace will be -+ * returned; otherwise all windows in the stack will be -+ * returned. -+ * -+ * Returns all the focus candidate windows in the stack, in order. -+ * -+ * Returns: (transfer container) (element-type Meta.Window): -+ * A #GList of #MetaWindow, in stacking order, honouring layers. -+ */ -+GList * meta_stack_get_default_focus_candidates (MetaStack *stack, -+ MetaWorkspace *workspace); -+ - /** - * meta_stack_list_windows: - * @stack: The stack to examine. diff -Nru mutter-3.28.4/debian/patches/test-runner-Add-assert_focused-command.patch mutter-3.28.4+git20200505/debian/patches/test-runner-Add-assert_focused-command.patch --- mutter-3.28.4/debian/patches/test-runner-Add-assert_focused-command.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/test-runner-Add-assert_focused-command.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 08:37:14 +0100 -Subject: test-runner: Add 'assert_focused' command - -This allows to verify which window should have the focus, which might not -be the same as the top of the stack. - -It's possible to assert the case where there's no focused window using -"NONE" as parameter. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit 51f9e04ef1fa8cd7298044ac8c82e83bea425770) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/tests/test-runner.c | 36 ++++++++++++++++++++++++++++++++++++ - 1 file changed, 36 insertions(+) - -diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c -index 37befb4..9056d9a 100644 ---- a/src/tests/test-runner.c -+++ b/src/tests/test-runner.c -@@ -273,6 +273,37 @@ test_case_assert_stacking (TestCase *test, - return *error == NULL; - } - -+static gboolean -+test_case_assert_focused (TestCase *test, -+ const char *expected_window, -+ GError **error) -+{ -+ MetaDisplay *display = meta_get_display (); -+ -+ if (!display->focus_window) -+ { -+ if (g_strcmp0 (expected_window, "none") != 0) -+ { -+ g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED, -+ "focus: expected='%s', actual='none'", expected_window); -+ } -+ } -+ else -+ { -+ const char *focused = display->focus_window->title; -+ -+ if (g_str_has_prefix (focused, "test/")) -+ focused += 5; -+ -+ if (g_strcmp0 (focused, expected_window) != 0) -+ g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED, -+ "focus: expected='%s', actual='%s'", -+ expected_window, focused); -+ } -+ -+ return *error == NULL; -+} -+ - static gboolean - test_case_check_xserver_stacking (TestCase *test, - GError **error) -@@ -496,6 +527,11 @@ test_case_do (TestCase *test, - if (!test_case_check_xserver_stacking (test, error)) - return FALSE; - } -+ else if (strcmp (argv[0], "assert_focused") == 0) -+ { -+ if (!test_case_assert_focused (test, argv[1], error)) -+ return FALSE; -+ } - else - { - BAD_COMMAND("Unknown command %s", argv[0]); diff -Nru mutter-3.28.4/debian/patches/test-runner-Add-dispatch-command.patch mutter-3.28.4+git20200505/debian/patches/test-runner-Add-dispatch-command.patch --- mutter-3.28.4/debian/patches/test-runner-Add-dispatch-command.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/test-runner-Add-dispatch-command.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,84 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Fri, 21 Jun 2019 13:15:48 +0200 -Subject: test-runner: Add 'dispatch' command - -This will only wait for events to be dispatched and processed by the server -without waiting for client processing. - -Reuse the code for the wait command too. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit 6022b23923fa6192c630920e9f895f185977beee) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/tests/test-runner.c | 38 ++++++++++++++++++++++++++++---------- - 1 file changed, 28 insertions(+), 10 deletions(-) - -diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c -index 75732c6..cdeaba2 100644 ---- a/src/tests/test-runner.c -+++ b/src/tests/test-runner.c -@@ -122,6 +122,24 @@ test_case_loop_quit (gpointer data) - return FALSE; - } - -+static gboolean -+test_case_dispatch (TestCase *test, -+ GError **error) -+{ -+ /* Wait until we've done any outstanding queued up work. -+ * Though we add this as BEFORE_REDRAW, the iteration that runs the -+ * BEFORE_REDRAW idles will proceed on and do the redraw, so we're -+ * waiting until after *all* frame processing. -+ */ -+ meta_later_add (META_LATER_BEFORE_REDRAW, -+ test_case_loop_quit, -+ test, -+ NULL); -+ g_main_loop_run (test->loop); -+ -+ return TRUE; -+} -+ - static gboolean - test_case_wait (TestCase *test, - GError **error) -@@ -138,16 +156,8 @@ test_case_wait (TestCase *test, - if (!test_client_wait (value, error)) - return FALSE; - -- /* Then wait until we've done any outstanding queued up work. -- * Though we add this as BEFORE_REDRAW, the iteration that runs the -- * BEFORE_REDRAW idles will proceed on and do the redraw, so we're -- * waiting until after *all* frame processing. -- */ -- meta_later_add (META_LATER_BEFORE_REDRAW, -- test_case_loop_quit, -- test, -- NULL); -- g_main_loop_run (test->loop); -+ /* Then wait until we've done any outstanding queued up work. */ -+ test_case_dispatch (test, error); - - /* Then set an XSync counter ourselves and and wait until - * we receive the resulting event - this makes sure that we've -@@ -530,6 +540,14 @@ test_case_do (TestCase *test, - if (!test_case_wait (test, error)) - return FALSE; - } -+ else if (strcmp (argv[0], "dispatch") == 0) -+ { -+ if (argc != 1) -+ BAD_COMMAND("usage: %s", argv[0]); -+ -+ if (!test_case_dispatch (test, error)) -+ return FALSE; -+ } - else if (strcmp (argv[0], "sleep") == 0) - { - guint64 interval; diff -Nru mutter-3.28.4/debian/patches/test-runner-Add-sleep-command.patch mutter-3.28.4+git20200505/debian/patches/test-runner-Add-sleep-command.patch --- mutter-3.28.4/debian/patches/test-runner-Add-sleep-command.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/test-runner-Add-sleep-command.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 18 Jun 2019 19:33:10 +0200 -Subject: test-runner: Add 'sleep' command - -This allows to sleep for a given timeout in milliseconds. - -Rename test_case_before_redraw to test_case_loop_quit since it's a generic -function and use it for the timeout too. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit d08763c18cb25fe250b27bf296e1607e63e86400) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/tests/test-runner.c | 29 +++++++++++++++++++++++++++-- - 1 file changed, 27 insertions(+), 2 deletions(-) - -diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c -index 9056d9a..75732c6 100644 ---- a/src/tests/test-runner.c -+++ b/src/tests/test-runner.c -@@ -113,7 +113,7 @@ test_case_new (void) - } - - static gboolean --test_case_before_redraw (gpointer data) -+test_case_loop_quit (gpointer data) - { - TestCase *test = data; - -@@ -144,7 +144,7 @@ test_case_wait (TestCase *test, - * waiting until after *all* frame processing. - */ - meta_later_add (META_LATER_BEFORE_REDRAW, -- test_case_before_redraw, -+ test_case_loop_quit, - test, - NULL); - g_main_loop_run (test->loop); -@@ -157,6 +157,17 @@ test_case_wait (TestCase *test, - return TRUE; - } - -+static gboolean -+test_case_sleep (TestCase *test, -+ guint32 interval, -+ GError **error) -+{ -+ g_timeout_add_full (G_PRIORITY_LOW, interval, test_case_loop_quit, test, NULL); -+ g_main_loop_run (test->loop); -+ -+ return TRUE; -+} -+ - #define BAD_COMMAND(...) \ - G_STMT_START { \ - g_set_error (error, \ -@@ -519,6 +530,20 @@ test_case_do (TestCase *test, - if (!test_case_wait (test, error)) - return FALSE; - } -+ else if (strcmp (argv[0], "sleep") == 0) -+ { -+ guint64 interval; -+ -+ if (argc != 2) -+ BAD_COMMAND("usage: %s ", argv[0]); -+ -+ if (!g_ascii_string_to_unsigned (argv[1], 10, 0, G_MAXUINT32, -+ &interval, error)) -+ return FALSE; -+ -+ if (!test_case_sleep (test, (guint32) interval, error)) -+ return FALSE; -+ } - else if (strcmp (argv[0], "assert_stacking") == 0) - { - if (!test_case_assert_stacking (test, argv + 1, argc - 1, error)) diff -Nru mutter-3.28.4/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch mutter-3.28.4+git20200505/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch --- mutter-3.28.4/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/tests-Add-accept_focus-command-to-runner-and-client.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 03:43:57 +0100 -Subject: tests: Add 'accept_focus' command to runner and client - -Under the hood, calls gtk_window_set_accept_focus in the client - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit e1f839f48f8e49c826ba558fbc9d6842a156b28b) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/tests/test-client.c | 18 ++++++++++++++++++ - src/tests/test-runner.c | 19 +++++++++++++++++++ - 2 files changed, 37 insertions(+) - -diff --git a/src/tests/test-client.c b/src/tests/test-client.c -index 5836083..1870fd2 100644 ---- a/src/tests/test-client.c -+++ b/src/tests/test-client.c -@@ -161,6 +161,24 @@ process_line (const char *line) - gtk_window_set_transient_for (GTK_WINDOW (window), - GTK_WINDOW (parent_window)); - } -+ else if (strcmp (argv[0], "accept_focus") == 0) -+ { -+ if (argc != 3) -+ { -+ g_print ("usage: %s [true|false]", argv[0]); -+ goto out; -+ } -+ -+ GtkWidget *window = lookup_window (argv[1]); -+ if (!window) -+ { -+ g_print ("unknown window %s", argv[1]); -+ goto out; -+ } -+ -+ gboolean enabled = g_ascii_strcasecmp (argv[2], "true") == 0; -+ gtk_window_set_accept_focus (GTK_WINDOW (window), enabled); -+ } - else if (strcmp (argv[0], "show") == 0) - { - if (argc != 2) -diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c -index 8867945..613c0bb 100644 ---- a/src/tests/test-runner.c -+++ b/src/tests/test-runner.c -@@ -406,6 +406,25 @@ test_case_do (TestCase *test, - NULL)) - return FALSE; - } -+ else if (strcmp (argv[0], "accept_focus") == 0) -+ { -+ if (argc != 3 || -+ (g_ascii_strcasecmp (argv[2], "true") != 0 && -+ g_ascii_strcasecmp (argv[2], "false") != 0)) -+ BAD_COMMAND("usage: %s / [true|false]", -+ argv[0]); -+ -+ TestClient *client; -+ const char *window_id; -+ if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error)) -+ return FALSE; -+ -+ if (!test_client_do (client, error, -+ argv[0], window_id, -+ argv[2], -+ NULL)) -+ return FALSE; -+ } - else if (strcmp (argv[0], "show") == 0 || - strcmp (argv[0], "hide") == 0 || - strcmp (argv[0], "activate") == 0 || diff -Nru mutter-3.28.4/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch mutter-3.28.4+git20200505/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch --- mutter-3.28.4/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/tests-Add-can_take_focus-command-to-runner-and-client.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,116 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 04:04:22 +0100 -Subject: tests: Add 'can_take_focus' command to runner and client - -Allow to set/unset WM_TAKE_FOCUS from client window. -This is added by default by gtk, but this might not happen in other toolkits, -so add an ability to (un)set this. - -So fetch the protocols with XGetWMProtocols and unset the atom. - -test-client now needs to depend on Xlib directly in meson build. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit f2d2d473b71dbdb339c80f068c5cb3e529af2478) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/tests/test-client.c | 50 +++++++++++++++++++++++++++++++++++++++++++++++++ - src/tests/test-runner.c | 19 +++++++++++++++++++ - 2 files changed, 69 insertions(+) - -diff --git a/src/tests/test-client.c b/src/tests/test-client.c -index 1870fd2..aa763d5 100644 ---- a/src/tests/test-client.c -+++ b/src/tests/test-client.c -@@ -179,6 +179,56 @@ process_line (const char *line) - gboolean enabled = g_ascii_strcasecmp (argv[2], "true") == 0; - gtk_window_set_accept_focus (GTK_WINDOW (window), enabled); - } -+ else if (strcmp (argv[0], "can_take_focus") == 0) -+ { -+ if (argc != 3) -+ { -+ g_print ("usage: %s [true|false]", argv[0]); -+ goto out; -+ } -+ -+ GtkWidget *window = lookup_window (argv[1]); -+ if (!window) -+ { -+ g_print ("unknown window %s", argv[1]); -+ goto out; -+ } -+ -+ if (wayland) -+ { -+ g_print ("%s not supported under wayland", argv[0]); -+ goto out; -+ } -+ -+ GdkDisplay *display = gdk_display_get_default (); -+ GdkWindow *gdkwindow = gtk_widget_get_window (window); -+ Display *xdisplay = gdk_x11_display_get_xdisplay (display); -+ Window xwindow = GDK_WINDOW_XID (gdkwindow); -+ Atom wm_take_focus = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS"); -+ gboolean add = g_ascii_strcasecmp(argv[2], "true") == 0; -+ Atom *protocols = NULL; -+ Atom *new_protocols; -+ int n_protocols = 0; -+ int i, n = 0; -+ -+ gdk_display_sync (display); -+ XGetWMProtocols (xdisplay, xwindow, &protocols, &n_protocols); -+ new_protocols = g_new0 (Atom, n_protocols + (add ? 1 : 0)); -+ -+ for (i = 0; i < n_protocols; ++i) -+ { -+ if (protocols[i] != wm_take_focus) -+ new_protocols[n++] = protocols[i]; -+ } -+ -+ if (add) -+ new_protocols[n++] = wm_take_focus; -+ -+ XSetWMProtocols (xdisplay, xwindow, new_protocols, n); -+ -+ XFree (new_protocols); -+ XFree (protocols); -+ } - else if (strcmp (argv[0], "show") == 0) - { - if (argc != 2) -diff --git a/src/tests/test-runner.c b/src/tests/test-runner.c -index 613c0bb..37befb4 100644 ---- a/src/tests/test-runner.c -+++ b/src/tests/test-runner.c -@@ -425,6 +425,25 @@ test_case_do (TestCase *test, - NULL)) - return FALSE; - } -+ else if (strcmp (argv[0], "can_take_focus") == 0) -+ { -+ if (argc != 3 || -+ (g_ascii_strcasecmp (argv[2], "true") != 0 && -+ g_ascii_strcasecmp (argv[2], "false") != 0)) -+ BAD_COMMAND("usage: %s / [true|false]", -+ argv[0]); -+ -+ TestClient *client; -+ const char *window_id; -+ if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error)) -+ return FALSE; -+ -+ if (!test_client_do (client, error, -+ argv[0], window_id, -+ argv[2], -+ NULL)) -+ return FALSE; -+ } - else if (strcmp (argv[0], "show") == 0 || - strcmp (argv[0], "hide") == 0 || - strcmp (argv[0], "activate") == 0 || diff -Nru mutter-3.28.4/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch mutter-3.28.4+git20200505/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch --- mutter-3.28.4/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,125 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 07:48:53 +0100 -Subject: tests, stacking: Add tests with no-input and no-take-focus windows - -When a window with no frame, that doesn't accept focus and that has no -take-focus atom set is destroyed, we ended up in not changing the current_focus -window, causing a crash. - -Added test cases that verify this situation. - -Related to https://gitlab.gnome.org/GNOME/mutter/issues/308 -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit 2fc7760ceed6f948d4f3c1dd74d4e57c7df05eea) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/Makefile-tests.am | 3 +++ - ...ransient-no-input-no-take-focus-parent.metatest | 21 ++++++++++++++++++++ - ...ansient-no-input-no-take-focus-parents.metatest | 23 ++++++++++++++++++++++ - .../closed-transient-no-input-parent.metatest | 20 +++++++++++++++++++ - 4 files changed, 67 insertions(+) - create mode 100644 src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest - create mode 100644 src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest - create mode 100644 src/tests/stacking/closed-transient-no-input-parent.metatest - -diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am -index 4be832c..3764917 100644 ---- a/src/Makefile-tests.am -+++ b/src/Makefile-tests.am -@@ -15,6 +15,9 @@ dist_stacking_DATA = \ - tests/stacking/basic-x11.metatest \ - tests/stacking/basic-wayland.metatest \ - tests/stacking/closed-transient.metatest \ -+ tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \ -+ tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ -+ tests/stacking/closed-transient-no-input-parent.metatest \ - tests/stacking/minimized.metatest \ - tests/stacking/mixed-windows.metatest \ - tests/stacking/set-parent.metatest \ -diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest -new file mode 100644 -index 0000000..4249c32 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest -@@ -0,0 +1,21 @@ -+new_client 1 x11 -+create 1/1 -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+can_take_focus 1/2 false -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+show 1/3 -+ -+wait -+assert_stacking 1/1 1/2 1/3 -+ -+destroy 1/3 -+ -+wait -+assert_stacking 1/1 1/2 -diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest -new file mode 100644 -index 0000000..a61c640 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest -@@ -0,0 +1,23 @@ -+new_client 1 x11 -+create 1/1 -+accept_focus 1/1 false -+can_take_focus 1/1 false -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+can_take_focus 1/2 false -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+show 1/3 -+ -+wait -+assert_stacking 1/1 1/2 1/3 -+ -+destroy 1/3 -+wait -+ -+assert_stacking 1/1 1/2 -diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest -new file mode 100644 -index 0000000..4cadb23 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-parent.metatest -@@ -0,0 +1,20 @@ -+new_client 1 x11 -+create 1/1 -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+show 1/3 -+ -+wait -+assert_stacking 1/1 1/2 1/3 -+ -+destroy 1/3 -+ -+wait -+assert_stacking 1/1 1/2 diff -Nru mutter-3.28.4/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch mutter-3.28.4+git20200505/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch --- mutter-3.28.4/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/tests-Verify-focused-window-in-closed-transient-tests.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 08:45:56 +0100 -Subject: tests: Verify focused window in closed-transient tests - -Ensure that we have a focused window when closing transient windows with -no-focus or no-take-focus atoms - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit fcb408ad5d8d7fec3e6a7bdaa92e5ef06b55c2c6) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - .../closed-transient-no-input-no-take-focus-parent.metatest | 2 ++ - ...closed-transient-no-input-no-take-focus-parents.metatest | 13 ++++++++++--- - 2 files changed, 12 insertions(+), 3 deletions(-) - -diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest -index 4249c32..0c0649c 100644 ---- a/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest -+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest -@@ -13,9 +13,11 @@ set_parent 1/3 2 - show 1/3 - - wait -+assert_focused 1/3 - assert_stacking 1/1 1/2 1/3 - - destroy 1/3 - - wait -+assert_focused 1/1 - assert_stacking 1/1 1/2 -diff --git a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest -index a61c640..6556803 100644 ---- a/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest -+++ b/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest -@@ -1,3 +1,8 @@ -+new_client 2 x11 -+create 2/1 -+show 2/1 -+wait -+ - new_client 1 x11 - create 1/1 - accept_focus 1/1 false -@@ -15,9 +20,11 @@ set_parent 1/3 2 - show 1/3 - - wait --assert_stacking 1/1 1/2 1/3 -+assert_focused 1/3 -+assert_stacking 2/1 1/1 1/2 1/3 - - destroy 1/3 --wait - --assert_stacking 1/1 1/2 -+wait -+assert_stacking 1/1 1/2 2/1 -+assert_focused 2/1 diff -Nru mutter-3.28.4/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch mutter-3.28.4+git20200505/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch --- mutter-3.28.4/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-Emit-an-error-and-return-when-trying-to-activate-a.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Fri, 3 May 2019 20:10:47 +0200 -Subject: window: Emit an error and return when trying to activate an - unmanaged - -If something (i.e. gnome-shell or an extension) tries to activate an unmanaged -window, we should warn about this and avoid to perform further actions as this -could lead to a crash of mutter, since the window has not valid flags (like -workspace) set anymore at this stage. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/580 - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/564 - -(cherry picked from commit a6fc656e917fd48b8708b8d9f4bf9f8b15581313) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/core/window.c | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/src/core/window.c b/src/core/window.c -index eaae5b0..32c9461 100644 ---- a/src/core/window.c -+++ b/src/core/window.c -@@ -3622,6 +3622,13 @@ meta_window_activate_full (MetaWindow *window, - MetaWorkspace *workspace) - { - gboolean allow_workspace_switch; -+ -+ if (window->unmanaging) -+ { -+ g_warning ("Trying to activate unmanaged window '%s'", window->desc); -+ return; -+ } -+ - meta_topic (META_DEBUG_FOCUS, - "_NET_ACTIVE_WINDOW message sent for %s at time %u " - "by client type %u.\n", diff -Nru mutter-3.28.4/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch mutter-3.28.4+git20200505/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch --- mutter-3.28.4/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-x11-Accept-any-focusable-window-as-fallback-focus.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,109 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 3 Jul 2019 11:15:36 +0200 -Subject: window-x11: Accept any focusable window as fallback focus - -As per commit f71151a5 we were ignoring WM_TAKE_FOCUS-only windows as focus -targets, however this might end-up in an infinite loop if there are multiple -non-input windows stacked. - -So, accept any focusable window as fallback focus target even if it's a -take-focus one (that might not reply to the request). - -Added a stacking test to verify this. - -Closes: https://gitlab.gnome.org/GNOME/mutter/issues/660 -https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 - -(cherry picked from commit c327b2df95ff9979dd22bca2e0d285e1b3ba0add) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-Ubuntu: https://launchpad.net/bugs/1834583 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Applied-Upstream: 3.28.5 ---- - src/Makefile-tests.am | 1 + - .../closed-transient-no-input-parents.metatest | 46 ++++++++++++++++++++++ - src/x11/window-x11.c | 2 +- - 3 files changed, 48 insertions(+), 1 deletion(-) - create mode 100644 src/tests/stacking/closed-transient-no-input-parents.metatest - -diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am -index eca6a7b..21d0619 100644 ---- a/src/Makefile-tests.am -+++ b/src/Makefile-tests.am -@@ -19,6 +19,7 @@ dist_stacking_DATA = \ - tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ - tests/stacking/closed-transient-no-input-parent.metatest \ - tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ -+ tests/stacking/closed-transient-no-input-parents.metatest \ - tests/stacking/minimized.metatest \ - tests/stacking/mixed-windows.metatest \ - tests/stacking/set-parent.metatest \ -diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest -new file mode 100644 -index 0000000..e3ec2e8 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-parents.metatest -@@ -0,0 +1,46 @@ -+new_client 0 x11 -+create 0/1 -+show 0/1 -+ -+new_client 1 x11 -+create 1/1 -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+accept_focus 1/3 false -+show 1/3 -+ -+create 1/4 csd -+set_parent 1/4 3 -+accept_focus 1/4 false -+show 1/4 -+ -+create 1/5 csd -+set_parent 1/5 3 -+show 1/5 -+ -+wait -+assert_focused 1/5 -+assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 -+ -+destroy 1/5 -+dispatch -+ -+assert_focused none -+assert_stacking 0/1 1/1 1/2 1/3 1/4 -+ -+sleep 250 -+assert_focused none -+assert_stacking 0/1 1/1 1/2 1/3 1/4 -+ -+destroy 1/3 -+wait -+ -+assert_focused none -+assert_stacking 0/1 1/1 1/2 1/4 -diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c -index c09ba3e..7dff35e 100644 ---- a/src/x11/window-x11.c -+++ b/src/x11/window-x11.c -@@ -852,7 +852,7 @@ meta_window_x11_focus (MetaWindow *window, - if (!focus_window) - break; - -- if (focus_window->input) -+ if (focus_window->input || focus_window->take_focus) - break; - - if (focus_window->shaded && focus_window->frame) diff -Nru mutter-3.28.4/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch mutter-3.28.4+git20200505/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch --- mutter-3.28.4/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-x11-Don-t-double-check-for-unmanaging-windows.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,39 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Mon, 1 Jul 2019 10:38:02 +0200 -Subject: window-x11: Don't double-check for unmanaging windows - -When looking for the best fallback focus window, we ignore it if it is in the -unmanaging state, but meta_stack_get_default_focus_window() does this is check -for us already. - -So, ignore the redundant test. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 - -(cherry picked from commit 9aee47daa984e5cc4a1ccefb3aacfbb2729cfbc1) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-Ubuntu: https://launchpad.net/bugs/1834583 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Applied-Upstream: 3.28.5 ---- - src/x11/window-x11.c | 3 --- - 1 file changed, 3 deletions(-) - -diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c -index 29ea3a6..c09ba3e 100644 ---- a/src/x11/window-x11.c -+++ b/src/x11/window-x11.c -@@ -852,9 +852,6 @@ meta_window_x11_focus (MetaWindow *window, - if (!focus_window) - break; - -- if (focus_window->unmanaging) -- continue; -- - if (focus_window->input) - break; - diff -Nru mutter-3.28.4/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch mutter-3.28.4+git20200505/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch --- mutter-3.28.4/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,68 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 17 Jul 2019 01:13:48 +0200 -Subject: window-x11: Focus a window in the active workspace as take-focus - fallback - -Starting with commit 2db94e2e we try to focus a fallback default focus window -if no take-focus window candidate gets the input focus when we request it and -we limit the focus candidates to the current window's workspace. - -However, if the window is unmanaging, the workspace might be unset, and we could -end up in deferencing a NULL pointer causing a crash. - -So, in case the window's workspace is unset, just use the currently active -workspace for the display. - -Closes https://gitlab.gnome.org/GNOME/mutter/issues/687 - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/688 - -(cherry picked from commit 5ca0ef078d39548edda1a97e9066d44aa8f38108) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/688 -Applied-Upstream: 3.28.5 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1791574 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/687 ---- - src/x11/window-x11.c | 16 +++++++++++----- - 1 file changed, 11 insertions(+), 5 deletions(-) - -diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c -index 60b121f..7ca51da 100644 ---- a/src/x11/window-x11.c -+++ b/src/x11/window-x11.c -@@ -834,15 +834,21 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window, - } - - static void --maybe_focus_default_window (MetaWorkspace *workspace, -- MetaWindow *not_this_one, -- guint32 timestamp) -+maybe_focus_default_window (MetaScreen *screen, -+ MetaWindow *not_this_one, -+ guint32 timestamp) - { -- MetaStack *stack = workspace->screen->stack; -+ MetaWorkspace *workspace; -+ MetaStack *stack = screen->stack; - g_autoptr (GList) focusable_windows = NULL; - g_autoptr (GQueue) focus_candidates = NULL; - GList *l; - -+ if (not_this_one && not_this_one->workspace) -+ workspace = not_this_one->workspace; -+ else -+ workspace = screen->active_workspace; -+ - /* Go through all the focusable windows and try to focus them - * in order, waiting for a delay. The first one that replies to - * the request (in case of take focus windows) changing the display -@@ -936,7 +942,7 @@ meta_window_x11_focus (MetaWindow *window, - meta_display_focus_the_no_focus_window (window->display, - window->screen, - timestamp); -- maybe_focus_default_window (window->workspace, window, -+ maybe_focus_default_window (window->screen, window, - timestamp); - } - } diff -Nru mutter-3.28.4/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch mutter-3.28.4+git20200505/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch --- mutter-3.28.4/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-x11-Focus-the-default-window-with-delay-while-wait.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,247 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 14 Nov 2018 00:08:34 +0100 -Subject: window-x11: Focus the default window with delay while waiting for - take-focus - -When requesting to a take-focus window to acquire the input, the client may or -may not respond with a SetInputFocus (this doesn't happen for no-input gtk -windows in fact [to be fixed there too]), in such case we were unsetting the -focus while waiting the reply. - -In case the client won't respond, we wait for a small delay (set to 250 ms) for -the take-focus window to grab the input focus before setting it to the default -window. - -Added a test for this behavior and for the case in which a window takes the -focus meanwhile we're waiting to focus the default window. - -https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -(cherry picked from commit f71151a5dd990d935f3fbb39451f9b41f640b625) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/Makefile-tests.am | 1 + - ...parent-delayed-focus-default-cancelled.metatest | 36 ++++++++ - .../closed-transient-no-input-parent.metatest | 16 +++- - src/x11/window-x11.c | 101 ++++++++++++++++++++- - 4 files changed, 146 insertions(+), 8 deletions(-) - create mode 100644 src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest - -diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am -index 3764917..eca6a7b 100644 ---- a/src/Makefile-tests.am -+++ b/src/Makefile-tests.am -@@ -18,6 +18,7 @@ dist_stacking_DATA = \ - tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \ - tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ - tests/stacking/closed-transient-no-input-parent.metatest \ -+ tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ - tests/stacking/minimized.metatest \ - tests/stacking/mixed-windows.metatest \ - tests/stacking/set-parent.metatest \ -diff --git a/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest -new file mode 100644 -index 0000000..38897e3 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest -@@ -0,0 +1,36 @@ -+new_client 2 x11 -+create 2/1 -+show 2/1 -+ -+new_client 1 x11 -+create 1/1 -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+show 1/3 -+ -+wait -+assert_focused 1/3 -+assert_stacking 2/1 1/1 1/2 1/3 -+ -+destroy 1/3 -+sleep 10 -+ -+assert_focused none -+assert_stacking 2/1 1/1 1/2 -+ -+activate 2/1 -+wait -+ -+assert_focused 2/1 -+assert_stacking 1/1 1/2 2/1 -+ -+sleep 250 -+assert_focused 2/1 -+assert_stacking 1/1 1/2 2/1 -diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest -index 4cadb23..e0f1dc1 100644 ---- a/src/tests/stacking/closed-transient-no-input-parent.metatest -+++ b/src/tests/stacking/closed-transient-no-input-parent.metatest -@@ -1,3 +1,7 @@ -+new_client 2 x11 -+create 2/1 -+show 2/1 -+ - new_client 1 x11 - create 1/1 - show 1/1 -@@ -12,9 +16,15 @@ set_parent 1/3 2 - show 1/3 - - wait --assert_stacking 1/1 1/2 1/3 -+assert_focused 1/3 -+assert_stacking 2/1 1/1 1/2 1/3 - - destroy 1/3 -+dispatch - --wait --assert_stacking 1/1 1/2 -+assert_focused none -+assert_stacking 2/1 1/1 1/2 -+ -+sleep 250 -+assert_focused 1/1 -+assert_stacking 2/1 1/1 1/2 -diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c -index e1c3441..29ea3a6 100644 ---- a/src/x11/window-x11.c -+++ b/src/x11/window-x11.c -@@ -53,6 +53,8 @@ - #include "backends/meta-logical-monitor.h" - #include "backends/x11/meta-backend-x11.h" - -+#define TAKE_FOCUS_FALLBACK_DELAY_MS 250 -+ - G_DEFINE_TYPE_WITH_PRIVATE (MetaWindowX11, meta_window_x11, META_TYPE_WINDOW) - - static void -@@ -722,6 +724,66 @@ request_take_focus (MetaWindow *window, - send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp); - } - -+typedef struct -+{ -+ MetaWindow *window; -+ guint32 timestamp; -+ guint timeout_id; -+ gulong unmanaged_id; -+ gulong focused_changed_id; -+} MetaWindowX11DelayedFocusData; -+ -+static void -+meta_window_x11_delayed_focus_data_free (MetaWindowX11DelayedFocusData *data) -+{ -+ g_signal_handler_disconnect (data->window, data->unmanaged_id); -+ g_signal_handler_disconnect (data->window->display, data->focused_changed_id); -+ -+ if (data->timeout_id) -+ g_source_remove (data->timeout_id); -+ -+ g_free (data); -+} -+ -+static gboolean -+focus_window_delayed_timeout (gpointer user_data) -+{ -+ MetaWindowX11DelayedFocusData *data = user_data; -+ MetaWindow *window = data->window; -+ guint32 timestamp = data->timestamp; -+ -+ data->timeout_id = 0; -+ meta_window_x11_delayed_focus_data_free (data); -+ -+ meta_window_focus (window, timestamp); -+ -+ return G_SOURCE_REMOVE; -+} -+ -+static void -+meta_window_x11_maybe_focus_delayed (MetaWindow *window, -+ guint32 timestamp) -+{ -+ MetaWindowX11DelayedFocusData *data; -+ -+ data = g_new0 (MetaWindowX11DelayedFocusData, 1); -+ data->window = window; -+ data->timestamp = timestamp; -+ -+ data->unmanaged_id = -+ g_signal_connect_swapped (window, "unmanaged", -+ G_CALLBACK (meta_window_x11_delayed_focus_data_free), -+ data); -+ -+ data->focused_changed_id = -+ g_signal_connect_swapped (window->display, "notify::focus-window", -+ G_CALLBACK (meta_window_x11_delayed_focus_data_free), -+ data); -+ -+ data->timeout_id = g_timeout_add (TAKE_FOCUS_FALLBACK_DELAY_MS, -+ focus_window_delayed_timeout, data); -+} -+ - static void - meta_window_x11_focus (MetaWindow *window, - guint32 timestamp) -@@ -771,14 +833,43 @@ meta_window_x11_focus (MetaWindow *window, - * Normally, we want to just leave the focus undisturbed until - * the window responds to WM_TAKE_FOCUS, but if we're unmanaging - * the current focus window we *need* to move the focus away, so -- * we focus the no_focus_window now (and set -- * display->focus_window to that) before sending WM_TAKE_FOCUS. -+ * we focus the no focus window before sending WM_TAKE_FOCUS, -+ * and eventually the default focus windwo excluding this one, -+ * if meanwhile we don't get any focus request. - */ - if (window->display->focus_window != NULL && - window->display->focus_window->unmanaging) -- meta_display_focus_the_no_focus_window (window->display, -- window->screen, -- timestamp); -+ { -+ MetaWindow *focus_window = window; -+ MetaWorkspace *workspace = window->workspace; -+ MetaStack *stack = window->screen->stack; -+ -+ while (TRUE) -+ { -+ focus_window = meta_stack_get_default_focus_window (stack, -+ workspace, -+ focus_window); -+ if (!focus_window) -+ break; -+ -+ if (focus_window->unmanaging) -+ continue; -+ -+ if (focus_window->input) -+ break; -+ -+ if (focus_window->shaded && focus_window->frame) -+ break; -+ } -+ -+ meta_display_focus_the_no_focus_window (window->display, -+ window->screen, -+ timestamp); -+ -+ if (focus_window) -+ meta_window_x11_maybe_focus_delayed (focus_window, -+ timestamp); -+ } - } - - request_take_focus (window, timestamp); diff -Nru mutter-3.28.4/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch mutter-3.28.4+git20200505/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch --- mutter-3.28.4/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,339 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 3 Jul 2019 12:04:08 +0200 -Subject: window-x11: Use any focusable window as fallback delayed focus - window - -As per commit f71151a5 we focus an input window if no take-focus-window accepts -it. This might lead to an infinite loop if there are various focusable but -non-input windows in the stack. - -When the current focus window is unmanaging and we're trying to focus a -WM_TAKE_FOCUS window, we intent to give the focus to the first focusable input -window in the stack. - -However, if an application (such as the Java ones) only uses non-input -WM_TAKE_FOCUS windows, are not requesting these ones to get the focus. This -might lead to a state where no window is focused, or a wrong one is. - -So, instead of only focus the first eventually input window available, try to -request to all the take-focus windows that are in the stack between the -destroyed one and the first input one to acquire the input focus. -Use a queue to keep track of those windows, that is passed around stealing -ownership, while we protect for unmanaged queued windows. - -Also, reduce the default timeout value, as the previous one might lead to an -excessive long wait. - -Added metatests verifying these situations. - -Closes: https://gitlab.gnome.org/GNOME/mutter/issues/660 -https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 - -(cherry picked from commit 6d8293a422b08af97d3da985d49448db32d59248) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/669 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-Ubuntu: https://launchpad.net/bugs/1834583 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/660 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Applied-Upstream: 3.28.5 ---- - src/Makefile-tests.am | 1 + - .../closed-transient-no-input-parent.metatest | 2 +- - ...parents-queued-default-focus-destroyed.metatest | 43 ++++++++ - .../closed-transient-no-input-parents.metatest | 6 +- - src/x11/window-x11.c | 120 ++++++++++++++++----- - 5 files changed, 144 insertions(+), 28 deletions(-) - create mode 100644 src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest - -diff --git a/src/Makefile-tests.am b/src/Makefile-tests.am -index 21d0619..359f398 100644 ---- a/src/Makefile-tests.am -+++ b/src/Makefile-tests.am -@@ -20,6 +20,7 @@ dist_stacking_DATA = \ - tests/stacking/closed-transient-no-input-parent.metatest \ - tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ - tests/stacking/closed-transient-no-input-parents.metatest \ -+ tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest \ - tests/stacking/minimized.metatest \ - tests/stacking/mixed-windows.metatest \ - tests/stacking/set-parent.metatest \ -diff --git a/src/tests/stacking/closed-transient-no-input-parent.metatest b/src/tests/stacking/closed-transient-no-input-parent.metatest -index e0f1dc1..d0f3228 100644 ---- a/src/tests/stacking/closed-transient-no-input-parent.metatest -+++ b/src/tests/stacking/closed-transient-no-input-parent.metatest -@@ -25,6 +25,6 @@ dispatch - assert_focused none - assert_stacking 2/1 1/1 1/2 - --sleep 250 -+sleep 150 - assert_focused 1/1 - assert_stacking 2/1 1/1 1/2 -diff --git a/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest -new file mode 100644 -index 0000000..49ecc51 ---- /dev/null -+++ b/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest -@@ -0,0 +1,43 @@ -+new_client 0 x11 -+create 0/1 -+show 0/1 -+ -+new_client 1 x11 -+create 1/1 -+show 1/1 -+ -+create 1/2 csd -+set_parent 1/2 1 -+accept_focus 1/2 false -+show 1/2 -+ -+create 1/3 csd -+set_parent 1/3 2 -+accept_focus 1/3 false -+show 1/3 -+ -+create 1/4 csd -+set_parent 1/4 3 -+accept_focus 1/4 false -+show 1/4 -+ -+create 1/5 csd -+set_parent 1/5 3 -+show 1/5 -+ -+wait -+assert_focused 1/5 -+assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 -+ -+destroy 1/5 -+dispatch -+ -+assert_focused none -+assert_stacking 0/1 1/1 1/2 1/3 1/4 -+ -+destroy 1/2 -+dispatch -+ -+sleep 450 -+assert_focused 1/1 -+assert_stacking 0/1 1/1 1/3 1/4 -diff --git a/src/tests/stacking/closed-transient-no-input-parents.metatest b/src/tests/stacking/closed-transient-no-input-parents.metatest -index e3ec2e8..ee99841 100644 ---- a/src/tests/stacking/closed-transient-no-input-parents.metatest -+++ b/src/tests/stacking/closed-transient-no-input-parents.metatest -@@ -35,12 +35,12 @@ dispatch - assert_focused none - assert_stacking 0/1 1/1 1/2 1/3 1/4 - --sleep 250 --assert_focused none -+sleep 600 -+assert_focused 1/1 - assert_stacking 0/1 1/1 1/2 1/3 1/4 - - destroy 1/3 - wait - --assert_focused none -+assert_focused 1/1 - assert_stacking 0/1 1/1 1/2 1/4 -diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c -index 7dff35e..60b121f 100644 ---- a/src/x11/window-x11.c -+++ b/src/x11/window-x11.c -@@ -53,10 +53,15 @@ - #include "backends/meta-logical-monitor.h" - #include "backends/x11/meta-backend-x11.h" - --#define TAKE_FOCUS_FALLBACK_DELAY_MS 250 -+#define TAKE_FOCUS_FALLBACK_DELAY_MS 150 - - G_DEFINE_TYPE_WITH_PRIVATE (MetaWindowX11, meta_window_x11, META_TYPE_WINDOW) - -+static void -+meta_window_x11_maybe_focus_delayed (MetaWindow *window, -+ GQueue *other_focus_candidates, -+ guint32 timestamp); -+ - static void - meta_window_x11_init (MetaWindowX11 *window_x11) - { -@@ -727,24 +732,60 @@ request_take_focus (MetaWindow *window, - typedef struct - { - MetaWindow *window; -+ GQueue *pending_focus_candidates; - guint32 timestamp; - guint timeout_id; - gulong unmanaged_id; - gulong focused_changed_id; - } MetaWindowX11DelayedFocusData; - -+static void -+disconnect_pending_focus_window_signals (MetaWindow *window, -+ GQueue *focus_candidates) -+{ -+ g_signal_handlers_disconnect_by_func (window, g_queue_remove, -+ focus_candidates); -+} -+ - static void - meta_window_x11_delayed_focus_data_free (MetaWindowX11DelayedFocusData *data) - { - g_signal_handler_disconnect (data->window, data->unmanaged_id); - g_signal_handler_disconnect (data->window->display, data->focused_changed_id); - -+ if (data->pending_focus_candidates) -+ { -+ g_queue_foreach (data->pending_focus_candidates, -+ (GFunc) disconnect_pending_focus_window_signals, -+ data->pending_focus_candidates); -+ g_queue_free (data->pending_focus_candidates); -+ } -+ - if (data->timeout_id) - g_source_remove (data->timeout_id); - - g_free (data); - } - -+static void -+focus_candidates_maybe_take_and_focus_next (GQueue **focus_candidates_ptr, -+ guint32 timestamp) -+{ -+ MetaWindow *focus_window; -+ GQueue *focus_candidates; -+ -+ g_assert (*focus_candidates_ptr); -+ -+ if (g_queue_is_empty (*focus_candidates_ptr)) -+ return; -+ -+ focus_candidates = g_steal_pointer (focus_candidates_ptr); -+ focus_window = g_queue_pop_head (focus_candidates); -+ -+ disconnect_pending_focus_window_signals (focus_window, focus_candidates); -+ meta_window_x11_maybe_focus_delayed (focus_window, focus_candidates, timestamp); -+} -+ - static gboolean - focus_window_delayed_timeout (gpointer user_data) - { -@@ -752,6 +793,9 @@ focus_window_delayed_timeout (gpointer user_data) - MetaWindow *window = data->window; - guint32 timestamp = data->timestamp; - -+ focus_candidates_maybe_take_and_focus_next (&data->pending_focus_candidates, -+ timestamp); -+ - data->timeout_id = 0; - meta_window_x11_delayed_focus_data_free (data); - -@@ -762,6 +806,7 @@ focus_window_delayed_timeout (gpointer user_data) - - static void - meta_window_x11_maybe_focus_delayed (MetaWindow *window, -+ GQueue *other_focus_candidates, - guint32 timestamp) - { - MetaWindowX11DelayedFocusData *data; -@@ -769,6 +814,10 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window, - data = g_new0 (MetaWindowX11DelayedFocusData, 1); - data->window = window; - data->timestamp = timestamp; -+ data->pending_focus_candidates = other_focus_candidates; -+ -+ meta_topic (META_DEBUG_FOCUS, -+ "Requesting delayed focus to %s\n", window->desc); - - data->unmanaged_id = - g_signal_connect_swapped (window, "unmanaged", -@@ -784,6 +833,50 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window, - focus_window_delayed_timeout, data); - } - -+static void -+maybe_focus_default_window (MetaWorkspace *workspace, -+ MetaWindow *not_this_one, -+ guint32 timestamp) -+{ -+ MetaStack *stack = workspace->screen->stack; -+ g_autoptr (GList) focusable_windows = NULL; -+ g_autoptr (GQueue) focus_candidates = NULL; -+ GList *l; -+ -+ /* Go through all the focusable windows and try to focus them -+ * in order, waiting for a delay. The first one that replies to -+ * the request (in case of take focus windows) changing the display -+ * focused window, will stop the chained requests. -+ */ -+ focusable_windows = -+ meta_stack_get_default_focus_candidates (stack, workspace); -+ focus_candidates = g_queue_new (); -+ -+ for (l = g_list_last (focusable_windows); l; l = l->prev) -+ { -+ MetaWindow *focus_window = l->data; -+ -+ if (focus_window == not_this_one) -+ continue; -+ -+ g_queue_push_tail (focus_candidates, focus_window); -+ g_signal_connect_swapped (focus_window, "unmanaged", -+ G_CALLBACK (g_queue_remove), -+ focus_candidates); -+ -+ if (!META_IS_WINDOW_X11 (focus_window)) -+ break; -+ -+ if (focus_window->input) -+ break; -+ -+ if (focus_window->shaded && focus_window->frame) -+ break; -+ } -+ -+ focus_candidates_maybe_take_and_focus_next (&focus_candidates, timestamp); -+} -+ - static void - meta_window_x11_focus (MetaWindow *window, - guint32 timestamp) -@@ -840,32 +933,11 @@ meta_window_x11_focus (MetaWindow *window, - if (window->display->focus_window != NULL && - window->display->focus_window->unmanaging) - { -- MetaWindow *focus_window = window; -- MetaWorkspace *workspace = window->workspace; -- MetaStack *stack = window->screen->stack; -- -- while (TRUE) -- { -- focus_window = meta_stack_get_default_focus_window (stack, -- workspace, -- focus_window); -- if (!focus_window) -- break; -- -- if (focus_window->input || focus_window->take_focus) -- break; -- -- if (focus_window->shaded && focus_window->frame) -- break; -- } -- - meta_display_focus_the_no_focus_window (window->display, - window->screen, - timestamp); -- -- if (focus_window) -- meta_window_x11_maybe_focus_delayed (focus_window, -- timestamp); -+ maybe_focus_default_window (window->workspace, window, -+ timestamp); - } - } - diff -Nru mutter-3.28.4/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch mutter-3.28.4+git20200505/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch --- mutter-3.28.4/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch 2019-07-09 16:03:10.000000000 +0000 +++ mutter-3.28.4+git20200505/debian/patches/workspace-Focus-only-ancestors-that-are-focusable.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 13 Nov 2018 08:31:52 +0100 -Subject: workspace: Focus only ancestors that are focusable - -When destroying a window that has a parent, we initially try to focus one of -its ancestors. However if no ancestor can be focused, then we should instead -focus the default focus window instead of trying to request focus for a window -that can't get focus anyways. - -Fixes https://gitlab.gnome.org/GNOME/mutter/issues/308 -(cherry picked from commit eccc791f3b3451216f957e67fec47a73b65ed2b2) - -Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/307 -Bug-Ubuntu: https://launchpad.net/bugs/1791574 -Bug-JetBrains: https://youtrack.jetbrains.com/issue/IDEA-198187 -Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/308 -Applied-Upstream: 3.28.5 ---- - src/core/workspace.c | 37 +++++++++++++++++++++++++++---------- - 1 file changed, 27 insertions(+), 10 deletions(-) - -diff --git a/src/core/workspace.c b/src/core/workspace.c -index a964e66..d194943 100644 ---- a/src/core/workspace.c -+++ b/src/core/workspace.c -@@ -85,6 +85,12 @@ typedef struct _MetaWorkspaceLogicalMonitorData - MetaRectangle logical_monitor_work_area; - } MetaWorkspaceLogicalMonitorData; - -+typedef struct _MetaWorkspaceFocusableAncestorData -+{ -+ MetaWorkspace *workspace; -+ MetaWindow *out_window; -+} MetaWorkspaceFocusableAncestorData; -+ - static MetaWorkspaceLogicalMonitorData * - meta_workspace_get_logical_monitor_data (MetaWorkspace *workspace, - MetaLogicalMonitor *logical_monitor) -@@ -1319,13 +1325,20 @@ meta_workspace_focus_default_window (MetaWorkspace *workspace, - } - - static gboolean --record_ancestor (MetaWindow *window, -- void *data) -+find_focusable_ancestor (MetaWindow *window, -+ gpointer user_data) - { -- MetaWindow **result = data; -+ MetaWorkspaceFocusableAncestorData *data = user_data; -+ -+ if (!window->unmanaging && (window->input || window->take_focus) && -+ meta_window_located_on_workspace (window, data->workspace) && -+ meta_window_showing_on_its_workspace (window)) -+ { -+ data->out_window = window; -+ return FALSE; -+ } - -- *result = window; -- return FALSE; /* quit with the first ancestor we find */ -+ return TRUE; - } - - /* Focus ancestor of not_this_one if there is one */ -@@ -1347,11 +1360,15 @@ focus_ancestor_or_top_window (MetaWorkspace *workspace, - if (not_this_one) - { - MetaWindow *ancestor; -- ancestor = NULL; -- meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor); -- if (ancestor != NULL && -- meta_window_located_on_workspace (ancestor, workspace) && -- meta_window_showing_on_its_workspace (ancestor)) -+ MetaWorkspaceFocusableAncestorData data; -+ -+ data = (MetaWorkspaceFocusableAncestorData) { -+ .workspace = workspace, -+ }; -+ meta_window_foreach_ancestor (not_this_one, find_focusable_ancestor, &data); -+ ancestor = data.out_window; -+ -+ if (ancestor) - { - meta_topic (META_DEBUG_FOCUS, - "Focusing %s, ancestor of %s\n", diff -Nru mutter-3.28.4/doc/Makefile.in mutter-3.28.4+git20200505/doc/Makefile.in --- mutter-3.28.4/doc/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/doc/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -140,7 +140,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -366,6 +366,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -399,8 +400,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -517,10 +518,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/doc/man/Makefile.in mutter-3.28.4+git20200505/doc/man/Makefile.in --- mutter-3.28.4/doc/man/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/doc/man/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -337,6 +337,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -368,8 +369,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -436,10 +437,7 @@ cscope cscopelist: -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ diff -Nru mutter-3.28.4/m4/glib-2.0.m4 mutter-3.28.4+git20200505/m4/glib-2.0.m4 --- mutter-3.28.4/m4/glib-2.0.m4 2019-05-14 17:29:39.000000000 +0000 +++ mutter-3.28.4+git20200505/m4/glib-2.0.m4 2020-05-05 19:17:25.000000000 +0000 @@ -2,7 +2,7 @@ # Owen Taylor 1997-2001 # Increment this whenever this file is changed. -#serial 3 +#serial 1 dnl AM_PATH_GLIB_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GLIB, and define GLIB_CFLAGS and GLIB_LIBS, if gmodule, gobject, @@ -12,16 +12,10 @@ [dnl dnl Get the cflags and libraries from pkg-config dnl - -dnl We can't use PKG_PREREQ because that needs 0.29. -m4_ifndef([PKG_PROG_PKG_CONFIG], - [pkg.m4 version 0.28 or later is required]) - AC_ARG_ENABLE(glibtest, [ --disable-glibtest do not try to compile and run a test GLIB program], , enable_glibtest=yes) - min_glib_version=ifelse([$1], [], [2.0.0], [$1]) - pkg_config_args="glib-2.0 >= $min_glib_version" + pkg_config_args=glib-2.0 for module in . $4 do case "$module" in @@ -52,15 +46,7 @@ PKG_CONFIG=no fi - dnl For GLIB_CFLAGS and GLIB_LIBS - PKG_CHECK_MODULES([GLIB], [$pkg_config_args], [:], [:]) - - dnl For the tools - PKG_CHECK_VAR([GLIB_GENMARSHAL], [glib-2.0], [glib_genmarshal]) - PKG_CHECK_VAR([GOBJECT_QUERY], [glib-2.0], [gobject_query]) - PKG_CHECK_VAR([GLIB_MKENUMS], [glib-2.0], [glib_mkenums]) - PKG_CHECK_VAR([GLIB_COMPILE_RESOURCES], [gio-2.0], [glib_compile_resources]) - + min_glib_version=ifelse([$1], ,2.0.0,$1) AC_MSG_CHECKING(for GLIB - version >= $min_glib_version) if test x$PKG_CONFIG != xno ; then @@ -78,6 +64,13 @@ fi if test x"$no_glib" = x ; then + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + GOBJECT_QUERY=`$PKG_CONFIG --variable=gobject_query glib-2.0` + GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0` + GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0` + + GLIB_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_args` + GLIB_LIBS=`$PKG_CONFIG --libs $pkg_config_args` glib_config_major_version=`$PKG_CONFIG --modversion glib-2.0 | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` glib_config_minor_version=`$PKG_CONFIG --modversion glib-2.0 | \ @@ -211,5 +204,11 @@ GLIB_COMPILE_RESOURCES="" ifelse([$3], , :, [$3]) fi + AC_SUBST(GLIB_CFLAGS) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_GENMARSHAL) + AC_SUBST(GOBJECT_QUERY) + AC_SUBST(GLIB_MKENUMS) + AC_SUBST(GLIB_COMPILE_RESOURCES) rm -f conf.glibtest ]) diff -Nru mutter-3.28.4/m4/gsettings.m4 mutter-3.28.4+git20200505/m4/gsettings.m4 --- mutter-3.28.4/m4/gsettings.m4 2019-05-14 17:29:39.000000000 +0000 +++ mutter-3.28.4+git20200505/m4/gsettings.m4 2020-05-05 19:17:25.000000000 +0000 @@ -1,5 +1,5 @@ # Increment this whenever this file is changed. -#serial 2 +#serial 1 dnl GLIB_GSETTINGS dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether @@ -8,10 +8,6 @@ AC_DEFUN([GLIB_GSETTINGS], [ - dnl We can't use PKG_PREREQ because that needs 0.29. - m4_ifndef([PKG_PROG_PKG_CONFIG], - [pkg.m4 version 0.28 or later is required]) - m4_pattern_allow([AM_V_GEN]) AC_ARG_ENABLE(schemas-compile, AS_HELP_STRING([--disable-schemas-compile], @@ -24,9 +20,11 @@ AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE]) PKG_PROG_PKG_CONFIG([0.16]) AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas]) - AS_IF([test x$cross_compiling != xyes], - [PKG_CHECK_VAR([GLIB_COMPILE_SCHEMAS], [gio-2.0], [glib_compile_schemas])], - [AC_PATH_PROG([GLIB_COMPILE_SCHEMAS], [glib-compile-schemas])]) + if test x$cross_compiling != xyes; then + GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0` + else + AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas) + fi AC_SUBST(GLIB_COMPILE_SCHEMAS) if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2]) diff -Nru mutter-3.28.4/m4/libtool.m4 mutter-3.28.4+git20200505/m4/libtool.m4 --- mutter-3.28.4/m4/libtool.m4 2019-05-14 17:30:08.000000000 +0000 +++ mutter-3.28.4+git20200505/m4/libtool.m4 2020-05-05 19:17:54.000000000 +0000 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. @@ -2867,9 +2866,6 @@ # before this can be enabled. hardcode_into_libs=yes - # Add ABI-specific directories to the system library path. - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" - # Ideally, we could use ldconfig to report *all* directores which are # searched for libraries, however this is still not possible. Aside from not # being certain /sbin/ldconfig is available, command @@ -2878,7 +2874,7 @@ # appending ld.so.conf contents (and includes) to the search path. if test -f /etc/ld.so.conf; then lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '` - sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" + sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" fi # We used to test for /lib/ld.so.1 and disable shared libraries on @@ -2890,6 +2886,18 @@ dynamic_linker='GNU/Linux ld.so' ;; +netbsdelf*-gnu) + version_type=linux + need_lib_prefix=no + need_version=no + library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' + soname_spec='${libname}${release}${shared_ext}$major' + shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no + hardcode_into_libs=yes + dynamic_linker='NetBSD ld.elf_so' + ;; + netbsd*) version_type=sunos need_lib_prefix=no @@ -3549,7 +3557,7 @@ lt_cv_deplibs_check_method=pass_all ;; -netbsd*) +netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' else @@ -4427,7 +4435,7 @@ ;; esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) ;; *qnx* | *nto*) # QNX uses GNU C++, but need to define -shared option too, otherwise @@ -4939,6 +4947,9 @@ ;; esac ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ;; @@ -5001,6 +5012,9 @@ openbsd* | bitrig*) with_gnu_ld=no ;; + linux* | k*bsd*-gnu | gnu*) + _LT_TAGVAR(link_all_deplibs, $1)=no + ;; esac _LT_TAGVAR(ld_shlibs, $1)=yes @@ -5255,7 +5269,7 @@ fi ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' wlarc= @@ -5776,6 +5790,7 @@ if test yes = "$lt_cv_irix_exported_symbol"; then _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib' fi + _LT_TAGVAR(link_all_deplibs, $1)=no else _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib' _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib' @@ -5797,7 +5812,7 @@ esac ;; - netbsd*) + netbsd* | netbsdelf*-gnu) if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out else diff -Nru mutter-3.28.4/m4/pkg.m4 mutter-3.28.4+git20200505/m4/pkg.m4 --- mutter-3.28.4/m4/pkg.m4 2019-05-14 17:29:39.000000000 +0000 +++ mutter-3.28.4+git20200505/m4/pkg.m4 2020-05-05 19:17:25.000000000 +0000 @@ -1,6 +1,6 @@ -# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- -# serial 11 (pkg-config-0.29.1) - +dnl pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +dnl serial 11 (pkg-config-0.29.1) +dnl dnl Copyright © 2004 Scott James Remnant . dnl Copyright © 2012-2015 Dan Nicholson dnl @@ -273,71 +273,3 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ])dnl PKG_CHECK_VAR - -dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------ -dnl -dnl Prepare a "--with-" configure option using the lowercase -dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and -dnl PKG_CHECK_MODULES in a single macro. -AC_DEFUN([PKG_WITH_MODULES], -[ -m4_pushdef([with_arg], m4_tolower([$1])) - -m4_pushdef([description], - [m4_default([$5], [build with ]with_arg[ support])]) - -m4_pushdef([def_arg], [m4_default([$6], [auto])]) -m4_pushdef([def_action_if_found], [AS_TR_SH([with_]with_arg)=yes]) -m4_pushdef([def_action_if_not_found], [AS_TR_SH([with_]with_arg)=no]) - -m4_case(def_arg, - [yes],[m4_pushdef([with_without], [--without-]with_arg)], - [m4_pushdef([with_without],[--with-]with_arg)]) - -AC_ARG_WITH(with_arg, - AS_HELP_STRING(with_without, description[ @<:@default=]def_arg[@:>@]),, - [AS_TR_SH([with_]with_arg)=def_arg]) - -AS_CASE([$AS_TR_SH([with_]with_arg)], - [yes],[PKG_CHECK_MODULES([$1],[$2],$3,$4)], - [auto],[PKG_CHECK_MODULES([$1],[$2], - [m4_n([def_action_if_found]) $3], - [m4_n([def_action_if_not_found]) $4])]) - -m4_popdef([with_arg]) -m4_popdef([description]) -m4_popdef([def_arg]) - -])dnl PKG_WITH_MODULES - -dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ----------------------------------------------- -dnl -dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES -dnl check._[VARIABLE-PREFIX] is exported as make variable. -AC_DEFUN([PKG_HAVE_WITH_MODULES], -[ -PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) - -AM_CONDITIONAL([HAVE_][$1], - [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) -])dnl PKG_HAVE_WITH_MODULES - -dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, -dnl [DESCRIPTION], [DEFAULT]) -dnl ------------------------------------------------------ -dnl -dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after -dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make -dnl and preprocessor variable. -AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], -[ -PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) - -AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], - [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) -])dnl PKG_HAVE_DEFINE_WITH_MODULES diff -Nru mutter-3.28.4/Makefile.in mutter-3.28.4+git20200505/Makefile.in --- mutter-3.28.4/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -143,7 +143,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - cscope distdir distdir-am dist dist-all distcheck + cscope distdir dist dist-all distcheck am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ $(LISP)config.h.in # Read a list of newline-separated strings from the standard input, @@ -176,7 +176,7 @@ $(top_srcdir)/build-aux/missing \ $(top_srcdir)/src/meta/meta-version.h.in ABOUT-NLS COPYING \ NEWS build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ + build-aux/config.rpath build-aux/config.sub \ build-aux/install-sh build-aux/ltmain.sh build-aux/missing DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) @@ -398,6 +398,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -440,8 +441,8 @@ echo ' $(SHELL) ./config.status'; \ $(SHELL) ./config.status;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -585,10 +586,7 @@ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -rm -f cscope.out cscope.in.out cscope.po.out cscope.files -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) $(am__remove_distdir) test -d "$(distdir)" || mkdir "$(distdir)" @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/am.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/am.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ar.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ar.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/as.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/as.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ast.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ast.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/az.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/az.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/be.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/be.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/be@latin.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/be@latin.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/bg.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/bg.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/bn.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/bn.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/bn_IN.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/bn_IN.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/br.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/br.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/bs.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/bs.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ca.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ca.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ca@valencia.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ca@valencia.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/cs.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/cs.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/cy.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/cy.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/da.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/da.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/de.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/de.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/dz.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/dz.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/el.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/el.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/en_CA.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/en_CA.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/en_GB.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/en_GB.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/eo.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/eo.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/es.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/es.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/et.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/et.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/eu.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/eu.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/fa.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/fa.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/fi.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/fi.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/fr.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/fr.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/fur.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/fur.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ga.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ga.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/gd.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/gd.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/gl.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/gl.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/gu.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/gu.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ha.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ha.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/he.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/he.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/hi.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/hi.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/hr.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/hr.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/hu.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/hu.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/hy.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/hy.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/id.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/id.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ig.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ig.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/is.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/is.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/it.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/it.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ja.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ja.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ka.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ka.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/kk.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/kk.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/kn.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/kn.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ko.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ko.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ku.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ku.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/la.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/la.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/lt.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/lt.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/lv.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/lv.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/mai.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/mai.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/mg.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/mg.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/mk.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/mk.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ml.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ml.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/mn.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/mn.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/mr.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/mr.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ms.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ms.gmo differ diff -Nru mutter-3.28.4/po/mutter.pot mutter-3.28.4+git20200505/po/mutter.pot --- mutter-3.28.4/po/mutter.pot 2019-05-14 17:44:27.000000000 +0000 +++ mutter-3.28.4+git20200505/po/mutter.pot 2020-05-05 19:18:53.000000000 +0000 @@ -9,7 +9,7 @@ "Project-Id-Version: mutter 3.28.4\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?" "product=mutter&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2019-05-14 17:44+0000\n" +"POT-Creation-Date: 2020-05-05 21:18+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,6 +18,230 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +#: data/50-mutter-navigation.xml:6 +msgid "Navigation" +msgstr "" + +#: data/50-mutter-navigation.xml:9 +msgid "Move window to workspace 1" +msgstr "" + +#: data/50-mutter-navigation.xml:12 +msgid "Move window to workspace 2" +msgstr "" + +#: data/50-mutter-navigation.xml:15 +msgid "Move window to workspace 3" +msgstr "" + +#: data/50-mutter-navigation.xml:18 +msgid "Move window to workspace 4" +msgstr "" + +#: data/50-mutter-navigation.xml:21 +msgid "Move window to last workspace" +msgstr "" + +#: data/50-mutter-navigation.xml:24 +msgid "Move window one workspace up" +msgstr "" + +#: data/50-mutter-navigation.xml:27 +msgid "Move window one workspace down" +msgstr "" + +#: data/50-mutter-navigation.xml:30 +msgid "Move window one monitor to the left" +msgstr "" + +#: data/50-mutter-navigation.xml:33 +msgid "Move window one monitor to the right" +msgstr "" + +#: data/50-mutter-navigation.xml:36 +msgid "Move window one monitor up" +msgstr "" + +#: data/50-mutter-navigation.xml:39 +msgid "Move window one monitor down" +msgstr "" + +#: data/50-mutter-navigation.xml:43 +msgid "Switch applications" +msgstr "" + +#: data/50-mutter-navigation.xml:48 +msgid "Switch to previous application" +msgstr "" + +#: data/50-mutter-navigation.xml:52 +msgid "Switch windows" +msgstr "" + +#: data/50-mutter-navigation.xml:57 +msgid "Switch to previous window" +msgstr "" + +#: data/50-mutter-navigation.xml:61 +msgid "Switch windows of an application" +msgstr "" + +#: data/50-mutter-navigation.xml:66 +msgid "Switch to previous window of an application" +msgstr "" + +#: data/50-mutter-navigation.xml:70 +msgid "Switch system controls" +msgstr "" + +#: data/50-mutter-navigation.xml:75 +msgid "Switch to previous system control" +msgstr "" + +#: data/50-mutter-navigation.xml:79 +msgid "Switch windows directly" +msgstr "" + +#: data/50-mutter-navigation.xml:84 +msgid "Switch directly to previous window" +msgstr "" + +#: data/50-mutter-navigation.xml:88 +msgid "Switch windows of an app directly" +msgstr "" + +#: data/50-mutter-navigation.xml:93 +msgid "Switch directly to previous window of an app" +msgstr "" + +#: data/50-mutter-navigation.xml:97 +msgid "Switch system controls directly" +msgstr "" + +#: data/50-mutter-navigation.xml:102 +msgid "Switch directly to previous system control" +msgstr "" + +#: data/50-mutter-navigation.xml:105 +msgid "Hide all normal windows" +msgstr "" + +#: data/50-mutter-navigation.xml:108 +msgid "Switch to workspace 1" +msgstr "" + +#: data/50-mutter-navigation.xml:111 +msgid "Switch to workspace 2" +msgstr "" + +#: data/50-mutter-navigation.xml:114 +msgid "Switch to workspace 3" +msgstr "" + +#: data/50-mutter-navigation.xml:117 +msgid "Switch to workspace 4" +msgstr "" + +#: data/50-mutter-navigation.xml:120 +msgid "Switch to last workspace" +msgstr "" + +#: data/50-mutter-navigation.xml:123 +msgid "Move to workspace above" +msgstr "" + +#: data/50-mutter-navigation.xml:126 +msgid "Move to workspace below" +msgstr "" + +#: data/50-mutter-system.xml:6 data/50-mutter-wayland.xml:6 +msgid "System" +msgstr "" + +#: data/50-mutter-system.xml:8 +msgid "Show the run command prompt" +msgstr "" + +#: data/50-mutter-system.xml:10 +msgid "Show the activities overview" +msgstr "" + +#: data/50-mutter-wayland.xml:8 +msgid "Restore the keyboard shortcuts" +msgstr "" + +#: data/50-mutter-windows.xml:6 +msgid "Windows" +msgstr "" + +#: data/50-mutter-windows.xml:8 +msgid "Activate the window menu" +msgstr "" + +#: data/50-mutter-windows.xml:10 +msgid "Toggle fullscreen mode" +msgstr "" + +#: data/50-mutter-windows.xml:12 +msgid "Toggle maximization state" +msgstr "" + +#: data/50-mutter-windows.xml:14 +msgid "Maximize window" +msgstr "" + +#: data/50-mutter-windows.xml:16 +msgid "Restore window" +msgstr "" + +#: data/50-mutter-windows.xml:18 +msgid "Close window" +msgstr "" + +#: data/50-mutter-windows.xml:20 +msgid "Hide window" +msgstr "" + +#: data/50-mutter-windows.xml:22 +msgid "Move window" +msgstr "" + +#: data/50-mutter-windows.xml:24 +msgid "Resize window" +msgstr "" + +#: data/50-mutter-windows.xml:27 +msgid "Toggle window on all workspaces or one" +msgstr "" + +#: data/50-mutter-windows.xml:29 +msgid "Raise window if covered, otherwise lower it" +msgstr "" + +#: data/50-mutter-windows.xml:31 +msgid "Raise window above other windows" +msgstr "" + +#: data/50-mutter-windows.xml:33 +msgid "Lower window below other windows" +msgstr "" + +#: data/50-mutter-windows.xml:35 +msgid "Maximize window vertically" +msgstr "" + +#: data/50-mutter-windows.xml:37 +msgid "Maximize window horizontally" +msgstr "" + +#: data/50-mutter-windows.xml:41 +msgid "View split on left" +msgstr "" + +#: data/50-mutter-windows.xml:45 +msgid "View split on right" +msgstr "" + #: data/mutter.desktop.in:4 msgid "Mutter" msgstr "" @@ -287,7 +511,7 @@ #. This probably means that a non-WM compositor like xcompmgr is running; #. * we have no way to get it to exit -#: src/compositor/compositor.c:507 +#: src/compositor/compositor.c:494 #, c-format msgid "" "Another compositing manager is already running on screen %i on display “%s”." @@ -389,14 +613,14 @@ msgid "Workspace %d" msgstr "" -#: src/core/screen.c:583 +#: src/core/screen.c:584 #, c-format msgid "" "Display “%s” already has a window manager; try using the --replace option to " "replace the current window manager." msgstr "" -#: src/core/screen.c:668 +#: src/core/screen.c:669 #, c-format msgid "Screen %d on display “%s” is invalid\n" msgstr "" Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/nb.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/nb.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/nds.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/nds.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ne.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ne.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/nl.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/nl.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/nn.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/nn.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/oc.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/oc.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/or.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/or.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/pa.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/pa.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/pl.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/pl.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/pt_BR.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/pt_BR.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/pt.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/pt.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ro.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ro.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ru.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ru.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/rw.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/rw.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/si.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/si.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sk.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sk.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sl.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sl.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sq.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sq.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sr.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sr.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sr@latin.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sr@latin.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/sv.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/sv.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ta.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ta.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/te.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/te.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/tg.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/tg.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/th.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/th.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/tk.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/tk.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/tr.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/tr.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/ug.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/ug.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/uk.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/uk.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/vi.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/vi.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/wa.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/wa.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/xh.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/xh.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/yo.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/yo.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/zh_CN.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/zh_CN.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/zh_HK.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/zh_HK.gmo differ Binary files /tmp/tmpQbHBZv/CEVBC3ypBY/mutter-3.28.4/po/zh_TW.gmo and /tmp/tmpQbHBZv/rjnU5eDqiI/mutter-3.28.4+git20200505/po/zh_TW.gmo differ diff -Nru mutter-3.28.4/src/backends/meta-monitor-config-manager.c mutter-3.28.4+git20200505/src/backends/meta-monitor-config-manager.c --- mutter-3.28.4/src/backends/meta-monitor-config-manager.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/backends/meta-monitor-config-manager.c 2020-05-05 19:16:46.000000000 +0000 @@ -330,23 +330,35 @@ meta_create_monitors_config_key_for_current_state (MetaMonitorManager *monitor_manager) { MetaMonitorsConfigKey *config_key; + MetaMonitorSpec *laptop_monitor_spec; GList *l; GList *monitor_specs; + laptop_monitor_spec = NULL; monitor_specs = NULL; for (l = monitor_manager->monitors; l; l = l->next) { MetaMonitor *monitor = l->data; MetaMonitorSpec *monitor_spec; - if (meta_monitor_is_laptop_panel (monitor) && - meta_monitor_manager_is_lid_closed (monitor_manager)) - continue; + if (meta_monitor_is_laptop_panel (monitor)) + { + laptop_monitor_spec = meta_monitor_get_spec (monitor); + + if (meta_monitor_manager_is_lid_closed (monitor_manager)) + continue; + } monitor_spec = meta_monitor_spec_clone (meta_monitor_get_spec (monitor)); monitor_specs = g_list_prepend (monitor_specs, monitor_spec); } + if (!monitor_specs && laptop_monitor_spec) + { + monitor_specs = + g_list_prepend (NULL, meta_monitor_spec_clone (laptop_monitor_spec)); + } + if (!monitor_specs) return NULL; @@ -1007,6 +1019,7 @@ MetaMonitorSwitchConfigType config_type) { MetaMonitorManager *monitor_manager = config_manager->monitor_manager; + MetaMonitorsConfig *config; if (!meta_monitor_manager_can_switch_config (monitor_manager)) return NULL; @@ -1014,18 +1027,27 @@ switch (config_type) { case META_MONITOR_SWITCH_CONFIG_ALL_MIRROR: - return create_for_switch_config_all_mirror (config_manager); + config = create_for_switch_config_all_mirror (config_manager); + break; case META_MONITOR_SWITCH_CONFIG_ALL_LINEAR: - return meta_monitor_config_manager_create_linear (config_manager); + config = meta_monitor_config_manager_create_linear (config_manager); + break; case META_MONITOR_SWITCH_CONFIG_EXTERNAL: - return create_for_switch_config_external (config_manager); + config = create_for_switch_config_external (config_manager); + break; case META_MONITOR_SWITCH_CONFIG_BUILTIN: - return create_for_switch_config_builtin (config_manager); + config = create_for_switch_config_builtin (config_manager); + break; case META_MONITOR_SWITCH_CONFIG_UNKNOWN: + default: g_warn_if_reached (); - break; + return NULL; } - return NULL; + + if (config) + meta_monitors_config_set_switch_config (config, config_type); + + return config; } void @@ -1217,6 +1239,19 @@ return TRUE; } +MetaMonitorSwitchConfigType +meta_monitors_config_get_switch_config (MetaMonitorsConfig *config) +{ + return config->switch_config; +} + +void +meta_monitors_config_set_switch_config (MetaMonitorsConfig *config, + MetaMonitorSwitchConfigType switch_config) +{ + config->switch_config = switch_config; +} + MetaMonitorsConfig * meta_monitors_config_new_full (GList *logical_monitor_configs, GList *disabled_monitor_specs, @@ -1232,6 +1267,7 @@ disabled_monitor_specs); config->layout_mode = layout_mode; config->flags = flags; + config->switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; return config; } diff -Nru mutter-3.28.4/src/backends/meta-monitor-config-manager.h mutter-3.28.4+git20200505/src/backends/meta-monitor-config-manager.h --- mutter-3.28.4/src/backends/meta-monitor-config-manager.h 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/backends/meta-monitor-config-manager.h 2020-05-05 19:16:46.000000000 +0000 @@ -69,6 +69,8 @@ MetaMonitorsConfigFlag flags; MetaLogicalMonitorLayoutMode layout_mode; + + MetaMonitorSwitchConfigType switch_config; }; #define META_TYPE_MONITORS_CONFIG (meta_monitors_config_get_type ()) @@ -124,6 +126,11 @@ MetaLogicalMonitorLayoutMode layout_mode, MetaMonitorsConfigFlag flags); +MetaMonitorSwitchConfigType meta_monitors_config_get_switch_config (MetaMonitorsConfig *config); + +void meta_monitors_config_set_switch_config (MetaMonitorsConfig *config, + MetaMonitorSwitchConfigType switch_config); + unsigned int meta_monitors_config_key_hash (gconstpointer config_key); gboolean meta_monitors_config_key_equal (gconstpointer config_key_a, diff -Nru mutter-3.28.4/src/backends/meta-monitor-manager.c mutter-3.28.4+git20200505/src/backends/meta-monitor-manager.c --- mutter-3.28.4/src/backends/meta-monitor-manager.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/backends/meta-monitor-manager.c 2020-05-05 19:16:46.000000000 +0000 @@ -2652,8 +2652,6 @@ static void meta_monitor_manager_notify_monitors_changed (MetaMonitorManager *manager) { - manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; - meta_backend_monitors_changed (manager->backend); g_signal_emit (manager, signals[MONITORS_CHANGED_INTERNAL], 0); @@ -2710,10 +2708,17 @@ MetaMonitorsConfig *config) { if (config) - manager->layout_mode = config->layout_mode; + { + manager->layout_mode = config->layout_mode; + manager->current_switch_config = + meta_monitors_config_get_switch_config (config); + } else - manager->layout_mode = - meta_monitor_manager_get_default_layout_mode (manager); + { + manager->layout_mode = + meta_monitor_manager_get_default_layout_mode (manager); + manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; + } meta_monitor_manager_rebuild_logical_monitors (manager, config); } @@ -2755,6 +2760,12 @@ meta_monitor_manager_update_logical_state_derived (MetaMonitorManager *manager, MetaMonitorsConfig *config) { + if (config) + manager->current_switch_config = + meta_monitors_config_get_switch_config (config); + else + manager->current_switch_config = META_MONITOR_SWITCH_CONFIG_UNKNOWN; + manager->layout_mode = META_LOGICAL_MONITOR_LAYOUT_MODE_PHYSICAL; meta_monitor_manager_rebuild_logical_monitors_derived (manager, config); diff -Nru mutter-3.28.4/src/backends/native/meta-cursor-renderer-native.c mutter-3.28.4+git20200505/src/backends/native/meta-cursor-renderer-native.c --- mutter-3.28.4/src/backends/native/meta-cursor-renderer-native.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/backends/native/meta-cursor-renderer-native.c 2020-05-05 19:16:46.000000000 +0000 @@ -710,6 +710,7 @@ cursor_priv_free (MetaCursorNativePrivate *cursor_priv) { g_hash_table_destroy (cursor_priv->gpu_states); + g_free (cursor_priv); } static MetaCursorNativePrivate * diff -Nru mutter-3.28.4/src/compositor/compositor.c mutter-3.28.4+git20200505/src/compositor/compositor.c --- mutter-3.28.4/src/compositor/compositor.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/compositor/compositor.c 2020-05-05 19:16:46.000000000 +0000 @@ -145,19 +145,6 @@ clutter_threads_remove_repaint_func (compositor->pre_paint_func_id); clutter_threads_remove_repaint_func (compositor->post_paint_func_id); - if (compositor->top_window_actor) - { - g_signal_handlers_disconnect_by_func (compositor->top_window_actor, - on_top_window_actor_destroyed, - compositor); - compositor->top_window_actor = NULL; - } - - g_clear_pointer (&compositor->window_group, clutter_actor_destroy); - g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy); - g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy); - g_clear_pointer (&compositor->windows, g_list_free); - if (compositor->have_x11_sync_object) meta_sync_ring_destroy (); } @@ -610,6 +597,23 @@ } } +void +meta_compositor_unmanage_window_actors (MetaCompositor *compositor) +{ + if (compositor->top_window_actor) + { + g_signal_handlers_disconnect_by_func (compositor->top_window_actor, + on_top_window_actor_destroyed, + compositor); + compositor->top_window_actor = NULL; + } + + g_clear_pointer (&compositor->window_group, clutter_actor_destroy); + g_clear_pointer (&compositor->top_window_group, clutter_actor_destroy); + g_clear_pointer (&compositor->feedback_group, clutter_actor_destroy); + g_clear_pointer (&compositor->windows, g_list_free); +} + /** * meta_shape_cow_for_window: * @compositor: A #MetaCompositor diff -Nru mutter-3.28.4/src/compositor/compositor-private.h mutter-3.28.4+git20200505/src/compositor/compositor-private.h --- mutter-3.28.4/src/compositor/compositor-private.h 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/compositor/compositor-private.h 2020-05-05 19:16:46.000000000 +0000 @@ -73,4 +73,6 @@ MetaInhibitShortcutsDialog * meta_compositor_create_inhibit_shortcuts_dialog (MetaCompositor *compositor, MetaWindow *window); +void meta_compositor_unmanage_window_actors (MetaCompositor *compositor); + #endif /* META_COMPOSITOR_PRIVATE_H */ diff -Nru mutter-3.28.4/src/compositor/plugins/Makefile.in mutter-3.28.4+git20200505/src/compositor/plugins/Makefile.in --- mutter-3.28.4/src/compositor/plugins/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/src/compositor/plugins/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -159,8 +159,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/default_la-default.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -388,6 +387,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -441,8 +441,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) @@ -498,13 +498,7 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_la-default.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/default_la-default.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -595,10 +589,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -671,7 +662,7 @@ mostlyclean-am distclean: distclean-am - -rm -f ./$(DEPDIR)/default_la-default.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -718,7 +709,7 @@ installcheck-am: maintainer-clean: maintainer-clean-am - -rm -f ./$(DEPDIR)/default_la-default.Plo + -rm -rf ./$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -739,21 +730,20 @@ .MAKE: install-am install-exec-am install-strip -.PHONY: CTAGS GTAGS TAGS all all-am am--depfiles check check-am clean \ - clean-generic clean-libtool clean-pkglibLTLIBRARIES \ - cscopelist-am ctags ctags-am distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-exec-hook install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-local \ - uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-pkglibLTLIBRARIES cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkglibLTLIBRARIES install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-local uninstall-pkglibLTLIBRARIES .PRECIOUS: Makefile diff -Nru mutter-3.28.4/src/core/screen.c mutter-3.28.4+git20200505/src/core/screen.c --- mutter-3.28.4/src/core/screen.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/core/screen.c 2020-05-05 19:16:46.000000000 +0000 @@ -41,6 +41,7 @@ #include "stack.h" #include #include +#include "compositor-private.h" #include "core.h" #include "meta-cursor-tracker-private.h" #include "boxes-private.h" @@ -835,6 +836,7 @@ guint32 timestamp) { MetaDisplay *display; + GList *l; display = screen->display; @@ -844,6 +846,8 @@ meta_display_unmanage_windows_for_screen (display, screen, timestamp); + meta_compositor_unmanage_window_actors (display->compositor); + meta_prefs_remove_listener (prefs_changed_callback, screen); meta_screen_ungrab_keys (screen); @@ -874,6 +878,16 @@ g_free (screen->screen_name); + screen->active_workspace = NULL; + + for (l = screen->workspaces; l;) + { + MetaWorkspace *workspace = l->data; + l = l->next; + + meta_workspace_remove (workspace); + } + g_object_unref (screen); } diff -Nru mutter-3.28.4/src/core/stack.c mutter-3.28.4+git20200505/src/core/stack.c --- mutter-3.28.4/src/core/stack.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/core/stack.c 2020-05-05 19:16:46.000000000 +0000 @@ -1176,6 +1176,27 @@ return POINT_IN_RECT (root_x, root_y, rect); } +static gboolean +window_can_get_default_focus (MetaWindow *window) +{ + if (window->unmaps_pending > 0) + return FALSE; + + if (window->unmanaging) + return FALSE; + + if (!(window->input || window->take_focus)) + return FALSE; + + if (!meta_window_should_be_showing (window)) + return FALSE; + + if (window->type == META_WINDOW_DOCK) + return FALSE; + + return TRUE; +} + static MetaWindow* get_default_focus_window (MetaStack *stack, MetaWorkspace *workspace, @@ -1203,24 +1224,12 @@ if (window == not_this_one) continue; - if (window->unmaps_pending > 0) - continue; - - if (window->unmanaging) - continue; - - if (!(window->input || window->take_focus)) - continue; - - if (!meta_window_should_be_showing (window)) + if (!window_can_get_default_focus (window)) continue; if (must_be_at_point && !window_contains_point (window, root_x, root_y)) continue; - if (window->type == META_WINDOW_DOCK) - continue; - return window; } @@ -1275,6 +1284,26 @@ return workspace_windows; } +GList * +meta_stack_get_default_focus_candidates (MetaStack *stack, + MetaWorkspace *workspace) +{ + GList *windows = meta_stack_list_windows (stack, workspace); + GList *l; + + for (l = windows; l;) + { + GList *next = l->next; + + if (!window_can_get_default_focus (l->data)) + windows = g_list_delete_link (windows, l); + + l = next; + } + + return windows; +} + int meta_stack_windows_cmp (MetaStack *stack, MetaWindow *window_a, diff -Nru mutter-3.28.4/src/core/stack.h mutter-3.28.4+git20200505/src/core/stack.h --- mutter-3.28.4/src/core/stack.h 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/core/stack.h 2020-05-05 19:16:46.000000000 +0000 @@ -338,6 +338,21 @@ int root_y); /** + * meta_stack_get_default_focus_candidates: + * @stack: The stack to examine. + * @workspace: If not %NULL, only windows on this workspace will be + * returned; otherwise all windows in the stack will be + * returned. + * + * Returns all the focus candidate windows in the stack, in order. + * + * Returns: (transfer container) (element-type Meta.Window): + * A #GList of #MetaWindow, in stacking order, honouring layers. + */ +GList * meta_stack_get_default_focus_candidates (MetaStack *stack, + MetaWorkspace *workspace); + +/** * meta_stack_list_windows: * @stack: The stack to examine. * @workspace: If not %NULL, only windows on this workspace will be diff -Nru mutter-3.28.4/src/core/window.c mutter-3.28.4+git20200505/src/core/window.c --- mutter-3.28.4/src/core/window.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/core/window.c 2020-05-05 19:16:46.000000000 +0000 @@ -1272,11 +1272,10 @@ window->desc, window->transient_for->desc); set_workspace_state (window, - window->transient_for->on_all_workspaces_requested, + window->transient_for->on_all_workspaces, window->transient_for->workspace); } - - if (window->on_all_workspaces) + else if (window->on_all_workspaces) { meta_topic (META_DEBUG_PLACEMENT, "Putting window %s on all workspaces\n", @@ -3622,6 +3621,13 @@ MetaWorkspace *workspace) { gboolean allow_workspace_switch; + + if (window->unmanaging) + { + g_warning ("Trying to activate unmanaged window '%s'", window->desc); + return; + } + meta_topic (META_DEBUG_FOCUS, "_NET_ACTIVE_WINDOW message sent for %s at time %u " "by client type %u.\n", diff -Nru mutter-3.28.4/src/core/workspace.c mutter-3.28.4+git20200505/src/core/workspace.c --- mutter-3.28.4/src/core/workspace.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/core/workspace.c 2020-05-05 19:16:46.000000000 +0000 @@ -85,6 +85,12 @@ MetaRectangle logical_monitor_work_area; } MetaWorkspaceLogicalMonitorData; +typedef struct _MetaWorkspaceFocusableAncestorData +{ + MetaWorkspace *workspace; + MetaWindow *out_window; +} MetaWorkspaceFocusableAncestorData; + static MetaWorkspaceLogicalMonitorData * meta_workspace_get_logical_monitor_data (MetaWorkspace *workspace, MetaLogicalMonitor *logical_monitor) @@ -1319,13 +1325,20 @@ } static gboolean -record_ancestor (MetaWindow *window, - void *data) +find_focusable_ancestor (MetaWindow *window, + gpointer user_data) { - MetaWindow **result = data; + MetaWorkspaceFocusableAncestorData *data = user_data; + + if (!window->unmanaging && (window->input || window->take_focus) && + meta_window_located_on_workspace (window, data->workspace) && + meta_window_showing_on_its_workspace (window)) + { + data->out_window = window; + return FALSE; + } - *result = window; - return FALSE; /* quit with the first ancestor we find */ + return TRUE; } /* Focus ancestor of not_this_one if there is one */ @@ -1347,11 +1360,15 @@ if (not_this_one) { MetaWindow *ancestor; - ancestor = NULL; - meta_window_foreach_ancestor (not_this_one, record_ancestor, &ancestor); - if (ancestor != NULL && - meta_window_located_on_workspace (ancestor, workspace) && - meta_window_showing_on_its_workspace (ancestor)) + MetaWorkspaceFocusableAncestorData data; + + data = (MetaWorkspaceFocusableAncestorData) { + .workspace = workspace, + }; + meta_window_foreach_ancestor (not_this_one, find_focusable_ancestor, &data); + ancestor = data.out_window; + + if (ancestor) { meta_topic (META_DEBUG_FOCUS, "Focusing %s, ancestor of %s\n", diff -Nru mutter-3.28.4/src/Makefile.in mutter-3.28.4+git20200505/src/Makefile.in --- mutter-3.28.4/src/Makefile.in 2019-05-14 17:55:18.000000000 +0000 +++ mutter-3.28.4+git20200505/src/Makefile.in 2020-05-05 19:18:00.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.16.1 from Makefile.am. +# Makefile.in generated by automake 1.15.1 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2018 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, @@ -311,22 +311,6 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(bindir)" \ - "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" \ - "$(DESTDIR)$(libdir)" "$(DESTDIR)$(stackingdir)" \ - "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" \ - "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" \ - "$(DESTDIR)$(libmutterincludedir)" \ - "$(DESTDIR)$(libmutterincludedir)" -am__EXEEXT_1 = -@HAVE_WAYLAND_TRUE@am__EXEEXT_2 = mutter-test-client$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-runner$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-unit-tests$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ mutter-test-headless-start-test$(EXEEXT) \ -@HAVE_WAYLAND_TRUE@ $(am__EXEEXT_1) -@BUILDOPT_INSTALL_TESTS_FALSE@@HAVE_WAYLAND_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2) -PROGRAMS = $(bin_PROGRAMS) $(installedtestsbin_PROGRAMS) \ - $(libexec_PROGRAMS) $(noinst_PROGRAMS) am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -354,6 +338,12 @@ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } +am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \ + "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" \ + "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" \ + "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" \ + "$(DESTDIR)$(libmutterincludedir)" LTLIBRARIES = $(lib_LTLIBRARIES) am__DEPENDENCIES_1 = libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES = \ @@ -817,6 +807,15 @@ $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(libmutter_@LIBMUTTER_API_VERSION@_la_LDFLAGS) $(LDFLAGS) -o \ $@ +am__EXEEXT_1 = +@HAVE_WAYLAND_TRUE@am__EXEEXT_2 = mutter-test-client$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-runner$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-unit-tests$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ mutter-test-headless-start-test$(EXEEXT) \ +@HAVE_WAYLAND_TRUE@ $(am__EXEEXT_1) +@BUILDOPT_INSTALL_TESTS_FALSE@@HAVE_WAYLAND_TRUE@am__EXEEXT_3 = $(am__EXEEXT_2) +PROGRAMS = $(bin_PROGRAMS) $(installedtestsbin_PROGRAMS) \ + $(libexec_PROGRAMS) $(noinst_PROGRAMS) am_mutter_OBJECTS = core/mutter.$(OBJEXT) mutter_OBJECTS = $(am_mutter_OBJECTS) mutter_DEPENDENCIES = $(am__DEPENDENCIES_1) \ @@ -897,200 +896,7 @@ am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp -am__maybe_remake_depfiles = depfiles -am__depfiles_remade = ./$(DEPDIR)/gtk-primary-selection-protocol.Plo \ - ./$(DEPDIR)/gtk-shell-protocol.Plo \ - ./$(DEPDIR)/gtk-text-input-protocol.Plo \ - ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/meta-dbus-display-config.Plo \ - ./$(DEPDIR)/meta-dbus-idle-monitor.Plo \ - ./$(DEPDIR)/meta-dbus-login1.Plo \ - ./$(DEPDIR)/meta-dbus-remote-desktop.Plo \ - ./$(DEPDIR)/meta-dbus-screen-cast.Plo \ - ./$(DEPDIR)/meta-enum-types.Plo \ - ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo \ - ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo \ - ./$(DEPDIR)/xdg-shell-protocol.Plo \ - ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo \ - ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo \ - backends/$(DEPDIR)/edid-parse.Plo \ - backends/$(DEPDIR)/meta-backend.Plo \ - backends/$(DEPDIR)/meta-barrier.Plo \ - backends/$(DEPDIR)/meta-crtc.Plo \ - backends/$(DEPDIR)/meta-cursor-renderer.Plo \ - backends/$(DEPDIR)/meta-cursor-tracker.Plo \ - backends/$(DEPDIR)/meta-cursor.Plo \ - backends/$(DEPDIR)/meta-dbus-session-watcher.Plo \ - backends/$(DEPDIR)/meta-egl.Plo \ - backends/$(DEPDIR)/meta-gles3.Plo \ - backends/$(DEPDIR)/meta-gpu.Plo \ - backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo \ - backends/$(DEPDIR)/meta-idle-monitor.Plo \ - backends/$(DEPDIR)/meta-input-settings.Plo \ - backends/$(DEPDIR)/meta-logical-monitor.Plo \ - backends/$(DEPDIR)/meta-monitor-config-manager.Plo \ - backends/$(DEPDIR)/meta-monitor-config-migration.Plo \ - backends/$(DEPDIR)/meta-monitor-config-store.Plo \ - backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo \ - backends/$(DEPDIR)/meta-monitor-manager.Plo \ - backends/$(DEPDIR)/meta-monitor.Plo \ - backends/$(DEPDIR)/meta-orientation-manager.Plo \ - backends/$(DEPDIR)/meta-output.Plo \ - backends/$(DEPDIR)/meta-pointer-constraint.Plo \ - backends/$(DEPDIR)/meta-remote-desktop-session.Plo \ - backends/$(DEPDIR)/meta-remote-desktop.Plo \ - backends/$(DEPDIR)/meta-renderer-view.Plo \ - backends/$(DEPDIR)/meta-renderer.Plo \ - backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo \ - backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo \ - backends/$(DEPDIR)/meta-screen-cast-session.Plo \ - backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo \ - backends/$(DEPDIR)/meta-screen-cast-stream.Plo \ - backends/$(DEPDIR)/meta-screen-cast.Plo \ - backends/$(DEPDIR)/meta-settings.Plo \ - backends/$(DEPDIR)/meta-stage.Plo \ - backends/native/$(DEPDIR)/dbus-utils.Plo \ - backends/native/$(DEPDIR)/meta-backend-native.Plo \ - backends/native/$(DEPDIR)/meta-barrier-native.Plo \ - backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo \ - backends/native/$(DEPDIR)/meta-crtc-kms.Plo \ - backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo \ - backends/native/$(DEPDIR)/meta-gpu-kms.Plo \ - backends/native/$(DEPDIR)/meta-input-settings-native.Plo \ - backends/native/$(DEPDIR)/meta-launcher.Plo \ - backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo \ - backends/native/$(DEPDIR)/meta-output-kms.Plo \ - backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo \ - backends/native/$(DEPDIR)/meta-renderer-native.Plo \ - backends/native/$(DEPDIR)/meta-stage-native.Plo \ - backends/x11/$(DEPDIR)/meta-backend-x11.Plo \ - backends/x11/$(DEPDIR)/meta-barrier-x11.Plo \ - backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo \ - backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo \ - backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo \ - backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo \ - backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo \ - backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo \ - backends/x11/$(DEPDIR)/meta-output-xrandr.Plo \ - backends/x11/$(DEPDIR)/meta-renderer-x11.Plo \ - backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo \ - backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo \ - backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo \ - backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo \ - backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo \ - backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo \ - compositor/$(DEPDIR)/clutter-utils.Plo \ - compositor/$(DEPDIR)/cogl-utils.Plo \ - compositor/$(DEPDIR)/compositor.Plo \ - compositor/$(DEPDIR)/meta-background-actor.Plo \ - compositor/$(DEPDIR)/meta-background-group.Plo \ - compositor/$(DEPDIR)/meta-background-image.Plo \ - compositor/$(DEPDIR)/meta-background.Plo \ - compositor/$(DEPDIR)/meta-cullable.Plo \ - compositor/$(DEPDIR)/meta-dnd-actor.Plo \ - compositor/$(DEPDIR)/meta-dnd.Plo \ - compositor/$(DEPDIR)/meta-feedback-actor.Plo \ - compositor/$(DEPDIR)/meta-module.Plo \ - compositor/$(DEPDIR)/meta-plugin-manager.Plo \ - compositor/$(DEPDIR)/meta-plugin.Plo \ - compositor/$(DEPDIR)/meta-shadow-factory.Plo \ - compositor/$(DEPDIR)/meta-shaped-texture.Plo \ - compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo \ - compositor/$(DEPDIR)/meta-surface-actor-x11.Plo \ - compositor/$(DEPDIR)/meta-surface-actor.Plo \ - compositor/$(DEPDIR)/meta-sync-ring.Plo \ - compositor/$(DEPDIR)/meta-texture-rectangle.Plo \ - compositor/$(DEPDIR)/meta-texture-tower.Plo \ - compositor/$(DEPDIR)/meta-window-actor.Plo \ - compositor/$(DEPDIR)/meta-window-group.Plo \ - compositor/$(DEPDIR)/meta-window-shape.Plo \ - compositor/$(DEPDIR)/region-utils.Plo core/$(DEPDIR)/bell.Plo \ - core/$(DEPDIR)/boxes.Plo core/$(DEPDIR)/constraints.Plo \ - core/$(DEPDIR)/core.Plo core/$(DEPDIR)/delete.Plo \ - core/$(DEPDIR)/display.Plo core/$(DEPDIR)/edge-resistance.Plo \ - core/$(DEPDIR)/errors.Plo core/$(DEPDIR)/events.Plo \ - core/$(DEPDIR)/frame.Plo core/$(DEPDIR)/keybindings.Plo \ - core/$(DEPDIR)/main.Plo core/$(DEPDIR)/meta-accel-parse.Plo \ - core/$(DEPDIR)/meta-border.Plo \ - core/$(DEPDIR)/meta-close-dialog-default.Plo \ - core/$(DEPDIR)/meta-close-dialog.Plo \ - core/$(DEPDIR)/meta-fraction.Plo \ - core/$(DEPDIR)/meta-gesture-tracker.Plo \ - core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo \ - core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo \ - core/$(DEPDIR)/mutter.Po core/$(DEPDIR)/place.Plo \ - core/$(DEPDIR)/prefs.Plo core/$(DEPDIR)/restart-helper.Po \ - core/$(DEPDIR)/restart.Plo core/$(DEPDIR)/screen.Plo \ - core/$(DEPDIR)/stack-tracker.Plo core/$(DEPDIR)/stack.Plo \ - core/$(DEPDIR)/startup-notification.Plo \ - core/$(DEPDIR)/testboxes.Po core/$(DEPDIR)/util.Plo \ - core/$(DEPDIR)/window.Plo core/$(DEPDIR)/workspace.Plo \ - tests/$(DEPDIR)/headless-start-test.Po \ - tests/$(DEPDIR)/meta-backend-test.Po \ - tests/$(DEPDIR)/meta-monitor-manager-test.Po \ - tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po \ - tests/$(DEPDIR)/monitor-store-unit-tests.Po \ - tests/$(DEPDIR)/monitor-test-utils.Po \ - tests/$(DEPDIR)/monitor-unit-tests.Po \ - tests/$(DEPDIR)/test-client.Po tests/$(DEPDIR)/test-runner.Po \ - tests/$(DEPDIR)/test-utils.Po tests/$(DEPDIR)/unit-tests.Po \ - ui/$(DEPDIR)/frames.Plo ui/$(DEPDIR)/theme.Plo \ - ui/$(DEPDIR)/ui.Plo \ - wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo \ - wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo \ - wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo \ - wayland/$(DEPDIR)/meta-wayland-buffer.Plo \ - wayland/$(DEPDIR)/meta-wayland-data-device.Plo \ - wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo \ - wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo \ - wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo \ - wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo \ - wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo \ - wayland/$(DEPDIR)/meta-wayland-input-device.Plo \ - wayland/$(DEPDIR)/meta-wayland-keyboard.Plo \ - wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo \ - wayland/$(DEPDIR)/meta-wayland-outputs.Plo \ - wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo \ - wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo \ - wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo \ - wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo \ - wayland/$(DEPDIR)/meta-wayland-pointer.Plo \ - wayland/$(DEPDIR)/meta-wayland-popup.Plo \ - wayland/$(DEPDIR)/meta-wayland-region.Plo \ - wayland/$(DEPDIR)/meta-wayland-seat.Plo \ - wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo \ - wayland/$(DEPDIR)/meta-wayland-subsurface.Plo \ - wayland/$(DEPDIR)/meta-wayland-surface-role-cursor.Plo \ - wayland/$(DEPDIR)/meta-wayland-surface-role-tablet-cursor.Plo \ - wayland/$(DEPDIR)/meta-wayland-surface.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo \ - wayland/$(DEPDIR)/meta-wayland-tablet.Plo \ - wayland/$(DEPDIR)/meta-wayland-text-input.Plo \ - wayland/$(DEPDIR)/meta-wayland-touch.Plo \ - wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo \ - wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo \ - wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo \ - wayland/$(DEPDIR)/meta-wayland.Plo \ - wayland/$(DEPDIR)/meta-window-wayland.Plo \ - wayland/$(DEPDIR)/meta-window-xwayland.Plo \ - wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo \ - wayland/$(DEPDIR)/meta-xwayland-selection.Plo \ - wayland/$(DEPDIR)/meta-xwayland.Plo x11/$(DEPDIR)/events.Plo \ - x11/$(DEPDIR)/group-props.Plo x11/$(DEPDIR)/group.Plo \ - x11/$(DEPDIR)/iconcache.Plo x11/$(DEPDIR)/session.Plo \ - x11/$(DEPDIR)/window-props.Plo x11/$(DEPDIR)/window-x11.Plo \ - x11/$(DEPDIR)/xprops.Plo +am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) @@ -1141,6 +947,12 @@ am__dist_stacking_DATA_DIST = tests/stacking/basic-x11.metatest \ tests/stacking/basic-wayland.metatest \ tests/stacking/closed-transient.metatest \ + tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \ + tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ + tests/stacking/closed-transient-no-input-parent.metatest \ + tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ + tests/stacking/closed-transient-no-input-parents.metatest \ + tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest \ tests/stacking/minimized.metatest \ tests/stacking/mixed-windows.metatest \ tests/stacking/set-parent.metatest \ @@ -1156,7 +968,7 @@ $(RECURSIVE_CLEAN_TARGETS) \ $(am__extra_recursive_targets) AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ - distdir distdir-am + distdir am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) # Read a list of newline-separated strings from the standard input, # and print each of them once, without duplicates. Input order is @@ -1383,6 +1195,7 @@ prefix = @prefix@ program_transform_name = @program_transform_name@ psdir = @psdir@ +runstatedir = @runstatedir@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ srcdir = @srcdir@ @@ -1679,6 +1492,12 @@ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/basic-x11.metatest \ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/basic-wayland.metatest \ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-parent.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-parents.metatest \ +@BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest \ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/minimized.metatest \ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/mixed-windows.metatest \ @BUILDOPT_INSTALL_TESTS_TRUE@@HAVE_WAYLAND_TRUE@ tests/stacking/set-parent.metatest \ @@ -1811,8 +1630,8 @@ *config.status*) \ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__maybe_remake_depfiles);; \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; $(srcdir)/Makefile-tests.am $(am__empty): @@ -1824,162 +1643,6 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh $(am__aclocal_m4_deps): -install-binPROGRAMS: $(bin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-binPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files - -clean-binPROGRAMS: - @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -install-installedtestsbinPROGRAMS: $(installedtestsbin_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(installedtestsbindir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(installedtestsbindir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(installedtestsbindir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(installedtestsbindir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-installedtestsbinPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(installedtestsbindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(installedtestsbindir)" && rm -f $$files - -clean-installedtestsbinPROGRAMS: - @list='$(installedtestsbin_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -install-libexecPROGRAMS: $(libexec_PROGRAMS) - @$(NORMAL_INSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ - fi; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p \ - || test -f $$p1 \ - ; then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' \ - -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-libexecPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' \ - `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(libexecdir)" && rm -f $$files - -clean-libexecPROGRAMS: - @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list - -clean-noinstPROGRAMS: - @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) @@ -2424,6 +2087,162 @@ libmutter-@LIBMUTTER_API_VERSION@.la: $(libmutter_@LIBMUTTER_API_VERSION@_la_OBJECTS) $(libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES) $(EXTRA_libmutter_@LIBMUTTER_API_VERSION@_la_DEPENDENCIES) $(AM_V_CCLD)$(libmutter_@LIBMUTTER_API_VERSION@_la_LINK) -rpath $(libdir) $(libmutter_@LIBMUTTER_API_VERSION@_la_OBJECTS) $(libmutter_@LIBMUTTER_API_VERSION@_la_LIBADD) $(LIBS) +install-binPROGRAMS: $(bin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-binPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(bindir)" && rm -f $$files + +clean-binPROGRAMS: + @list='$(bin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +install-installedtestsbinPROGRAMS: $(installedtestsbin_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(installedtestsbindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(installedtestsbindir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(installedtestsbindir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(installedtestsbindir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-installedtestsbinPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(installedtestsbin_PROGRAMS)'; test -n "$(installedtestsbindir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(installedtestsbindir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(installedtestsbindir)" && rm -f $$files + +clean-installedtestsbinPROGRAMS: + @list='$(installedtestsbin_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list +install-libexecPROGRAMS: $(libexec_PROGRAMS) + @$(NORMAL_INSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(libexecdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libexecdir)" || exit 1; \ + fi; \ + for p in $$list; do echo "$$p $$p"; done | \ + sed 's/$(EXEEXT)$$//' | \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ + done | \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ + -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ + sed 'N;N;N;s,\n, ,g' | \ + $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ + { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ + if ($$2 == $$4) files[d] = files[d] " " $$1; \ + else { print "f", $$3 "/" $$4, $$1; } } \ + END { for (d in files) print "f", d, files[d] }' | \ + while read type dir files; do \ + if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ + test -z "$$files" || { \ + echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(libexecdir)$$dir'"; \ + $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(libexecdir)$$dir" || exit $$?; \ + } \ + ; done + +uninstall-libexecPROGRAMS: + @$(NORMAL_UNINSTALL) + @list='$(libexec_PROGRAMS)'; test -n "$(libexecdir)" || list=; \ + files=`for p in $$list; do echo "$$p"; done | \ + sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ + -e 's/$$/$(EXEEXT)/' \ + `; \ + test -n "$$list" || exit 0; \ + echo " ( cd '$(DESTDIR)$(libexecdir)' && rm -f" $$files ")"; \ + cd "$(DESTDIR)$(libexecdir)" && rm -f $$files + +clean-libexecPROGRAMS: + @list='$(libexec_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list + +clean-noinstPROGRAMS: + @list='$(noinst_PROGRAMS)'; test -n "$$list" || exit 0; \ + echo " rm -f" $$list; \ + rm -f $$list || exit $$?; \ + test -n "$(EXEEXT)" || exit 0; \ + list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f" $$list; \ + rm -f $$list core/mutter.$(OBJEXT): core/$(am__dirstamp) \ core/$(DEPDIR)/$(am__dirstamp) @@ -2514,225 +2333,219 @@ distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-primary-selection-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-shell-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-text-input-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-display-config.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-idle-monitor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-login1.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-remote-desktop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-screen-cast.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-enum-types.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tablet-unstable-v2-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/edid-parse.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-backend.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-barrier.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-crtc.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-renderer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-tracker.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-dbus-session-watcher.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-egl.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gles3.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gpu.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-input-settings.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-logical-monitor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-migration.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-store.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-orientation-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-output.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-pointer-constraint.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop-session.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer-view.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-session.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-settings.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-stage.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/dbus-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-backend-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-barrier-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-crtc-kms.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-gpu-kms.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-input-settings-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-launcher.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-output-kms.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-stage-native.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-backend-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-barrier-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-output-xrandr.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-renderer-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/clutter-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/cogl-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/compositor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-image.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-cullable.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-feedback-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-module.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shadow-factory.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shaped-texture.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-sync-ring.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-rectangle.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-tower.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-actor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-shape.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/region-utils.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/bell.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/boxes.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/constraints.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/core.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/delete.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/display.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/edge-resistance.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/errors.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/events.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/frame.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/keybindings.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/main.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-accel-parse.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-border.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog-default.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-fraction.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-gesture-tracker.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/mutter.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/place.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/prefs.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart-helper.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/screen.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack-tracker.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/startup-notification.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/testboxes.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/util.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/window.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/workspace.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/headless-start-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-backend-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-monitor-manager-test.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-store-unit-tests.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-test-utils.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-unit-tests.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-client.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-runner.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-utils.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/unit-tests.Po@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frames.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/theme.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/ui.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-buffer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-data-device.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-input-device.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-keyboard.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-outputs.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-popup.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-region.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-seat.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-subsurface.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface-role-cursor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface-role-tablet-cursor.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-touch.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-wayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-xwayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-selection.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/events.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group-props.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/iconcache.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/session.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-props.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-x11.Plo@am__quote@ # am--include-marker -@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/xprops.Plo@am__quote@ # am--include-marker - -$(am__depfiles_remade): - @$(MKDIR_P) $(@D) - @echo '# dummy' >$@-t && $(am__mv) $@-t $@ - -am--depfiles: $(am__depfiles_remade) +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-primary-selection-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-shell-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gtk-text-input-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-display-config.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-idle-monitor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-login1.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-remote-desktop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-dbus-screen-cast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/meta-enum-types.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/tablet-unstable-v2-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/edid-parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-backend.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-barrier.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-crtc.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-renderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor-tracker.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-cursor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-dbus-session-watcher.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-egl.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gles3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-gpu.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-idle-monitor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-input-settings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-logical-monitor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-migration.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-config-store.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-monitor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-orientation-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-output.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-pointer-constraint.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop-session.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-remote-desktop.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer-view.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-renderer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-session.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-screen-cast.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-settings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/$(DEPDIR)/meta-stage.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/dbus-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-backend-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-barrier-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-crtc-kms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-gpu-kms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-input-settings-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-launcher.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-output-kms.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-renderer-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/native/$(DEPDIR)/meta-stage-native.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-backend-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-barrier-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-output-xrandr.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-renderer-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/clutter-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/cogl-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/compositor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background-image.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-background.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-cullable.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-dnd.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-feedback-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-module.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-plugin.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shadow-factory.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-shaped-texture.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-surface-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-sync-ring.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-rectangle.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-texture-tower.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-actor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/meta-window-shape.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@compositor/$(DEPDIR)/region-utils.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/bell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/boxes.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/constraints.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/core.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/delete.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/display.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/edge-resistance.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/errors.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/events.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/frame.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/keybindings.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/main.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-accel-parse.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-border.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-close-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-fraction.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-gesture-tracker.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/mutter.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/place.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/prefs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart-helper.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/restart.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/screen.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack-tracker.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/stack.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/startup-notification.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/testboxes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/util.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/window.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@core/$(DEPDIR)/workspace.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/headless-start-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-backend-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/meta-monitor-manager-test.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-store-unit-tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-test-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/monitor-unit-tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-client.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-runner.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/test-utils.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/unit-tests.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/frames.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/theme.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@ui/$(DEPDIR)/ui.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-buffer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-data-device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-input-device.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-keyboard.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-outputs.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-pointer.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-popup.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-region.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-seat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-subsurface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface-role-cursor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface-role-tablet-cursor.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-surface.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-tablet.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-text-input.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-touch.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-wayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-wayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-window-xwayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland-selection.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@wayland/$(DEPDIR)/meta-xwayland.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/events.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group-props.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/group.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/iconcache.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/session.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-props.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/window-x11.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@x11/$(DEPDIR)/xprops.Plo@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\ @@ -3020,10 +2833,7 @@ distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags -distdir: $(BUILT_SOURCES) - $(MAKE) $(AM_MAKEFLAGS) distdir-am - -distdir-am: $(DISTFILES) +distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -3081,12 +2891,12 @@ check-am: all-am check: $(BUILT_SOURCES) $(MAKE) $(AM_MAKEFLAGS) check-recursive -all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(DATA) $(HEADERS) +all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA) $(HEADERS) install-binPROGRAMS: install-libLTLIBRARIES installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(libdir)" "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" "$(DESTDIR)$(libmutterincludedir)"; do \ + for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(installedtestsbindir)" "$(DESTDIR)$(libexecdir)" "$(DESTDIR)$(stackingdir)" "$(DESTDIR)$(girdir)" "$(DESTDIR)$(installedtestsdir)" "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(typelibdir)" "$(DESTDIR)$(libmutterincludedir)" "$(DESTDIR)$(libmutterincludedir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: $(BUILT_SOURCES) @@ -3153,219 +2963,7 @@ mostlyclean-am distclean: distclean-recursive - -rm -f ./$(DEPDIR)/gtk-primary-selection-protocol.Plo - -rm -f ./$(DEPDIR)/gtk-shell-protocol.Plo - -rm -f ./$(DEPDIR)/gtk-text-input-protocol.Plo - -rm -f ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/meta-dbus-display-config.Plo - -rm -f ./$(DEPDIR)/meta-dbus-idle-monitor.Plo - -rm -f ./$(DEPDIR)/meta-dbus-login1.Plo - -rm -f ./$(DEPDIR)/meta-dbus-remote-desktop.Plo - -rm -f ./$(DEPDIR)/meta-dbus-screen-cast.Plo - -rm -f ./$(DEPDIR)/meta-enum-types.Plo - -rm -f ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-shell-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo - -rm -f ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo - -rm -f backends/$(DEPDIR)/edid-parse.Plo - -rm -f backends/$(DEPDIR)/meta-backend.Plo - -rm -f backends/$(DEPDIR)/meta-barrier.Plo - -rm -f backends/$(DEPDIR)/meta-crtc.Plo - -rm -f backends/$(DEPDIR)/meta-cursor-renderer.Plo - -rm -f backends/$(DEPDIR)/meta-cursor-tracker.Plo - -rm -f backends/$(DEPDIR)/meta-cursor.Plo - -rm -f backends/$(DEPDIR)/meta-dbus-session-watcher.Plo - -rm -f backends/$(DEPDIR)/meta-egl.Plo - -rm -f backends/$(DEPDIR)/meta-gles3.Plo - -rm -f backends/$(DEPDIR)/meta-gpu.Plo - -rm -f backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo - -rm -f backends/$(DEPDIR)/meta-idle-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-input-settings.Plo - -rm -f backends/$(DEPDIR)/meta-logical-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-manager.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-migration.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-store.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-manager.Plo - -rm -f backends/$(DEPDIR)/meta-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-orientation-manager.Plo - -rm -f backends/$(DEPDIR)/meta-output.Plo - -rm -f backends/$(DEPDIR)/meta-pointer-constraint.Plo - -rm -f backends/$(DEPDIR)/meta-remote-desktop-session.Plo - -rm -f backends/$(DEPDIR)/meta-remote-desktop.Plo - -rm -f backends/$(DEPDIR)/meta-renderer-view.Plo - -rm -f backends/$(DEPDIR)/meta-renderer.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-session.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-stream.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast.Plo - -rm -f backends/$(DEPDIR)/meta-settings.Plo - -rm -f backends/$(DEPDIR)/meta-stage.Plo - -rm -f backends/native/$(DEPDIR)/dbus-utils.Plo - -rm -f backends/native/$(DEPDIR)/meta-backend-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-barrier-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-crtc-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-gpu-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-input-settings-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-launcher.Plo - -rm -f backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-output-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo - -rm -f backends/native/$(DEPDIR)/meta-renderer-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-stage-native.Plo - -rm -f backends/x11/$(DEPDIR)/meta-backend-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-barrier-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-output-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-renderer-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo - -rm -f backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo - -rm -f backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo - -rm -f compositor/$(DEPDIR)/clutter-utils.Plo - -rm -f compositor/$(DEPDIR)/cogl-utils.Plo - -rm -f compositor/$(DEPDIR)/compositor.Plo - -rm -f compositor/$(DEPDIR)/meta-background-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-background-group.Plo - -rm -f compositor/$(DEPDIR)/meta-background-image.Plo - -rm -f compositor/$(DEPDIR)/meta-background.Plo - -rm -f compositor/$(DEPDIR)/meta-cullable.Plo - -rm -f compositor/$(DEPDIR)/meta-dnd-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-dnd.Plo - -rm -f compositor/$(DEPDIR)/meta-feedback-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-module.Plo - -rm -f compositor/$(DEPDIR)/meta-plugin-manager.Plo - -rm -f compositor/$(DEPDIR)/meta-plugin.Plo - -rm -f compositor/$(DEPDIR)/meta-shadow-factory.Plo - -rm -f compositor/$(DEPDIR)/meta-shaped-texture.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor-x11.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-sync-ring.Plo - -rm -f compositor/$(DEPDIR)/meta-texture-rectangle.Plo - -rm -f compositor/$(DEPDIR)/meta-texture-tower.Plo - -rm -f compositor/$(DEPDIR)/meta-window-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-window-group.Plo - -rm -f compositor/$(DEPDIR)/meta-window-shape.Plo - -rm -f compositor/$(DEPDIR)/region-utils.Plo - -rm -f core/$(DEPDIR)/bell.Plo - -rm -f core/$(DEPDIR)/boxes.Plo - -rm -f core/$(DEPDIR)/constraints.Plo - -rm -f core/$(DEPDIR)/core.Plo - -rm -f core/$(DEPDIR)/delete.Plo - -rm -f core/$(DEPDIR)/display.Plo - -rm -f core/$(DEPDIR)/edge-resistance.Plo - -rm -f core/$(DEPDIR)/errors.Plo - -rm -f core/$(DEPDIR)/events.Plo - -rm -f core/$(DEPDIR)/frame.Plo - -rm -f core/$(DEPDIR)/keybindings.Plo - -rm -f core/$(DEPDIR)/main.Plo - -rm -f core/$(DEPDIR)/meta-accel-parse.Plo - -rm -f core/$(DEPDIR)/meta-border.Plo - -rm -f core/$(DEPDIR)/meta-close-dialog-default.Plo - -rm -f core/$(DEPDIR)/meta-close-dialog.Plo - -rm -f core/$(DEPDIR)/meta-fraction.Plo - -rm -f core/$(DEPDIR)/meta-gesture-tracker.Plo - -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo - -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo - -rm -f core/$(DEPDIR)/mutter.Po - -rm -f core/$(DEPDIR)/place.Plo - -rm -f core/$(DEPDIR)/prefs.Plo - -rm -f core/$(DEPDIR)/restart-helper.Po - -rm -f core/$(DEPDIR)/restart.Plo - -rm -f core/$(DEPDIR)/screen.Plo - -rm -f core/$(DEPDIR)/stack-tracker.Plo - -rm -f core/$(DEPDIR)/stack.Plo - -rm -f core/$(DEPDIR)/startup-notification.Plo - -rm -f core/$(DEPDIR)/testboxes.Po - -rm -f core/$(DEPDIR)/util.Plo - -rm -f core/$(DEPDIR)/window.Plo - -rm -f core/$(DEPDIR)/workspace.Plo - -rm -f tests/$(DEPDIR)/headless-start-test.Po - -rm -f tests/$(DEPDIR)/meta-backend-test.Po - -rm -f tests/$(DEPDIR)/meta-monitor-manager-test.Po - -rm -f tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po - -rm -f tests/$(DEPDIR)/monitor-store-unit-tests.Po - -rm -f tests/$(DEPDIR)/monitor-test-utils.Po - -rm -f tests/$(DEPDIR)/monitor-unit-tests.Po - -rm -f tests/$(DEPDIR)/test-client.Po - -rm -f tests/$(DEPDIR)/test-runner.Po - -rm -f tests/$(DEPDIR)/test-utils.Po - -rm -f tests/$(DEPDIR)/unit-tests.Po - -rm -f ui/$(DEPDIR)/frames.Plo - -rm -f ui/$(DEPDIR)/theme.Plo - -rm -f ui/$(DEPDIR)/ui.Plo - -rm -f wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-buffer.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-data-device.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-input-device.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-keyboard.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-outputs.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-popup.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-region.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-seat.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-subsurface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface-role-cursor.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface-role-tablet-cursor.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-text-input.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-touch.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-window-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-window-xwayland.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland-selection.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland.Plo - -rm -f x11/$(DEPDIR)/events.Plo - -rm -f x11/$(DEPDIR)/group-props.Plo - -rm -f x11/$(DEPDIR)/group.Plo - -rm -f x11/$(DEPDIR)/iconcache.Plo - -rm -f x11/$(DEPDIR)/session.Plo - -rm -f x11/$(DEPDIR)/window-props.Plo - -rm -f x11/$(DEPDIR)/window-x11.Plo - -rm -f x11/$(DEPDIR)/xprops.Plo + -rm -rf ./$(DEPDIR) backends/$(DEPDIR) backends/native/$(DEPDIR) backends/x11/$(DEPDIR) backends/x11/cm/$(DEPDIR) backends/x11/nested/$(DEPDIR) compositor/$(DEPDIR) core/$(DEPDIR) tests/$(DEPDIR) ui/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) -rm -f Makefile distclean-am: clean-am distclean-compile distclean-generic \ distclean-tags @@ -3416,219 +3014,7 @@ installcheck-am: maintainer-clean: maintainer-clean-recursive - -rm -f ./$(DEPDIR)/gtk-primary-selection-protocol.Plo - -rm -f ./$(DEPDIR)/gtk-shell-protocol.Plo - -rm -f ./$(DEPDIR)/gtk-text-input-protocol.Plo - -rm -f ./$(DEPDIR)/keyboard-shortcuts-inhibit-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/linux-dmabuf-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/meta-dbus-display-config.Plo - -rm -f ./$(DEPDIR)/meta-dbus-idle-monitor.Plo - -rm -f ./$(DEPDIR)/meta-dbus-login1.Plo - -rm -f ./$(DEPDIR)/meta-dbus-remote-desktop.Plo - -rm -f ./$(DEPDIR)/meta-dbus-screen-cast.Plo - -rm -f ./$(DEPDIR)/meta-enum-types.Plo - -rm -f ./$(DEPDIR)/pointer-constraints-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/pointer-gestures-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/relative-pointer-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/tablet-unstable-v2-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-foreign-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-output-unstable-v1-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-shell-protocol.Plo - -rm -f ./$(DEPDIR)/xdg-shell-unstable-v6-protocol.Plo - -rm -f ./$(DEPDIR)/xwayland-keyboard-grab-unstable-v1-protocol.Plo - -rm -f backends/$(DEPDIR)/edid-parse.Plo - -rm -f backends/$(DEPDIR)/meta-backend.Plo - -rm -f backends/$(DEPDIR)/meta-barrier.Plo - -rm -f backends/$(DEPDIR)/meta-crtc.Plo - -rm -f backends/$(DEPDIR)/meta-cursor-renderer.Plo - -rm -f backends/$(DEPDIR)/meta-cursor-tracker.Plo - -rm -f backends/$(DEPDIR)/meta-cursor.Plo - -rm -f backends/$(DEPDIR)/meta-dbus-session-watcher.Plo - -rm -f backends/$(DEPDIR)/meta-egl.Plo - -rm -f backends/$(DEPDIR)/meta-gles3.Plo - -rm -f backends/$(DEPDIR)/meta-gpu.Plo - -rm -f backends/$(DEPDIR)/meta-idle-monitor-dbus.Plo - -rm -f backends/$(DEPDIR)/meta-idle-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-input-settings.Plo - -rm -f backends/$(DEPDIR)/meta-logical-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-manager.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-migration.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-config-store.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-manager-dummy.Plo - -rm -f backends/$(DEPDIR)/meta-monitor-manager.Plo - -rm -f backends/$(DEPDIR)/meta-monitor.Plo - -rm -f backends/$(DEPDIR)/meta-orientation-manager.Plo - -rm -f backends/$(DEPDIR)/meta-output.Plo - -rm -f backends/$(DEPDIR)/meta-pointer-constraint.Plo - -rm -f backends/$(DEPDIR)/meta-remote-desktop-session.Plo - -rm -f backends/$(DEPDIR)/meta-remote-desktop.Plo - -rm -f backends/$(DEPDIR)/meta-renderer-view.Plo - -rm -f backends/$(DEPDIR)/meta-renderer.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream-src.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-monitor-stream.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-session.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-stream-src.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast-stream.Plo - -rm -f backends/$(DEPDIR)/meta-screen-cast.Plo - -rm -f backends/$(DEPDIR)/meta-settings.Plo - -rm -f backends/$(DEPDIR)/meta-stage.Plo - -rm -f backends/native/$(DEPDIR)/dbus-utils.Plo - -rm -f backends/native/$(DEPDIR)/meta-backend-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-barrier-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-clutter-backend-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-crtc-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-cursor-renderer-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-gpu-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-input-settings-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-launcher.Plo - -rm -f backends/native/$(DEPDIR)/meta-monitor-manager-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-output-kms.Plo - -rm -f backends/native/$(DEPDIR)/meta-renderer-native-gles3.Plo - -rm -f backends/native/$(DEPDIR)/meta-renderer-native.Plo - -rm -f backends/native/$(DEPDIR)/meta-stage-native.Plo - -rm -f backends/x11/$(DEPDIR)/meta-backend-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-barrier-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-clutter-backend-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-crtc-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-cursor-renderer-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-gpu-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-input-settings-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-monitor-manager-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-output-xrandr.Plo - -rm -f backends/x11/$(DEPDIR)/meta-renderer-x11.Plo - -rm -f backends/x11/$(DEPDIR)/meta-stage-x11-nested.Plo - -rm -f backends/x11/cm/$(DEPDIR)/meta-backend-x11-cm.Plo - -rm -f backends/x11/cm/$(DEPDIR)/meta-renderer-x11-cm.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-backend-x11-nested.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-cursor-renderer-x11-nested.Plo - -rm -f backends/x11/nested/$(DEPDIR)/meta-renderer-x11-nested.Plo - -rm -f compositor/$(DEPDIR)/clutter-utils.Plo - -rm -f compositor/$(DEPDIR)/cogl-utils.Plo - -rm -f compositor/$(DEPDIR)/compositor.Plo - -rm -f compositor/$(DEPDIR)/meta-background-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-background-group.Plo - -rm -f compositor/$(DEPDIR)/meta-background-image.Plo - -rm -f compositor/$(DEPDIR)/meta-background.Plo - -rm -f compositor/$(DEPDIR)/meta-cullable.Plo - -rm -f compositor/$(DEPDIR)/meta-dnd-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-dnd.Plo - -rm -f compositor/$(DEPDIR)/meta-feedback-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-module.Plo - -rm -f compositor/$(DEPDIR)/meta-plugin-manager.Plo - -rm -f compositor/$(DEPDIR)/meta-plugin.Plo - -rm -f compositor/$(DEPDIR)/meta-shadow-factory.Plo - -rm -f compositor/$(DEPDIR)/meta-shaped-texture.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor-wayland.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor-x11.Plo - -rm -f compositor/$(DEPDIR)/meta-surface-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-sync-ring.Plo - -rm -f compositor/$(DEPDIR)/meta-texture-rectangle.Plo - -rm -f compositor/$(DEPDIR)/meta-texture-tower.Plo - -rm -f compositor/$(DEPDIR)/meta-window-actor.Plo - -rm -f compositor/$(DEPDIR)/meta-window-group.Plo - -rm -f compositor/$(DEPDIR)/meta-window-shape.Plo - -rm -f compositor/$(DEPDIR)/region-utils.Plo - -rm -f core/$(DEPDIR)/bell.Plo - -rm -f core/$(DEPDIR)/boxes.Plo - -rm -f core/$(DEPDIR)/constraints.Plo - -rm -f core/$(DEPDIR)/core.Plo - -rm -f core/$(DEPDIR)/delete.Plo - -rm -f core/$(DEPDIR)/display.Plo - -rm -f core/$(DEPDIR)/edge-resistance.Plo - -rm -f core/$(DEPDIR)/errors.Plo - -rm -f core/$(DEPDIR)/events.Plo - -rm -f core/$(DEPDIR)/frame.Plo - -rm -f core/$(DEPDIR)/keybindings.Plo - -rm -f core/$(DEPDIR)/main.Plo - -rm -f core/$(DEPDIR)/meta-accel-parse.Plo - -rm -f core/$(DEPDIR)/meta-border.Plo - -rm -f core/$(DEPDIR)/meta-close-dialog-default.Plo - -rm -f core/$(DEPDIR)/meta-close-dialog.Plo - -rm -f core/$(DEPDIR)/meta-fraction.Plo - -rm -f core/$(DEPDIR)/meta-gesture-tracker.Plo - -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog-default.Plo - -rm -f core/$(DEPDIR)/meta-inhibit-shortcuts-dialog.Plo - -rm -f core/$(DEPDIR)/mutter.Po - -rm -f core/$(DEPDIR)/place.Plo - -rm -f core/$(DEPDIR)/prefs.Plo - -rm -f core/$(DEPDIR)/restart-helper.Po - -rm -f core/$(DEPDIR)/restart.Plo - -rm -f core/$(DEPDIR)/screen.Plo - -rm -f core/$(DEPDIR)/stack-tracker.Plo - -rm -f core/$(DEPDIR)/stack.Plo - -rm -f core/$(DEPDIR)/startup-notification.Plo - -rm -f core/$(DEPDIR)/testboxes.Po - -rm -f core/$(DEPDIR)/util.Plo - -rm -f core/$(DEPDIR)/window.Plo - -rm -f core/$(DEPDIR)/workspace.Plo - -rm -f tests/$(DEPDIR)/headless-start-test.Po - -rm -f tests/$(DEPDIR)/meta-backend-test.Po - -rm -f tests/$(DEPDIR)/meta-monitor-manager-test.Po - -rm -f tests/$(DEPDIR)/monitor-config-migration-unit-tests.Po - -rm -f tests/$(DEPDIR)/monitor-store-unit-tests.Po - -rm -f tests/$(DEPDIR)/monitor-test-utils.Po - -rm -f tests/$(DEPDIR)/monitor-unit-tests.Po - -rm -f tests/$(DEPDIR)/test-client.Po - -rm -f tests/$(DEPDIR)/test-runner.Po - -rm -f tests/$(DEPDIR)/test-utils.Po - -rm -f tests/$(DEPDIR)/unit-tests.Po - -rm -f ui/$(DEPDIR)/frames.Plo - -rm -f ui/$(DEPDIR)/theme.Plo - -rm -f ui/$(DEPDIR)/ui.Plo - -rm -f wayland/$(DEPDIR)/meta-pointer-confinement-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-pointer-lock-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-actor-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-buffer.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-data-device.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-dma-buf.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-egl-stream.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-gtk-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts-dialog.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-inhibit-shortcuts.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-input-device.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-keyboard.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-legacy-xdg-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-outputs.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-constraints.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-pinch.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gesture-swipe.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer-gestures.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-pointer.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-popup.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-region.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-seat.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-shell-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-subsurface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface-role-cursor.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface-role-tablet-cursor.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-surface.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-manager.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-group.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-ring.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad-strip.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-pad.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-seat.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet-tool.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-tablet.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-text-input.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-touch.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-wl-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-foreign.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland-xdg-shell.Plo - -rm -f wayland/$(DEPDIR)/meta-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-window-wayland.Plo - -rm -f wayland/$(DEPDIR)/meta-window-xwayland.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland-grab-keyboard.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland-selection.Plo - -rm -f wayland/$(DEPDIR)/meta-xwayland.Plo - -rm -f x11/$(DEPDIR)/events.Plo - -rm -f x11/$(DEPDIR)/group-props.Plo - -rm -f x11/$(DEPDIR)/group.Plo - -rm -f x11/$(DEPDIR)/iconcache.Plo - -rm -f x11/$(DEPDIR)/session.Plo - -rm -f x11/$(DEPDIR)/window-props.Plo - -rm -f x11/$(DEPDIR)/window-x11.Plo - -rm -f x11/$(DEPDIR)/xprops.Plo + -rm -rf ./$(DEPDIR) backends/$(DEPDIR) backends/native/$(DEPDIR) backends/x11/$(DEPDIR) backends/x11/cm/$(DEPDIR) backends/x11/nested/$(DEPDIR) compositor/$(DEPDIR) core/$(DEPDIR) tests/$(DEPDIR) ui/$(DEPDIR) wayland/$(DEPDIR) x11/$(DEPDIR) -rm -f Makefile maintainer-clean-am: distclean-am maintainer-clean-generic @@ -3655,17 +3041,17 @@ .MAKE: $(am__recursive_targets) all check install install-am \ install-strip -.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ - am--depfiles check check-am clean clean-binPROGRAMS \ - clean-generic clean-installedtestsbinPROGRAMS \ - clean-libLTLIBRARIES clean-libexecPROGRAMS clean-libtool \ - clean-noinstPROGRAMS cscopelist-am ctags ctags-am distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-binPROGRAMS install-data \ - install-data-am install-dist_stackingDATA install-dvi \ - install-dvi-am install-exec install-exec-am install-girDATA \ - install-html install-html-am install-info install-info-am \ +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-binPROGRAMS clean-generic \ + clean-installedtestsbinPROGRAMS clean-libLTLIBRARIES \ + clean-libexecPROGRAMS clean-libtool clean-noinstPROGRAMS \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-binPROGRAMS install-data install-data-am \ + install-dist_stackingDATA install-dvi install-dvi-am \ + install-exec install-exec-am install-girDATA install-html \ + install-html-am install-info install-info-am \ install-installedtestsDATA install-installedtestsbinPROGRAMS \ install-libLTLIBRARIES install-libexecPROGRAMS \ install-libmutterincludeHEADERS install-man \ diff -Nru mutter-3.28.4/src/Makefile-tests.am mutter-3.28.4+git20200505/src/Makefile-tests.am --- mutter-3.28.4/src/Makefile-tests.am 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/Makefile-tests.am 2020-05-05 19:16:46.000000000 +0000 @@ -15,6 +15,12 @@ tests/stacking/basic-x11.metatest \ tests/stacking/basic-wayland.metatest \ tests/stacking/closed-transient.metatest \ + tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest \ + tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest \ + tests/stacking/closed-transient-no-input-parent.metatest \ + tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest \ + tests/stacking/closed-transient-no-input-parents.metatest \ + tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest \ tests/stacking/minimized.metatest \ tests/stacking/mixed-windows.metatest \ tests/stacking/set-parent.metatest \ diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-no-take-focus-parent.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,23 @@ +new_client 1 x11 +create 1/1 +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +can_take_focus 1/2 false +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +show 1/3 + +wait +assert_focused 1/3 +assert_stacking 1/1 1/2 1/3 + +destroy 1/3 + +wait +assert_focused 1/1 +assert_stacking 1/1 1/2 diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-no-take-focus-parents.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,30 @@ +new_client 2 x11 +create 2/1 +show 2/1 +wait + +new_client 1 x11 +create 1/1 +accept_focus 1/1 false +can_take_focus 1/1 false +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +can_take_focus 1/2 false +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +show 1/3 + +wait +assert_focused 1/3 +assert_stacking 2/1 1/1 1/2 1/3 + +destroy 1/3 + +wait +assert_stacking 1/1 1/2 2/1 +assert_focused 2/1 diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parent-delayed-focus-default-cancelled.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,36 @@ +new_client 2 x11 +create 2/1 +show 2/1 + +new_client 1 x11 +create 1/1 +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +show 1/3 + +wait +assert_focused 1/3 +assert_stacking 2/1 1/1 1/2 1/3 + +destroy 1/3 +sleep 10 + +assert_focused none +assert_stacking 2/1 1/1 1/2 + +activate 2/1 +wait + +assert_focused 2/1 +assert_stacking 1/1 1/2 2/1 + +sleep 250 +assert_focused 2/1 +assert_stacking 1/1 1/2 2/1 diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parent.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parent.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parent.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parent.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,30 @@ +new_client 2 x11 +create 2/1 +show 2/1 + +new_client 1 x11 +create 1/1 +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +show 1/3 + +wait +assert_focused 1/3 +assert_stacking 2/1 1/1 1/2 1/3 + +destroy 1/3 +dispatch + +assert_focused none +assert_stacking 2/1 1/1 1/2 + +sleep 150 +assert_focused 1/1 +assert_stacking 2/1 1/1 1/2 diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parents.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parents.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parents.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parents.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,46 @@ +new_client 0 x11 +create 0/1 +show 0/1 + +new_client 1 x11 +create 1/1 +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +accept_focus 1/3 false +show 1/3 + +create 1/4 csd +set_parent 1/4 3 +accept_focus 1/4 false +show 1/4 + +create 1/5 csd +set_parent 1/5 3 +show 1/5 + +wait +assert_focused 1/5 +assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 + +destroy 1/5 +dispatch + +assert_focused none +assert_stacking 0/1 1/1 1/2 1/3 1/4 + +sleep 600 +assert_focused 1/1 +assert_stacking 0/1 1/1 1/2 1/3 1/4 + +destroy 1/3 +wait + +assert_focused 1/1 +assert_stacking 0/1 1/1 1/2 1/4 diff -Nru mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest --- mutter-3.28.4/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest 1970-01-01 00:00:00.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/stacking/closed-transient-no-input-parents-queued-default-focus-destroyed.metatest 2020-05-05 19:16:46.000000000 +0000 @@ -0,0 +1,43 @@ +new_client 0 x11 +create 0/1 +show 0/1 + +new_client 1 x11 +create 1/1 +show 1/1 + +create 1/2 csd +set_parent 1/2 1 +accept_focus 1/2 false +show 1/2 + +create 1/3 csd +set_parent 1/3 2 +accept_focus 1/3 false +show 1/3 + +create 1/4 csd +set_parent 1/4 3 +accept_focus 1/4 false +show 1/4 + +create 1/5 csd +set_parent 1/5 3 +show 1/5 + +wait +assert_focused 1/5 +assert_stacking 0/1 1/1 1/2 1/3 1/4 1/5 + +destroy 1/5 +dispatch + +assert_focused none +assert_stacking 0/1 1/1 1/2 1/3 1/4 + +destroy 1/2 +dispatch + +sleep 450 +assert_focused 1/1 +assert_stacking 0/1 1/1 1/3 1/4 diff -Nru mutter-3.28.4/src/tests/test-client.c mutter-3.28.4+git20200505/src/tests/test-client.c --- mutter-3.28.4/src/tests/test-client.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/test-client.c 2020-05-05 19:16:46.000000000 +0000 @@ -161,6 +161,74 @@ gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (parent_window)); } + else if (strcmp (argv[0], "accept_focus") == 0) + { + if (argc != 3) + { + g_print ("usage: %s [true|false]", argv[0]); + goto out; + } + + GtkWidget *window = lookup_window (argv[1]); + if (!window) + { + g_print ("unknown window %s", argv[1]); + goto out; + } + + gboolean enabled = g_ascii_strcasecmp (argv[2], "true") == 0; + gtk_window_set_accept_focus (GTK_WINDOW (window), enabled); + } + else if (strcmp (argv[0], "can_take_focus") == 0) + { + if (argc != 3) + { + g_print ("usage: %s [true|false]", argv[0]); + goto out; + } + + GtkWidget *window = lookup_window (argv[1]); + if (!window) + { + g_print ("unknown window %s", argv[1]); + goto out; + } + + if (wayland) + { + g_print ("%s not supported under wayland", argv[0]); + goto out; + } + + GdkDisplay *display = gdk_display_get_default (); + GdkWindow *gdkwindow = gtk_widget_get_window (window); + Display *xdisplay = gdk_x11_display_get_xdisplay (display); + Window xwindow = GDK_WINDOW_XID (gdkwindow); + Atom wm_take_focus = gdk_x11_get_xatom_by_name_for_display (display, "WM_TAKE_FOCUS"); + gboolean add = g_ascii_strcasecmp(argv[2], "true") == 0; + Atom *protocols = NULL; + Atom *new_protocols; + int n_protocols = 0; + int i, n = 0; + + gdk_display_sync (display); + XGetWMProtocols (xdisplay, xwindow, &protocols, &n_protocols); + new_protocols = g_new0 (Atom, n_protocols + (add ? 1 : 0)); + + for (i = 0; i < n_protocols; ++i) + { + if (protocols[i] != wm_take_focus) + new_protocols[n++] = protocols[i]; + } + + if (add) + new_protocols[n++] = wm_take_focus; + + XSetWMProtocols (xdisplay, xwindow, new_protocols, n); + + XFree (new_protocols); + XFree (protocols); + } else if (strcmp (argv[0], "show") == 0) { if (argc != 2) diff -Nru mutter-3.28.4/src/tests/test-runner.c mutter-3.28.4+git20200505/src/tests/test-runner.c --- mutter-3.28.4/src/tests/test-runner.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/tests/test-runner.c 2020-05-05 19:16:46.000000000 +0000 @@ -113,7 +113,7 @@ } static gboolean -test_case_before_redraw (gpointer data) +test_case_loop_quit (gpointer data) { TestCase *test = data; @@ -123,6 +123,24 @@ } static gboolean +test_case_dispatch (TestCase *test, + GError **error) +{ + /* Wait until we've done any outstanding queued up work. + * Though we add this as BEFORE_REDRAW, the iteration that runs the + * BEFORE_REDRAW idles will proceed on and do the redraw, so we're + * waiting until after *all* frame processing. + */ + meta_later_add (META_LATER_BEFORE_REDRAW, + test_case_loop_quit, + test, + NULL); + g_main_loop_run (test->loop); + + return TRUE; +} + +static gboolean test_case_wait (TestCase *test, GError **error) { @@ -138,16 +156,8 @@ if (!test_client_wait (value, error)) return FALSE; - /* Then wait until we've done any outstanding queued up work. - * Though we add this as BEFORE_REDRAW, the iteration that runs the - * BEFORE_REDRAW idles will proceed on and do the redraw, so we're - * waiting until after *all* frame processing. - */ - meta_later_add (META_LATER_BEFORE_REDRAW, - test_case_before_redraw, - test, - NULL); - g_main_loop_run (test->loop); + /* Then wait until we've done any outstanding queued up work. */ + test_case_dispatch (test, error); /* Then set an XSync counter ourselves and and wait until * we receive the resulting event - this makes sure that we've @@ -157,6 +167,17 @@ return TRUE; } +static gboolean +test_case_sleep (TestCase *test, + guint32 interval, + GError **error) +{ + g_timeout_add_full (G_PRIORITY_LOW, interval, test_case_loop_quit, test, NULL); + g_main_loop_run (test->loop); + + return TRUE; +} + #define BAD_COMMAND(...) \ G_STMT_START { \ g_set_error (error, \ @@ -274,6 +295,37 @@ } static gboolean +test_case_assert_focused (TestCase *test, + const char *expected_window, + GError **error) +{ + MetaDisplay *display = meta_get_display (); + + if (!display->focus_window) + { + if (g_strcmp0 (expected_window, "none") != 0) + { + g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED, + "focus: expected='%s', actual='none'", expected_window); + } + } + else + { + const char *focused = display->focus_window->title; + + if (g_str_has_prefix (focused, "test/")) + focused += 5; + + if (g_strcmp0 (focused, expected_window) != 0) + g_set_error (error, TEST_RUNNER_ERROR, TEST_RUNNER_ERROR_ASSERTION_FAILED, + "focus: expected='%s', actual='%s'", + expected_window, focused); + } + + return *error == NULL; +} + +static gboolean test_case_check_xserver_stacking (TestCase *test, GError **error) { @@ -406,6 +458,44 @@ NULL)) return FALSE; } + else if (strcmp (argv[0], "accept_focus") == 0) + { + if (argc != 3 || + (g_ascii_strcasecmp (argv[2], "true") != 0 && + g_ascii_strcasecmp (argv[2], "false") != 0)) + BAD_COMMAND("usage: %s / [true|false]", + argv[0]); + + TestClient *client; + const char *window_id; + if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error)) + return FALSE; + + if (!test_client_do (client, error, + argv[0], window_id, + argv[2], + NULL)) + return FALSE; + } + else if (strcmp (argv[0], "can_take_focus") == 0) + { + if (argc != 3 || + (g_ascii_strcasecmp (argv[2], "true") != 0 && + g_ascii_strcasecmp (argv[2], "false") != 0)) + BAD_COMMAND("usage: %s / [true|false]", + argv[0]); + + TestClient *client; + const char *window_id; + if (!test_case_parse_window_id (test, argv[1], &client, &window_id, error)) + return FALSE; + + if (!test_client_do (client, error, + argv[0], window_id, + argv[2], + NULL)) + return FALSE; + } else if (strcmp (argv[0], "show") == 0 || strcmp (argv[0], "hide") == 0 || strcmp (argv[0], "activate") == 0 || @@ -450,6 +540,28 @@ if (!test_case_wait (test, error)) return FALSE; } + else if (strcmp (argv[0], "dispatch") == 0) + { + if (argc != 1) + BAD_COMMAND("usage: %s", argv[0]); + + if (!test_case_dispatch (test, error)) + return FALSE; + } + else if (strcmp (argv[0], "sleep") == 0) + { + guint64 interval; + + if (argc != 2) + BAD_COMMAND("usage: %s ", argv[0]); + + if (!g_ascii_string_to_unsigned (argv[1], 10, 0, G_MAXUINT32, + &interval, error)) + return FALSE; + + if (!test_case_sleep (test, (guint32) interval, error)) + return FALSE; + } else if (strcmp (argv[0], "assert_stacking") == 0) { if (!test_case_assert_stacking (test, argv + 1, argc - 1, error)) @@ -458,6 +570,11 @@ if (!test_case_check_xserver_stacking (test, error)) return FALSE; } + else if (strcmp (argv[0], "assert_focused") == 0) + { + if (!test_case_assert_focused (test, argv[1], error)) + return FALSE; + } else { BAD_COMMAND("Unknown command %s", argv[0]); diff -Nru mutter-3.28.4/src/wayland/meta-wayland-seat.c mutter-3.28.4+git20200505/src/wayland/meta-wayland-seat.c --- mutter-3.28.4/src/wayland/meta-wayland-seat.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/wayland/meta-wayland-seat.c 2020-05-05 19:16:46.000000000 +0000 @@ -264,7 +264,7 @@ g_object_unref (seat->touch); meta_wayland_text_input_destroy (seat->text_input); - g_slice_free (MetaWaylandSeat, seat); + g_free (seat); } static gboolean diff -Nru mutter-3.28.4/src/x11/window-x11.c mutter-3.28.4+git20200505/src/x11/window-x11.c --- mutter-3.28.4/src/x11/window-x11.c 2019-05-14 17:55:12.000000000 +0000 +++ mutter-3.28.4+git20200505/src/x11/window-x11.c 2020-05-05 19:16:46.000000000 +0000 @@ -53,9 +53,16 @@ #include "backends/meta-logical-monitor.h" #include "backends/x11/meta-backend-x11.h" +#define TAKE_FOCUS_FALLBACK_DELAY_MS 150 + G_DEFINE_TYPE_WITH_PRIVATE (MetaWindowX11, meta_window_x11, META_TYPE_WINDOW) static void +meta_window_x11_maybe_focus_delayed (MetaWindow *window, + GQueue *other_focus_candidates, + guint32 timestamp); + +static void meta_window_x11_init (MetaWindowX11 *window_x11) { window_x11->priv = meta_window_x11_get_instance_private (window_x11); @@ -722,6 +729,160 @@ send_icccm_message (window, display->atom_WM_TAKE_FOCUS, timestamp); } +typedef struct +{ + MetaWindow *window; + GQueue *pending_focus_candidates; + guint32 timestamp; + guint timeout_id; + gulong unmanaged_id; + gulong focused_changed_id; +} MetaWindowX11DelayedFocusData; + +static void +disconnect_pending_focus_window_signals (MetaWindow *window, + GQueue *focus_candidates) +{ + g_signal_handlers_disconnect_by_func (window, g_queue_remove, + focus_candidates); +} + +static void +meta_window_x11_delayed_focus_data_free (MetaWindowX11DelayedFocusData *data) +{ + g_signal_handler_disconnect (data->window, data->unmanaged_id); + g_signal_handler_disconnect (data->window->display, data->focused_changed_id); + + if (data->pending_focus_candidates) + { + g_queue_foreach (data->pending_focus_candidates, + (GFunc) disconnect_pending_focus_window_signals, + data->pending_focus_candidates); + g_queue_free (data->pending_focus_candidates); + } + + if (data->timeout_id) + g_source_remove (data->timeout_id); + + g_free (data); +} + +static void +focus_candidates_maybe_take_and_focus_next (GQueue **focus_candidates_ptr, + guint32 timestamp) +{ + MetaWindow *focus_window; + GQueue *focus_candidates; + + g_assert (*focus_candidates_ptr); + + if (g_queue_is_empty (*focus_candidates_ptr)) + return; + + focus_candidates = g_steal_pointer (focus_candidates_ptr); + focus_window = g_queue_pop_head (focus_candidates); + + disconnect_pending_focus_window_signals (focus_window, focus_candidates); + meta_window_x11_maybe_focus_delayed (focus_window, focus_candidates, timestamp); +} + +static gboolean +focus_window_delayed_timeout (gpointer user_data) +{ + MetaWindowX11DelayedFocusData *data = user_data; + MetaWindow *window = data->window; + guint32 timestamp = data->timestamp; + + focus_candidates_maybe_take_and_focus_next (&data->pending_focus_candidates, + timestamp); + + data->timeout_id = 0; + meta_window_x11_delayed_focus_data_free (data); + + meta_window_focus (window, timestamp); + + return G_SOURCE_REMOVE; +} + +static void +meta_window_x11_maybe_focus_delayed (MetaWindow *window, + GQueue *other_focus_candidates, + guint32 timestamp) +{ + MetaWindowX11DelayedFocusData *data; + + data = g_new0 (MetaWindowX11DelayedFocusData, 1); + data->window = window; + data->timestamp = timestamp; + data->pending_focus_candidates = other_focus_candidates; + + meta_topic (META_DEBUG_FOCUS, + "Requesting delayed focus to %s\n", window->desc); + + data->unmanaged_id = + g_signal_connect_swapped (window, "unmanaged", + G_CALLBACK (meta_window_x11_delayed_focus_data_free), + data); + + data->focused_changed_id = + g_signal_connect_swapped (window->display, "notify::focus-window", + G_CALLBACK (meta_window_x11_delayed_focus_data_free), + data); + + data->timeout_id = g_timeout_add (TAKE_FOCUS_FALLBACK_DELAY_MS, + focus_window_delayed_timeout, data); +} + +static void +maybe_focus_default_window (MetaScreen *screen, + MetaWindow *not_this_one, + guint32 timestamp) +{ + MetaWorkspace *workspace; + MetaStack *stack = screen->stack; + g_autoptr (GList) focusable_windows = NULL; + g_autoptr (GQueue) focus_candidates = NULL; + GList *l; + + if (not_this_one && not_this_one->workspace) + workspace = not_this_one->workspace; + else + workspace = screen->active_workspace; + + /* Go through all the focusable windows and try to focus them + * in order, waiting for a delay. The first one that replies to + * the request (in case of take focus windows) changing the display + * focused window, will stop the chained requests. + */ + focusable_windows = + meta_stack_get_default_focus_candidates (stack, workspace); + focus_candidates = g_queue_new (); + + for (l = g_list_last (focusable_windows); l; l = l->prev) + { + MetaWindow *focus_window = l->data; + + if (focus_window == not_this_one) + continue; + + g_queue_push_tail (focus_candidates, focus_window); + g_signal_connect_swapped (focus_window, "unmanaged", + G_CALLBACK (g_queue_remove), + focus_candidates); + + if (!META_IS_WINDOW_X11 (focus_window)) + break; + + if (focus_window->input) + break; + + if (focus_window->shaded && focus_window->frame) + break; + } + + focus_candidates_maybe_take_and_focus_next (&focus_candidates, timestamp); +} + static void meta_window_x11_focus (MetaWindow *window, guint32 timestamp) @@ -771,14 +932,19 @@ * Normally, we want to just leave the focus undisturbed until * the window responds to WM_TAKE_FOCUS, but if we're unmanaging * the current focus window we *need* to move the focus away, so - * we focus the no_focus_window now (and set - * display->focus_window to that) before sending WM_TAKE_FOCUS. + * we focus the no focus window before sending WM_TAKE_FOCUS, + * and eventually the default focus windwo excluding this one, + * if meanwhile we don't get any focus request. */ if (window->display->focus_window != NULL && window->display->focus_window->unmanaging) - meta_display_focus_the_no_focus_window (window->display, - window->screen, - timestamp); + { + meta_display_focus_the_no_focus_window (window->display, + window->screen, + timestamp); + maybe_focus_default_window (window->screen, window, + timestamp); + } } request_take_focus (window, timestamp);