Fix build

CMakeLists.txt

@@ -4,7 +4,7 @@
 # Copyright (c) 2016-2024, Olivier Martin <[email protected]>
 #
 
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.25.1)
 
 # Add Cross-Compilation support when the environment variables
 # CROSS_COMPILE and SYSROOT are defined
@@ -61,7 +61,7 @@ endif()
 # With 'syslog' backend, we enable all logs (ie: up to level debug) and we leave the
 # application to set the level using 'setlogmask()'
 set(GATTLIB_LOG_LEVEL 3 CACHE STRING "Define the minimum logging level for Gattlib (0=error, 1=warning, 2=info, 3=debug)")
-set(GATTLIB_LOG_BACKEND syslog CACHE STRING "Define logging backend: syslog, printf (default: syslog)")
+set(GATTLIB_LOG_BACKEND syslog CACHE STRING "Define logging backend: syslog, printf, python (default: syslog)")
 
 if (GATTLIB_DBUS)
   # Build dbus-based gattlib

bluez/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,14 +19,14 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 
 message("Build gattlib for Bluez v${BLUEZ_VERSION_MAJOR}.${BLUEZ_VERSION_MINOR}")
 
 set(bluez4_DIR bluez4)
-set(bluez5_DIR bluez5) 
+set(bluez5_DIR bluez5)
 
 # Bluez specific files
 set(bluez4_SRCS ${bluez4_DIR}/attrib/att.c
@@ -109,12 +109,12 @@ include(GNUInstallDirs)
 if(GATTLIB_SHARED_LIB)
   add_library(gattlib SHARED ${gattlib_SRCS})
   target_link_libraries(gattlib ${gattlib_LIBS})
-  
+
   install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 else()
   add_library(gattlib ${gattlib_SRCS})
   target_include_directories(gattlib INTERFACE ../include)
   target_link_libraries(gattlib ${gattlib_LIBS})
-  
+
   install(TARGETS gattlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
 endif()

common/logging_backend/python/gattlib_logging.c

@@ -0,0 +1,56 @@
+/*
+ * SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later
+ *
+ * Copyright (c) 2024, Olivier Martin <[email protected]>
+ */
+
+#include <syslog.h>
+
+#include "gattlib_internal.h"
+
+static PyObject* m_logging_func;
+
+void gattlib_log_init(PyObject* logging_func) {
+	m_logging_func = logging_func;
+}
+
+void gattlib_log(int level, const char *format, ...) {
+	va_list args;
+	va_start(args, format);
+
+	if (m_logging_func == NULL) {
+		FILE *stream = stdout;
+
+		if (level == GATTLIB_ERROR) {
+			stream = stderr;
+		}
+
+		vfprintf(stream, format, args);
+		fprintf(stream, "\n");
+	} else {
+		PyGILState_STATE d_gstate;
+		PyObject *result;
+		char string[400];
+
+		vsnprintf(string, sizeof(string), format, args);
+
+		d_gstate = PyGILState_Ensure();
+
+		PyObject *arglist = Py_BuildValue("Is", level, string);
+#if PYTHON_VERSION >= PYTHON_VERSIONS(3, 9)
+		result = PyObject_Call(m_logging_func, arglist, NULL);
+#else
+		result = PyEval_CallObject(m_logging_func, arglist);
+#endif
+		Py_DECREF(arglist);
+
+		if (result == NULL) {
+			GATTLIB_LOG(GATTLIB_ERROR, "Python notification handler has raised an exception.");
+			PyErr_Print();
+		}
+
+		PyGILState_Release(d_gstate);
+	}
+
+	va_end(args);
+}

dbus/CMakeLists.txt

@@ -4,7 +4,7 @@
 # Copyright (c) 2016-2024, Olivier Martin <[email protected]>
 #
 
-cmake_minimum_required(VERSION 3.0)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 
@@ -103,12 +103,17 @@ if(GATTLIB_PYTHON_INTERFACE)
     set(Python_USE_STATIC_LIBS TRUE)
   endif()
   find_package(Python COMPONENTS Interpreter Development)
-  if (Python_Development_FOUND)
-	include_directories(${Python_INCLUDE_DIRS})
-	list(APPEND gattlib_LIBS ${Python_LIBRARIES})
-
-	add_definitions(-DWITH_PYTHON -DPYTHON_VERSION_MAJOR=${Python_VERSION_MAJOR} -DPYTHON_VERSION_MINOR=${Python_VERSION_MINOR})
+  if (NOT Python_Development_FOUND)
+    find_package(Python COMPONENTS Development.Module)
+    if (NOT Python_Development.Module_FOUND)
+      message(FATAL_ERROR "Could not find Python developer package")
+    endif()
   endif()
+
+  include_directories(${Python_INCLUDE_DIRS})
+  list(APPEND gattlib_LIBS ${Python_LIBRARIES})
+
+  add_definitions(-DWITH_PYTHON -DPYTHON_VERSION_MAJOR=${Python_VERSION_MAJOR} -DPYTHON_VERSION_MINOR=${Python_VERSION_MINOR})
 endif()
 
 # Gattlib

examples/advertisement_data/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/ble_scan/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/discover/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/find_eddystone/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/gatttool/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/nordic_uart/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/notification/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/read_write/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

examples/read_write_memory/CMakeLists.txt

@@ -1,7 +1,7 @@
 #
 #  GattLib - GATT Library
 #
-#  Copyright (C) 2016-2021  Olivier Martin <[email protected]>
+#  Copyright (C) 2016-2024  Olivier Martin <[email protected]>
 #
 #
 #  This program is free software; you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 #  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.25.1)
 
 find_package(PkgConfig REQUIRED)
 

gattlib-py/gattlib/__init__.py

@@ -11,6 +11,28 @@
 
 gattlib = CDLL("libgattlib.so")
 
+def native_logging(level: int, string: str):
+    if level == 3:
+        logger.debug(string)
+    elif level == 2:
+        logger.info(string)
+    elif level == 1:
+        logger.warning(string)
+    elif level == 0:
+        logger.error(string)
+    else:
+        logger.debug(string)
+
+try:
+    # void gattlib_log_init(PyObject* logging_func)
+    gattlib_log_init = gattlib.gattlib_log_init
+    gattlib_log_init.argtypes = [py_object]
+
+    # Declare Python function for logging native string
+    gattlib_log_init(native_logging)
+except AttributeError:
+    # Excepted when using a Gattlib logging backend without 'gattlib_log_init'
+    pass
 
 # typedef struct {
 #    uint8_t data[16];

gattlib-py/setup.py

@@ -78,7 +78,10 @@ def build_extension(self, ext: CMakeExtension) -> None:
             cmake_args += [item for item in os.environ["CMAKE_ARGS"].split(" ") if item]
 
         # In this example, we pass in the version to C++. You might not need to.
-        cmake_args += [f"-DEXAMPLE_VERSION_INFO={self.distribution.get_version()}", "-DGATTLIB_BUILD_EXAMPLES=NO"]
+        cmake_args += [
+            f"-DEXAMPLE_VERSION_INFO={self.distribution.get_version()}",
+            "-DGATTLIB_BUILD_EXAMPLES=NO",
+            "-DGATTLIB_LOG_BACKEND=python"]
 
         if self.compiler.compiler_type != "msvc":
             # Using Ninja-build since it a) is available as a wheel and b)