compiler warning fixes and cmake support

Author: jwinarske

.gitignore

@@ -10,4 +10,5 @@ mazda/installer/config/androidauto/data_persist/dev/bin/headunit
 *.creator.user
 bin/
 */version\.h
-.vscode
+.vscode
+build

cmake/deps.cmake

@@ -0,0 +1,54 @@
+
+find_package(Threads REQUIRED)
+find_package(OpenSSL REQUIRED)
+find_package(Protobuf REQUIRED)
+find_package(SDL2 REQUIRED)
+find_package(ALSA REQUIRED)
+find_package(X11 REQUIRED)
+
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_EXECUTABLE)
+
+    pkg_check_modules(GST REQUIRED gstreamer-1.0
+                                gstreamer-video-1.0
+                                gstreamer-app-1.0
+                                gstreamer-audio-1.0
+                                gstreamer-codecparsers-1.0)
+
+    pkg_check_modules(USB REQUIRED libusb-1.0)
+    pkg_check_modules(GTK3 REQUIRED gtk+-3.0)
+    pkg_check_modules(UNWIND REQUIRED libunwind)
+    pkg_check_modules(UDEV REQUIRED libudev)
+endif()
+
+find_package(Git)
+if(GIT_EXECUTABLE)
+    execute_process(
+        WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+        COMMAND "${GIT_EXECUTABLE}" describe --tags --always
+        OUTPUT_VARIABLE GIT_HASH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+    )
+	set(BUILD_HASH ${GIT_HASH})
+
+	if (NOT REPRODUCIBLE)
+		execute_process(
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMAND "whoami"
+			OUTPUT_VARIABLE GIT_USER
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			)
+		execute_process(
+			WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+			COMMAND "hostname"
+			OUTPUT_VARIABLE GIT_HOST
+			OUTPUT_STRIP_TRAILING_WHITESPACE
+			)
+		string(REGEX REPLACE "([^\\])[\\]([^\\])" "\\1\\\\\\\\\\2" GIT_USER ${GIT_USER})
+		set(BUILD_HASH ${GIT_USER}@${GIT_HOST}-${GIT_HASH})
+	endif()
+
+    message("Git commit hash: ${BUILD_HASH}")
+
+    configure_file(cmake/version.in.h ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
+endif()

cmake/version.in.h

@@ -0,0 +1,2 @@
+
+#define HEADUNIT_VERSION "@BUILD_HASH@"

common/audio.h

@@ -2,7 +2,7 @@
 
 #include <glib.h>
 #include <stdio.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
 #include <thread>
 
 #include "hu_uti.h"

hu/hu_aad.cpp

@@ -234,13 +234,13 @@ Channel specified for each service:
 
     if (log_dmp) {
       //logd ("iaad_dmp_arry n: %d  num: %d  alen: %ld", n, num, alen); // Dump raw array
-      char str_buf [256] = {0};
+      char str_buf [255] = {0};
       int ctr = 0;
       for (ctr = 0; ctr < n - 1; ctr ++)
         strncat (str_buf, "                    ", sizeof(str_buf) - strlen(str_buf) - 1);
 
       char str_buf2 [256] = {0};
-      snprintf (str_buf2, sizeof (str_buf), "%s%1.1u", str_buf, num);   // Dump raw array
+      snprintf (str_buf2, sizeof (str_buf2), "%s%1.1u", str_buf, num);   // Dump raw array
       hex_dump (str_buf2, 16, buf, alen);
     }
 

hu/hu_aap.cpp

@@ -1166,6 +1166,7 @@
       delete ptr;
       loge("hu_queue_command error %d", ret);
     }
+    return ret;
   }
 
   int HUServer::hu_aap_shutdown()

hu/hu_ssl.cpp

@@ -138,7 +138,7 @@
     else
       logd ("BIO_free(pkey_bio) ret: %d", ret);
 
-    hu_ssl_method = (SSL_METHOD *) TLSv1_2_client_method ();
+    hu_ssl_method = (SSL_METHOD *)SSLv23_client_method();
     if (hu_ssl_method == NULL) {
       loge ("TLSv1_2_client_method() error");
       return (-1);

hu/hu_usb.cpp

@@ -5,7 +5,7 @@
 #include <algorithm>
 
 
-#include <libusb.h>
+#include <libusb-1.0/libusb.h>
 
 #ifndef LIBUSB_LOG_LEVEL_NONE
 #define LIBUSB_LOG_LEVEL_NONE     0
@@ -355,7 +355,7 @@ int HUTransportStreamUSB::Start(bool waitForDevice) {
       return (-1);
   }
 
-  libusb_set_debug(iusb_ctx, LIBUSB_LOG_LEVEL_INFO);
+  libusb_set_option(iusb_ctx, LIBUSB_OPTION_LOG_LEVEL, LIBUSB_LOG_LEVEL_INFO);
 
   //See if there is a OAP device already
   while ((iusb_dev_hndl = find_oap_device()) == nullptr)

hu/hu_uti.cpp

@@ -102,7 +102,7 @@ int hu_log (int prio, const char * tag, const char * func, const char * fmt, ...
   //Time doesn't work on CMU anyway, always says 1970
   time_t timestamp;
   time(&timestamp);
-  printf ("%d %s: %s: %s : %s\n", timestamp, prio_get (prio), tag, func, log_line);
+  printf ("%ld %s: %s: %s : %s\n", timestamp, prio_get (prio), tag, func, log_line);
 
   va_end(aq);
 #endif

mazda/callbacks.h

@@ -7,7 +7,7 @@
 #include "command_server.h"
 #include "audio.h"
 #include <dbus-c++/dbus.h>
-#include <asoundlib.h>
+#include <alsa/asoundlib.h>
 
 #include "dbus/generated_cmu.h"
 #include "version.h"