diff --git a/srcpkgs/gstreamer1/patches/no-gir-automagic.patch b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch new file mode 100644 index 00000000000..c0135214edd --- /dev/null +++ b/srcpkgs/gstreamer1/patches/no-gir-automagic.patch @@ -0,0 +1,13 @@ +diff --git a/meson.build b/meson.build +index e738c55..e1b8d93 100644 +--- meson.build ++++ meson.build +@@ -451,7 +451,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() + + gir_init_section = [ '--add-init-section=extern void gst_init(gint*,gchar**);' + \ + 'g_setenv("GST_REGISTRY_DISABLE", "yes", TRUE);' + \ diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 4f419e38488..4bcdf03012b 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,40 +1,34 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.14.5 +version=1.16.0 revision=1 wrksrc="gstreamer-${version}" -build_style=gnu-configure +build_style=meson build_helper="gir" -configure_args="--disable-valgrind --enable-docbook - --with-package-origin=http://www.voidlinux.org $(vopt_enable gir introspection)" -hostmakedepends="automake gettext-devel libtool pkg-config flex python - docbook-xsl glib-devel" -makedepends="libxml2-devel libglib-devel" +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-devel pkg-config flex python docbook-xsl glib-devel + libcap-progs $(vopt_if gtk_doc gtk-doc)" +makedepends="libxml2-devel libglib-devel gtk+3-devel libcap-devel libunwind-devel + bash-completion" short_desc="Core GStreamer libraries and elements (1.x)" maintainer="Juan RP " license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=e40888752883177e97b2d90cd68591f87ccd213dc0178ff721d80a4cdaad34b5 +checksum=0e8e2f7118be437cba879353970cf83c2acced825ecb9275ba05d9186ef07c00 # Package build options -build_options="gir" +build_options="gir gtk_doc" build_options_default="gir" -pre_configure() { - # Remove a non-existing include path from the gstreamer.pc.in file, - # or otherwise building pkgs which enable -Werror fail to build with - # gcc-6.2.1 which issues a warning for non existing -I/some/path args. - # There is no ./usr/lib/gstreamer-1.0/include path in this pkg. - sed -i pkgconfig/gstreamer.pc.in \ - -e 's; -I${libdir}/gstreamer-@GST_API_VERSION@/include;;' - NOCONFIGURE=1 ./autogen.sh -} +desc_option_gtk_doc="Build GTK Documentation with gtk-doc" -pre_build() { - # Export paths for gobject introspection - export GIR_EXTRA_LIBS_PATH="${wrksrc}/gst/.libs:${wrksrc}/libs/gst/base/.libs" -} +if [ -z "$CROSS_BUILD" ]; then + build_options_default+=" gtk_doc" +fi gstreamer1-devel_package() { depends="${makedepends} ${sourcepkg}>=${version}_${revision}" @@ -43,7 +37,9 @@ gstreamer1-devel_package() { vmove usr/include vmove usr/lib/pkgconfig vmove "usr/lib/*.so" - vmove usr/share/gtk-doc + 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*"