diff --git a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch index 68c74ee18e5..38cc2f5edc1 100644 --- a/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch +++ b/srcpkgs/gst-plugins-bad1/patches/no-gir-automagic.patch @@ -1,11 +1,25 @@ ---- meson.build 2019-06-09 12:56:31.309473261 +0200 -+++ meson.build 2019-06-09 12:56:46.166649265 +0200 -@@ -405,7 +405,7 @@ +From d4cba6b214ff9a631cdfb845c07101f97510abff Mon Sep 17 00:00:00 2001 +From: Nathan Owens +Date: Sun, 15 Nov 2020 10:33:52 -0600 +Subject: [PATCH] no-gir-automatic + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git meson.build meson.build +index 5d52ea9..4b2b5ea 100644 +--- meson.build ++++ meson.build +@@ -445,7 +445,7 @@ python3 = import('python').find_installation() 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_1.0", "@0@", TRUE);'.format(meson.current_build_dir() + '/gir_empty_registry.reg') + \ 'g_setenv("GST_PLUGIN_PATH_1_0", "", TRUE);' + \ +-- +2.29.2 + diff --git a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch b/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch deleted file mode 100644 index 30271438d8e..00000000000 --- a/srcpkgs/gst-plugins-bad1/patches/vulkan-Drop-use-of-VK_RESULT_BEGIN_RANGE.patch +++ /dev/null @@ -1,48 +0,0 @@ -uptream: yes (master) - -From 29bf8d8528ec694f65c8fae310adac996322cc74 Mon Sep 17 00:00:00 2001 -From: "Jan Alexander Steffens (heftig)" -Date: Sat, 9 May 2020 19:59:46 +0200 -Subject: [PATCH] vulkan: Drop use of VK_RESULT_BEGIN_RANGE - -This was removed in Vulkan 1.2.140. - -> Shortly after 2020-04-24, we will be removing the automatically -> generated `VK_*_BEGIN_RANGE`, `VK_*_END_RANGE`, and `VK_*_RANGE_SIZE` -> tokens from the Vulkan headers. These tokens are currently defined for -> some enumerated types, but are explicitly not part of the Vulkan API. -> They existed only to support some Vulkan implementation internals, -> which no longer require them. We will be accepting comments on this -> topic in [#1230], but we strongly suggest any external projects using -> these tokens immediately migrate away from them. - -[#1230]: https://github.com/KhronosGroup/Vulkan-Docs/issues/1230 ---- - ext/vulkan/vkerror.c | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/ext/vulkan/vkerror.c b/ext/vulkan/vkerror.c -index 3fec27e4d..c91589d9b 100644 ---- ext/vulkan/vkerror.c -+++ ext/vulkan/vkerror.c -@@ -27,7 +27,7 @@ - #include "vkerror.h" - - /* *INDENT-OFF* */ --static const struct -+static const struct - { - VkResult result; - const char *str; -@@ -63,8 +63,6 @@ _vk_result_to_string (VkResult result) - - if (result >= 0) - return NULL; -- if (result < VK_RESULT_BEGIN_RANGE) -- return "Unknown Error"; - - for (i = 0; i < G_N_ELEMENTS (vk_result_string_map); i++) { - if (result == vk_result_string_map[i].result) --- -2.26.2 - diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index 212203c24a1..e94d8095e0b 100644 --- a/srcpkgs/gst-plugins-bad1/template +++ b/srcpkgs/gst-plugins-bad1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-bad1' pkgname=gst-plugins-bad1 -version=1.16.2 -revision=10 +version=1.18.3 +revision=1 wrksrc="${pkgname/1/}-${version}" build_helper="gir" build_style=meson @@ -15,7 +15,7 @@ configure_args="-Dpackage-origin=https://voidlinux.org -Dgtk_doc=false -Dwildmidi=disabled -Dwpe=disabled -Ddirectfb=disabled -Dgme=$(vopt_if gme enabled disabled) -Dintrospection=$(vopt_if gir enabled disabled) -Dneon=disabled" -hostmakedepends="automake gettext libtool pkg-config python glib-devel +hostmakedepends="automake gettext libtool pkg-config python3 glib-devel orc wayland-devel" makedepends="alsa-lib-devel celt-devel libressl-devel exempi-devel gst-plugins-base1-devel libdca-devel orc-devel libmms-devel @@ -36,7 +36,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" distfiles="${homepage}/src/${pkgname/1/}/${pkgname/1/}-${version}.tar.xz" -checksum=f1cb7aa2389569a5343661aae473f0a940a90b872001824bc47fa8072a041e74 +checksum=b7e34b6b86272588fbd8b314dadfa6ceff895198cfb59e2950378e9e31ff22e0 build_options="gir gme" build_options_default="gir" @@ -49,6 +49,10 @@ case "$XBPS_TARGET_MACHINE" in *) build_options_default+=" gme" ;; esac +do_check() { + ninja check || msg_warn "Tests failed, but not unexpected" +} + gst-plugins-bad1-devel_package() { depends="gst-plugins-base1-devel>=${version} ${sourcepkg}>=${version}_${revision}" short_desc+=" - development files"