Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2020-01-13 22:16:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new.6675 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo" Mon Jan 13 22:16:48 2020 rev:40 rq:761953 version:0.3.11 Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2019-11-24 00:02:15.555053305 +0100 +++ /work/SRC/openSUSE:Factory/.grilo.new.6675/grilo.changes 2020-01-13 22:17:56.794418658 +0100 @@ -1,0 +2,10 @@ +Wed Jan 8 17:22:43 UTC 2020 - Bjørn Lie <[email protected]> + +- Update to version 0.3.11: + + pls: Support totem-pl-parser 3.26.4. + + build: + - Add a Meson dependency variable for libgrlpls. + - Avoid using meson.source_root(). +- Drop grilo-fix-build-totem-pl-parser.patch: Fixed upstream. + +------------------------------------------------------------------- Old: ---- grilo-0.3.10.tar.xz grilo-fix-build-totem-pl-parser.patch New: ---- grilo-0.3.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.qTiO3T/_old 2020-01-13 22:18:01.534420857 +0100 +++ /var/tmp/diff_new_pack.qTiO3T/_new 2020-01-13 22:18:01.626420899 +0100 @@ -1,7 +1,7 @@ # # spec file for package grilo # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,15 +17,13 @@ Name: grilo -Version: 0.3.10 +Version: 0.3.11 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1-or-later Group: Productivity/Multimedia/Other URL: https://live.gnome.org/Grilo Source0: https://download.gnome.org/sources/grilo/0.3/%{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM grilo-fix-build-totem-pl-parser.patch -- Fix build with totem-pl-parser 3.26.4 -Patch0: grilo-fix-build-totem-pl-parser.patch BuildRequires: fdupes BuildRequires: gtk-doc ++++++ grilo-0.3.10.tar.xz -> grilo-0.3.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/NEWS new/grilo-0.3.11/NEWS --- old/grilo-0.3.10/NEWS 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/NEWS 2020-01-08 16:28:39.000000000 +0100 @@ -1,3 +1,13 @@ +NEW in 0.3.11 +============= + * !52 pls: Support totem-pl-parser 3.26.4 + * !51 build: Add a Meson dependency variable for libgrlpls + * !50 build: Avoid using meson.source_root() + + * Contributors to this release: + Sam Thursfield <[email protected]> + Bastien Nocera <[email protected]> + NEW in 0.3.10 ============= * !48 - build: Use variables in pc files diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/doc/grilo/meson.build new/grilo-0.3.11/doc/grilo/meson.build --- old/grilo-0.3.10/doc/grilo/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/doc/grilo/meson.build 2020-01-08 16:28:39.000000000 +0100 @@ -23,8 +23,8 @@ gnome.gtkdoc('grilo', main_sgml: 'grilo-docs.sgml', src_dir: [ - join_paths(meson.source_root(), 'src'), - join_paths(meson.source_root(), 'libs'), + join_paths(source_root, 'src'), + join_paths(source_root, 'libs'), ], dependencies: libgrl_dep, gobject_typesfile: types, @@ -37,10 +37,10 @@ 'quick-start.xml', 'writing-apps.xml', 'overview.xml', - join_paths(meson.source_root(), 'examples', 'configuring-plugins.c'), - join_paths(meson.source_root(), 'examples', 'browsing.c'), - join_paths(meson.source_root(), 'examples', 'searching.c'), - join_paths(meson.source_root(), 'examples', 'multivalues.c'), - join_paths(meson.source_root(), 'examples', 'efficient-metadata-resolution.c'), + join_paths(source_root, 'examples', 'configuring-plugins.c'), + join_paths(source_root, 'examples', 'browsing.c'), + join_paths(source_root, 'examples', 'searching.c'), + join_paths(source_root, 'examples', 'multivalues.c'), + join_paths(source_root, 'examples', 'efficient-metadata-resolution.c'), ] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/libs/pls/grl-pls.c new/grilo-0.3.11/libs/pls/grl-pls.c --- old/grilo-0.3.10/libs/pls/grl-pls.c 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/libs/pls/grl-pls.c 2020-01-08 16:28:39.000000000 +0100 @@ -47,6 +47,10 @@ #include <totem-pl-parser.h> #include <totem-pl-parser-mini.h> +#ifndef TOTEM_PL_IS_PARSER(x) +#define TOTEM_PL_IS_PARSER(x) TOTEM_IS_PL_PARSER(x) +#endif /* TOTEM_PL_IS_PARSER */ + /* --------- Constants -------- */ #define GRL_DATA_PRIV_PLS_IS_PLAYLIST "priv:pls:is_playlist" @@ -465,7 +469,7 @@ GRL_DEBUG ("%s (parser=%p, uri=\"%s\", metadata=%p, user_data=%p)", __FUNCTION__, parser, uri, metadata, user_data); - g_return_if_fail (TOTEM_IS_PL_PARSER (parser)); + g_return_if_fail (TOTEM_PL_IS_PARSER (parser)); g_return_if_fail (uri); g_return_if_fail (metadata); g_return_if_fail (user_data); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/libs/pls/meson.build new/grilo-0.3.11/libs/pls/meson.build --- old/grilo-0.3.10/libs/pls/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/libs/pls/meson.build 2020-01-08 16:28:39.000000000 +0100 @@ -19,6 +19,8 @@ install_headers(grlpls_headers, subdir: '@0@/pls'.format(grl_name)) +libgrlpls_inc = include_directories(['..']) + libgrlpls = shared_library('grlpls-@0@'.format(grl_majorminor), sources: grlpls_sources, install: true, @@ -28,6 +30,10 @@ dependencies: [totem_plparser_dep, libgrl_dep], include_directories: libgrl_inc) +libgrlpls_dep = declare_dependency(link_with: libgrlpls, + include_directories: [libgrl_inc, libgrlpls_inc], + dependencies: [totem_plparser_dep, libgrl_dep]) + grlpls_pc = pkgconfig.generate(libgrlpls, filebase: 'grilo-pls-@0@'.format(grl_majorminor), requires: libgrl, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/meson.build new/grilo-0.3.11/meson.build --- old/grilo-0.3.10/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/meson.build 2020-01-08 16:28:39.000000000 +0100 @@ -6,7 +6,7 @@ # Copyright (C) 2016 Igalia S.L. All rights reserved. project('grilo', 'c', - version: '0.3.10', + version: '0.3.11', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', @@ -72,6 +72,8 @@ oauth_dep = dependency('oauth', required: false) endif +source_root = meson.current_source_dir() + prefix = get_option('prefix') includedir = join_paths(prefix, get_option('includedir')) libdir = join_paths(prefix, get_option('libdir')) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.10/tools/grilo-inspect/meson.build new/grilo-0.3.11/tools/grilo-inspect/meson.build --- old/grilo-0.3.10/tools/grilo-inspect/meson.build 2019-09-12 17:01:01.000000000 +0200 +++ new/grilo-0.3.11/tools/grilo-inspect/meson.build 2020-01-08 16:28:39.000000000 +0100 @@ -14,7 +14,7 @@ endif run_command(python, '@0@/generate_core_keys.py'.format(meson.current_source_dir()), - '@0@/src/grl-metadata-key.h'.format(meson.source_root()), + '@0@/src/grl-metadata-key.h'.format(source_root), '@0@/grl-core-keys.h'.format(meson.current_build_dir())) configure_file(output: 'config.h',
