diff --git a/srcpkgs/totem-pl-parser/patches/fix-gir-cross.patch b/srcpkgs/totem-pl-parser/patches/fix-gir-cross.patch
new file mode 100644
index 00000000000..25b68c85689
--- /dev/null
+++ b/srcpkgs/totem-pl-parser/patches/fix-gir-cross.patch
@@ -0,0 +1,24 @@
+diff --git a/meson_options.txt b/meson_options.txt
+index 9c32a5f..0fea01b 100644
+--- meson_options.txt
++++ meson_options.txt
+@@ -6,3 +6,5 @@ option('enable-libgcrypt', type: 'combo', choices : ['yes', 'no', 'auto'], value
+   description : 'Enable libgcrypt support.')
+ option('enable-gtk-doc', type: 'boolean', value: 'false',
+   description : 'Generate the API reference (depends on GTK-Doc)')
++option('introspection', type: 'boolean', value: 'true',
++  description : 'Generate GObject Introspection bindings')
+diff --git a/plparse/meson.build b/plparse/meson.build
+index bdfde9d..668a072 100644
+--- plparse/meson.build
++++ plparse/meson.build
+@@ -121,7 +121,7 @@ if have_quvi
+ endif
+ 
+ # Introspection
+-if not meson.is_cross_build()
++if get_option('introspection')
+   gnome.generate_gir(plparser_lib,
+                      sources: plparser_public_headers + plparser_sources + [
+                        totem_pl_parser_marshalers[1],
+
diff --git a/srcpkgs/totem-pl-parser/template b/srcpkgs/totem-pl-parser/template
index f50d4a6a7f0..80f0d25ef8c 100644
--- a/srcpkgs/totem-pl-parser/template
+++ b/srcpkgs/totem-pl-parser/template
@@ -1,12 +1,13 @@
 # Template file for 'totem-pl-parser'
 pkgname=totem-pl-parser
 version=3.26.2
-revision=1
+revision=2
 build_style=meson
+build_helper="gir"
 # XXX needs libquvi>=0.9
-configure_args="-Denable-libarchive=yes -Denable-libgcrypt=yes"
-hostmakedepends="glib-devel intltool pkg-config
- $(vopt_if gir 'gobject-introspection')"
+configure_args="-Denable-libarchive=yes -Denable-libgcrypt=yes
+ -Dintrospection=$(vopt_if gir true false)"
+hostmakedepends="glib-devel intltool pkg-config"
 makedepends="libarchive-devel libgcrypt-devel libsoup-gnome-devel"
 short_desc="Totem playlist parser library"
 maintainer="Enno Boland <gottox@voidlinux.org>"
@@ -17,10 +18,12 @@ checksum=d386acf965a44597e25ddee4a42ccde3c649a55b657e3a605648815b70861c3a
 
 # Package build options
 build_options="gir"
-# Disable gir for cross builds.
-if [ -z "$CROSS_BUILD" ]; then
-	build_options_default="gir"
-fi
+
+case "$XBPS_TARGET_MACHINE" in
+	x86_64-musl) build_options_default+=" gir" ;;
+	*-musl) ;;
+	*) build_options_default+=" gir" ;;
+esac
 
 totem-pl-parser-devel_package() {
 	depends="${makedepends} totem-pl-parser-${version}_${revision}