Changes - SailfishOS Open Build Service

Changes of Revision 2

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.changes
@@ -1,3 +1,10 @@ +* Fri Oct 07 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.99 +- [parser] Better support for includes in xml. Fixes JB#58934 +- [parser] Generate default profile for device ports which have none. + +* Mon Sep 19 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.98 +- [build] Add meson support. JB#58078 + * Fri Feb 25 2022 Juho Hämäläinen <juho.hamalainen@jolla.com> - 14.2.97 - [common] Enable audio_cal_wait properly. JB#55832
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid.spec ^
@@ -5,7 +5,7 @@ Name: pulseaudio-modules-droid Summary: PulseAudio Droid HAL modules -Version: 14.2.97 +Version: 14.2.99 Release: 1 License: LGPLv2+ URL: https://github.com/mer-hybris/pulseaudio-modules-droid @@ -13,9 +13,8 @@ Requires: pulseaudio >= %{pulseversion} Requires: %{name}-common = %{version}-%{release} Requires: pulseaudio-module-keepalive >= 1.0.0 -BuildRequires: automake -BuildRequires: libtool BuildRequires: libtool-ltdl-devel +BuildRequires: meson BuildRequires: pkgconfig(pulsecore) >= %{pulsemajorminor} BuildRequires: pkgconfig(android-headers) BuildRequires: pkgconfig(libhardware) @@ -50,11 +49,12 @@ else . %{_libdir}/droid-devel/hw-release.vars fi -%reconfigure --disable-static --with-droid-device=$MER_HA_DEVICE -%make_build + +%meson -Ddroid-device=$MER_HA_DEVICE +%meson_build %install -%make_install +%meson_install %files %defattr(-,root,root,-)
[-] [+]	Changed	_service ^
@@ -2,7 +2,7 @@ <service name="tar_git"> <param name="url">https://github.com/mer-hybris/pulseaudio-modules-droid.git</param> <param name="branch">master</param> - <param name="revision">14.2.97</param> + <param name="revision">14.2.99</param> <param name="token"/> <param name="debian"/> <param name="dumb"/>
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/Makefile.am ^
@@ -1,10 +0,0 @@ -SUBDIRS = src - -ACLOCAL_AMFLAGS = -I m4 - -$(top_srcdir)/.version: - echo $(VERSION) > $@-t && mv $@-t $@ - -dist-hook: - echo $(VERSION) > $(distdir)/.tarball-version - echo $(VERSION) > $(distdir)/.version
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/bootstrap.sh ^
@@ -1,14 +0,0 @@ -#!/bin/bash - -autoreconf -vfi - -if type -p colorgcc > /dev/null ; then - export CC=colorgcc -fi - -export CFLAGS=${CFLAGS-"-g -O0"} - -if test "x$NOCONFIGURE" = "x"; then - ./configure --enable-maintainer-mode --disable-processing "$@" - make clean -fi
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/configure.ac ^
@@ -1,273 +0,0 @@ -AC_PREREQ(2.60) - -AC_INIT([pulseaudio-modules-droid], [m4_esyscmd(./git-version-gen .tarball-version)], [mer-general@lists.merproject.org]) -AC_CONFIG_HEADER([config.h]) -AM_INIT_AUTOMAKE([foreign -Wall silent-rules]) -AC_CONFIG_MACRO_DIR(m4) -AM_SILENT_RULES([yes]) - -AS_IF([! test -n "$VERSION"], [ - AC_MSG_ERROR([git-version-gen failed]) -]) - -if type -p stow > /dev/null && test -d /usr/local/stow ; then - AC_MSG_NOTICE([* Found /usr/local/stow: default install prefix set to /usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION} ]) - ac_default_prefix="/usr/local/stow/${PACKAGE_NAME}-${PACKAGE_VERSION}" -fi - -AC_PROG_CC -AC_PROG_CC_C99 -AM_PROG_CC_C_O -AC_PROG_GCC_TRADITIONAL - -m4_define(pa_major, `echo $VERSION \| cut -d. -f1 \| cut -d- -f1`) -m4_define(pa_minor, `echo $VERSION \| cut -d. -f2 \| cut -d- -f1`) -m4_define(pa_module_version, `echo $VERSION \| cut -d. -f3 \| cut -d- -f1`) - -AC_SUBST(PA_MAJOR, pa_major) -AC_SUBST(PA_MAJORMINOR, pa_major.pa_minor) -AC_SUBST(PA_MODULE_VERSION, pa_module_version) - -DESIRED_FLAGS="-std=gnu11 -Wall -W -Wextra -pipe -Wno-long-long -Wno-overlength-strings -Wunsafe-loop-optimizations -Wundef -Wformat=2 -Wlogical-op -Wsign-compare -Wformat-security -Wmissing-include-dirs -Wformat-nonliteral -Wold-style-definition -Wpointer-arith -Winit-self -Wdeclaration-after-statement -Wfloat-equal -Wmissing-prototypes -Wstrict-prototypes -Wredundant-decls -Wmissing-declarations -Wmissing-noreturn -Wshadow -Wendif-labels -Wcast-align -Wstrict-aliasing -Wwrite-strings -Wno-unused-parameter -fno-common -fdiagnostics-show-option -fdiagnostics-color=auto" - -for flag in $DESIRED_FLAGS ; do - CC_CHECK_CFLAGS([$flag], [CFLAGS="$CFLAGS $flag"]) -done - -# FIXME: we should push that as .m4 macro installed by pulseaudio-dev package -# Native atomic operation support -AC_ARG_ENABLE([atomic-arm-linux-helpers], - AS_HELP_STRING([--disable-atomic-arm-linux-helpers],[use inline asm or libatomic_ops instead]), - [ - case "${enableval}" in - yes) atomic_arm_linux_helpers=yes ;; - no) atomic_arm_linux_helpers=no ;; - ) AC_MSG_ERROR(bad value ${enableval} for --disable-atomic-arm-linux-helpers) ;; - esac - ], - [atomic_arm_linux_helpers=auto]) - -AC_ARG_ENABLE([atomic-arm-memory-barrier], - AS_HELP_STRING([--enable-atomic-arm-memory-barrier],[only really needed in SMP arm systems]), - [ - case "${enableval}" in - yes) AC_DEFINE_UNQUOTED(ATOMIC_ARM_MEMORY_BARRIER_ENABLED, 1, [Enable memory barriers]) ;; - no) ;; - ) AC_MSG_ERROR(bad value ${enableval} for --disable-atomic-arm-linux-helpers) ;; - esac - ],) - -AC_CANONICAL_HOST -AC_DEFINE_UNQUOTED([CANONICAL_HOST], "$host", [Canonical host string.]) - -AC_MSG_CHECKING([target operating system]) - -case $host in - --linux) - AC_MSG_RESULT([linux]) - pulse_target_os=linux - ;; - ) - AC_MSG_RESULT([unknown]) - pulse_target_os=unknown - ;; -esac - -# If everything else fails use libatomic_ops -need_libatomic_ops=yes - -AC_MSG_CHECKING([whether $CC knows __sync_bool_compare_and_swap()]) -AC_LANG_CONFTEST([int main() { int a = 4; __sync_bool_compare_and_swap(&a, 4, 5); }]) -$CC conftest.c $CFLAGS -o conftest > /dev/null 2> /dev/null -ret=$? -rm -f conftest.o conftest -if test $ret -eq 0 ; then - AC_DEFINE([HAVE_ATOMIC_BUILTINS], 1, [Have __sync_bool_compare_and_swap() and friends.]) - AC_MSG_RESULT([yes]) - need_libatomic_ops=no -else - AC_MSG_RESULT([no]) - # HW specific atomic ops stuff - AC_MSG_CHECKING([architecture for native atomic operations]) - case $host_cpu in - arm) - AC_MSG_RESULT([arm]) - AC_MSG_CHECKING([compiler support for arm inline asm atomic operations]) - AC_LANG_CONFTEST([[int main() - { - volatile int a=0; - int o=0, n=1, r; - asm volatile ("ldrex %0, [%1]\n" - "subs %0, %0, %2\n" - "strexeq %0, %3, [%1]\n" - : "=&r" (r) - : "r" (&a), "Ir" (o), "r" (n) - : "cc"); - return (a==1 ? 0 : -1); - }]]) - $CC conftest.c $CFLAGS -o conftest > /dev/null 2>&1 - ret=$? - rm -f conftest.o conftest - if test $ret -eq 0 ; then - AC_DEFINE([ATOMIC_ARM_INLINE_ASM], 1, [Have ARMv6 instructions.]) - AC_MSG_RESULT([yes]) - need_libatomic_ops=no - else - # We really want inline asm atomic operations!! - echo "ERROR No ARMv6 instructions available check your compiler!!!" - exit 1 - - AC_MSG_CHECKING([whether we can use Linux kernel helpers]) - # The Linux kernel helper functions have been there since 2.6.16. However - # compile time checking for kernel version in cross compile environment - # (which is usually the case for arm cpu) is tricky (or impossible). - if test "x$pulse_target_os" = "xlinux" && test "x$atomic_arm_linux_helpers" != "xno"; then - AC_MSG_RESULT([yes]) - AC_DEFINE_UNQUOTED(ATOMIC_ARM_LINUX_HELPERS, 1, [special arm linux implementation]) - need_libatomic_ops=no - else - AC_MSG_RESULT([no]) - fi - fi - ;; - ) - AC_MSG_RESULT([unknown]) - ;; - esac -fi - -AC_MSG_CHECKING([whether we need libatomic_ops]) -if test "x$need_libatomic_ops" = "xyes"; then - AC_MSG_RESULT([yes]) - AC_CHECK_HEADERS([atomic_ops.h], [], [ - AC_MSG_ERROR([** libatomic-ops headers not found]) - ]) - - # Win32 does not need the lib and breaks horribly if we try to include it - if test "x$os_is_win32" != "x1" ; then - LIBS="$LIBS -latomic_ops" - fi -else - AC_MSG_RESULT([no]) -fi - -CC_CHECK_TLS - -AC_CACHE_CHECK([whether $CC knows _Bool], - pulseaudio_cv__Bool, - [AC_COMPILE_IFELSE( - AC_LANG_PROGRAM([], [[_Bool b;]]), - [pulseaudio_cv__Bool=yes], - [pulseaudio_cv__Bool=no]) - ]) - -AS_IF([test "$pulseaudio_cv__Bool" = "yes"], [ - AC_DEFINE([HAVE_STD_BOOL], 1, [Have _Bool.]) - ]) - -#### libtool stuff (FIXME: when sbox will have 2.2 )#### -#LT_PREREQ(2.2) -#LT_INIT([dlopen win32-dll disable-static]) -AC_PROG_LIBTOOL - -PKG_CHECK_MODULES([PULSEAUDIO], [libpulse >= 14.2 pulsecore >= 14.2]) -AC_SUBST(PULSEAUDIO_CFLAGS) -AC_SUBST(PULSEAUDIO_LIBS) - -#PKG_CHECK_MODULES([DROIDHEADERS], [android-headers >= 0.0.6]) -# android-headers.pc has broken version field -PKG_CHECK_MODULES([DROIDHEADERS], [android-headers]) -AC_SUBST(DROIDHEADERS_CFLAGS) - -PKG_CHECK_MODULES([HYBRIS], [libhardware >= 0.1.0]) -AC_SUBST(HYBRIS_CFLAGS) -AC_SUBST(HYBRIS_LIBS) - -#### expat (for xml config format parsing) #### - -PKG_CHECK_MODULES([EXPAT], [expat >= 2.1]) -AC_SUBST(EXPAT_CFLAGS) -AC_SUBST(EXPAT_LIBS) - -# Input devices -CC_CHECK_DROID_ENUM([${DROIDHEADERS_CFLAGS}], [AUDIO_DEVICE_IN_FM_RX]) -CC_CHECK_DROID_ENUM([${DROIDHEADERS_CFLAGS}], [AUDIO_DEVICE_IN_FM_RX_A2DP]) - -# Audio sources -CC_CHECK_DROID_ENUM([${DROIDHEADERS_CFLAGS}], [AUDIO_SOURCE_ECHO_REFERENCE]) -CC_CHECK_DROID_ENUM([${DROIDHEADERS_CFLAGS}], [AUDIO_SOURCE_FM_TUNER]) -CC_CHECK_DROID_ENUM([${DROIDHEADERS_CFLAGS}], [AUDIO_SOURCE_FM_RX])
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/m4/.gitignore ^
@@ -1,5 +0,0 @@ -libtool.m4 -ltoptions.m4 -ltsugar.m4 -ltversion.m4 -lt~obsolete.m4
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/m4/attributes.m4 ^
@@ -1,258 +0,0 @@ -dnl Macros to check the presence of generic (non-typed) symbols. -dnl Copyright (c) 2006-2007 Diego Pettenò <flameeyes@gmail.com> -dnl Copyright (c) 2006-2007 xine project -dnl -dnl This program is free software; you can redistribute it and/or modify -dnl it under the terms of the GNU General Public License as published by -dnl the Free Software Foundation; either version 2, or (at your option) -dnl any later version. -dnl -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -dnl GNU General Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License -dnl along with this program; if not, write to the Free Software -dnl Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -dnl 02110-1301, USA. -dnl -dnl As a special exception, the copyright owners of the -dnl macro gives unlimited permission to copy, distribute and modify the -dnl configure scripts that are the output of Autoconf when processing the -dnl Macro. You need not follow the terms of the GNU General Public -dnl License when using or distributing such scripts, even though portions -dnl of the text of the Macro appear in them. The GNU General Public -dnl License (GPL) does govern all other use of the material that -dnl constitutes the Autoconf Macro. -dnl -dnl This special exception to the GPL applies to versions of the -dnl Autoconf Macro released by this project. When you make and -dnl distribute a modified version of the Autoconf Macro, you may extend -dnl this special exception to the GPL to apply to your modified version as -dnl well. - -AC_DEFUN([CC_CHECK_CFLAGS_SILENT], [ - AC_CACHE_VAL(AS_TR_SH([cc_cv_cflags_$1]), - [ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_COMPILE_IFELSE([int a;], - [eval "AS_TR_SH([cc_cv_cflags_$1])='yes'"], - [eval "AS_TR_SH([cc_cv_cflags_$1])='no'"]) - CFLAGS="$ac_save_CFLAGS" - ]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], - [$2], [$3]) -]) - -AC_DEFUN([CC_CHECK_CFLAGS], [ - AC_CACHE_CHECK([if $CC supports $1 flag], - AS_TR_SH([cc_cv_cflags_$1]), - CC_CHECK_CFLAGS_SILENT([$1]) dnl Don't execute actions here! - ) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_cflags_$1])[ = xyes], - [$2], [$3]) -]) - -AC_DEFUN([CC_CHECK_LDFLAGS], [ - AC_CACHE_CHECK([if $CC supports $1 flag], - AS_TR_SH([cc_cv_ldflags_$1]), - [ac_save_LDFLAGS="$LDFLAGS" - LDFLAGS="$LDFLAGS $1" - AC_LINK_IFELSE([int main() { return 1; }], - [eval "AS_TR_SH([cc_cv_ldflags_$1])='yes'"], - [eval "AS_TR_SH([cc_cv_ldflags_$1])="]) - LDFLAGS="$ac_save_LDFLAGS" - ]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_ldflags_$1])[ = xyes], - [$2], [$3]) -]) - -dnl Check for a -Werror flag or equivalent. -Werror is the GCC -dnl and ICC flag that tells the compiler to treat all the warnings -dnl as fatal. We usually need this option to make sure that some -dnl constructs (like attributes) are not simply ignored. -dnl -dnl Other compilers don't support -Werror per se, but they support -dnl an equivalent flag: -dnl - Sun Studio compiler supports -errwarn=%all -AC_DEFUN([CC_CHECK_WERROR], [ - AC_CACHE_CHECK( - [for $CC way to treat warnings as errors], - [cc_cv_werror], - [CC_CHECK_CFLAGS_SILENT([-Werror], [cc_cv_werror=-Werror], - [CC_CHECK_CFLAGS_SILENT([-errwarn=%all], [cc_cv_werror=-errwarn=%all])]) - ]) -]) - -AC_DEFUN([CC_CHECK_ATTRIBUTE], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([if $CC supports __attribute__(( ifelse([$2], , [$1], [$2]) ))], - AS_TR_SH([cc_cv_attribute_$1]), - [ac_save_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $cc_cv_werror" - AC_COMPILE_IFELSE([$3], - [eval "AS_TR_SH([cc_cv_attribute_$1])='yes'"], - [eval "AS_TR_SH([cc_cv_attribute_$1])='no'"]) - CFLAGS="$ac_save_CFLAGS" - ]) - - AS_IF([eval test x$]AS_TR_SH([cc_cv_attribute_$1])[ = xyes], - [AC_DEFINE( - AS_TR_CPP([SUPPORT_ATTRIBUTE_$1]), 1, - [Define this if the compiler supports __attribute__(( ifelse([$2], , [$1], [$2]) ))] - ) - $4], - [$5]) -]) - -AC_DEFUN([CC_ATTRIBUTE_CONSTRUCTOR], [ - CC_CHECK_ATTRIBUTE( - [constructor],, - [void __attribute__((constructor)) ctor() { int a; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_FORMAT], [ - CC_CHECK_ATTRIBUTE( - [format], [format(printf, n, n)], - [void __attribute__((format(printf, 1, 2))) printflike(const char fmt, ...) { fmt = (void )0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_FORMAT_ARG], [ - CC_CHECK_ATTRIBUTE( - [format_arg], [format_arg(printf)], - [char __attribute__((format_arg(1))) gettextlike(const char fmt) { fmt = (void )0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_VISIBILITY], [ - CC_CHECK_ATTRIBUTE( - [visibility_$1], [visibility("$1")], - [void __attribute__((visibility("$1"))) $1_function() { }], - [$2], [$3]) -]) - -AC_DEFUN([CC_ATTRIBUTE_NONNULL], [ - CC_CHECK_ATTRIBUTE( - [nonnull], [nonnull()], - [void __attribute__((nonnull())) some_function(void foo, void bar) { foo = (void)0; bar = (void)0; }], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_UNUSED], [ - CC_CHECK_ATTRIBUTE( - [unused], , - [void some_function(void foo, __attribute__((unused)) void bar);], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_SENTINEL], [ - CC_CHECK_ATTRIBUTE( - [sentinel], , - [void some_function(void foo, ...) __attribute__((sentinel));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_DEPRECATED], [ - CC_CHECK_ATTRIBUTE( - [deprecated], , - [void some_function(void foo, ...) __attribute__((deprecated));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_ALIAS], [ - CC_CHECK_ATTRIBUTE( - [alias], [weak, alias], - [void other_function(void foo) { } - void some_function(void foo) __attribute__((weak, alias("other_function")));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_MALLOC], [ - CC_CHECK_ATTRIBUTE( - [malloc], , - [void __attribute__((malloc)) my_alloc(int n);], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_PACKED], [ - CC_CHECK_ATTRIBUTE( - [packed], , - [struct astructure { char a; int b; long c; void *d; } __attribute__((packed));], - [$1], [$2]) -]) - -AC_DEFUN([CC_ATTRIBUTE_CONST], [ - CC_CHECK_ATTRIBUTE( - [const], , - [int __attribute__((const)) twopow(int n) { return 1 << n; } ], - [$1], [$2]) -]) - -AC_DEFUN([CC_FLAG_VISIBILITY], [ - AC_REQUIRE([CC_CHECK_WERROR]) - AC_CACHE_CHECK([if $CC supports -fvisibility=hidden],
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/m4/check_droid_enum.m4 ^
@@ -1,26 +0,0 @@ -AC_DEFUN([CC_CHECK_DROID_ENUM], -[AC_MSG_CHECKING([if droid headers have enum $2]) - AC_LANG_SAVE - AC_LANG_C - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $1" - AC_TRY_COMPILE( - [ #include <android-config.h> - #ifdef QCOM_BSP - #define QCOM_HARDWARE - #endif - #include <system/audio.h> ], - [ unsigned int e = $2; ], - cc_check_droid_enum=yes, cc_check_droid_enum=no) - CFLAGS="$SAVE_CFLAGS" - AC_LANG_RESTORE - AC_MSG_RESULT([$cc_check_droid_enum]) -if test x"$cc_check_droid_enum" = x"yes"; then - AC_DEFINE(HAVE_ENUM_$2,,[define if enum $2 is found in headers]) - AC_DEFINE(STRING_ENTRY_IF_$2,[STRING_ENTRY($2),],[string entry for enum $2]) - AC_DEFINE(FANCY_ENTRY_IF_$2(n),[{$2, n},],[fancy entry for enum $2]) -else - AC_DEFINE(STRING_ENTRY_IF_$2,,[string entry for enum $2]) - AC_DEFINE(FANCY_ENTRY_IF_$2(n),,[fancy entry for enum $2]) -fi -])
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/m4/tls.m4 ^
@@ -1,17 +0,0 @@ -AC_DEFUN([CC_CHECK_TLS], [ - AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage], - cc_cv_tls___thread, - [AC_COMPILE_IFELSE( - AC_LANG_PROGRAM( - [[static __thread int a = 6;]], - [[a = 5;]]), - [cc_cv_tls___thread=yes], - [cc_cv_tls___thread=no]) - ]) - - AS_IF([test "x$cc_cv_tls___thread" = "xyes"], - [AC_DEFINE([SUPPORT_TLS___THREAD], 1, - [Define this if the compiler supports __thread for Thread-Local Storage]) - $1], - [$2]) -])
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/src/Makefile.am ^
@@ -1 +0,0 @@ -SUBDIRS = common droid
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/src/common/Makefile.am ^
@@ -1,38 +0,0 @@ -AM_LIBADD = \ - $(PULSEAUDIO_LIBS) \ - $(HYBRIS_LIBS) \ - $(EXPAT_LIBS) -AM_CFLAGS = \ - $(DROID_DEVICE_CFLAGS) \ - $(PULSEAUDIO_CFLAGS) \ - $(DROIDHEADERS_CFLAGS) \ - $(HYBRIS_CFLAGS) \ - $(EXPAT_CFLAGS) \ - -DPULSEAUDIO_VERSION=@PA_MAJOR@ \ - -I$(top_srcdir)/src/common \ - -I$(top_srcdir)/src/common/include - - -modlibexec_LTLIBRARIES = libdroid-util.la -includedir = @includedir@/pulsecore/modules/droid -include_HEADERS = include/droid/version.h \ - include/droid/conversion.h \ - include/droid/droid-config.h \ - include/droid/droid-util.h \ - include/droid/sllist.h \ - include/droid/utils.h - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = libdroid-util.pc - -libdroid_util_la_SOURCES = droid-util.c \ - droid-config.c \ - conversion.c \ - config-parser-xml.c \ - config-parser-xml.h \ - sllist.c \ - utils.c \ - droid-util-audio.h -libdroid_util_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common $(SBJ_DEVICE_LDFLAGS) -libdroid_util_la_LIBADD = $(AM_LIBADD) -libdroid_util_la_CFLAGS = $(AM_CFLAGS)
[-] [+]	Deleted	_service:tar_git:pulseaudio-modules-droid-14.2.97.tar.bz2/src/droid/Makefile.am ^
@@ -1,45 +0,0 @@ -AM_LIBADD = \ - $(PULSEAUDIO_LIBS) \ - $(HYBRIS_LIBS) - -AM_CFLAGS = \ - $(DROID_DEVICE_CFLAGS) \ - $(PULSEAUDIO_CFLAGS) \ - $(DROIDHEADERS_CFLAGS) \ - $(HYBRIS_CFLAGS) \ - -DPULSEAUDIO_VERSION=@PA_MAJOR@ \ - -I$(top_srcdir)/src/droid \ - -I$(top_srcdir)/src/common/include - - -modlibexec_LTLIBRARIES = \ - libdroid-sink.la \ - libdroid-source.la \ - module-droid-sink.la \ - module-droid-source.la \ - module-droid-card.la - -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) -libdroid_sink_la_CFLAGS = $(AM_CFLAGS) - -libdroid_source_la_SOURCES = droid-source.c droid-source.h -libdroid_source_la_LDFLAGS = -avoid-version -Wl,-z,noexecstack -lhybris-common -libdroid_source_la_LIBADD = $(top_builddir)/src/common/libdroid-util.la $(AM_LIBADD) -libdroid_source_la_CFLAGS = $(AM_CFLAGS) - -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) -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) -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) -DPA_MODULE_NAME=module_droid_card
[-] [+]	Added	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/meson.build ^
@@ -0,0 +1,172 @@ +project('pulseaudio-modules-droid', 'c', + version : run_command(find_program('git-version-gen'), join_paths(meson.current_source_dir(), '.tarball-version'), check: true).stdout().strip(), + meson_version : '>= 0.50.0', + default_options : [ 'c_std=gnu11' ] + ) + +cc = meson.get_compiler('c') + +configinc = include_directories('.') +libdir = join_paths(get_option('prefix'), get_option('libdir')) + +pa_c_args = ['-DHAVE_CONFIG_H'] + +droiddevice = get_option('droid-device') +pa_c_args += ['-DDROID_DEVICE_@0@=1'.format(droiddevice.underscorify().to_upper())] +pa_c_args += ['-DDROID_DEVICE_STRING="@0@"'.format(droiddevice)] + +# dependencies +droid_headers_dep = dependency('android-headers', required : true) +expat_dep = dependency('expat', version : '>= 2.1', required : true) +hybris_dep = dependency('libhardware', version : '>= 0.1.0', required : true) +hybris_common_dep = cc.find_library('hybris-common', required : true) +ltdl_dep = cc.find_library('ltdl', required : true) +pulsecore_dep = dependency('pulsecore', version : '>= 14.2', required : true) + +pa_version_str = meson.project_version() +# For tarballs, the first split will do nothing, but for builds in git, we +# split out suffixes when there are commits since the last tag +# (e.g.: v11.99.1-3-gad14bdb24 -> v11.99.1) +version_split = pa_version_str.split('-')[0].split('.') +pa_version_major = version_split[0].split('v')[0] +pa_version_minor = version_split[1] +pa_version_module = version_split[2].split('+')[0] +pa_version_major_minor = pa_version_major + '.' + pa_version_minor + +modlibexecdir = get_option('modlibexecdir') +if modlibexecdir == '' + modlibexecdir = join_paths(libdir, 'pulse-' + pa_version_major_minor, 'modules') +endif + +privlibdir = join_paths(libdir, 'pulseaudio') +rpath_dirs = join_paths(privlibdir) + ':' + join_paths(modlibexecdir) + +cdata = configuration_data() +cdata.set_quoted('PACKAGE', meson.project_name()) +cdata.set_quoted('PACKAGE_NAME', meson.project_name()) +cdata.set_quoted('PACKAGE_VERSION', pa_version_str) +cdata.set_quoted('VERSION', pa_version_str) + +# Atomic operations + +if get_option('atomic-arm-memory-barrier') + cdata.set('ATOMIC_ARM_MEMORY_BARRIER_ENABLED', 1) +endif + +need_libatomic_ops = false + +atomictest = '''void func() { + volatile int atomic = 2; + __sync_bool_compare_and_swap (&atomic, 2, 3); +} +''' + +if cc.compiles(atomictest) + cdata.set('HAVE_ATOMIC_BUILTINS', 1) + + newatomictest = '''void func() { + int c = 0; + __atomic_store_n(&c, 4, __ATOMIC_SEQ_CST); + } + ''' + + if(cc.compiles(newatomictest)) + cdata.set('HAVE_ATOMIC_BUILTINS_MEMORY_MODEL', 1) + endif + +elif host_machine.cpu_family() == 'arm' + if host_machine.system() == 'linux' and get_option('atomic-arm-linux-helpers') + cdata.set('ATOMIC_ARM_LINUX_HELPERS', 1) + else + armatomictest = '''int func() { + volatile int a=0; + int o=0, n=1, r; + asm volatile ( + "ldrex %0, [%1]\n" + "subs %0, %0, %2\n" + "strexeq %0, %3, [%1]\n" + : "=&r" (r) + : "r" (&a), "Ir" (o), "r" (n) + : "cc"); + return (a==1 ? 0 : -1); + } + ''' + + if cc.compiles(armatomictest) + cdata.set('ATOMIC_ARM_INLINE_ASM', 1) + else + need_libatomic_ops = true + endif + endif # arm && !linux + +elif not ['freebsd', 'netbsd'].contains(host_machine.system()) + need_libatomic_ops = true +endif # !atomic helpers && !arm + +if need_libatomic_ops + assert(cc.has_header('atomic_ops.h'), 'Need libatomic_ops') + + cdata.set('AO_REQUIRE_CAS', 1) + + if host_machine.system() != 'windows' + libatomic_ops_dep = cc.find_library('atomic_ops', required : true) + else + libatomic_ops_dep = dependency('', required: false) + endif +else + libatomic_ops_dep = dependency('', required: false) +endif + +check_enums = [ + # Input devices + 'AUDIO_DEVICE_IN_FM_RX', + 'AUDIO_DEVICE_IN_FM_RX_A2DP', + # Audio sources + 'AUDIO_SOURCE_ECHO_REFERENCE', + 'AUDIO_SOURCE_FM_TUNER', + 'AUDIO_SOURCE_FM_RX', + 'AUDIO_SOURCE_FM_RX_A2DP', + # Output flags + 'AUDIO_OUTPUT_FLAG_COMPRESS_PASSTHROUGH', + # Channels + 'AUDIO_CHANNEL_IN_VOICE_CALL_MONO', + 'AUDIO_CHANNEL_IN_VOICE_UPLINK_MONO', + 'AUDIO_CHANNEL_IN_VOICE_DNLINK_MONO', + # Formats + 'AUDIO_FORMAT_PCM_OFFLOAD', + 'AUDIO_FORMAT_FLAC', + 'AUDIO_FORMAT_OPUS', +] + +foreach e : check_enums + if cc.has_header_symbol('system/audio.h', e, dependencies : droid_headers_dep, prefix : '#include <android-config.h>\n#ifdef QCOM_BSP\n#define QCOM_HARDWARE\n#endif') + define = 'HAVE_ENUM_' + e + cdata.set(define, 1) + define = 'STRING_ENTRY_IF_' + e + cdata.set(define, 'STRING_ENTRY(' + e + '),') + define = 'FANCY_ENTRY_IF_' + e + '(n)' + cdata.set(define, '{' + e + ', n},') + else + define = 'STRING_ENTRY_IF_' + e + cdata.set(define, '') + define = 'FANCY_ENTRY_IF_' + e + '(n)' + cdata.set(define, '') + endif +endforeach + +# Headers +check_headers = [ + 'valgrind/memcheck.h', +] + +foreach h : check_headers + if cc.has_header(h) + define = 'HAVE_' + h.underscorify().to_upper() + cdata.set(define, 1) + endif +endforeach + +# Now generate config.h from everything above +configure_file(output : 'config.h', configuration : cdata) + +subdir('src')
[-] [+]	Added	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/meson_options.txt ^
@@ -0,0 +1,15 @@ +option('atomic-arm-linux-helpers', + type : 'boolean', + value : true, + description : 'Use inline asm or libatomic_ops instead') +option('atomic-arm-memory-barrier', + type : 'boolean', + value : false, + description : 'Enable memory barriers (only really needed in SMP arm systems)') +option('droid-device', + type : 'string', + value : 'generic', + description : 'Droid device type for possible specific quirks (defaults to generic).') +option('modlibexecdir', + type : 'string', + description : 'Specify location where modules will be installed')
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/src/common/config-parser-xml.c ^
@@ -215,6 +215,12 @@ &element_parse_item }; +/* Entries like + * <modules> + * <module name="primary"> <xi:include href="other.xml"/> </module> + * </modules> + * Where other.xml contains module elements + / static const struct element_parser element_parse_module_include = { ELEMENT_include, parse_module_include, @@ -223,11 +229,25 @@ NULL }; +/ Entries like + * <modules> + * <xi:include href="other.xml"/> + * </modules> + * Where other.xml contains <module name="primary">... + / +static const struct element_parser element_parse_modules_include = { + ELEMENT_include, + parse_module_include, + NULL, + NULL, + NULL +}; + static const struct element_parser element_parse_module = { ELEMENT_module, parse_module, NULL, - NULL, + &element_parse_modules_include, &element_parse_module_include }; @@ -1007,6 +1027,27 @@ return c_mix_port; } +/ If a devicePort doesn't have any profiles defined let's just make something + * up that could work. / +static struct profile default_profile(const char role) { + struct profile p; + bool output; + + output = pa_safe_streq(role, PORT_TYPE_sink); + + p = pa_xmalloc0(sizeof(p)); + + p->name = pa_sprintf_malloc("generated-default"); + pa_assert(pa_string_convert_str_to_num(CONV_STRING_FORMAT, "AUDIO_FORMAT_PCM_16_BIT", &p->format)); + p->sampling_rates[0] = 48000; + pa_assert(pa_string_convert_str_to_num(output ? CONV_STRING_OUTPUT_CHANNELS : CONV_STRING_INPUT_CHANNELS, + output ? "AUDIO_CHANNEL_OUT_STEREO" : "AUDIO_CHANNEL_IN_STEREO", + &p->channel_masks[0])); + p->next = NULL; + + return p; +} + static void generate_config_for_module(struct module module, dm_config_device config) { dm_config_module c_module; struct mix_port mix_port; @@ -1034,8 +1075,8 @@ dm_config_port c_device_port; if (!device_port->profiles) { - pa_log("No profile defined for devicePort %s", device_port->tag_name); - continue; + pa_log_info("No profile defined for devicePort %s, generating default.", device_port->tag_name); + SLLIST_APPEND(struct profile, device_port->profiles, default_profile(device_port->role)); } c_device_port = config_device_port_new(c_module, device_port); @@ -1181,9 +1222,6 @@ SLLIST_FOREACH(data.current_include, data.conf->includes) { char *fn = NULL; - if (!data.current_include->module) - continue; - if (data.current_include->href[0] != '/') fn = build_path(filename, data.current_include->href);
[-] [+]	Changed	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/src/common/include/droid/version.h ^
@@ -24,7 +24,7 @@ #include <android-config.h> -#if defined(QCOM_BSP) \|\| defined(DROID_DEVICE_SBJ) +#if defined(QCOM_BSP) #define QCOM_HARDWARE #endif
[-] [+]	Added	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/src/common/meson.build ^
@@ -0,0 +1,64 @@ +libdroid_util_sources = [ + 'config-parser-xml.c', + 'config-parser-xml.h', + 'conversion.c', + 'droid-util.c', + 'droid-util-audio.h', + 'droid-config.c', + 'sllist.c', + 'utils.c', +] + +libdroid_util_headers = [ + 'include/droid/conversion.h', + 'include/droid/droid-config.h', + 'include/droid/droid-util.h', + 'include/droid/sllist.h', + 'include/droid/utils.h', + 'include/droid/version.h', +] + +libdroid_util_deps = [ + droid_headers_dep, + expat_dep, + hybris_dep, + hybris_common_dep, + ltdl_dep, + pulsecore_dep, +] + +install_headers(libdroid_util_headers, subdir : 'pulsecore/modules/droid') + +libdroid_util = library('droid-util', + libdroid_util_sources, + c_args : [pa_c_args, '-DPULSEAUDIO_VERSION=@0@'.format(pa_version_major)], + dependencies : libdroid_util_deps, + pic : true, + include_directories : [configinc, include_directories('include')], + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +) + +libdroid_util_dep = declare_dependency( + link_with : libdroid_util, + compile_args : pa_c_args + ['-DPULSEAUDIO_VERSION=@0@'.format(pa_version_major)], + dependencies : libdroid_util_deps, + include_directories : [configinc, include_directories('include')], +) + +# pkgconfig +pc_cdata = configuration_data() + +pc_cdata.set('prefix', get_option('prefix')) +pc_cdata.set('libdir', libdir) +pc_cdata.set('libexecdir', get_option('libexecdir')) +pc_cdata.set('PA_MAJORMINOR', pa_version_major_minor) +pc_cdata.set('PA_MODULE_VERSION', pa_version_module) + +configure_file( + input : 'libdroid-util.pc.in', + output : 'libdroid-util.pc', + configuration : pc_cdata, + install_dir : join_paths(libdir, 'pkgconfig') +)
[-] [+]	Added	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/src/droid/meson.build ^
@@ -0,0 +1,62 @@ +droid_sink = library('droid-sink', + ['droid-sink.c', 'droid-sink.h'], + dependencies : libdroid_util_dep, + pic : true, + include_directories : configinc, + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +) + +droid_sink_dep = declare_dependency( + link_with : droid_sink, + compile_args : pa_c_args + ['-DPULSEAUDIO_VERSION=@0@'.format(pa_version_major)], + dependencies : libdroid_util_dep, + include_directories : [configinc], +) + +droid_source = library('droid-source', + ['droid-source.c', 'droid-source.h'], + dependencies : libdroid_util_dep, + pic : true, + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +) + +droid_source_dep = declare_dependency( + link_with : droid_source, + compile_args : pa_c_args + ['-DPULSEAUDIO_VERSION=@0@'.format(pa_version_major)], + dependencies : libdroid_util_dep, + include_directories : [configinc], +) + +module_sink = shared_module('module-droid-sink', + 'module-droid-sink.c', + name_prefix : '', + c_args : '-DPA_MODULE_NAME=module_droid_sink', + dependencies : [droid_sink_dep, libdroid_util_dep], + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +) + +module_sink = shared_module('module-droid-source', + 'module-droid-source.c', + name_prefix : '', + c_args : '-DPA_MODULE_NAME=module_droid_source', + dependencies : [droid_source_dep, libdroid_util_dep], + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +) + +module_sink = shared_module('module-droid-card', + 'module-droid-card.c', + name_prefix : '', + c_args : '-DPA_MODULE_NAME=module_droid_card', + dependencies : [droid_sink_dep, droid_source_dep, libdroid_util_dep], + install : true, + install_dir : modlibexecdir, + install_rpath : rpath_dirs, +)
[-] [+]	Added	_service:tar_git:pulseaudio-modules-droid-14.2.99.tar.bz2/src/meson.build ^
@@ -0,0 +1,2 @@ +subdir('common') +subdir('droid')