Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dleyna-connector-dbus for openSUSE:Factory checked in at 2021-09-29 20:18:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dleyna-connector-dbus (Old) and /work/SRC/openSUSE:Factory/.dleyna-connector-dbus.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dleyna-connector-dbus" Wed Sep 29 20:18:08 2021 rev:6 rq:921853 version:0.4.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dleyna-connector-dbus/dleyna-connector-dbus.changes 2018-02-18 11:42:56.284365038 +0100 +++ /work/SRC/openSUSE:Factory/.dleyna-connector-dbus.new.1899/dleyna-connector-dbus.changes 2021-09-29 20:18:54.054970380 +0200 @@ -1,0 +2,14 @@ +Sun Sep 26 11:08:31 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 0.4.1: + + Fix use-after-free on shutdown due to missing reference on bus +- Changes from version 0.4.0: + + Remove build-time dependency on dbus-1 + + Move build system to meson +- Add meson BuildRequires and macros, and drop libtool + BuildRequires following upstreams port. +- Drop pkgconfig(dbus-1) BuildRequires following upstream changes. +- Update URL and Source to new home, as intel have dropped + maintenance of this package, go with the leading fork. + +------------------------------------------------------------------- Old: ---- dleyna-connector-dbus-0.3.0.tar_1.gz New: ---- dleyna-connector-dbus-0.4.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dleyna-connector-dbus.spec ++++++ --- /var/tmp/diff_new_pack.5aW0wP/_old 2021-09-29 20:18:55.094972735 +0200 +++ /var/tmp/diff_new_pack.5aW0wP/_new 2021-09-29 20:18:55.098972744 +0200 @@ -1,7 +1,7 @@ # # spec file for package dleyna-connector-dbus # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,23 +12,22 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: dleyna-connector-dbus -Version: 0.3.0 +Version: 0.4.1 Release: 0 Summary: dLeyna connector interface -- DBus -License: LGPL-2.1 +License: LGPL-2.1-only Group: System/Libraries -Url: http://01.org/dleyna -Source: https://01.org/sites/default/files/downloads/dleyna/%{name}-%{version}.tar_1.gz +URL: https://github.com/phako/dleyna-connector-dbus +Source: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig -BuildRequires: pkgconfig(dbus-1) -BuildRequires: pkgconfig(dleyna-core-1.0) >= 0.6.0 +BuildRequires: pkgconfig(dleyna-core-1.0) >= 0.7.0 BuildRequires: pkgconfig(gio-2.0) >= 2.28 BuildRequires: pkgconfig(glib-2.0) >= 2.28 Provides: dleyna-connector(dbus) @@ -37,25 +36,19 @@ D-Bus connector for dLeyna services. %prep -%setup -q +%autosetup -p1 %build -autoreconf -fi -%configure \ - --disable-static \ +%meson \ %{nil} -make %{?_smp_mflags} +%meson_build %install -%make_install -find %{buildroot}%{_libdir} -type f -name '*.la' -delete -print -# There is no reason to install the .pc file: it's a dlopen()'d connector, not linked -# Not providing this file until it makes sense avoids us from having to split a -devel package -rm %{buildroot}%{_libdir}/pkgconfig/dleyna-connector-dbus-1.0.pc +%meson_install %files %license COPYING -%doc ChangeLog README +%doc ChangeLog README.md %dir %{_libdir}/dleyna-1.0 %dir %{_libdir}/dleyna-1.0/connectors %{_libdir}/dleyna-1.0/connectors/libdleyna-connector-dbus.so ++++++ dleyna-connector-dbus-0.3.0.tar_1.gz -> dleyna-connector-dbus-0.4.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/.travis.yml new/dleyna-connector-dbus-0.4.1/.travis.yml --- old/dleyna-connector-dbus-0.3.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/.travis.yml 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1,16 @@ +language: C +dist: focal +sudo: true + +before_install: + - sudo apt-get update -qq + +install: + - sudo apt install libglib2.0-dev libgupnp-1.2-dev + - sudo apt install ninja-build clang-tools python3-pip + +script: + - pip3 install meson + - meson build + - ninja -C build + - ninja -C build scan-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/ChangeLog new/dleyna-connector-dbus-0.4.1/ChangeLog --- old/dleyna-connector-dbus-0.3.0/ChangeLog 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/ChangeLog 2021-06-06 00:11:37.000000000 +0200 @@ -1,3 +1,10 @@ +version 0.4.1 + - Fix use-after-free on shutdown due to missing + reference on bus +version 0.4.0 + - Remove build-time dependency on dbus-1 + - Move build system to autotools + version 0.3.0 - Don't crash when trying to unwatch non-existent client Merge pull request #10 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/Makefile.am new/dleyna-connector-dbus-0.4.1/Makefile.am --- old/dleyna-connector-dbus-0.3.0/Makefile.am 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -connectordir = $(libdir)/dleyna-1.0/connectors - -AM_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ - $(DLEYNA_CORE_CFLAGS) \ - -include config.h - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -connector_LTLIBRARIES = libdleyna-connector-dbus.la - -libdleyna_connector_dbus_la_LDFLAGS = -avoid-version \ - -no-undefined \ - -module - - -libdleyna_connector_dbus_la_SOURCES = src/connector-dbus.c - -libdleyna_connector_dbus_la_LIBADD = $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(DLEYNA_CORE_LIBS) - -MAINTAINERCLEANFILES = Makefile.in \ - aclocal.m4 \ - configure \ - config.h.in \ - config.h.in~ \ - build-aux/depcomp \ - build-aux/compile \ - build-aux/missing \ - build-aux/install-sh - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dleyna-connector-dbus-1.0.pc - -CLEANFILES = $(pkgconfig_DATA) -DISTCLEANFILES = $(pkgconfig_DATA) - -maintainer-clean-local: - rm -rf build-aux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/README new/dleyna-connector-dbus-0.4.1/README --- old/dleyna-connector-dbus-0.3.0/README 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,70 +0,0 @@ -Introduction: -------------- - -TODO - -Compilation ------------- - -TODO - -Working with the source code repository ---------------------------------------- - -dleyna-connector-dbus can be downloaded, compiled and installed as -follows: - - Clone repository - # git clone git://github.com/01org/dleyna-connector-dbus.git - # cd dleyna-connector-dbus - - Configure and build - # ./autogen.sh - # make - - Final installation - # sudo make install - -These instructions are suitable for users who simply want to install -dleyna-connector-dbus. However, developers wishing to contribute -to the project should follow a separate "Configure and build" step. - - Configure and build - # ./bootstrap-configure - # make - -The script "bootstrap-configure" cleans the repository, calls -autreconf and then invokes configure with proper settings for -development. These settings include the enabling of -maintainer mode and debugging. - -Developers can remove autogenerated files with the following command - - # make maintainer-clean - -Configure Options: ------------------- - ---enable-werror - -This option is disabled by default. To enable use --enable-werror. -When enabled, all warnings are treated as errors during compilation. -Should be enabled during development to ensure that errors do not -creep into the code base. This option is enabled by -bootstrap-configure. - ---enable-debug - -This option is disabled by default. To enable use ---enable-debug. When enabled, the make files produce debug builds. -This option is enabled by bootstrap-configure. - ---enable-optimization - -This option is enabled by default. To disable use ---disable-optimization. When enabled it turns on compiler -optimizations. Disable = -O0, enable = -O2. - ---with-log-level - -See logging.txt for more information about logging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/README.md new/dleyna-connector-dbus-0.4.1/README.md --- old/dleyna-connector-dbus-0.3.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/README.md 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1,37 @@ +Introduction: +------------- + +TODO + +Compilation +------------ + +TODO + +Working with the source code repository +--------------------------------------- + +dleyna-connector-dbus can be downloaded, compiled and installed as +follows: + + Clone repository + # git clone git://github.com/01org/dleyna-connector-dbus.git + # cd dleyna-connector-dbus + + Configure and build +``` + # meson setup build + # ninja -C build +``` + + Final installation +``` + # sudo ninja -C build install + ``` + +Configure Options: +------------------ + +`-Dlog_level` + +See logging.txt for more information about logging. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/autogen.sh new/dleyna-connector-dbus-0.4.1/autogen.sh --- old/dleyna-connector-dbus-0.3.0/autogen.sh 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/autogen.sh 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -#!/bin/sh -# Run this to generate all the initial makefiles, etc. -# Derived from https://git.gnome.org/browse/glib/tree/autogen.sh - -test -n "$srcdir" || srcdir=`dirname "$0"` -test -n "$srcdir" || srcdir=. - -olddir=`pwd` -cd "$srcdir" - -AUTORECONF=`which autoreconf` -if test -z $AUTORECONF; then - echo "*** No autoreconf found, please install it ***" - exit 1 -fi - -autoreconf --force --install --verbose || exit $? - -cd "$olddir" -test -n "$NOCONFIGURE" || "$srcdir/configure" "$@" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/bootstrap-configure new/dleyna-connector-dbus-0.4.1/bootstrap-configure --- old/dleyna-connector-dbus-0.3.0/bootstrap-configure 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/bootstrap-configure 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/bin/sh - -if [ -f config.status ]; then - make maintainer-clean -fi - -./autogen.sh --enable-maintainer-mode \ - --enable-silent-rules \ - --disable-optimization \ - --enable-debug \ - --with-log-level=8 $* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/configure.ac new/dleyna-connector-dbus-0.4.1/configure.ac --- old/dleyna-connector-dbus-0.3.0/configure.ac 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,161 +0,0 @@ -AC_PREREQ([2.66]) - -AC_INIT([dleyna-connector-dbus], - [0.3.0], - [https://github.com/01org/dleyna-connector-dbus/issues/new], - , - [https://01.org/dleyna/]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_AUX_DIR([build-aux]) -AC_CONFIG_MACRO_DIR([m4]) -AC_CONFIG_SRCDIR([src/connector-dbus.c]) - -AC_PREFIX_DEFAULT(/usr/local) - -AM_INIT_AUTOMAKE([subdir-objects]) - -AM_MAINTAINER_MODE -AM_SILENT_RULES([yes]) - -DLEYNA_CONNECTOR_DBUS_COMPILER_FLAGS - -# Checks for languages. -AC_LANG_C - -# Checks for programs. -AC_PROG_CC -AM_PROG_CC_C_O -AC_PROG_MKDIR_P - -# Initialize libtool -# Disable generation of static libraries -LT_PREREQ([2.2.6]) -LT_INIT([dlopen disable-static]) -LT_LANG([C]) - -# Checks for libraries. -PKG_PROG_PKG_CONFIG(0.16) -PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28]) -PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28]) -PKG_CHECK_MODULES([DBUS], [dbus-1]) - -# Checks for header files. -AC_CHECK_HEADERS([stdlib.h string.h syslog.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_TYPE_UINT8_T -AC_HEADER_STDBOOL -AC_TYPE_SIZE_T - -# Checks for library functions. -AC_FUNC_MALLOC -AC_FUNC_REALLOC -AC_CHECK_FUNCS([memset strchr strrchr strstr]) - -# Define Log Level values -LOG_LEVEL_0=0x00 -LOG_LEVEL_1=0x01 -LOG_LEVEL_2=0x02 -LOG_LEVEL_3=0x04 -LOG_LEVEL_4=0x08 -LOG_LEVEL_5=0x10 -LOG_LEVEL_6=0x20 -LOG_LEVEL_7=0x13 -LOG_LEVEL_8=0x3F - -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DISABLED], [${LOG_LEVEL_0}], [Log level flag for disabled messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_ERROR], [${LOG_LEVEL_1}], [Log level flag for errors]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_CRITICAL], [${LOG_LEVEL_2}], [Log level flag for critical messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_WARNING], [${LOG_LEVEL_3}], [Log level flag for warnings]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_MESSAGE], [${LOG_LEVEL_4}], [Log level flag for messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_INFO], [${LOG_LEVEL_5}], [Log level flag for informational messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEBUG], [${LOG_LEVEL_6}], [Log level flag for debug messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEFAULT], [${LOG_LEVEL_7}], [Log level flag to display default level messages]) -AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_ALL], [${LOG_LEVEL_8}], [Log level flag for all messages]) - -AC_ARG_ENABLE(master-build,, - [], - [master_build=no]) - -AS_IF([test "x$master_build" = "xno"], - [PKG_CHECK_MODULES([DLEYNA_CORE], [dleyna-core-1.0 >= 0.2.1])], - [DLEYNA_CORE_CFLAGS="-I../dleyna-core"; - DLEYNA_CORE_LIBS="-L../dleyna-core/.libs -ldleyna-core-1.0" - ]) - -AC_ARG_ENABLE(debug, - AS_HELP_STRING( - [--enable-debug], - [enable compiling with debugging information]), - [], - [enable_debug=no]) - -AS_CASE("${enable_debug}", - [yes], [CFLAGS="$CFLAGS -g"; - AC_DEFINE_UNQUOTED([DLEYNA_DEBUG_ENABLED],[1], [Compiling with debugging information enabled]) - ], - [no], [], - [AC_MSG_ERROR([bad value ${enable_debug} for --enable-debug])]) - - -AC_ARG_ENABLE(werror, - AS_HELP_STRING( - [--enable-werror], - [warnings are treated as errors]), - [], - [enable_werror=no]) - -AS_CASE("${enable_werror}", - [yes], [CFLAGS="$CFLAGS -Werror"], - [no], [], - [AC_MSG_ERROR([bad value ${enable_werror} for --enable-werror])]) - - -AC_ARG_ENABLE(optimization, - AS_HELP_STRING( - [--disable-optimization], - [disable code optimization through compiler]), - [], - [enable_optimization=yes]) - -AS_CASE("${enable_optimization}", - [yes], [disable_optimization=no], - [no], [CFLAGS="$CFLAGS -O0"; disable_optimization=yes], - [AC_MSG_ERROR([bad value ${enable_optimization} for --enable-werror])]) - -AC_ARG_WITH(log-level, - AS_HELP_STRING( - [--with-log-level], - [enable logging information (0,1..6,7,8)\ - 0=disabled \ - 7=default (=1,2,5) \ - 8=all (=1,2,3,4,5,6) \ - 1,..,6=a comma separated list of log level\ - ]), - [], - [with_log_level=7]) - -DLEYNA_LOG_LEVEL_CHECK([${with_log_level}]) - -AC_CONFIG_FILES([Makefile \ - dleyna-connector-dbus-1.0.pc - ]) - -AC_OUTPUT - -AS_ECHO(["------------------------------------------------- - -${PACKAGE_NAME} Version ${PACKAGE_VERSION} - -Prefix : '${prefix}' -Compiler : '${CC}' -CFLAGS : '${CFLAGS}' - --Package features: - - enable-werror : ${enable_werror} - - enable-debug : ${enable_debug} - - disable-optimization: ${disable_optimization} - - with-log-level : ${with_log_level} - ---------------------------------------------------"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/dleyna-connector-dbus-1.0.pc.in new/dleyna-connector-dbus-0.4.1/dleyna-connector-dbus-1.0.pc.in --- old/dleyna-connector-dbus-0.3.0/dleyna-connector-dbus-1.0.pc.in 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/dleyna-connector-dbus-1.0.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libexecdir=@libexecdir@ -includedir=${prefix}/include -libdir=@libdir@ - -Name: @PACKAGE@ -Description: dLeyna dbus connector -Libs: -L${libdir}/dleyna-1.0/connectors -ldleyna-connector-dbus -Requires.private: glib-2.0 gio-2.0 dbus-1 -Version: @VERSION@ \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/m4/compiler-flags.m4 new/dleyna-connector-dbus-0.4.1/m4/compiler-flags.m4 --- old/dleyna-connector-dbus-0.3.0/m4/compiler-flags.m4 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/m4/compiler-flags.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,55 +0,0 @@ -dnl -dnl dLeyna -dnl -dnl Copyright (C) 2012-2017 Intel Corporation. All rights reserved. -dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms and conditions of the GNU Lesser General Public License, -dnl version 2.1, as published by the Free Software Foundation. -dnl -dnl This program is distributed in the hope it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -dnl for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public License -dnl along with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. -dnl -dnl Ludovic Ferrandis <ludovic.ferran...@intel.com> -dnl Regis Merlino <regis.merl...@intel.com> -dnl - -AC_DEFUN_ONCE([DLEYNA_CONNECTOR_DBUS_COMPILER_FLAGS], [ - if test x"${CFLAGS}" = x""; then - CFLAGS="-Wall" - AS_VAR_APPEND([CFLAGS], [" -O2"]) - AS_VAR_APPEND([CFLAGS], [" -D_FORTIFY_SOURCE=2"]) - fi - - if test x"$USE_MAINTAINER_MODE" = x"yes"; then - AS_VAR_APPEND([CFLAGS], [" -Wextra"]) - AS_VAR_APPEND([CFLAGS], [" -Wno-unused-parameter"]) - AS_VAR_APPEND([CFLAGS], [" -Wno-missing-field-initializers"]) - AS_VAR_APPEND([CFLAGS], [" -Wdeclaration-after-statement"]) - AS_VAR_APPEND([CFLAGS], [" -Wmissing-declarations"]) - AS_VAR_APPEND([CFLAGS], [" -Wredundant-decls"]) - AS_VAR_APPEND([CFLAGS], [" -Wcast-align"]) - - AS_VAR_APPEND([CFLAGS], [" -Wstrict-prototypes"]) - AS_VAR_APPEND([CFLAGS], [" -Wmissing-prototypes"]) - AS_VAR_APPEND([CFLAGS], [" -Wnested-externs"]) - AS_VAR_APPEND([CFLAGS], [" -Wshadow"]) - AS_VAR_APPEND([CFLAGS], [" -Wformat=2"]) - AS_VAR_APPEND([CFLAGS], [" -Winit-self"]) - - AS_VAR_APPEND([CFLAGS], [" -std=gnu99"]) - AS_VAR_APPEND([CFLAGS], [" -pedantic"]) - AS_VAR_APPEND([CFLAGS], [" -Wno-overlength-strings"]) - - AS_VAR_APPEND([CFLAGS], [" -DG_DISABLE_DEPRECATED"]) - AS_VAR_APPEND([CFLAGS], [" -DGLIB_DISABLE_DEPRECATION_WARNINGS"]) - fi - - AS_VAR_APPEND([CFLAGS], [" -Wno-format-extra-args"]) -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/m4/log.m4 new/dleyna-connector-dbus-0.4.1/m4/log.m4 --- old/dleyna-connector-dbus-0.3.0/m4/log.m4 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/m4/log.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,72 +0,0 @@ -dnl -dnl dLeyna -dnl -dnl Copyright (C) 2012-2017 Intel Corporation. All rights reserved. -dnl -dnl This program is free software; you can redistribute it and/or modify it -dnl under the terms and conditions of the GNU Lesser General Public License, -dnl version 2.1, as published by the Free Software Foundation. -dnl -dnl This program is distributed in the hope it will be useful, but WITHOUT -dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -dnl FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License -dnl for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public License -dnl along with this program; if not, write to the Free Software Foundation, Inc., -dnl 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA. -dnl -dnl Ludovic Ferrandis <ludovic.ferran...@intel.com> -dnl - - -AC_DEFUN([_DLEYNA_LOG_LEVEL_CHECK_VALUE], -[ - AS_CASE($1, - [[[1-6]]], [AS_IF([test "x${log_unique}" = xyes], - [ - AC_MSG_ERROR(["Log levels 0, 7 and 8 cannot be combined with other values"], 1) - ]) - : $((log_level_count++)) - ], - - [0|7|8], [AS_IF([test ${log_level_count} -ne 0], - [ - AC_MSG_ERROR(["Log level $1 cannot be combined with other values"], 1) - ]) - log_unique=yes - ], - [AC_MSG_ERROR(["$1 is not a valid value"], 1)] - ) -] -) - -AC_DEFUN([DLEYNA_LOG_LEVEL_CHECK], -[ - AC_MSG_CHECKING([for --with-log-level=$1]) - - old_IFS=${IFS} - IFS="," - - log_ok=yes - log_unique=no - log_level_count=0 - LOG_LEVEL=0 - - for log_level in $1 - do - IFS=${old_IFS} - _DLEYNA_LOG_LEVEL_CHECK_VALUE([$log_level]) - IFS="," - log_name=LOG_LEVEL_${log_level} - eval log_value=\$${log_name} - : $((LOG_LEVEL |= ${log_value})) - done - - IFS=${old_IFS} - - AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL], [${LOG_LEVEL}], [Log level flag for debug messages]) - - AC_MSG_RESULT([ok]) -] -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/meson.build new/dleyna-connector-dbus-0.4.1/meson.build --- old/dleyna-connector-dbus-0.3.0/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/meson.build 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1,54 @@ +project('dleyna-connector-dbus', 'c', version: '0.4.1') + +conf = configuration_data() + +log_levels = [ + 0x00, + 0x01, + 0x02, + 0x04, + 0x08, + 0x10, + 0x20, + 0x13, + 0x3F +] + +conf.set_quoted('VERSION', meson.project_version()) + +conf.set('DLEYNA_LOG_LEVEL_DISABLED', log_levels[0], description: 'Log level flag for disabled messages') +conf.set('DLEYNA_LOG_LEVEL_ERROR', log_levels[1], description: 'Log level flag for errors') +conf.set('DLEYNA_LOG_LEVEL_CRITICAL', log_levels[2], description: 'Log level flag for critical messages') +conf.set('DLEYNA_LOG_LEVEL_WARNING', log_levels[3], description: 'Log level flag for warnings') +conf.set('DLEYNA_LOG_LEVEL_MESSAGE', log_levels[4], description: 'Log level flag for messages') +conf.set('DLEYNA_LOG_LEVEL_INFO', log_levels[5], description: 'Log level flag for informational messages') +conf.set('DLEYNA_LOG_LEVEL_DEBUG', log_levels[6], description: 'Log level flag for debug messages') +conf.set('DLEYNA_LOG_LEVEL_DEFAULT', log_levels[7], description: 'Log level flag to display default level messages') +conf.set('DLEYNA_LOG_LEVEL_ALL', log_levels[8], description: 'Log level flag for all messages') + +conf.set('DLEYNA_NEVER_QUIT', 'FALSE', description : 'Default service behavior when last client disconnects') +conf.set_quoted('DLEYNA_CONNECTOR_NAME', 'dbus', description : 'IPC connector name') +conf.set_quoted('DLEYNA_CONNECTOR_LIB_PATTERN', 'libdleyna-connector-', description : 'Starting pattern for dleyna connector libraries') +conf.set('DLEYNA_LOG_TYPE', '0', description: 'Define log output technology') + +exclusive = get_option('log_level').contains('0') or get_option('log_level').contains('7') or get_option('log_level').contains('8') + +if exclusive and get_option('log_level').length() > 1 + error('Log levels 0, 7 and 8 cannot be used with other log levels') +endif + +log_level = 0 +foreach value : get_option('log_level') + log_level += log_levels[value.to_int()] +endforeach + +conf.set('DLEYNA_LOG_LEVEL', log_level) + +config_h_file = configure_file(output: 'config.h', configuration: conf) +config_h = declare_dependency( + include_directories : include_directories('.'), + compile_args : ['-include', 'config.h'], + sources : config_h_file +) + +subdir('src') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/meson_options.txt new/dleyna-connector-dbus-0.4.1/meson_options.txt --- old/dleyna-connector-dbus-0.3.0/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/meson_options.txt 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1 @@ +option('log_level', type: 'array', choices : ['0', '1', '2', '3', '4', '5', '6', '7', '8'], value : ['7']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/src/connector-dbus.c new/dleyna-connector-dbus-0.4.1/src/connector-dbus.c --- old/dleyna-connector-dbus-0.3.0/src/connector-dbus.c 2017-03-04 20:25:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/src/connector-dbus.c 2021-06-06 00:11:37.000000000 +0200 @@ -218,8 +218,7 @@ prv_connector_disconnect(); - if (g_context.connection) - g_object_unref(g_context.connection); + g_clear_object(&g_context.connection); if (g_context.server_node_info) g_dbus_node_info_unref(g_context.server_node_info); @@ -233,7 +232,7 @@ static void prv_bus_acquired(GDBusConnection *connection, const gchar *name, gpointer user_data) { - g_context.connection = connection; + g_context.connection = g_object_ref (connection); g_context.connected_cb((dleyna_connector_id_t)connection); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/src/meson.build new/dleyna-connector-dbus-0.4.1/src/meson.build --- old/dleyna-connector-dbus-0.3.0/src/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/src/meson.build 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1,12 @@ +connector = shared_module( + 'dleyna-connector-dbus', + files('connector-dbus.c'), + dependencies: [ + dependency('gio-2.0', version: '>= 2.28'), + dependency('glib-2.0', version: '>= 2.28'), + dependency('dleyna-core-1.0', version: '>= 0.7.0') + ], + install: true, + install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'dleyna-1.0/connectors') +) + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-connector-dbus-0.3.0/subprojects/dleyna-core-1.0.wrap new/dleyna-connector-dbus-0.4.1/subprojects/dleyna-core-1.0.wrap --- old/dleyna-connector-dbus-0.3.0/subprojects/dleyna-core-1.0.wrap 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-connector-dbus-0.4.1/subprojects/dleyna-core-1.0.wrap 2021-06-06 00:11:37.000000000 +0200 @@ -0,0 +1,6 @@ +[wrap-git] +url = https://github.com/phako/dleyna-core.git +revision = head + +[provides] +dependency_name = dleyna-core-1.0