grilo: update to 0.3.16

This commit is contained in:
chrysos349 2024-02-28 08:33:51 +03:00 committed by oreo639
parent f082d99d9e
commit 8f2cd7dcd6
2 changed files with 34 additions and 7 deletions

View File

@ -0,0 +1,19 @@
We patch girdir and typelibdir in gobject-introspection to include pc_sysrootdir
for cross compiling.
Avoid using pkg-config variables for girdir_for_pc_file and typelibdir_for_pc_file
since they include pc_sysrootdir, which cannot be overridden using pkgconfig_define.
meson needs non-absolute paths in order to correctly generate datadir.
--- a/meson.build
+++ b/meson.build
@@ -96,9 +96,9 @@ 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_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', datadir])
- girdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'girdir', pkgconfig_define: ['datadir', '${datadir}'])
+ girdir_for_pc_file = join_paths('${datadir}', 'gir-1.0')
typelibdir = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', libdir])
- typelibdir_for_pc_file = gobject_introspection.get_variable(pkgconfig: 'typelibdir', pkgconfig_define: ['libdir', '${libdir}'])
+ typelibdir_for_pc_file = join_paths('${libdir}', 'girepository-1.0')
endif
vapidir = join_paths(datadir, 'vala', 'vapi')

View File

@ -1,25 +1,30 @@
# Template file for 'grilo'
pkgname=grilo
version=0.3.13
version=0.3.16
revision=1
build_style=meson
build_helper="gir"
configure_args="$(vopt_bool gir enable-introspection) $(vopt_bool gir enable-vala)
-Denable-gtk-doc=false"
hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)"
makedepends="gtk+3-devel libxml2-devel libsoup-devel liboauth-devel
$(vopt_bool gtk_doc enable-gtk-doc)"
hostmakedepends="gettext pkg-config glib-devel $(vopt_if gir vala)
$(vopt_if gtk_doc gtk-doc)"
makedepends="gtk+3-devel libxml2-devel libsoup3-devel liboauth-devel
totem-pl-parser-devel"
short_desc="Framework focused on making media discovery and browsing easy"
maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="http://live.gnome.org/Grilo"
homepage="https://wiki.gnome.org/Projects/Grilo"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
checksum=d14837f22341943ed8a189d9f0827a17016b802d18d0ed080e1413de0fdc927b
checksum=884580e8c5ece280df23aa63ff5234b7d48988a404df7d6bfccd1e77b473bd96
# Package build options
build_options="gir"
build_options="gir gtk_doc"
build_options_default="gir"
if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
grilo-devel_package() {
depends="${makedepends} grilo>=${version}_${revision}"
short_desc+=" - development files"
@ -31,5 +36,8 @@ grilo-devel_package() {
fi
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
if [ "$build_option_gtk_doc" ]; then
vmove usr/share/gtk-doc
fi
}
}