Changes - SailfishOS Open Build Service

Changes of Revision 14

[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.changes
@@ -1,3 +1,9 @@ +* Mon Mar 01 2021 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 14.2.88 +- [modules] Add missing include. JB#47666 + +* Fri Feb 26 2021 Matti Lehtimäki <matti.lehtimaki@jolla.com> - 12.2.87 +- [packaging] Support new droid-devel header location. JB#51449 + * Wed Oct 21 2020 Juho Hämäläinen <juho.hamalainen@jolla.com> - 12.2.86 - [parser-xml] Support module includes in configuration files. Fixes JB#51666
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.spec ^
@@ -5,7 +5,7 @@ Name: pulseaudio-modules-droid Summary: PulseAudio Droid HAL modules -Version: 12.2.86 +Version: 14.2.88 Release: 1 License: LGPLv2+ URL: https://github.com/mer-hybris/pulseaudio-modules-droid @@ -45,7 +45,11 @@ %build echo "%{moduleversion}" > .tarball-version # Obtain the DEVICE from the same source as used in /etc/os-release +if [ -e "%{_includedir}/droid-devel/hw-release.vars" ]; then +. %{_includedir}/droid-devel/hw-release.vars +else . %{_libdir}/droid-devel/hw-release.vars +fi %reconfigure --disable-static --with-droid-device=$MER_HA_DEVICE make %{?jobs:-j%jobs}
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-card-symdef.h ^
@@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013-2018 Jolla Ltd. - * - * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com> - * - * These PulseAudio Modules are free software; you can redistribute - * it and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA. - / -#ifndef foomoduledroidcardsymdeffoo -#define foomoduledroidcardsymdeffoo - -#include <pulsecore/core.h> -#include <pulsecore/module.h> - -#define pa__init module_droid_card_LTX_pa__init -#define pa__done module_droid_card_LTX_pa__done -#define pa__get_author module_droid_card_LTX_pa__get_author -#define pa__get_description module_droid_card_LTX_pa__get_description -#define pa__get_usage module_droid_card_LTX_pa__get_usage -#define pa__get_version module_droid_card_LTX_pa__get_version - -int pa__init(struct pa_modulem); -void pa__done(struct pa_modulem); - -const char pa__get_author(void); -const char* pa__get_description(void); -const char* pa__get_usage(void); -const char* pa__get_version(void); - -#endif
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-sink-symdef.h ^
@@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013-2018 Jolla Ltd. - * - * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com> - * - * These PulseAudio Modules are free software; you can redistribute - * it and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA. - / -#ifndef foomoduledroidsinksymdeffoo -#define foomoduledroidsinksymdeffoo - -#include <pulsecore/core.h> -#include <pulsecore/module.h> - -#define pa__init module_droid_sink_LTX_pa__init -#define pa__done module_droid_sink_LTX_pa__done -#define pa__get_author module_droid_sink_LTX_pa__get_author -#define pa__get_description module_droid_sink_LTX_pa__get_description -#define pa__get_usage module_droid_sink_LTX_pa__get_usage -#define pa__get_version module_droid_sink_LTX_pa__get_version - -int pa__init(struct pa_modulem); -void pa__done(struct pa_modulem); - -const char pa__get_author(void); -const char* pa__get_description(void); -const char* pa__get_usage(void); -const char* pa__get_version(void); - -#endif
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-12.2.86.tar.bz2/src/droid/module-droid-source-symdef.h ^
@@ -1,42 +0,0 @@ -/* - * Copyright (C) 2013-2018 Jolla Ltd. - * - * Contact: Juho Hämäläinen <juho.hamalainen@jolla.com> - * - * These PulseAudio Modules are free software; you can redistribute - * it and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation - * version 2.1 of the License. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 - * USA. - / -#ifndef foomoduledroidsourcesymdeffoo -#define foomoduledroidsourcesymdeffoo - -#include <pulsecore/core.h> -#include <pulsecore/module.h> - -#define pa__init module_droid_source_LTX_pa__init -#define pa__done module_droid_source_LTX_pa__done -#define pa__get_author module_droid_source_LTX_pa__get_author -#define pa__get_description module_droid_source_LTX_pa__get_description -#define pa__get_usage module_droid_source_LTX_pa__get_usage -#define pa__get_version module_droid_source_LTX_pa__get_version - -int pa__init(struct pa_modulem); -void pa__done(struct pa_modulem); - -const char pa__get_author(void); -const char* pa__get_description(void); -const char* pa__get_usage(void); -const char* pa__get_version(void); - -#endif
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/Makefile.am ^
@@ -19,8 +19,6 @@ module-droid-source.la \ module-droid-card.la -noinst_HEADERS = module-droid-sink-symdef.h module-droid-source-symdef.h module-droid-card-symdef.h - libdroid_sink_la_SOURCES = droid-sink.c droid-sink.h libdroid_sink_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common libdroid_sink_la_LIBADD = $(top_builddir)/src/common/libdroid-util.la $(AM_LIBADD) @@ -34,14 +32,14 @@ module_droid_sink_la_SOURCES = module-droid-sink.c module_droid_sink_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common module_droid_sink_la_LIBADD = -lm libdroid-sink.la $(AM_LIBADD) -module_droid_sink_la_CFLAGS = $(AM_CFLAGS) +module_droid_sink_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_sink module_droid_source_la_SOURCES = module-droid-source.c module_droid_source_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common module_droid_source_la_LIBADD = -lm libdroid-source.la $(AM_LIBADD) -module_droid_source_la_CFLAGS = $(AM_CFLAGS) +module_droid_source_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_source module_droid_card_la_SOURCES = module-droid-card.c module_droid_card_la_LDFLAGS = -module -avoid-version -Wl,-z,noexecstack -lhybris-common module_droid_card_la_LIBADD = -lm libdroid-sink.la libdroid-source.la $(top_builddir)/src/common/libdroid-util.la $(AM_LIBADD) -module_droid_card_la_CFLAGS = $(AM_CFLAGS) +module_droid_card_la_CFLAGS = $(AM_CFLAGS) -DPA_MODULE_NAME=module_droid_card
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/droid-sink.c ^
@@ -54,6 +54,7 @@ #include <pulsecore/time-smoother.h> #include <pulsecore/hashmap.h> #include <pulsecore/core-subscribe.h> +#include <pulse/util.h> #include <pulse/version.h> #include "droid-sink.h" @@ -523,14 +524,6 @@ ((pa_usec_t) data) = pa_droid_stream_get_latency(u->stream); return 0; } - -#if PULSEAUDIO_VERSION < 12 - case PA_SINK_MESSAGE_SET_STATE: { - int r; - if ((r = sink_set_state_in_io_thread_cb(u->sink, PA_PTR_TO_UINT(data), 0)) < 0) - return r; - } -#endif } return pa_sink_process_msg(o, code, data, offset, chunk); @@ -1285,9 +1278,7 @@ u->sink->userdata = u; u->sink->parent.process_msg = sink_process_msg; -#if PULSEAUDIO_VERSION >= 12 u->sink->set_state_in_io_thread = sink_set_state_in_io_thread_cb; -#endif u->sink->set_port = sink_set_port_cb;
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/droid-source.c ^
@@ -51,6 +51,7 @@ #include <pulsecore/rtpoll.h> #include <pulsecore/time-smoother.h> #include <pulsecore/resampler.h> +#include <pulse/util.h> #include <pulse/version.h> #include "droid-source.h" @@ -324,23 +325,6 @@ return 0; } -/* Called from IO context / -static int source_process_msg(pa_msgobject o, int code, void data, int64_t offset, pa_memchunk chunk) { -#if PULSEAUDIO_VERSION < 12 - struct userdata u = PA_SOURCE(o)->userdata; - - switch (code) { - case PA_SOURCE_MESSAGE_SET_STATE: { - int r; - if ((r = source_set_state_in_io_thread_cb(u->source, PA_PTR_TO_UINT(data), 0)) < 0) - return r; - } - } -#endif - - return pa_source_process_msg(o, code, data, offset, chunk); -} - static int source_set_port_cb(pa_source s, pa_device_port p) { struct userdata u = s->userdata; pa_droid_port_data *data; @@ -740,10 +724,8 @@ u->source->userdata = u; - u->source->parent.process_msg = source_process_msg; -#if PULSEAUDIO_VERSION >= 12 + u->source->parent.process_msg = pa_source_process_msg; u->source->set_state_in_io_thread = source_set_state_in_io_thread_cb; -#endif source_set_mute_control(u);
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/module-droid-card.c ^
@@ -64,8 +64,6 @@ #include "droid-sink.h" #include "droid-source.h" -#include "module-droid-card-symdef.h" - PA_MODULE_AUTHOR("Juho Hämäläinen"); PA_MODULE_DESCRIPTION("Droid card"); PA_MODULE_VERSION(PACKAGE_VERSION);
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/module-droid-sink.c ^
@@ -41,8 +41,6 @@ #include <droid/conversion.h> #include "droid-sink.h" -#include "module-droid-sink-symdef.h" - PA_MODULE_AUTHOR("Juho Hämäläinen"); PA_MODULE_DESCRIPTION("Droid sink"); PA_MODULE_USAGE("master_sink=<sink to connect to> "
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.88.tar.bz2/src/droid/module-droid-source.c ^
@@ -40,8 +40,6 @@ #include <droid/droid-util.h> #include "droid-source.h" -#include "module-droid-source-symdef.h" - PA_MODULE_AUTHOR("Juho Hämäläinen"); PA_MODULE_DESCRIPTION("Droid source"); PA_MODULE_USAGE("master_source=<source to connect to> "