From 30f5e04a5148f3c6bb4d45e25c160895316ade24 Mon Sep 17 00:00:00 2001 From: luigino Date: Thu, 21 Jun 2018 17:55:21 +0200 Subject: [PATCH 1/3] Add return value to non-void function template --- src/projectM-qt/nullable.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/projectM-qt/nullable.hpp b/src/projectM-qt/nullable.hpp index 88e4a37bc..e491a9798 100644 --- a/src/projectM-qt/nullable.hpp +++ b/src/projectM-qt/nullable.hpp @@ -31,6 +31,8 @@ class Nullable { Nullable & operator=(const Value & value) { m_value = value; m_hasValue = true; + static Nullable tmp = 0; + return tmp; } void nullify() { From 5a99cf7da19a933d37ae2c1f86a80adc7d8ba5d3 Mon Sep 17 00:00:00 2001 From: luigino Date: Thu, 21 Jun 2018 17:56:10 +0200 Subject: [PATCH 2/3] Also search for rcc-qt5 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 5983f4a61..9cf027aa3 100644 --- a/configure.ac +++ b/configure.ac @@ -117,7 +117,7 @@ AS_IF([test "x$enable_qt" = "xyes"], [ AC_CHECK_PROGS(MOC, [moc-qt5 moc]) AC_CHECK_PROGS(UIC, [uic-qt5 uic]) - AC_CHECK_PROGS(RCC, [rcc]) + AC_CHECK_PROGS(RCC, [rcc-qt5 rcc]) if test -z "$MOC" || test -z "$UIC" || test -z "$RCC"; then AC_MSG_ERROR([Qt utility programs moc, uic, and rcc are required.]) fi From 244680861537b03c571cf71e2fc583da10662190 Mon Sep 17 00:00:00 2001 From: luigino Date: Thu, 21 Jun 2018 17:57:04 +0200 Subject: [PATCH 3/3] Use correct SOVERSION for libprojectM.so --- src/libprojectM/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libprojectM/Makefile.am b/src/libprojectM/Makefile.am index 12d16cac4..f08665d26 100644 --- a/src/libprojectM/Makefile.am +++ b/src/libprojectM/Makefile.am @@ -14,7 +14,7 @@ AM_CPPFLAGS = \ lib_LTLIBRARIES = libprojectM.la # public, possibly-shared library # link flags -libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 0:2:0 +libprojectM_la_LDFLAGS = $(CG_LDFLAGS) -no-undefined -version-info 2:0:0 # link libRenderer, MilkdropPresetFactory, NativePresetFactory, and libprojectM sources libprojectM_la_LIBADD = \