From 955a39b5ea3acf84926308a9bec1f33af739b11e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5vard=20F=2E=20Aasen?= Date: Sat, 16 Dec 2023 22:18:42 +0100 Subject: [PATCH 1/2] Update build-dependency for OpenGL The package 'libgl1-mesa-dev' has been superseded by 'libgl-dev' in unstable, 'libgl-dev' is searched for first. 'libgl1-mesa-swx11-dev' is so old that it does not exist on any supported distribution. --- debian/control.top.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control.top.in b/debian/control.top.in index bad7980b4ec..8fc1c21101a 100644 --- a/debian/control.top.in +++ b/debian/control.top.in @@ -23,7 +23,7 @@ Build-Depends: intltool, libboost-python-dev, libepoxy-dev, - libgl1-mesa-dev | libgl1-mesa-swx11-dev, + libgl-dev | libgl1-mesa-dev, libglu1-mesa-dev, libgtk2.0-dev, libgtk-3-dev, From 167bcd116fd4b5fd4c64eec5f7b5388d08decae6 Mon Sep 17 00:00:00 2001 From: andypugh Date: Sun, 17 Dec 2023 10:07:01 +0000 Subject: [PATCH 2/2] motion.c: Missed something from commit 7428898 --- src/emc/motion/motion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/emc/motion/motion.c b/src/emc/motion/motion.c index ea4368f2437..febe7f3ff3f 100644 --- a/src/emc/motion/motion.c +++ b/src/emc/motion/motion.c @@ -348,7 +348,7 @@ int rtapi_app_main(void) else if(names_misc_errors[0]){ num_misc_error = count_names(names_misc_errors); } - else { + else if (num_misc_error < 0) { num_misc_error = DEFAULT_MISC_ERROR; }