Skip to content

Commit

Permalink
gstreamer1: update to 1.18.3.
Browse files Browse the repository at this point in the history
Remove gtk_doc option as it does nothing and doubt many use
  • Loading branch information
ndowens authored and ericonr committed Feb 3, 2021
1 parent ab54c09 commit d2b9f1c
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 22 deletions.
22 changes: 17 additions & 5 deletions srcpkgs/gstreamer1/patches/no-gir-automagic.patch
Original file line number Diff line number Diff line change
@@ -1,13 +1,25 @@
diff --git a/meson.build b/meson.build
index e738c55..e1b8d93 100644
From 225e87688f21a817224655372004eb512f862d43 Mon Sep 17 00:00:00 2001
From: Nathan Owens <ndowens@artixlinux.org>
Date: Sun, 15 Nov 2020 10:04:50 -0600
Subject: [PATCH] no-gir-automatic

---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git meson.build meson.build
index 5a21823..5d1db37 100644
--- meson.build
+++ meson.build
@@ -451,7 +451,7 @@ rt_lib = cc.find_library('rt', required : false)
@@ -503,7 +503,7 @@ rt_lib = cc.find_library('rt', required : false)
gir = find_program('g-ir-scanner', required : get_option('introspection'))
gnome = import('gnome')

-build_gir = gir.found() and not meson.is_cross_build()
+build_gir = gir.found()
-build_gir = gir.found() and (not meson.is_cross_build() or get_option('introspection').enabled())
+build_gir = gir.found() or get_option('introspection').enabled()

gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \
'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \
--
2.29.2

32 changes: 15 additions & 17 deletions srcpkgs/gstreamer1/template
Original file line number Diff line number Diff line change
@@ -1,34 +1,35 @@
# Template file for 'gstreamer1'
pkgname=gstreamer1
version=1.16.2
revision=2
version=1.18.3
revision=1
wrksrc="gstreamer-${version}"
build_style=meson
build_helper="gir"
configure_args="-Dptp-helper-permissions=capabilities
-Dpackage-origin=https://www.voidlinux.org -Ddbghelp=disabled
-Dintrospection=$(vopt_if gir enabled disabled)
-Dgtk_doc=$(vopt_if gtk_doc enabled disabled)"
hostmakedepends="gettext pkg-config flex python docbook-xsl glib-devel
libcap-progs $(vopt_if gtk_doc gtk-doc)"
-Dintrospection=$(vopt_if gir enabled disabled)"
hostmakedepends="gettext pkg-config flex python3 docbook-xsl glib-devel
libcap-progs"
makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel
bash-completion"
short_desc="Core GStreamer libraries and elements (1.x)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="LGPL-2.0-or-later"
homepage="https://gstreamer.freedesktop.org"
distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz"
checksum=e3f044246783fd685439647373fa13ba14f7ab0b346eadd06437092f8419e94e
checksum=0c2e09e18f2df69a99b5cb3bd53c597b3cc2e35cf6c98043bb86a66f3d312100

# Package build options
build_options="gir gtk_doc"
build_options_default="gir"
pre_check() {
# gst_gstdatetime is known to fail according to LFS
vsed -i '/gstdatetime/d' tests/check/meson.build
}

desc_option_gtk_doc="Build GTK Documentation with gtk-doc"
do_check() {
ninja -C build test || msg_warn "Fails on musl"
}

if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
build_options="gir"
build_options_default="gir"

gstreamer1-devel_package() {
depends="${makedepends} ${sourcepkg}>=${version}_${revision}"
Expand All @@ -37,9 +38,6 @@ gstreamer1-devel_package() {
vmove usr/include
vmove usr/lib/pkgconfig
vmove "usr/lib/*.so"
if [ "$build_option_gtk_doc" ]; then
vmove usr/share/gtk-doc
fi
vmove usr/share/aclocal
if [ "$build_option_gir" ]; then
vmove "usr/share/gir*"
Expand Down

0 comments on commit d2b9f1c

Please sign in to comment.