Hello community, here is the log from the commit of package switcheroo-control for openSUSE:Factory checked in at 2019-07-11 13:08:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/switcheroo-control (Old) and /work/SRC/openSUSE:Factory/.switcheroo-control.new.4615 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "switcheroo-control" Thu Jul 11 13:08:31 2019 rev:5 rq:712511 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/switcheroo-control/switcheroo-control.changes 2018-06-13 15:39:37.732033897 +0200 +++ /work/SRC/openSUSE:Factory/.switcheroo-control.new.4615/switcheroo-control.changes 2019-07-11 13:08:32.990993503 +0200 @@ -1,0 +2,12 @@ +Tue Jun 25 09:19:39 UTC 2019 - Atri Bhattacharya <[email protected]> + +- Update to version 1.3.1 + + Fix Secure Boot work-around to not misdetect any system as + being dual-GPU and error out when it wasn't +- Changes from version 1.3: + + Work-around lack of access to vga_switcheroo when booting with + SecureBoot enabled + + Work-around a possible kernel deadlock on boot + + Install binary in $libexecdir + +------------------------------------------------------------------- Old: ---- switcheroo-control-1.2.tar.xz New: ---- switcheroo-control-1.3.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ switcheroo-control.spec ++++++ --- /var/tmp/diff_new_pack.0dTYYp/_old 2019-07-11 13:08:33.406993331 +0200 +++ /var/tmp/diff_new_pack.0dTYYp/_new 2019-07-11 13:08:33.410993330 +0200 @@ -1,7 +1,7 @@ # # spec file for package switcheroo-control # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,18 +12,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: switcheroo-control -Version: 1.2 +Version: 1.3.1 Release: 0 Summary: D-Bus service to check the availability of dual-GPU License: GPL-3.0-only Group: Hardware/Other Url: https://github.com/hadess/switcheroo-control -Source0: https://github.com/hadess/switcheroo-control/releases/download/1.2/%{name}-%{version}.tar.xz +Source0: https://github.com/hadess/switcheroo-control/releases/download/%{version}/%{name}-%{version}.tar.xz Source1: %{name}-rpmlintrc BuildRequires: gtk-doc BuildRequires: pkgconfig @@ -70,7 +70,7 @@ %defattr(-,root,root) %license COPYING %doc NEWS README -%{_sbindir}/switcheroo-control +%{_libexecdir}/switcheroo-control %{_unitdir}/switcheroo-control.service # Own dirs to avoid depending on dbus while building. %dir %{_sysconfdir}/dbus-1 ++++++ switcheroo-control-1.2.tar.xz -> switcheroo-control-1.3.1.tar.xz ++++++ ++++ 2446 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/NEWS new/switcheroo-control-1.3.1/NEWS --- old/switcheroo-control-1.2/NEWS 2017-09-20 18:43:32.000000000 +0200 +++ new/switcheroo-control-1.3.1/NEWS 2019-06-17 12:19:12.000000000 +0200 @@ -1,3 +1,17 @@ +1.3.1 +----- + +- Fix Secure Boot work-around to not misdetect any system as being + dual-GPU and error out when it wasn't + +1.3 +--- + +- Work-around lack of access to vga_switcheroo when booting with + SecureBoot enabled +- Work-around a possible kernel deadlock on boot +- Install binary in $libexecdir + 1.2 --- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/README new/switcheroo-control-1.3.1/README --- old/switcheroo-control-1.2/README 2016-11-03 17:19:07.000000000 +0100 +++ new/switcheroo-control-1.3.1/README 2017-09-20 19:12:05.000000000 +0200 @@ -3,7 +3,7 @@ D-Bus service to check the availability of dual-GPU -See https://developer.gnome.org/switcheroo-control/1.0/ for +See https://developer.gnome.org/switcheroo-control/ for developer information. Installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/README.md new/switcheroo-control-1.3.1/README.md --- old/switcheroo-control-1.2/README.md 2016-11-03 17:19:07.000000000 +0100 +++ new/switcheroo-control-1.3.1/README.md 2017-09-20 19:12:05.000000000 +0200 @@ -3,7 +3,7 @@ D-Bus service to check the availability of dual-GPU -See https://developer.gnome.org/switcheroo-control/1.0/ for +See https://developer.gnome.org/switcheroo-control/ for developer information. Installation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/compile new/switcheroo-control-1.3.1/compile --- old/switcheroo-control-1.2/compile 2017-09-20 18:44:04.000000000 +0200 +++ new/switcheroo-control-1.3.1/compile 2019-06-17 12:19:47.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2017 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # 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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -340,7 +340,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/configure.ac new/switcheroo-control-1.3.1/configure.ac --- old/switcheroo-control-1.2/configure.ac 2017-09-20 18:43:44.000000000 +0200 +++ new/switcheroo-control-1.3.1/configure.ac 2019-06-17 12:19:12.000000000 +0200 @@ -1,6 +1,6 @@ AC_PREREQ(2.59) -AC_INIT([switcheroo-control], [1.2], [[email protected]]) +AC_INIT([switcheroo-control], [1.3.1], [[email protected]]) AM_INIT_AUTOMAKE(1.9 dist-xz no-dist-gzip check-news) # Enable silent build when available (Automake 1.11) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/data/Makefile.am new/switcheroo-control-1.3.1/data/Makefile.am --- old/switcheroo-control-1.2/data/Makefile.am 2016-03-08 15:51:39.000000000 +0100 +++ new/switcheroo-control-1.3.1/data/Makefile.am 2019-06-12 12:21:58.000000000 +0200 @@ -2,7 +2,7 @@ systemdservice_in_files = switcheroo-control.service.in systemdservice_DATA = switcheroo-control.service switcheroo-control.service: switcheroo-control.service.in Makefile - $(AM_V_GEN) $(SED) -e "s|\@sbindir\@|$(sbindir)|" $< > $@ + $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ dbusconfdir = $(sysconfdir)/dbus-1/system.d dbusconf_DATA = net.hadess.SwitcherooControl.conf diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/data/switcheroo-control.service.in new/switcheroo-control-1.3.1/data/switcheroo-control.service.in --- old/switcheroo-control-1.2/data/switcheroo-control.service.in 2016-10-19 14:26:44.000000000 +0200 +++ new/switcheroo-control-1.3.1/data/switcheroo-control.service.in 2019-06-12 12:24:10.000000000 +0200 @@ -1,10 +1,11 @@ [Unit] Description=Switcheroo Control Proxy service +Before=multi-user.target display-manager.target alsa-restore.service alsa-state.service [Service] Type=dbus BusName=net.hadess.SwitcherooControl -ExecStart=@sbindir@/switcheroo-control +ExecStart=@libexecdir@/switcheroo-control [Install] WantedBy=graphical.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/gdbus-net.hadess.SwitcherooControl.html new/switcheroo-control-1.3.1/docs/html/gdbus-net.hadess.SwitcherooControl.html --- old/switcheroo-control-1.2/docs/html/gdbus-net.hadess.SwitcherooControl.html 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/gdbus-net.hadess.SwitcherooControl.html 2019-06-17 12:19:50.000000000 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="ref-dbus.html" title="D-Bus API Reference"> <link rel="prev" href="ref-dbus.html" title="D-Bus API Reference"> <link rel="next" href="ix01.html" title="Index"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -60,6 +60,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/index.html new/switcheroo-control-1.3.1/docs/html/index.html --- old/switcheroo-control-1.2/docs/html/index.html 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/index.html 2019-06-17 12:19:50.000000000 +0200 @@ -6,7 +6,7 @@ <meta name="generator" content="DocBook XSL Stylesheets Vsnapshot"> <link rel="home" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="next" href="ref-dbus.html" title="D-Bus API Reference"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -22,7 +22,7 @@ <code class="email"><<a class="email" href="mailto:[email protected]";>[email protected]</a>></code><br> </p></div></div> </div></div></div> -<div><p class="releaseinfo">Version 1.2 +<div><p class="releaseinfo">Version 1.3.1 </p></div> <div><p class="copyright">Copyright © 2016 Red Hat, Inc.</p></div> <div><div class="legalnotice"> @@ -67,6 +67,6 @@ </dl></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/ix01.html new/switcheroo-control-1.3.1/docs/html/ix01.html --- old/switcheroo-control-1.2/docs/html/ix01.html 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/ix01.html 2019-06-17 12:19:50.000000000 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="prev" href="gdbus-net.hadess.SwitcherooControl.html" title="net.hadess.SwitcherooControl"> <link rel="next" href="license.html" title="Appendix A. License"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -25,14 +25,14 @@ <div xmlns:xlink="http://www.w3.org/1999/xlink"; class="index"><div class="indexdiv"> <h3>N</h3> <dl> -<dt id="ientry-idm139773472549808">net.hadess.SwitcherooControl, <a class="indexterm" href="gdbus-net.hadess.SwitcherooControl.html#gdbus-interface-net-hadess-SwitcherooControl.top_of_page">net.hadess.SwitcherooControl</a> +<dt id="ientry-idm46043978875872">net.hadess.SwitcherooControl, <a class="indexterm" href="gdbus-net.hadess.SwitcherooControl.html#gdbus-interface-net-hadess-SwitcherooControl.top_of_page">net.hadess.SwitcherooControl</a> </dt> -<dt id="ientry-idm139773480025680">net.hadess.SwitcherooControl:HasDualGpu, <a class="indexterm" href="gdbus-net.hadess.SwitcherooControl.html#gdbus-property-net-hadess-SwitcherooControl.HasDualGpu">The "HasDualGpu" property</a> +<dt id="ientry-idm46043979613648">net.hadess.SwitcherooControl:HasDualGpu, <a class="indexterm" href="gdbus-net.hadess.SwitcherooControl.html#gdbus-property-net-hadess-SwitcherooControl.HasDualGpu">The "HasDualGpu" property</a> </dt> </dl> </div></div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/license.html new/switcheroo-control-1.3.1/docs/html/license.html --- old/switcheroo-control-1.2/docs/html/license.html 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/license.html 2019-06-17 12:19:50.000000000 +0200 @@ -7,7 +7,7 @@ <link rel="home" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="up" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="prev" href="ix01.html" title="Index"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -28,6 +28,6 @@ </p> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/ref-dbus.html new/switcheroo-control-1.3.1/docs/html/ref-dbus.html --- old/switcheroo-control-1.2/docs/html/ref-dbus.html 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/ref-dbus.html 2019-06-17 12:19:50.000000000 +0200 @@ -8,7 +8,7 @@ <link rel="up" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="prev" href="index.html" title="Switcheroo Control Reference Manual"> <link rel="next" href="gdbus-net.hadess.SwitcherooControl.html" title="net.hadess.SwitcherooControl"> -<meta name="generator" content="GTK-Doc V1.25 (XML mode)"> +<meta name="generator" content="GTK-Doc V1.29.1 (XML mode)"> <link rel="stylesheet" href="style.css" type="text/css"> </head> <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF"> @@ -40,6 +40,6 @@ </div> </div> <div class="footer"> -<hr>Generated by GTK-Doc V1.25</div> +<hr>Generated by GTK-Doc V1.29.1</div> </body> </html> \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/docs/html/style.css new/switcheroo-control-1.3.1/docs/html/style.css --- old/switcheroo-control-1.2/docs/html/style.css 2017-09-20 18:44:08.000000000 +0200 +++ new/switcheroo-control-1.3.1/docs/html/style.css 2019-06-17 12:19:50.000000000 +0200 @@ -30,6 +30,10 @@ vertical-align: top; } +span.nowrap { + white-space: nowrap; +} + div.gallery-float { float: left; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/gtk-doc.make new/switcheroo-control-1.3.1/gtk-doc.make --- old/switcheroo-control-1.2/gtk-doc.make 2017-09-20 18:44:00.000000000 +0200 +++ new/switcheroo-control-1.3.1/gtk-doc.make 2019-06-17 12:19:43.000000000 +0200 @@ -1,4 +1,22 @@ # -*- mode: makefile -*- +# +# gtk-doc.make - make rules for gtk-doc +# Copyright (C) 2003 James Henstridge +# 2004-2007 Damon Chaplin +# 2007-2017 Stefan Sauer +# +# 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 +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# 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 <http://www.gnu.org/licenses/>. #################################### # Everything below here is generic # @@ -81,55 +99,54 @@ #### setup #### -GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_$(V)) -GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SETUP=$(GTK_DOC_V_SETUP_@AM_V@) +GTK_DOC_V_SETUP_=$(GTK_DOC_V_SETUP_@AM_DEFAULT_V@) GTK_DOC_V_SETUP_0=@echo " DOC Preparing build"; setup-build.stamp: -$(GTK_DOC_V_SETUP)if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \ - files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ - if test "x$$files" != "x" ; then \ - for file in $$files ; do \ - destdir=`dirname $(abs_builddir)/$$file`; \ - test -d "$$destdir" || mkdir -p "$$destdir"; \ - test -f $(abs_srcdir)/$$file && \ - cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ - done; \ - fi; \ + files=`echo $(SETUP_FILES) $(DOC_MODULE).types`; \ + if test "x$$files" != "x" ; then \ + for file in $$files ; do \ + destdir=`dirname $(abs_builddir)/$$file`; \ + test -d "$$destdir" || mkdir -p "$$destdir"; \ + test -f $(abs_srcdir)/$$file && \ + cp -pf $(abs_srcdir)/$$file $(abs_builddir)/$$file || true; \ + done; \ + fi; \ fi $(AM_V_at)touch setup-build.stamp - #### scan #### -GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_$(V)) -GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_SCAN=$(GTK_DOC_V_SCAN_@AM_V@) +GTK_DOC_V_SCAN_=$(GTK_DOC_V_SCAN_@AM_DEFAULT_V@) GTK_DOC_V_SCAN_0=@echo " DOC Scanning header files"; -GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_$(V)) -GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_INTROSPECT=$(GTK_DOC_V_INTROSPECT_@AM_V@) +GTK_DOC_V_INTROSPECT_=$(GTK_DOC_V_INTROSPECT_@AM_DEFAULT_V@) GTK_DOC_V_INTROSPECT_0=@echo " DOC Introspecting gobjects"; scan-build.stamp: setup-build.stamp $(HFILE_GLOB) $(CFILE_GLOB) $(GTK_DOC_V_SCAN)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-scan --module=$(DOC_MODULE) --ignore-headers="$(IGNORE_HFILES)" $${_source_dir} $(SCAN_OPTIONS) $(EXTRA_HFILES) $(GTK_DOC_V_INTROSPECT)if grep -l '^..*$$' $(DOC_MODULE).types > /dev/null 2>&1 ; then \ - scanobj_options=""; \ - gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ - if test "$$?" = "0"; then \ - if test "x$(V)" = "x1"; then \ - scanobj_options="--verbose"; \ - fi; \ + scanobj_options=""; \ + gtkdoc-scangobj 2>&1 --help | grep >/dev/null "\-\-verbose"; \ + if test "$$?" = "0"; then \ + if test "x$(V)" = "x1"; then \ + scanobj_options="--verbose"; \ fi; \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ - gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ + fi; \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" RUN="$(GTKDOC_RUN)" CFLAGS="$(GTKDOC_CFLAGS) $(CFLAGS)" LDFLAGS="$(GTKDOC_LIBS) $(LDFLAGS)" \ + gtkdoc-scangobj $(SCANGOBJ_OPTIONS) $$scanobj_options --module=$(DOC_MODULE); \ else \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ fi $(AM_V_at)touch scan-build.stamp @@ -138,14 +155,14 @@ #### xml #### -GTK_DOC_V_XML=$(GTK_DOC_V_XML_$(V)) -GTK_DOC_V_XML_=$(GTK_DOC_V_XML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XML=$(GTK_DOC_V_XML_@AM_V@) +GTK_DOC_V_XML_=$(GTK_DOC_V_XML_@AM_DEFAULT_V@) GTK_DOC_V_XML_0=@echo " DOC Building XML"; sgml-build.stamp: setup-build.stamp $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(HFILE_GLOB) $(CFILE_GLOB) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt $(expand_content_files) xml/gtkdocentities.ent $(GTK_DOC_V_XML)_source_dir='' ; \ for i in $(DOC_SOURCE_DIR) ; do \ - _source_dir="$${_source_dir} --source-dir=$$i" ; \ + _source_dir="$${_source_dir} --source-dir=$$i" ; \ done ; \ gtkdoc-mkdb --module=$(DOC_MODULE) --output-format=xml --expand-content-files="$(expand_content_files)" --main-sgml-file=$(DOC_MAIN_SGML_FILE) $${_source_dir} $(MKDB_OPTIONS) $(AM_V_at)touch sgml-build.stamp @@ -153,6 +170,9 @@ sgml.stamp: sgml-build.stamp @true +$(DOC_MAIN_SGML_FILE): sgml-build.stamp + @true + xml/gtkdocentities.ent: Makefile $(GTK_DOC_V_XML)$(MKDIR_P) $(@D) && ( \ echo "<!ENTITY package \"$(PACKAGE)\">"; \ @@ -166,12 +186,12 @@ #### html #### -GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_$(V)) -GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_HTML=$(GTK_DOC_V_HTML_@AM_V@) +GTK_DOC_V_HTML_=$(GTK_DOC_V_HTML_@AM_DEFAULT_V@) GTK_DOC_V_HTML_0=@echo " DOC Building HTML"; -GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_$(V)) -GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_XREF=$(GTK_DOC_V_XREF_@AM_V@) +GTK_DOC_V_XREF_=$(GTK_DOC_V_XREF_@AM_DEFAULT_V@) GTK_DOC_V_XREF_0=@echo " DOC Fixing cross-references"; html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) @@ -190,20 +210,17 @@ cd html && gtkdoc-mkhtml $$mkhtml_options $(MKHTML_OPTIONS) $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) -@test "x$(HTML_IMAGES)" = "x" || \ for file in $(HTML_IMAGES) ; do \ - if test -f $(abs_srcdir)/$$file ; then \ - cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ - fi; \ - if test -f $(abs_builddir)/$$file ; then \ - cp $(abs_builddir)/$$file $(abs_builddir)/html; \ - fi; \ + test -f $(abs_srcdir)/$$file && cp $(abs_srcdir)/$$file $(abs_builddir)/html; \ + test -f $(abs_builddir)/$$file && cp $(abs_builddir)/$$file $(abs_builddir)/html; \ + test -f $$file && cp $$file $(abs_builddir)/html; \ done; $(GTK_DOC_V_XREF)gtkdoc-fixxref --module=$(DOC_MODULE) --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) $(AM_V_at)touch html-build.stamp #### pdf #### -GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_$(V)) -GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_$(AM_DEFAULT_VERBOSITY)) +GTK_DOC_V_PDF=$(GTK_DOC_V_PDF_@AM_V@) +GTK_DOC_V_PDF_=$(GTK_DOC_V_PDF_@AM_DEFAULT_V@) GTK_DOC_V_PDF_0=@echo " DOC Building PDF"; pdf-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) $(expand_content_files) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/missing new/switcheroo-control-1.3.1/missing --- old/switcheroo-control-1.2/missing 2017-09-20 18:44:04.000000000 +0200 +++ new/switcheroo-control-1.3.1/missing 2019-06-17 12:19:47.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2017 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 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 <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # 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=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,7 +207,7 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/src/Makefile.am new/switcheroo-control-1.3.1/src/Makefile.am --- old/switcheroo-control-1.2/src/Makefile.am 2016-03-08 15:46:59.000000000 +0100 +++ new/switcheroo-control-1.3.1/src/Makefile.am 2019-06-12 12:21:58.000000000 +0200 @@ -8,7 +8,7 @@ switcheroo-control-resources.h: switcheroo-control.gresource.xml $(resource_files) $(AM_V_GEN) glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-header --c-name switcheroo_control $< -sbin_PROGRAMS = switcheroo-control +libexec_PROGRAMS = switcheroo-control switcheroo_control_SOURCES = \ switcheroo-control.c \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/src/switcheroo-control-resources.c new/switcheroo-control-1.3.1/src/switcheroo-control-resources.c --- old/switcheroo-control-1.2/src/switcheroo-control-resources.c 2017-09-19 18:56:35.000000000 +0200 +++ new/switcheroo-control-1.3.1/src/switcheroo-control-resources.c 2019-06-11 19:08:04.000000000 +0200 @@ -6,142 +6,148 @@ # define SECTION #endif -static const SECTION union { const guint8 data[1054]; const double alignment; void * const ptr;} switcheroo_control_resource_data = { { - 0x47, 0x56, 0x61, 0x72, 0x69, 0x61, 0x6e, 0x74, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x18, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x28, 0x05, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x03, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, - 0x05, 0x00, 0x00, 0x00, 0x4a, 0x8e, 0x8f, 0x0b, - 0x01, 0x00, 0x00, 0x00, 0xac, 0x00, 0x00, 0x00, - 0x04, 0x00, 0x4c, 0x00, 0xb0, 0x00, 0x00, 0x00, - 0xb4, 0x00, 0x00, 0x00, 0xd4, 0xb5, 0x02, 0x00, - 0xff, 0xff, 0xff, 0xff, 0xb4, 0x00, 0x00, 0x00, - 0x01, 0x00, 0x4c, 0x00, 0xb8, 0x00, 0x00, 0x00, - 0xbc, 0x00, 0x00, 0x00, 0xc8, 0x7d, 0x4b, 0x83, - 0x03, 0x00, 0x00, 0x00, 0xbc, 0x00, 0x00, 0x00, - 0x12, 0x00, 0x4c, 0x00, 0xd0, 0x00, 0x00, 0x00, - 0xd4, 0x00, 0x00, 0x00, 0x51, 0x57, 0x03, 0x93, - 0x00, 0x00, 0x00, 0x00, 0xd4, 0x00, 0x00, 0x00, - 0x07, 0x00, 0x4c, 0x00, 0xdc, 0x00, 0x00, 0x00, - 0xe0, 0x00, 0x00, 0x00, 0x2a, 0xeb, 0x68, 0x25, - 0x02, 0x00, 0x00, 0x00, 0xe0, 0x00, 0x00, 0x00, - 0x20, 0x00, 0x76, 0x00, 0x00, 0x01, 0x00, 0x00, - 0x1e, 0x04, 0x00, 0x00, 0x6e, 0x65, 0x74, 0x2f, - 0x03, 0x00, 0x00, 0x00, 0x2f, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x53, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x65, 0x72, 0x6f, 0x6f, 0x43, 0x6f, - 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x2f, 0x00, 0x00, - 0x04, 0x00, 0x00, 0x00, 0x68, 0x61, 0x64, 0x65, - 0x73, 0x73, 0x2f, 0x00, 0x02, 0x00, 0x00, 0x00, - 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x61, 0x64, 0x65, - 0x73, 0x73, 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x65, 0x72, 0x6f, 0x6f, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x2e, 0x78, 0x6d, 0x6c, - 0x0e, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, - 0x3c, 0x3f, 0x78, 0x6d, 0x6c, 0x20, 0x76, 0x65, - 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x3d, 0x22, 0x31, - 0x2e, 0x30, 0x22, 0x3f, 0x3e, 0x0a, 0x3c, 0x21, - 0x44, 0x4f, 0x43, 0x54, 0x59, 0x50, 0x45, 0x20, - 0x6e, 0x6f, 0x64, 0x65, 0x20, 0x50, 0x55, 0x42, - 0x4c, 0x49, 0x43, 0x20, 0x22, 0x2d, 0x2f, 0x2f, - 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, 0x6b, - 0x74, 0x6f, 0x70, 0x2f, 0x2f, 0x44, 0x54, 0x44, - 0x20, 0x44, 0x2d, 0x42, 0x55, 0x53, 0x20, 0x4f, - 0x62, 0x6a, 0x65, 0x63, 0x74, 0x20, 0x49, 0x6e, - 0x74, 0x72, 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x20, 0x31, 0x2e, 0x30, 0x2f, - 0x2f, 0x45, 0x4e, 0x22, 0x20, 0x22, 0x68, 0x74, - 0x74, 0x70, 0x3a, 0x2f, 0x2f, 0x77, 0x77, 0x77, - 0x2e, 0x66, 0x72, 0x65, 0x65, 0x64, 0x65, 0x73, - 0x6b, 0x74, 0x6f, 0x70, 0x2e, 0x6f, 0x72, 0x67, - 0x2f, 0x73, 0x74, 0x61, 0x6e, 0x64, 0x61, 0x72, - 0x64, 0x73, 0x2f, 0x64, 0x62, 0x75, 0x73, 0x2f, - 0x31, 0x2e, 0x30, 0x2f, 0x69, 0x6e, 0x74, 0x72, - 0x6f, 0x73, 0x70, 0x65, 0x63, 0x74, 0x2e, 0x64, - 0x74, 0x64, 0x22, 0x3e, 0x0a, 0x3c, 0x6e, 0x6f, - 0x64, 0x65, 0x3e, 0x3c, 0x21, 0x2d, 0x2d, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x6e, 0x65, - 0x74, 0x2e, 0x68, 0x61, 0x64, 0x65, 0x73, 0x73, - 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x6f, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x3a, 0x0a, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x40, 0x73, 0x68, 0x6f, 0x72, 0x74, - 0x5f, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, - 0x74, 0x69, 0x6f, 0x6e, 0x3a, 0x20, 0x44, 0x2d, - 0x42, 0x75, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x78, - 0x79, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, - 0x65, 0x73, 0x73, 0x20, 0x64, 0x75, 0x61, 0x6c, - 0x2d, 0x47, 0x50, 0x55, 0x20, 0x63, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x73, 0x2e, 0x0a, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x41, 0x66, - 0x74, 0x65, 0x72, 0x20, 0x63, 0x68, 0x65, 0x63, - 0x6b, 0x69, 0x6e, 0x67, 0x20, 0x74, 0x68, 0x65, - 0x20, 0x61, 0x76, 0x61, 0x69, 0x6c, 0x61, 0x62, - 0x69, 0x6c, 0x69, 0x74, 0x79, 0x20, 0x6f, 0x66, - 0x20, 0x74, 0x77, 0x6f, 0x20, 0x73, 0x77, 0x69, - 0x74, 0x63, 0x68, 0x61, 0x62, 0x6c, 0x65, 0x20, - 0x47, 0x50, 0x55, 0x73, 0x20, 0x69, 0x6e, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x6d, 0x61, 0x63, 0x68, - 0x69, 0x6e, 0x65, 0x2c, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x63, 0x68, 0x65, 0x63, 0x6b, - 0x20, 0x74, 0x68, 0x65, 0x20, 0x76, 0x61, 0x6c, - 0x75, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x6e, 0x65, - 0x74, 0x2e, 0x68, 0x61, 0x64, 0x65, 0x73, 0x73, - 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, 0x68, 0x65, - 0x72, 0x6f, 0x6f, 0x43, 0x6f, 0x6e, 0x74, 0x72, - 0x6f, 0x6c, 0x2e, 0x48, 0x61, 0x73, 0x44, 0x75, - 0x61, 0x6c, 0x47, 0x70, 0x75, 0x20, 0x74, 0x6f, - 0x20, 0x73, 0x65, 0x65, 0x0a, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x69, 0x66, 0x20, 0x72, 0x75, - 0x6e, 0x6e, 0x69, 0x6e, 0x67, 0x20, 0x61, 0x70, - 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x73, 0x20, 0x6f, 0x6e, 0x20, 0x74, 0x68, - 0x65, 0x20, 0x64, 0x69, 0x73, 0x63, 0x72, 0x65, - 0x74, 0x65, 0x20, 0x47, 0x50, 0x55, 0x20, 0x73, - 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x62, 0x65, - 0x20, 0x6f, 0x66, 0x66, 0x65, 0x72, 0x65, 0x64, - 0x2e, 0x0a, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x54, 0x68, 0x65, 0x20, 0x6f, 0x62, 0x6a, - 0x65, 0x63, 0x74, 0x20, 0x70, 0x61, 0x74, 0x68, - 0x20, 0x77, 0x69, 0x6c, 0x6c, 0x20, 0x62, 0x65, - 0x20, 0x22, 0x2f, 0x6e, 0x65, 0x74, 0x2f, 0x68, - 0x61, 0x64, 0x65, 0x73, 0x73, 0x2f, 0x53, 0x77, - 0x69, 0x74, 0x63, 0x68, 0x65, 0x72, 0x6f, 0x6f, - 0x43, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x22, - 0x2e, 0x0a, 0x20, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, - 0x69, 0x6e, 0x74, 0x65, 0x72, 0x66, 0x61, 0x63, - 0x65, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, - 0x6e, 0x65, 0x74, 0x2e, 0x68, 0x61, 0x64, 0x65, - 0x73, 0x73, 0x2e, 0x53, 0x77, 0x69, 0x74, 0x63, - 0x68, 0x65, 0x72, 0x6f, 0x6f, 0x43, 0x6f, 0x6e, - 0x74, 0x72, 0x6f, 0x6c, 0x22, 0x3e, 0x3c, 0x21, - 0x2d, 0x2d, 0x0a, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x20, 0x20, 0x20, 0x48, 0x61, 0x73, 0x44, 0x75, - 0x61, 0x6c, 0x47, 0x70, 0x75, 0x3a, 0x0a, 0x0a, - 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, - 0x57, 0x68, 0x65, 0x74, 0x68, 0x65, 0x72, 0x20, - 0x74, 0x77, 0x6f, 0x20, 0x73, 0x77, 0x69, 0x74, - 0x63, 0x68, 0x61, 0x62, 0x6c, 0x65, 0x20, 0x47, - 0x50, 0x55, 0x73, 0x20, 0x61, 0x72, 0x65, 0x20, - 0x70, 0x72, 0x65, 0x73, 0x65, 0x6e, 0x74, 0x20, - 0x6f, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x73, - 0x79, 0x73, 0x74, 0x65, 0x6d, 0x2e, 0x0a, 0x20, - 0x20, 0x20, 0x20, 0x2d, 0x2d, 0x3e, 0x3c, 0x70, - 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x20, - 0x6e, 0x61, 0x6d, 0x65, 0x3d, 0x22, 0x48, 0x61, - 0x73, 0x44, 0x75, 0x61, 0x6c, 0x47, 0x70, 0x75, - 0x22, 0x20, 0x74, 0x79, 0x70, 0x65, 0x3d, 0x22, - 0x62, 0x22, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x3d, 0x22, 0x72, 0x65, 0x61, 0x64, 0x22, - 0x2f, 0x3e, 0x3c, 0x2f, 0x69, 0x6e, 0x74, 0x65, - 0x72, 0x66, 0x61, 0x63, 0x65, 0x3e, 0x3c, 0x2f, - 0x6e, 0x6f, 0x64, 0x65, 0x3e, 0x0a, 0x00, 0x00, - 0x28, 0x75, 0x75, 0x61, 0x79, 0x29 +#ifdef _MSC_VER +static const SECTION union { const guint8 data[1061]; const double alignment; void * const ptr;} switcheroo_control_resource_data = { { + 0107, 0126, 0141, 0162, 0151, 0141, 0156, 0164, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0000, + 0030, 0000, 0000, 0000, 0254, 0000, 0000, 0000, 0000, 0000, 0000, 0050, 0005, 0000, 0000, 0000, + 0000, 0000, 0000, 0000, 0002, 0000, 0000, 0000, 0003, 0000, 0000, 0000, 0003, 0000, 0000, 0000, + 0005, 0000, 0000, 0000, 0112, 0216, 0217, 0013, 0001, 0000, 0000, 0000, 0254, 0000, 0000, 0000, + 0004, 0000, 0114, 0000, 0260, 0000, 0000, 0000, 0264, 0000, 0000, 0000, 0324, 0265, 0002, 0000, + 0377, 0377, 0377, 0377, 0264, 0000, 0000, 0000, 0001, 0000, 0114, 0000, 0270, 0000, 0000, 0000, + 0274, 0000, 0000, 0000, 0310, 0175, 0113, 0203, 0004, 0000, 0000, 0000, 0274, 0000, 0000, 0000, + 0022, 0000, 0114, 0000, 0320, 0000, 0000, 0000, 0324, 0000, 0000, 0000, 0052, 0353, 0150, 0045, + 0002, 0000, 0000, 0000, 0324, 0000, 0000, 0000, 0040, 0000, 0166, 0000, 0370, 0000, 0000, 0000, + 0026, 0004, 0000, 0000, 0121, 0127, 0003, 0223, 0000, 0000, 0000, 0000, 0026, 0004, 0000, 0000, + 0007, 0000, 0114, 0000, 0040, 0004, 0000, 0000, 0044, 0004, 0000, 0000, 0156, 0145, 0164, 0057, + 0004, 0000, 0000, 0000, 0057, 0000, 0000, 0000, 0000, 0000, 0000, 0000, 0123, 0167, 0151, 0164, + 0143, 0150, 0145, 0162, 0157, 0157, 0103, 0157, 0156, 0164, 0162, 0157, 0154, 0057, 0000, 0000, + 0003, 0000, 0000, 0000, 0156, 0145, 0164, 0056, 0150, 0141, 0144, 0145, 0163, 0163, 0056, 0123, + 0167, 0151, 0164, 0143, 0150, 0145, 0162, 0157, 0157, 0103, 0157, 0156, 0164, 0162, 0157, 0154, + 0056, 0170, 0155, 0154, 0000, 0000, 0000, 0000, 0016, 0003, 0000, 0000, 0000, 0000, 0000, 0000, + 0074, 0077, 0170, 0155, 0154, 0040, 0166, 0145, 0162, 0163, 0151, 0157, 0156, 0075, 0042, 0061, + 0056, 0060, 0042, 0077, 0076, 0012, 0074, 0041, 0104, 0117, 0103, 0124, 0131, 0120, 0105, 0040, + 0156, 0157, 0144, 0145, 0040, 0120, 0125, 0102, 0114, 0111, 0103, 0040, 0042, 0055, 0057, 0057, + 0146, 0162, 0145, 0145, 0144, 0145, 0163, 0153, 0164, 0157, 0160, 0057, 0057, 0104, 0124, 0104, + 0040, 0104, 0055, 0102, 0125, 0123, 0040, 0117, 0142, 0152, 0145, 0143, 0164, 0040, 0111, 0156, + 0164, 0162, 0157, 0163, 0160, 0145, 0143, 0164, 0151, 0157, 0156, 0040, 0061, 0056, 0060, 0057, + 0057, 0105, 0116, 0042, 0040, 0042, 0150, 0164, 0164, 0160, 0072, 0057, 0057, 0167, 0167, 0167, + 0056, 0146, 0162, 0145, 0145, 0144, 0145, 0163, 0153, 0164, 0157, 0160, 0056, 0157, 0162, 0147, + 0057, 0163, 0164, 0141, 0156, 0144, 0141, 0162, 0144, 0163, 0057, 0144, 0142, 0165, 0163, 0057, + 0061, 0056, 0060, 0057, 0151, 0156, 0164, 0162, 0157, 0163, 0160, 0145, 0143, 0164, 0056, 0144, + 0164, 0144, 0042, 0076, 0012, 0074, 0156, 0157, 0144, 0145, 0076, 0074, 0041, 0055, 0055, 0012, + 0040, 0040, 0040, 0040, 0040, 0040, 0156, 0145, 0164, 0056, 0150, 0141, 0144, 0145, 0163, 0163, + 0056, 0123, 0167, 0151, 0164, 0143, 0150, 0145, 0162, 0157, 0157, 0103, 0157, 0156, 0164, 0162, + 0157, 0154, 0072, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0100, 0163, 0150, 0157, 0162, 0164, + 0137, 0144, 0145, 0163, 0143, 0162, 0151, 0160, 0164, 0151, 0157, 0156, 0072, 0040, 0104, 0055, + 0102, 0165, 0163, 0040, 0160, 0162, 0157, 0170, 0171, 0040, 0164, 0157, 0040, 0141, 0143, 0143, + 0145, 0163, 0163, 0040, 0144, 0165, 0141, 0154, 0055, 0107, 0120, 0125, 0040, 0143, 0157, 0156, + 0164, 0162, 0157, 0154, 0163, 0056, 0012, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0101, 0146, + 0164, 0145, 0162, 0040, 0143, 0150, 0145, 0143, 0153, 0151, 0156, 0147, 0040, 0164, 0150, 0145, + 0040, 0141, 0166, 0141, 0151, 0154, 0141, 0142, 0151, 0154, 0151, 0164, 0171, 0040, 0157, 0146, + 0040, 0164, 0167, 0157, 0040, 0163, 0167, 0151, 0164, 0143, 0150, 0141, 0142, 0154, 0145, 0040, + 0107, 0120, 0125, 0163, 0040, 0151, 0156, 0040, 0164, 0150, 0145, 0040, 0155, 0141, 0143, 0150, + 0151, 0156, 0145, 0054, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0143, 0150, 0145, 0143, 0153, + 0040, 0164, 0150, 0145, 0040, 0166, 0141, 0154, 0165, 0145, 0040, 0157, 0146, 0040, 0156, 0145, + 0164, 0056, 0150, 0141, 0144, 0145, 0163, 0163, 0056, 0123, 0167, 0151, 0164, 0143, 0150, 0145, + 0162, 0157, 0157, 0103, 0157, 0156, 0164, 0162, 0157, 0154, 0056, 0110, 0141, 0163, 0104, 0165, + 0141, 0154, 0107, 0160, 0165, 0040, 0164, 0157, 0040, 0163, 0145, 0145, 0012, 0040, 0040, 0040, + 0040, 0040, 0040, 0151, 0146, 0040, 0162, 0165, 0156, 0156, 0151, 0156, 0147, 0040, 0141, 0160, + 0160, 0154, 0151, 0143, 0141, 0164, 0151, 0157, 0156, 0163, 0040, 0157, 0156, 0040, 0164, 0150, + 0145, 0040, 0144, 0151, 0163, 0143, 0162, 0145, 0164, 0145, 0040, 0107, 0120, 0125, 0040, 0163, + 0150, 0157, 0165, 0154, 0144, 0040, 0142, 0145, 0040, 0157, 0146, 0146, 0145, 0162, 0145, 0144, + 0056, 0012, 0012, 0040, 0040, 0040, 0040, 0040, 0040, 0124, 0150, 0145, 0040, 0157, 0142, 0152, + 0145, 0143, 0164, 0040, 0160, 0141, 0164, 0150, 0040, 0167, 0151, 0154, 0154, 0040, 0142, 0145, + 0040, 0042, 0057, 0156, 0145, 0164, 0057, 0150, 0141, 0144, 0145, 0163, 0163, 0057, 0123, 0167, + 0151, 0164, 0143, 0150, 0145, 0162, 0157, 0157, 0103, 0157, 0156, 0164, 0162, 0157, 0154, 0042, + 0056, 0012, 0040, 0040, 0055, 0055, 0076, 0074, 0151, 0156, 0164, 0145, 0162, 0146, 0141, 0143, + 0145, 0040, 0156, 0141, 0155, 0145, 0075, 0042, 0156, 0145, 0164, 0056, 0150, 0141, 0144, 0145, + 0163, 0163, 0056, 0123, 0167, 0151, 0164, 0143, 0150, 0145, 0162, 0157, 0157, 0103, 0157, 0156, + 0164, 0162, 0157, 0154, 0042, 0076, 0074, 0041, 0055, 0055, 0012, 0040, 0040, 0040, 0040, 0040, + 0040, 0040, 0040, 0110, 0141, 0163, 0104, 0165, 0141, 0154, 0107, 0160, 0165, 0072, 0012, 0012, + 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0040, 0127, 0150, 0145, 0164, 0150, 0145, 0162, 0040, + 0164, 0167, 0157, 0040, 0163, 0167, 0151, 0164, 0143, 0150, 0141, 0142, 0154, 0145, 0040, 0107, + 0120, 0125, 0163, 0040, 0141, 0162, 0145, 0040, 0160, 0162, 0145, 0163, 0145, 0156, 0164, 0040, + 0157, 0156, 0040, 0164, 0150, 0145, 0040, 0163, 0171, 0163, 0164, 0145, 0155, 0056, 0012, 0040, + 0040, 0040, 0040, 0055, 0055, 0076, 0074, 0160, 0162, 0157, 0160, 0145, 0162, 0164, 0171, 0040, + 0156, 0141, 0155, 0145, 0075, 0042, 0110, 0141, 0163, 0104, 0165, 0141, 0154, 0107, 0160, 0165, + 0042, 0040, 0164, 0171, 0160, 0145, 0075, 0042, 0142, 0042, 0040, 0141, 0143, 0143, 0145, 0163, + 0163, 0075, 0042, 0162, 0145, 0141, 0144, 0042, 0057, 0076, 0074, 0057, 0151, 0156, 0164, 0145, + 0162, 0146, 0141, 0143, 0145, 0076, 0074, 0057, 0156, 0157, 0144, 0145, 0076, 0012, 0000, 0000, + 0050, 0165, 0165, 0141, 0171, 0051, 0150, 0141, 0144, 0145, 0163, 0163, 0057, 0000, 0000, 0000, + 0002, 0000, 0000, 0000 } }; +#else /* _MSC_VER */ +static const SECTION union { const guint8 data[1061]; const double alignment; void * const ptr;} switcheroo_control_resource_data = { + "\107\126\141\162\151\141\156\164\000\000\000\000\000\000\000\000" + "\030\000\000\000\254\000\000\000\000\000\000\050\005\000\000\000" + "\000\000\000\000\002\000\000\000\003\000\000\000\003\000\000\000" + "\005\000\000\000\112\216\217\013\001\000\000\000\254\000\000\000" + "\004\000\114\000\260\000\000\000\264\000\000\000\324\265\002\000" + "\377\377\377\377\264\000\000\000\001\000\114\000\270\000\000\000" + "\274\000\000\000\310\175\113\203\004\000\000\000\274\000\000\000" + "\022\000\114\000\320\000\000\000\324\000\000\000\052\353\150\045" + "\002\000\000\000\324\000\000\000\040\000\166\000\370\000\000\000" + "\026\004\000\000\121\127\003\223\000\000\000\000\026\004\000\000" + "\007\000\114\000\040\004\000\000\044\004\000\000\156\145\164\057" + "\004\000\000\000\057\000\000\000\000\000\000\000\123\167\151\164" + "\143\150\145\162\157\157\103\157\156\164\162\157\154\057\000\000" + "\003\000\000\000\156\145\164\056\150\141\144\145\163\163\056\123" + "\167\151\164\143\150\145\162\157\157\103\157\156\164\162\157\154" + "\056\170\155\154\000\000\000\000\016\003\000\000\000\000\000\000" + "\074\077\170\155\154\040\166\145\162\163\151\157\156\075\042\061" + "\056\060\042\077\076\012\074\041\104\117\103\124\131\120\105\040" + "\156\157\144\145\040\120\125\102\114\111\103\040\042\055\057\057" + "\146\162\145\145\144\145\163\153\164\157\160\057\057\104\124\104" + "\040\104\055\102\125\123\040\117\142\152\145\143\164\040\111\156" + "\164\162\157\163\160\145\143\164\151\157\156\040\061\056\060\057" + "\057\105\116\042\040\042\150\164\164\160\072\057\057\167\167\167" + "\056\146\162\145\145\144\145\163\153\164\157\160\056\157\162\147" + "\057\163\164\141\156\144\141\162\144\163\057\144\142\165\163\057" + "\061\056\060\057\151\156\164\162\157\163\160\145\143\164\056\144" + "\164\144\042\076\012\074\156\157\144\145\076\074\041\055\055\012" + "\040\040\040\040\040\040\156\145\164\056\150\141\144\145\163\163" + "\056\123\167\151\164\143\150\145\162\157\157\103\157\156\164\162" + "\157\154\072\012\040\040\040\040\040\040\100\163\150\157\162\164" + "\137\144\145\163\143\162\151\160\164\151\157\156\072\040\104\055" + "\102\165\163\040\160\162\157\170\171\040\164\157\040\141\143\143" + "\145\163\163\040\144\165\141\154\055\107\120\125\040\143\157\156" + "\164\162\157\154\163\056\012\012\040\040\040\040\040\040\101\146" + "\164\145\162\040\143\150\145\143\153\151\156\147\040\164\150\145" + "\040\141\166\141\151\154\141\142\151\154\151\164\171\040\157\146" + "\040\164\167\157\040\163\167\151\164\143\150\141\142\154\145\040" + "\107\120\125\163\040\151\156\040\164\150\145\040\155\141\143\150" + "\151\156\145\054\012\040\040\040\040\040\040\143\150\145\143\153" + "\040\164\150\145\040\166\141\154\165\145\040\157\146\040\156\145" + "\164\056\150\141\144\145\163\163\056\123\167\151\164\143\150\145" + "\162\157\157\103\157\156\164\162\157\154\056\110\141\163\104\165" + "\141\154\107\160\165\040\164\157\040\163\145\145\012\040\040\040" + "\040\040\040\151\146\040\162\165\156\156\151\156\147\040\141\160" + "\160\154\151\143\141\164\151\157\156\163\040\157\156\040\164\150" + "\145\040\144\151\163\143\162\145\164\145\040\107\120\125\040\163" + "\150\157\165\154\144\040\142\145\040\157\146\146\145\162\145\144" + "\056\012\012\040\040\040\040\040\040\124\150\145\040\157\142\152" + "\145\143\164\040\160\141\164\150\040\167\151\154\154\040\142\145" + "\040\042\057\156\145\164\057\150\141\144\145\163\163\057\123\167" + "\151\164\143\150\145\162\157\157\103\157\156\164\162\157\154\042" + "\056\012\040\040\055\055\076\074\151\156\164\145\162\146\141\143" + "\145\040\156\141\155\145\075\042\156\145\164\056\150\141\144\145" + "\163\163\056\123\167\151\164\143\150\145\162\157\157\103\157\156" + "\164\162\157\154\042\076\074\041\055\055\012\040\040\040\040\040" + "\040\040\040\110\141\163\104\165\141\154\107\160\165\072\012\012" + "\040\040\040\040\040\040\040\040\127\150\145\164\150\145\162\040" + "\164\167\157\040\163\167\151\164\143\150\141\142\154\145\040\107" + "\120\125\163\040\141\162\145\040\160\162\145\163\145\156\164\040" + "\157\156\040\164\150\145\040\163\171\163\164\145\155\056\012\040" + "\040\040\040\055\055\076\074\160\162\157\160\145\162\164\171\040" + "\156\141\155\145\075\042\110\141\163\104\165\141\154\107\160\165" + "\042\040\164\171\160\145\075\042\142\042\040\141\143\143\145\163" + "\163\075\042\162\145\141\144\042\057\076\074\057\151\156\164\145" + "\162\146\141\143\145\076\074\057\156\157\144\145\076\012\000\000" + "\050\165\165\141\171\051\150\141\144\145\163\163\057\000\000\000" + "\002\000\000\000" }; +#endif /* !_MSC_VER */ -static GStaticResource static_resource = { switcheroo_control_resource_data.data, sizeof (switcheroo_control_resource_data.data), NULL, NULL, NULL }; +static GStaticResource static_resource = { switcheroo_control_resource_data.data, sizeof (switcheroo_control_resource_data.data) - 1 /* nul terminator */, NULL, NULL, NULL }; extern GResource *switcheroo_control_get_resource (void); GResource *switcheroo_control_get_resource (void) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/switcheroo-control-1.2/src/switcheroo-control.c new/switcheroo-control-1.3.1/src/switcheroo-control.c --- old/switcheroo-control-1.2/src/switcheroo-control.c 2016-11-04 17:11:17.000000000 +0100 +++ new/switcheroo-control-1.3.1/src/switcheroo-control.c 2019-06-17 12:19:12.000000000 +0200 @@ -237,6 +237,8 @@ if (ret < 0) { g_warning ("could not force the integrated card on: %s", g_strerror (errno)); + } else { + g_debug ("Forced the integrated card as the default successfully"); } } @@ -248,28 +250,27 @@ /* g_setenv ("G_MESSAGES_DEBUG", "all", TRUE); */ /* Check for VGA switcheroo availability */ + if (!g_file_test (SWITCHEROO_SYSFS_PATH, G_FILE_TEST_IS_REGULAR)) { + g_debug ("No switcheroo support available"); + return 0; + } + + /* Try to force the integrated card to be the default card */ fd = open (SWITCHEROO_SYSFS_PATH, O_WRONLY); - if (fd < 0) { + if (fd > 0) { + force_integrate_card (fd); + close (fd); + } else { int err = errno; - switch (err) { - case EACCES: - g_warning ("switcheroo-control needs to run as root"); - break; - case ENOENT: - g_debug ("No switcheroo support available"); - /* not an error */ - return 0; - default: + if (err != EPERM) { g_warning ("switcheroo-control could not query vga_switcheroo status: %s", g_strerror (err)); + return 1; } - return 1; - } - /* And force the integrated card to be the default card */ - force_integrate_card (fd); - close (fd); + g_debug ("SecureBoot mode, can't force integrated card"); + } data = g_new0 (ControlData, 1); data->available = TRUE;
