Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package dleyna-server for openSUSE:Factory checked in at 2021-09-29 20:18:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dleyna-server (Old) and /work/SRC/openSUSE:Factory/.dleyna-server.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dleyna-server" Wed Sep 29 20:18:05 2021 rev:9 rq:921684 version:0.7.1 Changes: -------- --- /work/SRC/openSUSE:Factory/dleyna-server/dleyna-server.changes 2019-07-22 12:16:49.091721145 +0200 +++ /work/SRC/openSUSE:Factory/.dleyna-server.new.1899/dleyna-server.changes 2021-09-29 20:18:48.174957063 +0200 @@ -1,0 +2,23 @@ +Sun Sep 26 10:09:15 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com> + +- Update to version 0.7.1: + + Build fixes + + Fix service file generation for non-default service name + + Fix rpath linking errors + + Do not use deprecated SoupSessionAsync +- Changes from version 0.7.0: + + Port to GUPnP 1.2 + + Switch build system to meson + + Drop signalfd for GLib's unix signal handling + + Fix a potential crash when getting server properties + + Add support for changing the D-Bus server name + + Fix a use-after-free + + Fix unintialized buffer use +- Add meson BuildRequires and macros + drop libtool BuildRequires: + No longer needed following upstreams port. +- Add pkgconfig(libxml-2.0) BuildRequires: New dependency. +- Drop dleyna-server-port-gupnp1_2.patch: Fixed upstream. +- Update URL and Source to new home, as intel have dropped + maintenance of this package, go with the leading fork. + +------------------------------------------------------------------- Old: ---- dleyna-server-0.6.0.tar_2.gz dleyna-server-port-gupnp1_2.patch New: ---- dleyna-server-0.7.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dleyna-server.spec ++++++ --- /var/tmp/diff_new_pack.G4BZQE/_old 2021-09-29 20:18:49.082959119 +0200 +++ /var/tmp/diff_new_pack.G4BZQE/_new 2021-09-29 20:18:49.086959129 +0200 @@ -1,7 +1,7 @@ # # spec file for package dleyna-server # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2021 SUSE LLC # Copyright (c) 2014 Dominique Leuenberger, Amsterdam, The Netherlands # # All modifications and additions to the file contributed by third parties @@ -18,17 +18,15 @@ Name: dleyna-server -Version: 0.6.0 +Version: 0.7.1 Release: 0 Summary: A DLNA media server License: LGPL-2.1-only Group: Productivity/Multimedia/Other -URL: http://01.org/dleyna -Source: https://01.org/sites/default/files/downloads/dleyna/%{name}-%{version}.tar_2.gz -# PATCH-FIX-UPSTREAM dleyna-server-port-gupnp1_2.patch -- Port to gupnp-1.2 -Patch0: dleyna-server-port-gupnp1_2.patch +URL: https://github.com/phako/dleyna-server +Source: %{url}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz -BuildRequires: libtool +BuildRequires: meson BuildRequires: pkgconfig BuildRequires: pkgconfig(dleyna-core-1.0) >= 0.6.0 BuildRequires: pkgconfig(gio-2.0) >= 2.36 @@ -38,6 +36,7 @@ BuildRequires: pkgconfig(gupnp-av-1.0) >= 0.11.5 BuildRequires: pkgconfig(gupnp-dlna-2.0) >= 0.9.4 BuildRequires: pkgconfig(libsoup-2.4) >= 2.28.2 +BuildRequires: pkgconfig(libxml-2.0) # As dleyna-server publishes itself on DBus, it needs access to the DBus connector Requires: dleyna-connector-dbus Provides: dbus(com.intel.dleyna-server) = %{version} @@ -61,15 +60,12 @@ %autosetup -p1 %build -autoreconf -fi -%configure \ - --disable-static \ +%meson \ %{nil} -make %{?_smp_mflags} +%meson_build %install -%make_install -find %{buildroot} -type f -name "*.la" -delete -print +%meson_install %files %license COPYING @@ -82,7 +78,7 @@ %config %{_sysconfdir}/dleyna-server-service.conf %files devel -%doc ChangeLog README +%doc ChangeLog README.md %{_includedir}/dleyna-1.0/ %{_libdir}/%{name}/libdleyna-server-1.0.so %{_libdir}/pkgconfig/dleyna-server-service-1.0.pc ++++++ dleyna-server-0.6.0.tar_2.gz -> dleyna-server-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/.github/workflows/meson.yml new/dleyna-server-0.7.1/.github/workflows/meson.yml --- old/dleyna-server-0.6.0/.github/workflows/meson.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/.github/workflows/meson.yml 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,22 @@ +name: Meson Build + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - name: Install Dependencies + run: sudo apt-get install libgupnp-1.2-dev libgupnp-av-1.0-dev libsoup2.4-dev libxml2-dev libgupnp-dlna-2.0-dev + - uses: actions/checkout@v2 + - uses: actions/setup-python@v1 + - uses: BSFishy/meson-build@v1.0.3 + with: + action: test + meson-version: 0.54.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/.travis.yml new/dleyna-server-0.7.1/.travis.yml --- old/dleyna-server-0.6.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/.travis.yml 2021-09-18 20:07:01.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 libgupnp-dlna-2.0-dev libgupnp-av-1.0-dev libsoup2.4-dev + - sudo apt install ninja-build clang-tools python3-pip + +script: + - pip3 install meson + - meson build -Dman_pages=false + - ninja -C build + - ninja -C build scan-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/ChangeLog new/dleyna-server-0.7.1/ChangeLog --- old/dleyna-server-0.6.0/ChangeLog 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/ChangeLog 2021-09-18 20:07:01.000000000 +0200 @@ -1,27 +1,42 @@ +version 0.7.1 + - Build fixes + - Fix service file generation for non-default service name + - Fix rpath linking errors + - Do not use deprecated SoupSessionAsync + +version 0.7.0 + - Port to GUPnP 1.2 + - Switch build system to meson + - Drop signalfd for GLib's unix signal handling + - Fix a potential crash when getting server properties + - Add support for changing the D-Bus server name + - Fix a use-after-free + - Fix unintialized buffer use + version 0.6.0 - - [Props] Fix ChildCount property type - - Added new core.c and core.h to Makefile.am. - - Add Artist and AlbumArtURL to MediaContainer2 - - ifaddrs.h for Andriod compile - - [m4] Don't use bash arrays in m4 macros - - [m4] Don't use bash "let" builtin - - [m4] Use AS_VAR_APPEND macro instead of "+=" - Merge pull request #149 - - Fix possible use-after-free on exit - Merge pull request #151 - - fix for issue #156 - Invalid log line - https://github.com/01org/dleyna-server/issues/156 - Merge pull request #157 - - fix for issues #154 and #155 - Dereference of undefined pointer value - https://github.com/01org/dleyna-server/issues/154 - Result of operation is garbage or undefined - https://github.com/01org/dleyna-server/issues/155 - Merge pull request #158 - - Include libgupnp/gupnp-context-manager.h - Merge pull request #159 - - Changed the Copyright to 2017 + - [Props] Fix ChildCount property type + - Added new core.c and core.h to Makefile.am. + - Add Artist and AlbumArtURL to MediaContainer2 + - ifaddrs.h for Andriod compile + - [m4] Don't use bash arrays in m4 macros + - [m4] Don't use bash "let" builtin + - [m4] Use AS_VAR_APPEND macro instead of "+=" + Merge pull request #149 + - Fix possible use-after-free on exit + Merge pull request #151 + - fix for issue #156 + Invalid log line + https://github.com/01org/dleyna-server/issues/156 + Merge pull request #157 + - fix for issues #154 and #155 + Dereference of undefined pointer value + https://github.com/01org/dleyna-server/issues/154 + Result of operation is garbage or undefined + https://github.com/01org/dleyna-server/issues/155 + Merge pull request #158 + - Include libgupnp/gupnp-context-manager.h + Merge pull request #159 + - Changed the Copyright to 2017 version 0.5.0 - [Build] Fix out-of-source-tree builds diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/Makefile.am new/dleyna-server-0.7.1/Makefile.am --- old/dleyna-server-0.6.0/Makefile.am 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,20 +0,0 @@ -SUBDIRS = libdleyna/server - -if BUILD_SERVER -SUBDIRS += server test/dbus -endif - -ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} - -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 - -maintainer-clean-local: - rm -rf build-aux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/README new/dleyna-server-0.7.1/README --- old/dleyna-server-0.6.0/README 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -Introduction: -------------- - -TODO - -Compilation ------------- - -TODO - -Working with the source code repository ---------------------------------------- - -dleyna-server can be downloaded, compiled and installed as -follows: - - Clone repository - # git clone git://github.com/01org/dleyna-server.git - # cd dleyna-server - - Configure and build - # ./autogen.sh - # make - - Final installation - # sudo make install - -These instructions are suitable for users who simply want to install -and run dleyna-server. 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. - ---enable-never-quit - -This option is disabled by default. To enable use --enable-never-quit. -When enabled, dleyna-server-service doesn't quit when the last -client disconnects. - ---with-log-type - -See logging.txt for more information about logging. - ---with-log-level - -See logging.txt for more information about logging. - ---with-connector-name - -Set the IPC mechanism to be used. - ---enable-lib-only - -This option is disabled by default. To enable use --enable-lib-only. -When enabled, only the libdleyna-server library is built. - ---with-ua-prefix - -This option allows a prefix to be added to the SOUP session user agent. -For example, --with-ua-prefix=MyPrefix can be used to change a default user -agent string from "dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50" to -"MyPrefix dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50". - ---with-dbus-service-dir - -By default, the dbus service files are installed in $(datadir)/dbus-1/services. -This option allows to choose another installation directory. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/README.md new/dleyna-server-0.7.1/README.md --- old/dleyna-server-0.6.0/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/README.md 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,62 @@ +Introduction: +------------- + +TODO + +Compilation +------------ + +TODO + +Working with the source code repository +--------------------------------------- + +dleyna-server can be downloaded, compiled and installed as +follows: + + Clone repository + # git clone https://github.com/phako/dleyna-server.git + # cd dleyna-server + + 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. + +`-Dconnector` + +Set the IPC mechanism to be used. + +`-Dbuild_server` + +This option is enabled by default. To disable it use `-Dbuild_server=false`. +When disbled, only the libdleyna-server library is built. + +`-user_agent_prefix` + +This option allows a prefix to be added to the SOUP session user agent. +For example, `-Duser_agent_prefix=MyPrefix` can be used to change a default user +agent string from "dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50" to +"MyPrefix dLeyna/0.0.1 GUPnP/0.19.4 DLNADOC/1.50". + +`-Ddbus_service_dir` + +By default, the dbus service files are installed in `$(datadir)/dbus-1/services.` +This option allows to choose another installation directory. + +`-Dman_pages` + +Whether to build the man pages for the server diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/autogen.sh new/dleyna-server-0.7.1/autogen.sh --- old/dleyna-server-0.6.0/autogen.sh 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.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-server-0.6.0/bootstrap-configure new/dleyna-server-0.7.1/bootstrap-configure --- old/dleyna-server-0.6.0/bootstrap-configure 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.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-server-0.6.0/configure.ac new/dleyna-server-0.7.1/configure.ac --- old/dleyna-server-0.6.0/configure.ac 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/configure.ac 1970-01-01 01:00:00.000000000 +0100 @@ -1,258 +0,0 @@ -AC_PREREQ([2.66]) - -AC_INIT([dleyna-server], - [0.6.0], - [https://github.com/01org/dleyna-server/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([libdleyna/server/server.c]) - -AC_PREFIX_DEFAULT(/usr/local) - -AM_INIT_AUTOMAKE([subdir-objects]) - -AM_MAINTAINER_MODE -AM_SILENT_RULES([yes]) - -DLEYNA_SERVER_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([GSSDP], [gssdp-1.0 >= 0.13.2]) -PKG_CHECK_MODULES([GUPNP], [gupnp-1.0 >= 0.20.3]) -PKG_CHECK_MODULES([GUPNPAV], [gupnp-av-1.0 >= 0.11.5]) -PKG_CHECK_MODULES([GUPNPDLNA], [gupnp-dlna-2.0 >= 0.9.4]) -PKG_CHECK_MODULES([SOUP], [libsoup-2.4 >= 2.28.2]) -PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) - -# 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.6.0])], - [this_abs_top_srcdir=`cd "$srcdir" && pwd`; - DLEYNA_CORE_CFLAGS="-I$this_abs_top_srcdir/../dleyna-core"; - DLEYNA_CORE_LIBS="-L$this_abs_top_srcdir/../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_ENABLE(never-quit, - AS_HELP_STRING( - [--enable-never-quit], - [Service doesn't quit when last client disconnects]), - [], - [enable_never_quit=no]) - -AS_CASE("${enable_never_quit}", - [yes], [never_quit=true], - [no], [never_quit=false], - [AC_MSG_ERROR([bad value ${enable_never_quit} for --enable-never-quit])]) - - -AC_ARG_WITH(connector-name, - AS_HELP_STRING( - [--with-connector-name], - [IPC connector name]), - [], - [with_connector_name=dbus]) - - -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_ARG_WITH(log-type, - AS_HELP_STRING( - [--with-log-type], - [Select log output technology \ - 0=syslog 1=GLib \ - ]), - [], - [with_log_type=0]) - -DLEYNA_LOG_TYPE_CHECK([${with_log_type}]) - - -AC_ARG_WITH(ua-prefix, - AS_HELP_STRING( - [--with-ua-prefix], - [Specify a user agent prefix]), - [with_ua_prefix = "$withval"; AC_DEFINE_UNQUOTED([UA_PREFIX], "$with_ua_prefix", [User Agent prefix])], - []) - -AC_ARG_WITH(dbus_service_dir, - AS_HELP_STRING([--with-dbus-service-dir=PATH],[choose directory for dbus service files, [default=PREFIX/share/dbus-1/services]]), - with_dbus_service_dir="$withval", with_dbus_service_dir=$datadir/dbus-1/services) -DBUS_SERVICE_DIR=$with_dbus_service_dir -AC_SUBST(DBUS_SERVICE_DIR) - - -AC_ARG_ENABLE(lib-only, - AS_HELP_STRING( - [--enable-lib-only], - [compile only the libdleyna-server library]), - [], - [enable_lib_only=no]) - -AM_CONDITIONAL([BUILD_SERVER], [test "x$enable_lib_only" = "xno"]) - -AC_DEFINE([DLEYNA_SERVER_OBJECT], "/com/intel/dLeynaServer", [Name of object exposed by dleyna-server]) -AC_DEFINE([DLEYNA_SERVER_PATH], "/com/intel/dLeynaServer/server", [Path of server objects]) - -DLEYNA_SERVER_NAME=com.intel.dleyna-server -AC_SUBST(DLEYNA_SERVER_NAME) -AC_DEFINE([DLEYNA_SERVER_NAME], "com.intel.dleyna-server", - [d-Bus Name of dleyna-server]) - -DLEYNA_SERVER_INTERFACE_MANAGER=com.intel.dLeynaServer.Manager -AC_SUBST(DLEYNA_SERVER_INTERFACE_MANAGER) -AC_DEFINE([DLEYNA_SERVER_INTERFACE_MANAGER], "com.intel.dLeynaServer.Manager", - [d-Bus Name of dleyna-server main interface]) - -DLEYNA_SERVER_INTERFACE_MEDIA_DEVICE=com.intel.dLeynaServer.MediaDevice -AC_SUBST(DLEYNA_SERVER_INTERFACE_MEDIA_DEVICE) -AC_DEFINE([DLEYNA_SERVER_INTERFACE_MEDIA_DEVICE], "com.intel.dLeynaServer.MediaDevice", - [d-Bus Name of dleyna-server device interface]) - -AC_SUBST([never_quit]) -AC_SUBST([with_connector_name]) -AC_SUBST([with_log_level]) -AC_SUBST([with_log_type]) - -AC_CONFIG_FILES([Makefile \ - libdleyna/server/Makefile \ - libdleyna/server/dleyna-server-service.conf \ - server/dleyna-server-service-1.0.pc \ - server/Makefile \ - test/dbus/Makefile - ]) - -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} - - enable-never-quit : ${enable_never_quit} - - with-connector-name : ${with_connector_name} - - disable-optimization : ${disable_optimization} - - with-log-level : ${with_log_level} - - with-log-type : ${with_log_type} - - with-ua-prefix : ${with_ua_prefix} - - enable-lib-only : ${enable_lib_only} - - with-dbus-service-dir : ${with_dbus_service_dir} - ---------------------------------------------------"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/libdleyna/meson.build new/dleyna-server-0.7.1/libdleyna/meson.build --- old/dleyna-server-0.6.0/libdleyna/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/libdleyna/meson.build 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1 @@ +subdir('server') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/libdleyna/server/Makefile.am new/dleyna-server-0.7.1/libdleyna/server/Makefile.am --- old/dleyna-server-0.6.0/libdleyna/server/Makefile.am 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/libdleyna/server/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,77 +0,0 @@ -DLEYNA_SERVER_VERSION = 1:3:0 - -AM_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ - $(DLEYNA_CORE_CFLAGS) \ - $(GSSDP_CFLAGS) \ - $(GUPNP_CFLAGS) \ - $(GUPNPAV_CFLAGS) \ - $(GUPNPDLNA_CFLAGS) \ - $(SOUP_CFLAGS) \ - $(LIBXML_CFLAGS) \ - -include config.h - -pkglib_LTLIBRARIES = libdleyna-server-1.0.la - -libdleyna_serverincdir = $(includedir)/dleyna-1.0/libdleyna/server - -libdleyna_serverinc_HEADERS = control-point-server.h - -libdleyna_server_1_0_la_LDFLAGS = -version-info $(DLEYNA_SERVER_VERSION) \ - -no-undefined - -libdleyna_server_1_0_la_SOURCES = $(libdleyna_serverinc_HEADERS) \ - server.c \ - async.c \ - device.c \ - manager.c \ - path.c \ - props.c \ - search.c \ - sort.c \ - task.c \ - upnp.c \ - xml-util.c - -libdleyna_server_1_0_la_LIBADD = $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(DLEYNA_CORE_LIBS) \ - $(GSSDP_LIBS) \ - $(GUPNP_LIBS) \ - $(GUPNPAV_LIBS) \ - $(GUPNPDLNA_LIBS) \ - $(SOUP_LIBS) \ - $(LIBXML_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 - -sysconf_DATA = dleyna-server-service.conf - -EXTRA_DIST = $(sysconf_DATA) \ - async.h \ - client.h \ - device.h \ - interface.h \ - manager.h \ - path.h \ - props.h \ - search.h \ - server.h \ - sort.h \ - task.h \ - upnp.h \ - xml-util.h - -CLEANFILES = dleyna-server-service.conf -DISTCLEANFILES = dleyna-server-service.conf - -maintainer-clean-local: - rm -rf build-aux diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/libdleyna/server/device.c new/dleyna-server-0.7.1/libdleyna/server/device.c --- old/dleyna-server-0.6.0/libdleyna/server/device.c 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/libdleyna/server/device.c 2021-09-18 20:07:01.000000000 +0200 @@ -2256,15 +2256,14 @@ DLS_SYSTEM_UPDATE_VAR, g_variant_new_uint32(id)); - cb_data->task.result = g_variant_ref_sink(g_variant_builder_end( - cb_task_data->vb)); - on_complete: if (!cb_data->error) prv_get_sr_token_for_props(proxy, cb_data->task.target.device, cb_data); else { + cb_data->task.result = g_variant_ref_sink(g_variant_builder_end( + cb_task_data->vb)); (void) g_idle_add(dls_async_task_complete, cb_data); g_cancellable_disconnect(cb_data->cancellable, cb_data->cancel_id); @@ -2688,7 +2687,7 @@ cb_data->error = g_error_new(DLEYNA_SERVER_ERROR, DLEYNA_ERROR_OPERATION_FAILED, - "GetNetworkInterfaceInfo failed: %s", + "GetInterfaceInfo failed: %s", message); goto on_complete; @@ -4596,7 +4595,7 @@ upload = g_new0(dls_device_upload_t, 1); - upload->soup_session = soup_session_async_new(); + upload->soup_session = soup_session_new(); upload->msg = soup_message_new("POST", import_uri); upload->mapped_file = mapped_file; upload->body = body; @@ -5790,6 +5789,7 @@ dls_async_task_t *cb_data = (dls_async_task_t *)tcp_data->task; GError *tcp_error = NULL; gssize written; + guint max_wake_on_delay; DLEYNA_LOG_DEBUG("Enter"); @@ -5855,6 +5855,8 @@ goto on_exit; on_complete: + // Save no delay for potential use later + max_wake_on_delay = tcp_data->max_wake_on_delay; prv_free_tcp_data(tcp_data); if (!g_cancellable_is_cancelled(cb_data->cancellable)) { @@ -5862,7 +5864,7 @@ if (cb_data->task.target.device->sleeping_context != NULL) prv_start_wake_on_watcher(cb_data->task.target.device, - tcp_data->max_wake_on_delay); + max_wake_on_delay); } g_cancellable_disconnect(cb_data->cancellable, cb_data->cancel_id); @@ -5907,7 +5909,7 @@ goto on_exit; } - buffer = g_malloc(len / 2); + buffer = g_malloc0(len / 2); for (i = 0, j = 0; i < len; i += 2, j++) { if (!prv_hex_char_to_byte(hex_str[i], &buffer[j])) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/libdleyna/server/meson.build new/dleyna-server-0.7.1/libdleyna/server/meson.build --- old/dleyna-server-0.6.0/libdleyna/server/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/libdleyna/server/meson.build 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,69 @@ +install_headers( + files( + 'control-point-server.h' + ), + subdir: 'dleyna-1.0/libdleyna/server' +) + +libdleyna_server = library( + 'dleyna-server-1.0', + files( + 'async.c', + 'device.c', + 'manager.c', + 'path.c', + 'props.c', + 'search.c', + 'server.c', + 'sort.c', + 'task.c', + 'upnp.c', + 'xml-util.c' + ), + version: '1.0.3', + dependencies : [ + glib, + gio, + dleyna_core, + gupnp, + gupnp_av, + gupnp_dlna, + soup, + libxml2, + math, + config_h + ], + install: true, + install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'dleyna-server') +) + +# FIXME: Change the .in file to directly take the values we put in config.h +config_conf = configuration_data() +config_conf.set('with_connector_name', get_option('connector')) +config_conf.set('with_log_type', log_types[get_option('log_type')]) +config_conf.set('with_log_level', ','.join(get_option('log_level'))) +config_conf.set('never_quit', get_option('never_quit').to_string().to_lower()) + +configure_file( + input: 'dleyna-server-service.conf.in', + output: 'dleyna-server-service.conf', + configuration: config_conf, + install: true, + install_dir: get_option('sysconfdir') +) + +server_dep = declare_dependency ( + link_with: libdleyna_server, + include_directories: include_directories('../..') +) + +pkg.generate( + libdleyna_server, + name: 'dleyna-server-service-1.0', + description: 'UPnP & DLNA server library', + version: meson.project_version(), + requires: ['gupnp-1.2', 'glib-2.0', 'gio-2.0', 'dleyna-core-1.0'], + install_dir: join_paths(get_option('prefix'), get_option('libdir'), 'pkgconfig') +) + +meson.override_dependency('dleyna-server-1.0', server_dep) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/libdleyna/server/upnp.c new/dleyna-server-0.7.1/libdleyna/server/upnp.c --- old/dleyna-server-0.6.0/libdleyna/server/upnp.c 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/libdleyna/server/upnp.c 2021-09-18 20:07:01.000000000 +0200 @@ -351,8 +351,8 @@ udn = gupnp_device_info_get_udn((GUPnPDeviceInfo *)proxy); - ip_address = gupnp_context_get_host_ip( - gupnp_control_point_get_context(cp)); + ip_address = gssdp_client_get_host_ip( + GSSDP_CLIENT(gupnp_control_point_get_context(cp))); if (!udn || !ip_address) goto on_error; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/m4/compiler-flags.m4 new/dleyna-server-0.7.1/m4/compiler-flags.m4 --- old/dleyna-server-0.6.0/m4/compiler-flags.m4 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/m4/compiler-flags.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,56 +0,0 @@ -dnl -dnl dLeyna -dnl -dnl Copyright (C) 2012-2015 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_SERVER_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"]) - AS_VAR_APPEND([CFLAGS], [" -Wl,--no-undefined"]) -]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/m4/log.m4 new/dleyna-server-0.7.1/m4/log.m4 --- old/dleyna-server-0.6.0/m4/log.m4 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/m4/log.m4 1970-01-01 01:00:00.000000000 +0100 @@ -1,86 +0,0 @@ -dnl -dnl dLeyna -dnl -dnl Copyright (C) 2012-2015 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]) -] -) - -AC_DEFUN([DLEYNA_LOG_TYPE_CHECK], -[ - AC_MSG_CHECKING([for --with-log-type=$1]) - - AS_CASE($1, - [0|1], [], - - [AC_MSG_ERROR(["$1 is not a valid value"], 1)] - ) - - AC_MSG_RESULT([ok]) -] -) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/meson.build new/dleyna-server-0.7.1/meson.build --- old/dleyna-server-0.6.0/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/meson.build 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,105 @@ +project('dleyna-server', 'c', version: '0.7.1') + +pkg = import('pkgconfig') + +conf = configuration_data() + +log_levels = [ + 0x00, + 0x01, + 0x02, + 0x04, + 0x08, + 0x10, + 0x20, + 0x13, + 0x3F +] + +log_types = { + 'syslog' : 0, + 'glib' : 1 +} + +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', get_option('never_quit').to_string().to_upper(), description : 'Default service behavior when last client disconnects') +conf.set_quoted('DLEYNA_CONNECTOR_NAME', get_option('connector'), description : 'IPC connector name') +conf.set_quoted('DLEYNA_CONNECTOR_LIB_PATTERN', get_option('connector_lib_pattern'), description : 'Starting pattern for dleyna connector libraries') +conf.set('DLEYNA_LOG_TYPE', log_types[get_option('log_type')], 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) + +conf.set_quoted('DLEYNA_SERVER_INTERFACE_MANAGER', get_option('interface_manager')) +conf.set_quoted('DLEYNA_SERVER_INTERFACE_MEDIA_DEVICE', get_option('interface_media_device')) +conf.set_quoted('DLEYNA_SERVER_OBJECT', get_option('server_object')) +conf.set_quoted('DLEYNA_SERVER_NAME', get_option('server_name')) +conf.set_quoted('DLEYNA_SERVER_PATH', get_option('server_path')) +conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) + +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 +) + +glib = dependency('glib-2.0', version: '>= 2.28') +gio = dependency('gio-2.0', version: '>=2.28') +gssdp = dependency('gssdp-1.2', version: '>= 1.2.0') +gupnp = dependency('gupnp-1.2', version: '>= 1.2.0') +gupnp_av = dependency('gupnp-av-1.0', version: '>= 0.11.5') +gupnp_dlna = dependency('gupnp-dlna-2.0', version: '>= 0.9.4') +soup = dependency('libsoup-2.4', version: '>= 2.28.2') +dleyna_core = dependency('dleyna-core-1.0', version: '>= 0.6.0', fallback: 'dleyna-core-1.0') +libxml2 = dependency('libxml-2.0') + +cc = meson.get_compiler('c') +math = cc.find_library('m', required: false) + +subdir('libdleyna') +if get_option('build_server') + subdir('server') +endif + +summary( + { + 'prefix': get_option('prefix'), + }, + section: 'Paths' +) + +summary( + { + 'Build type': get_option('buildtype'), + 'Enable werror': get_option('werror'), + 'Enable never-quit': get_option('never_quit'), + 'Connector name': get_option('connector'), + 'Log level' : get_option('log_level'), + 'Log type' : get_option('log_type'), + 'Only build library' : not get_option('build_server'), + 'User-Agent prefix' : get_option('user_agent_prefix') + }, + section: 'Package features' +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/meson_options.txt new/dleyna-server-0.7.1/meson_options.txt --- old/dleyna-server-0.6.0/meson_options.txt 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/meson_options.txt 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,14 @@ +option('log_level', type: 'array', choices : ['0', '1', '2', '3', '4', '5', '6', '7', '8'], value : ['7']) +option('never_quit', type: 'boolean', value: 'false') +option('connector', type: 'string', value: 'dbus') +option('connector_lib_pattern', type: 'string', value: 'libdleyna-connector-') +option('user_agent_prefix', type: 'string', value: '') +option('dbus_service_dir', type: 'string', value: 'none') +option('log_type', type: 'combo', choices: ['syslog', 'glib'], value: 'syslog') +option('build_server', type: 'boolean', value: 'true') +option('server_object', type: 'string', value: '/com/intel/dLeynaServer') +option('server_path', type: 'string', value: '/com/intel/dLeynaServer/server') +option('server_name', type: 'string', value: 'com.intel.dleyna-server') +option('interface_manager', type: 'string', value: 'com.intel.dLeynaServer.Manager') +option('interface_media_device', type: 'string', value: 'com.intel.dLeynaServer.MediaDevice') +option('man_pages', type: 'boolean', value: 'true') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/server/Makefile.am new/dleyna-server-0.7.1/server/Makefile.am --- old/dleyna-server-0.6.0/server/Makefile.am 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/server/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,30 +0,0 @@ -AM_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) \ - $(DLEYNA_CORE_CFLAGS) \ - -I$(top_srcdir) \ - -include config.h - -libexec_PROGRAMS = dleyna-server-service - -dleyna_server_service_SOURCES = daemon.c - -dleyna_server_service_LDADD = $(GLIB_LIBS) \ - $(GIO_LIBS) \ - $(DLEYNA_CORE_LIBS) \ - $(top_builddir)/libdleyna/server/libdleyna-server-1.0.la - -dbusservicedir = $(DBUS_SERVICE_DIR) -dbusservice_in_files = com.intel.dleyna-server.service.in -dbusservice_DATA = com.intel.dleyna-server.service - -# Replace the 'libexecdir' marker with its fully expanded value -%.service: %.service.in Makefile - $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dleyna-server-service-1.0.pc - -EXTRA_DIST = $(dbusservice_in_files) - -CLEANFILES = $(dbusservice_DATA) -DISTCLEANFILES = $(dbusservice_DATA) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/server/com.intel.dleyna-server.service.in new/dleyna-server-0.7.1/server/com.intel.dleyna-server.service.in --- old/dleyna-server-0.6.0/server/com.intel.dleyna-server.service.in 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/server/com.intel.dleyna-server.service.in 2021-09-18 20:07:01.000000000 +0200 @@ -1,4 +1,4 @@ [D-BUS Service] -Name=com.intel.dleyna-server +Name=@DLEYNA_SERVER_NAME@ Exec=@libexecdir@/dleyna-server-service diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/server/daemon.c new/dleyna-server-0.7.1/server/daemon.c --- old/dleyna-server-0.6.0/server/daemon.c 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/server/daemon.c 2021-09-18 20:07:01.000000000 +0200 @@ -22,82 +22,29 @@ */ #include <glib.h> -#include <sys/signalfd.h> +#include <glib-unix.h> #include <libdleyna/core/main-loop.h> #include <libdleyna/server/control-point-server.h> #define DLS_SERVER_SERVICE_NAME "dleyna-server-service" -static guint g_sig_id; - -static gboolean prv_quit_handler(GIOChannel *source, GIOCondition condition, - gpointer user_data) +static gboolean prv_quit_handler(gpointer user_data) { dleyna_main_loop_quit(); - g_sig_id = 0; return FALSE; } -static gboolean prv_init_signal_handler(sigset_t mask) -{ - gboolean retval = FALSE; - int fd = -1; - GIOChannel *channel = NULL; - - fd = signalfd(-1, &mask, SFD_NONBLOCK); - if (fd == -1) - goto on_error; - - channel = g_io_channel_unix_new(fd); - g_io_channel_set_close_on_unref(channel, TRUE); - - if (g_io_channel_set_flags(channel, G_IO_FLAG_NONBLOCK, NULL) != - G_IO_STATUS_NORMAL) - goto on_error; - - if (g_io_channel_set_encoding(channel, NULL, NULL) != - G_IO_STATUS_NORMAL) - goto on_error; - - g_sig_id = g_io_add_watch(channel, G_IO_IN | G_IO_PRI, - prv_quit_handler, - NULL); - - retval = TRUE; - -on_error: - - if (channel) - g_io_channel_unref(channel); - - return retval; -} - int main(int argc, char *argv[]) { - sigset_t mask; + g_unix_signal_add (SIGTERM, prv_quit_handler, NULL); + g_unix_signal_add (SIGINT, prv_quit_handler, NULL); int retval = 1; - sigemptyset(&mask); - sigaddset(&mask, SIGTERM); - sigaddset(&mask, SIGINT); - - if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) - goto out; - - if (!prv_init_signal_handler(mask)) - goto out; - - retval = dleyna_main_loop_start(DLS_SERVER_SERVICE_NAME, + return dleyna_main_loop_start(DLS_SERVER_SERVICE_NAME, dleyna_control_point_get_server(), NULL); -out: - - if (g_sig_id) - (void) g_source_remove(g_sig_id); - return retval; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/server/meson.build new/dleyna-server-0.7.1/server/meson.build --- old/dleyna-server-0.6.0/server/meson.build 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/server/meson.build 2021-09-18 20:07:01.000000000 +0200 @@ -0,0 +1,27 @@ +server_service = executable( + 'dleyna-server-service', + files('daemon.c'), + dependencies : [ + glib, + gio, + dleyna_core, + server_dep, + ], + install: true, + install_dir: join_paths(get_option('prefix'), get_option('libexecdir')), + install_rpath: join_paths(get_option('prefix'), get_option('libdir'), 'dleyna-server') +) + +server_name = get_option('server_name') + +dbus_conf = configuration_data() +dbus_conf.set('DLEYNA_SERVER_NAME', server_name) +dbus_conf.set('libexecdir', join_paths(get_option('prefix'), get_option('libexecdir'))) + +configure_file( + input: 'com.intel.dleyna-server.service.in', + output: server_name + '.service', + configuration: dbus_conf, + install: true, + install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'dbus-1/services') +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/subprojects/dleyna-core-1.0.wrap new/dleyna-server-0.7.1/subprojects/dleyna-core-1.0.wrap --- old/dleyna-server-0.6.0/subprojects/dleyna-core-1.0.wrap 1970-01-01 01:00:00.000000000 +0100 +++ new/dleyna-server-0.7.1/subprojects/dleyna-core-1.0.wrap 2021-09-18 20:07:01.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 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/test/dbus/Makefile.am new/dleyna-server-0.7.1/test/dbus/Makefile.am --- old/dleyna-server-0.6.0/test/dbus/Makefile.am 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/test/dbus/Makefile.am 1970-01-01 01:00:00.000000000 +0100 @@ -1,13 +0,0 @@ -AM_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) - -dms_info_sources = dms-info.c - -noinst_PROGRAMS = dms-info -dms_info_SOURCES = $(dms_info_sources) - -dms_info_CFLAGS = $(GLIB_CFLAGS) \ - $(GIO_CFLAGS) - -dms_info_LDADD = $(GLIB_LIBS) \ - $(GIO_LIBS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/dleyna-server-0.6.0/test/dbus/dms-info.c new/dleyna-server-0.7.1/test/dbus/dms-info.c --- old/dleyna-server-0.6.0/test/dbus/dms-info.c 2017-03-04 19:24:19.000000000 +0100 +++ new/dleyna-server-0.7.1/test/dbus/dms-info.c 2021-09-18 20:07:01.000000000 +0200 @@ -360,8 +360,6 @@ if (sigprocmask(SIG_BLOCK, &mask, NULL) == -1) goto on_error; - g_type_init(); - /* Create proxy for com.intel.dLeynaServer.Manager. The Manager object has no properties. We will create the proxy asynchronously and use G_DBUS_PROXY_FLAGS_DO_NOT_LOAD_PROPERTIES to ensure that
