Update upstream source from tag 'upstream/1.10.1'

Update to upstream version '1.10.1'
with Debian dir e60c41769d4e52b2a2bf9f34a838448ce7cc87c0

diff --git a/Makefile b/Makefile
index 55596e2387a4dc8babb034d8c9192f49b3a328d7..c53510b8075e0f68673b80f867e03ff46b2dbc6d 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,8 @@
 DESTDIR=/
 PREFIX=/usr/
 RPM_SPEC=contrib/packaging/rpm/autorandr.spec
-CFLAGS=-O2
+CFLAGS?=-O2 -Wall
+CLEANUP_FILES=
 
 .PHONY: all install uninstall autorandr bash_completion autostart_config pmutils systemd udev
 
@@ -24,9 +25,11 @@ all:
        @echo
        @echo 'E.g. "make install TARGETS='autorandr pmutils' PM_UTILS_DIR=/etc/pm/sleep.d".'
        @echo
-       @echo "By default, if xcb libraries are available, autorandr prefers to"
-       @echo "install a launcher that listens for X11 randr events and runs"
-       @echo "autorandr whenever something changes, over udev/systemd rules."
+       @echo "An additional TARGETS variable \"launcher\" is available. This"
+       @echo "installs a launcher called \"autorandr_launcher\". The launcher"
+       @echo "is able to be run by the user and calls autorandr automatically"
+       @echo "without using udev rules. The launcher is an alternative to the"
+       @echo "udev/systemd setup that is more stable for some users."
        @echo
        @echo "The following additional targets are available:"
        @echo
@@ -140,20 +143,20 @@ uninstall_manpage:
        rm -f ${DESTDIR}/${MANDIR}/autorandr.1
 
 # Rules for launcher
-LAUNCHER_FLAGS=$(shell pkg-config --libs --cflags pkg-config xcb xcb-randr 2>/dev/null)
-ifneq (,$(LAUNCHER_FLAGS))
-DEFAULT_TARGETS+=launcher
-DEFAULT_TARGETS:=$(filter-out systemd udev,$(DEFAULT_TARGETS))
-endif
-
-install_launcher:
-       gcc -Wall $(CFLAGS) contrib/autorandr_launcher/autorandr_launcher.c -o contrib/autorandr_launcher/autorandr-launcher $(LAUNCHER_FLAGS)
+LAUNCHER_LDLIBS=$(shell pkg-config --libs pkg-config xcb xcb-randr 2>/dev/null)
+ifneq (,$(LAUNCHER_LDLIBS))
+CLEANUP_FILES+=contrib/autorandr_launcher/autorandr-launcher
+LAUNCHER_CFLAGS=$(shell pkg-config --cflags pkg-config xcb xcb-randr 2>/dev/null)
+contrib/autorandr_launcher/autorandr-launcher: contrib/autorandr_launcher/autorandr_launcher.c
+       $(CC) $(CFLAGS) $(LAUNCHER_CFLAGS) -o $@ $+ $(LDFLAGS) $(LAUNCHER_LDLIBS) $(LDLIBS)
+
+install_launcher: contrib/autorandr_launcher/autorandr-launcher
        install -D -m 755 contrib/autorandr_launcher/autorandr-launcher ${DESTDIR}${PREFIX}/bin/autorandr-launcher
-
        install -D -m 644 contrib/etc/xdg/autostart/autorandr-launcher.desktop ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-launcher.desktop
 ifneq ($(PREFIX),/usr/)
        sed -i -re 's#/usr/bin/autorandr-launcher#$(subst #,\#,${PREFIX})/bin/autorandr-launcher#g' ${DESTDIR}/${XDG_AUTOSTART_DIR}/autorandr-launcher.desktop
 endif
+endif
 
 uninstall_launcher:
        rm -f ${DESTDIR}${PREFIX}/bin/autorandr-launcher
@@ -169,3 +172,6 @@ deb:
 rpm:
        spectool -g -R $(RPM_SPEC)
        rpmbuild -ba $(RPM_SPEC)
+
+clean:
+       rm -f $(CLEANUP_FILES)

diff --git a/README.md b/README.md
index 0f2012e2ffb1f7ff345f748857c01c2c9bf95eb2..b1cc76de5f0fd23a170879ac2139438c60cbe00a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -214,6 +214,9 @@ profiles matching multiple (or any) monitors.
 
 ## Changelog
 
+**autorandr 1.10.1**
+* *2020-05-04* Revert making the launcher the default (fixes #195)
+
 **autorandr 1.10**
 * *2020-04-23* Fix hook script execution order to match description from readme
 * *2020-04-11* Handle negative gamma values (fixes #188)

diff --git a/autorandr.py b/autorandr.py
index f7356a08a56bd99c67c8076ec6e4d56ed0cb62a5..824a7dbae0e52fca4deb79349c034e70e8ba1da1 100755 (executable)
--- a/autorandr.py
+++ b/autorandr.py
@@ -48,7 +48,7 @@ if sys.version_info.major == 2:
 else:
     import configparser
 
-__version__ = "1.10"
+__version__ = "1.10.1"
 
 try:
     input = raw_input

diff --git a/contrib/autorandr_launcher/autorandr_launcher.c b/contrib/autorandr_launcher/autorandr_launcher.c
index 923ab98451f8bb01cefb3c3a8de76f535e1b11db..385d16f9370a5acffa5499e55b6c01af145a8860 100644 (file)
--- a/contrib/autorandr_launcher/autorandr_launcher.c
+++ b/contrib/autorandr_launcher/autorandr_launcher.c
@@ -108,7 +108,10 @@ int main(int argc, char **argv)
                sigaction(SIGTERM, &sa, NULL);
                sigaction(SIGQUIT, &sa, NULL);
                signal(SIGHUP, SIG_IGN);
-               daemon(0, 0);
+               if (daemon(0, 0)) {
+                       fprintf(stderr, "Failed to daemonize!\n");
+                       exit(1);
+               }
        }
 
        int screenNum;
@@ -140,6 +143,10 @@ int main(int argc, char **argv)
 
                ar_log("Waiting for event\n");
                xcb_generic_event_t *evt = xcb_wait_for_event(c);
+               if (!evt) {
+                       break;
+               }
+
                // ar_log("Event type: %" PRIu8 "\n", evt->response_type);
                // ar_log("screen change masked: %" PRIu8 "\n",
                //       evt->response_type &

diff --git a/contrib/etc/xdg/autostart/autorandr-launcher.desktop b/contrib/etc/xdg/autostart/autorandr-launcher.desktop
index 1a5bff08c75664a2d267aae5addd5db381f6eaf4..ea8284aff202273be7392ff56aaff5c8cbecce3a 100644 (file)
--- a/contrib/etc/xdg/autostart/autorandr-launcher.desktop
+++ b/contrib/etc/xdg/autostart/autorandr-launcher.desktop
@@ -2,5 +2,5 @@
 Name=Autorandr Launcher
 Comment=Automatically run autorandr whenever the configuration changes
 Type=Application
-Exec=/usr/bin/autorandr-launcher
+Exec=/usr/bin/autorandr-launcher --daemonize
 X-GNOME-Autostart-Phase=Initialization

diff --git a/setup.py b/setup.py
index 75713a8fc68bb05dcb89adec154d19d9227f21be..a98a689e5ebdb9b24cb6d748304cd30cff55ef9b 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -9,7 +9,7 @@ except:
 setup(
     name='autorandr',
 
-    version='1.10.post1',
+    version='1.10.1.post1',
 
     description='Automatically select a display configuration based on connected devices',
     long_description=long_description,