From be1f94671dc0e6e348e423cd8b49ab7e62843d89 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Thu, 27 Mar 2025 06:13:23 +0200 Subject: [PATCH] Version 1.1.22 --- Makefile | 2 ++ debian/changelog | 6 ++++++ lib/Makefile | 4 +++- lib/include/binder_ext_call.h | 3 ++- lib/include/binder_ext_call_impl.h | 3 ++- rpm/ofono-binder-plugin.spec | 9 ++++++--- 6 files changed, 21 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6966587..8916db8 100644 --- a/Makefile +++ b/Makefile @@ -93,6 +93,8 @@ STRIP ?= strip WARNINGS = -Wall BASE_FLAGS = -fPIC -fvisibility=hidden FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) -MMD -MP \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \ $(shell pkg-config --cflags $(PKGS)) -I$(EXTLIB_DIR)/include FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared \ $(shell pkg-config --libs $(LDPKGS)) diff --git a/debian/changelog b/debian/changelog index 8cd9c36..ddd71f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libofonobinderpluginext (1.1.22) unstable; urgency=low + + * Add support for external ringback tone + + -- Slava Monich Thu, 27 Mar 2025 05:56:56 +0200 + libofonobinderpluginext (1.1.0) unstable; urgency=low * Stable release of the extension API diff --git a/lib/Makefile b/lib/Makefile index e18b43c..4ec47f1 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -25,7 +25,7 @@ all: debug release pkgconfig VERSION_MAJOR = 1 VERSION_MINOR = 1 -VERSION_RELEASE = 21 +VERSION_RELEASE = 22 # Version for pkg-config PCVERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) @@ -76,6 +76,8 @@ WARNINGS = -Wall -Wstrict-aliasing -Wunused-result INCLUDES = -I$(INCLUDE_DIR) BASE_FLAGS = -fPIC FULL_CFLAGS = $(BASE_FLAGS) $(CFLAGS) $(DEFINES) $(WARNINGS) $(INCLUDES) \ + -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 \ + -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_MAX_ALLOWED \ -MMD -MP $(shell pkg-config --cflags $(PKGS)) FULL_LDFLAGS = $(BASE_FLAGS) $(LDFLAGS) -shared -Wl,-soname,$(LIB_SONAME) \ $(shell pkg-config --libs $(PKGS)) -lpthread diff --git a/lib/include/binder_ext_call.h b/lib/include/binder_ext_call.h index 98b9b0a..d3d4302 100644 --- a/lib/include/binder_ext_call.h +++ b/lib/include/binder_ext_call.h @@ -2,6 +2,7 @@ * oFono - Open Source Telephony - binder based adaptation * * Copyright (C) 2022 Jolla Ltd. + * Copyright (C) 2025 Slava Monich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -298,7 +299,7 @@ gulong binder_ext_call_add_ringback_tone_handler( BinderExtCall* ext, BinderExtCallRingbackToneFunc handler, - void* user_data); + void* user_data); /* Since 1.1.22 */ void binder_ext_call_remove_handlers( diff --git a/lib/include/binder_ext_call_impl.h b/lib/include/binder_ext_call_impl.h index bca2f74..c957add 100644 --- a/lib/include/binder_ext_call_impl.h +++ b/lib/include/binder_ext_call_impl.h @@ -2,6 +2,7 @@ * oFono - Open Source Telephony - binder based adaptation * * Copyright (C) 2022 Jolla Ltd. + * Copyright (C) 2025 Slava Monich * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -81,7 +82,7 @@ typedef struct binder_ext_call_interface { BinderExtCallSuppSvcNotifyFunc handler, void* user_data); void (*remove_handler)(BinderExtCall* ext, gulong id); gulong (*add_ringback_tone_handler)(BinderExtCall* ext, - BinderExtCallRingbackToneFunc handler, void* user_data); + BinderExtCallRingbackToneFunc handler, void* user_data); /* Since 1.1.22 */ /* Padding for future expansion */ void (*_reserved1)(void); diff --git a/rpm/ofono-binder-plugin.spec b/rpm/ofono-binder-plugin.spec index e3e4d26..86f1e67 100644 --- a/rpm/ofono-binder-plugin.spec +++ b/rpm/ofono-binder-plugin.spec @@ -1,6 +1,6 @@ Name: ofono-binder-plugin -Version: 1.1.21 +Version: 1.1.22 Release: 1 Summary: Binder based ofono plugin License: GPLv2 @@ -11,7 +11,8 @@ Source: %{name}-%{version}.tar.bz2 %define libgbinder_version 1.1.29 %define libgbinder_radio_version 1.6.0 %define libmce_version 1.0.6 -%define libofonobinderpluginext_version 1.1.0 +%define libofonobinderpluginext_version 1.1.22 +%define glib_version 2.32 %define ofono_version 1.29+git8 BuildRequires: pkgconfig @@ -20,7 +21,7 @@ BuildRequires: pkgconfig(libgbinder) >= %{libgbinder_version} BuildRequires: pkgconfig(libgbinder-radio) >= %{libgbinder_radio_version} BuildRequires: pkgconfig(libglibutil) >= %{libglibutil_version} BuildRequires: pkgconfig(libmce-glib) >= %{libmce_version} -BuildRequires: pkgconfig(glib-2.0) +BuildRequires: pkgconfig(glib-2.0) >= %{glib_version} # license macro requires rpm >= 4.11 BuildRequires: pkgconfig(rpm) @@ -35,6 +36,7 @@ Requires: libgbinder >= %{libgbinder_version} Requires: libgbinder-radio >= %{libgbinder_radio_version} Requires: libglibutil >= %{libglibutil_version} Requires: libmce-glib >= %{libmce_version} +Requires: glib2 >= %{glib_version} Conflicts: ofono-ril-plugin Obsoletes: ofono-ril-plugin @@ -88,6 +90,7 @@ Requires: pkgconfig(glib-2.0) Requires: pkgconfig(libgbinder-radio) >= %{libgbinder_radio_version} Requires: pkgconfig(libglibutil) >= %{libglibutil_version} Requires: libofonobinderpluginext = %{version} +Requires: glib2 >= %{glib_version} %post -n libofonobinderpluginext -p /sbin/ldconfig