Hello community, here is the log from the commit of package grilo for openSUSE:Factory checked in at 2019-10-17 13:01:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grilo (Old) and /work/SRC/openSUSE:Factory/.grilo.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grilo" Thu Oct 17 13:01:38 2019 rev:38 rq:736574 version:0.3.10 Changes: -------- --- /work/SRC/openSUSE:Factory/grilo/grilo.changes 2019-07-21 11:31:38.524804691 +0200 +++ /work/SRC/openSUSE:Factory/.grilo.new.2352/grilo.changes 2019-10-17 13:01:40.684942125 +0200 @@ -1,0 +2,10 @@ +Sat Sep 14 08:13:55 UTC 2019 - [email protected] + +- Update to version 0.3.10: + + build: Use variables in pc files. + + Fix grl_data_add_related_keys annotation. + + Use only one primary header for style. +- Add optional pkgconfig(oauth) BuildRequires: Build oauth support. +- Enable check section and run meson_test. + +------------------------------------------------------------------- Old: ---- grilo-0.3.9.tar.xz New: ---- grilo-0.3.10.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grilo.spec ++++++ --- /var/tmp/diff_new_pack.oa2S87/_old 2019-10-17 13:01:42.076938598 +0200 +++ /var/tmp/diff_new_pack.oa2S87/_new 2019-10-17 13:01:42.080938588 +0200 @@ -17,7 +17,7 @@ Name: grilo -Version: 0.3.9 +Version: 0.3.10 Release: 0 Summary: Framework for browsing and searching media content License: LGPL-2.1-or-later @@ -28,7 +28,7 @@ BuildRequires: fdupes BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: meson +BuildRequires: meson >= 0.46.0 BuildRequires: pkgconfig BuildRequires: vala BuildRequires: pkgconfig(gio-2.0) >= 2.44 @@ -39,6 +39,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.0 BuildRequires: pkgconfig(libsoup-2.4) >= 2.41.3 BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(oauth) BuildRequires: pkgconfig(totem-plparser) >= 3.4.1 BuildRequires: pkgconfig(vapigen) >= 0.27 @@ -87,7 +88,7 @@ various sources using a single API. %package -n typelib-1_0-GrlNet-0_3 -Summary: Framework for browsing and searching media content -- Networking Helper Library, Introspection bindings +Summary: Introspection bindings for grilo Group: System/Libraries %description -n typelib-1_0-GrlNet-0_3 @@ -98,7 +99,7 @@ libgrlnet library. %package -n typelib-1_0-GrlPls-0_3 -Summary: Framework for browsing and searching media content -- Playlist Helper Library, Introspection bindings +Summary: Introspection bindings for grilo Group: System/Libraries %description -n typelib-1_0-GrlPls-0_3 @@ -152,9 +153,8 @@ install -d %{buildroot}%{_datadir}/grilo-0.3/plugins %fdupes %{buildroot}%{_datadir} -# make check disabled: it requires grilo to be installed to /usr beforehand (in order to load the plugins) -#%%check -#make check +%check +%meson_test %post -n libgrilo-0_3-0 -p /sbin/ldconfig %postun -n libgrilo-0_3-0 -p /sbin/ldconfig ++++++ grilo-0.3.9.tar.xz -> grilo-0.3.10.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/NEWS new/grilo-0.3.10/NEWS --- old/grilo-0.3.9/NEWS 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/NEWS 2019-09-12 17:01:01.000000000 +0200 @@ -1,3 +1,16 @@ +NEW in 0.3.10 +============= + * !48 - build: Use variables in pc files + * !47 - fix grl_data_add_related_keys annotation + * !46 - Use only one primary header for style + + * Contributors to this release: + Jan Tojnar <[email protected]> + Jean Felder <jean@small-ubu> + Roger <[email protected]> + Victor Toso <[email protected]> + worldofpeace <[email protected]> + NEW in 0.3.9 ============ * !43 - grl-metadata-key: fix introspection diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/README.md new/grilo-0.3.10/README.md --- old/grilo-0.3.9/README.md 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/README.md 2019-09-12 17:01:01.000000000 +0200 @@ -1,44 +1,47 @@ +# Grilo + Thanks for using Grilo! -# What is Grilo? +## What is Grilo? Grilo is a framework for browsing and searching media content from various sources using a single API. -# Where can I find more? +## Where can I find more? We have a [wiki page](https://wiki.gnome.org/Projects/Grilo) You can subscribe to our [mailing list](http://mail.gnome.org/mailman/listinfo/grilo-list) You can join us on the IRC: + #grilo on GIMPNet -# How do I start? +## How do I start? Once you have Grilo installed, you may want to play around with the examples (See section "Examples") or check its documentation and tutorials (See section "Documentation"). -## Fedora +### Fedora ``` sudo dnf install grilo ``` -## Archlinux +### Arch Linux ``` sudo pacman -S grilo ``` -## Others +### Others Otherwise you have to download Grilo's source code from GNOME's repository and build it -don't worry, it takes only a few seconds-, see the section below if you want to do that. -## Building from git +### Building from git ``` git clone https://gitlab.gnome.org/GNOME/grilo.git @@ -48,7 +51,7 @@ sudo ninja -C build install ``` -# Examples +## Examples If you are looking for some example to play with you can try grilo-test-ui, a simple GTK+ based test application for testing purposes. You can find it @@ -72,11 +75,11 @@ If you are looking for a step-by-step guide from beginning to end, here it is: -## Building Grilo-Plugins +### Building Grilo-Plugins Check the [Grilo-Plugins README file](https://gitlab.gnome.org/GNOME/grilo-plugins/blob/master/README.md) for instructions -## Compiling/Running grilo-test-ui +### Compiling/Running grilo-test-ui ``` git clone https://gitlab.gnome.org/GNOME/grilo.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/bindings/vala/meson.build new/grilo-0.3.10/bindings/vala/meson.build --- old/grilo-0.3.9/bindings/vala/meson.build 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/bindings/vala/meson.build 2019-09-12 17:01:01.000000000 +0200 @@ -5,13 +5,6 @@ # # Copyright (C) 2016 Igalia S.L. All rights reserved. -vapidir = join_paths([ - prefix, - get_option('datadir'), - 'vala', - 'vapi', -]) - vala_sources = [ # LIBRARY, GIR, DEPS ['grilo-@0@'.format(grl_majorminor), grl_gir[0], ['gmodule-2.0', 'gio-2.0']], ['grilo-net-@0@'.format(grl_majorminor), grlnet_gir[0], ['gio-2.0']], @@ -26,6 +19,7 @@ gnome.generate_vapi(lib, sources: [custom_vala, gir], packages: deps, - install: true) + install: true, + install_dir: vapidir) endforeach diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-0.3.pc.in new/grilo-0.3.10/grilo-0.3.pc.in --- old/grilo-0.3.9/grilo-0.3.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-0.3.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/@GRL_NAME@ -plugindir=@GRL_PLUGINS_DIR@ -datarootdir=${prefix}/share -datadir=${datarootdir} -girdir=@INTROSPECTION_GIRDIR@ -typelibdir=@INTROSPECTION_TYPELIBDIR@ - -Name: Grilo Framework -Description: Grilo Framework for multimedia developers -Version: @VERSION@ -Libs: -L${libdir} -l@GRL_NAME@ -Cflags: -I${includedir} -Requires: glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 libxml-2.0 -Requires.Private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-net-0.3.pc.in new/grilo-0.3.10/grilo-net-0.3.pc.in --- old/grilo-0.3.9/grilo-net-0.3.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-net-0.3.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/@GRL_NAME@ -datarootdir=${prefix}/share -datadir=${datarootdir} -girdir=@INTROSPECTION_GIRDIR@ -typelibdir=@INTROSPECTION_TYPELIBDIR@ - -Name: Grilo networking library -Description: Grilo networking helpers for plug-ins -Requires: @GRL_NAME@ -Version: @GRLNET_VERSION@ -Libs: -L${libdir} -lgrlnet-0.3 -Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-net-uninstalled.pc.in new/grilo-0.3.10/grilo-net-uninstalled.pc.in --- old/grilo-0.3.9/grilo-net-uninstalled.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-net-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir= -includedir= -girdir=@abs_top_builddir@/libs/ -typelibdir=@abs_top_builddir@/libs - -Name: Grilo networking library -Description: Grilo networking helpers for plug-ins -Requires: @GRL_NAME@ -Version: @GRLNET_VERSION@ - -Libs: @abs_top_builddir@/libs/net/libgrlnet-0.3.la -Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-pls-0.3.pc.in new/grilo-0.3.10/grilo-pls-0.3.pc.in --- old/grilo-0.3.9/grilo-pls-0.3.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-pls-0.3.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@/@GRL_NAME@ -datarootdir=${prefix}/share -datadir=${datarootdir} -girdir=@INTROSPECTION_GIRDIR@ -typelibdir=@INTROSPECTION_TYPELIBDIR@ - -Name: Grilo playlist library -Description: Grilo playlist utility -Requires: @GRL_NAME@ -Version: @GRLPLS_VERSION@ -Libs: -L${libdir} -lgrlpls-0.3 -Cflags: -I${includedir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-pls-uninstalled.pc.in new/grilo-0.3.10/grilo-pls-uninstalled.pc.in --- old/grilo-0.3.9/grilo-pls-uninstalled.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-pls-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,15 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir= -includedir= -girdir=@abs_top_builddir@/libs/ -typelibdir=@abs_top_builddir@/libs - -Name: Grilo playlist library -Description: Grilo playlist utility -Requires: @GRL_NAME@ -Version: @GRLPLS_VERSION@ - -Libs: @abs_top_builddir@/libs/pls/libgrlpls-0.3.la -Cflags: -I@abs_top_srcdir@/libs -I@abs_top_builddir@/libs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/grilo-uninstalled.pc.in new/grilo-0.3.10/grilo-uninstalled.pc.in --- old/grilo-0.3.9/grilo-uninstalled.pc.in 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/grilo-uninstalled.pc.in 1970-01-01 01:00:00.000000000 +0100 @@ -1,17 +0,0 @@ -# the standard variables don't make sense for an uninstalled copy -prefix= -exec_prefix= -libdir= -includedir=@abs_top_builddir@/src -plugindir=@abs_top_builddir@ -girdir=@abs_top_builddir@/src -typelibdir=@abs_top_builddir@/src - -Name: Grilo Framework -Description: Grilo Framework for multimedia developers, Not Installed -Version: @VERSION@ -Libs: @abs_top_builddir@/src/lib@[email protected] -Cflags: -I@abs_top_srcdir@/src -I@abs_top_srcdir@/src/data -Requires: glib-2.0 gobject-2.0 gmodule-2.0 gio-2.0 libxml-2.0 -Requires.Private: - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/libs/net/meson.build new/grilo-0.3.10/libs/net/meson.build --- old/grilo-0.3.9/libs/net/meson.build 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/libs/net/meson.build 2019-09-12 17:01:01.000000000 +0200 @@ -43,6 +43,22 @@ include_directories: [libgrl_inc, libgrlnet_inc], dependencies: [libsoup_dep, libgrl_dep]) +grlnet_pc = pkgconfig.generate(libgrlnet, + filebase: 'grilo-net-@0@'.format(grl_majorminor), + requires: libgrl, + subdirs: grl_name, + name: 'Grilo networking library', + description: 'Grilo networking helpers for plug-ins', + version: grlnet_version, + variables: [ + 'exec_prefix=${prefix}', + 'datarootdir=' + datadir_for_pc_file, + 'datadir=${datarootdir}', + 'girdir=' + girdir_for_pc_file, + 'typelibdir=' + typelibdir_for_pc_file, + ], +) + if enable_gir grlnet_gir = gnome.generate_gir(libgrlnet, sources: grlnet_headers + grlnet_sources, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/libs/pls/meson.build new/grilo-0.3.10/libs/pls/meson.build --- old/grilo-0.3.9/libs/pls/meson.build 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/libs/pls/meson.build 2019-09-12 17:01:01.000000000 +0200 @@ -28,6 +28,22 @@ dependencies: [totem_plparser_dep, libgrl_dep], include_directories: libgrl_inc) +grlpls_pc = pkgconfig.generate(libgrlpls, + filebase: 'grilo-pls-@0@'.format(grl_majorminor), + requires: libgrl, + subdirs: grl_name, + name: 'Grilo playlist library', + description: 'Grilo playlist utility', + version: grlpls_version, + variables: [ + 'exec_prefix=${prefix}', + 'datarootdir=' + datadir_for_pc_file, + 'datadir=${datarootdir}', + 'girdir=' + girdir_for_pc_file, + 'typelibdir=' + typelibdir_for_pc_file, + ], +) + if enable_gir gnome.generate_gir(libgrlpls, sources: grlpls_headers + grlpls_sources, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/meson.build new/grilo-0.3.10/meson.build --- old/grilo-0.3.9/meson.build 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/meson.build 2019-09-12 17:01:01.000000000 +0200 @@ -6,14 +6,14 @@ # Copyright (C) 2016 Igalia S.L. All rights reserved. project('grilo', 'c', - version: '0.3.9', + version: '0.3.10', default_options: [ 'buildtype=debugoptimized', 'c_std=gnu99', 'warning_level=1' ], license: 'LGPL 2.1', - meson_version: '>= 0.37.0') + meson_version: '>= 0.46.0') grilo_version = meson.project_version() grlnet_version = meson.project_version() @@ -63,7 +63,7 @@ enable_vala = get_option('enable-vala') if enable_vala - vapigen = find_program('vapigen', required: true) + find_program('vapigen', required: true) endif enable_testui = get_option('enable-test-ui') @@ -73,9 +73,32 @@ endif prefix = get_option('prefix') +includedir = join_paths(prefix, get_option('includedir')) libdir = join_paths(prefix, get_option('libdir')) plugins_dir = join_paths(libdir, grl_name) +plugins_dir_for_pc_file = join_paths('${libdir}', grl_name) localedir = join_paths(prefix, get_option('localedir')) +datadir_unprefixed = get_option('datadir') +datadir = join_paths(prefix, datadir_unprefixed) +datadir_for_pc_file = join_paths('${prefix}', datadir_unprefixed) + +girdir = join_paths(datadir, 'gir-1.0') +girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0') +typelibdir = join_paths(libdir, 'girepository-1.0') +typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0') +gobject_introspection = dependency('gobject-introspection-1.0', required: false) +if gobject_introspection.found() + girdir = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir', datadir]) + girdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('girdir', define_variable: ['datadir', '${datadir}']) + typelibdir = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', libdir]) + typelibdir_for_pc_file = gobject_introspection.get_pkgconfig_variable('typelibdir', define_variable: ['libdir', '${libdir}']) +endif + +vapidir = join_paths(datadir, 'vala', 'vapi') +vapigen = dependency('vapigen', required: false) +if vapigen.found() + vapidir = vapigen.get_pkgconfig_variable('vapidir', define_variable: ['datadir', datadir]) +endif cdata = configuration_data() cdata.set_quoted('VERSION', grilo_version) @@ -89,35 +112,8 @@ cdata.set('HAVE_OAUTH', oauth_dep.found()) endif -pkgconfig_files = [ - 'grilo-@0@'.format(grl_majorminor), - 'grilo-net-@0@'.format(grl_majorminor), - 'grilo-pls-@0@'.format(grl_majorminor), -] - -pkgconf = configuration_data() -pkgconf.set('prefix', prefix) -pkgconf.set('exec_prefix', '${prefix}') -pkgconf.set('libdir', libdir) -pkgconf.set('includedir', '${prefix}/@0@'.format(get_option('includedir'))) -pkgconf.set('GRL_NAME', grl_name) -pkgconf.set('GRL_PLUGINS_DIR', plugins_dir) -pkgconf.set('INTROSPECTION_GIRDIR', '${datarootdir}/gir-1.0') -pkgconf.set('INTROSPECTION_TYPELIBDIR', '${libdir}/girepository-1.0'.format(get_option('libdir'))) -pkgconf.set('VERSION', grilo_version) -pkgconf.set('GRLNET_VERSION', grlnet_version) -pkgconf.set('GRLPLS_VERSION', grlpls_version) - -foreach p: pkgconfig_files - infile = p + '.pc.in' - outfile = p + '.pc' - configure_file(input: infile, - output: outfile, - configuration: pkgconf, - install_dir: '@0@/pkgconfig'.format(get_option('libdir'))) -endforeach - gnome = import('gnome') +pkgconfig = import('pkgconfig') subdir('src') subdir('libs') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/src/data/grl-data.c new/grilo-0.3.10/src/data/grl-data.c --- old/grilo-0.3.9/src/data/grl-data.c 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/src/data/grl-data.c 2019-09-12 17:01:01.000000000 +0200 @@ -635,7 +635,7 @@ /** * grl_data_set_for_id: * @data: data to change - * @key_name: name of the key to change or add + * @key_name: name of the key to change or add * @value: the new value * * Sets the first value associated with @key_name in @data. This @key_name is used to create @@ -693,7 +693,7 @@ /** * grl_data_add_for_id: * @data: data to change - * @key_name: name of the key to change or add + * @key_name: name of the key to change or add * @value: the new value * * Appends the value associated with @key_name to @data. This @key_name is used to create @@ -868,7 +868,7 @@ /** * grl_data_add_related_keys: * @data: data to change - * @relkeys: a set of related properties with their values + * @relkeys: (transfer full): a set of related properties with their values * * Adds a new set of values into @data. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/grilo-0.3.9/src/meson.build new/grilo-0.3.10/src/meson.build --- old/grilo-0.3.9/src/meson.build 2019-07-17 10:56:58.000000000 +0200 +++ new/grilo-0.3.10/src/meson.build 2019-09-12 17:01:01.000000000 +0200 @@ -89,19 +89,40 @@ '-DHAVE_CONFIG_H', ] +libgrl_deps = [ + glib_dep, gobject_dep, gmodule_dep, gio_dep, libxml_dep +] + libgrl = shared_library(grl_name, sources: grl_sources + grl_marshal + grl_type_builtins + grl_priv_headers, install: true, soversion: soversion, version: grilo_lt_version, - dependencies: [glib_dep, gobject_dep, gmodule_dep, gio_dep, libxml_dep], + dependencies: libgrl_deps, c_args: c_args, link_args: '-Wl,--no-undefined', include_directories: libgrl_inc) - + libgrl_dep = declare_dependency(link_with: libgrl, include_directories: libgrl_inc, - dependencies: [glib_dep, gobject_dep, gmodule_dep, gio_dep, libxml_dep]) + dependencies: libgrl_deps) + +grl_pc = pkgconfig.generate(libgrl, + filebase: grl_name, + requires: libgrl_deps, + subdirs: grl_name, + name: 'Grilo Framework', + description: 'Grilo Framework for multimedia developers', + version: grilo_version, + variables: [ + 'exec_prefix=${prefix}', + 'datarootdir=' + datadir_for_pc_file, + 'datadir=${datarootdir}', + 'girdir=' + girdir_for_pc_file, + 'typelibdir=' + typelibdir_for_pc_file, + 'plugindir=' + plugins_dir_for_pc_file, + ], +) if enable_gir gir_extra_args = [ @@ -120,5 +141,7 @@ dependencies: [ gobject_dep, gmodule_dep, gio_dep ], includes: [ 'GObject-2.0', 'GModule-2.0', 'Gio-2.0' ], install: true, + install_dir_gir: girdir, + install_dir_typelib: typelibdir, extra_args: gir_extra_args) endif
