diff --git a/Manual.md b/Manual.md index 478a34be696ba7..b7d771e13234a9 100644 --- a/Manual.md +++ b/Manual.md @@ -1136,6 +1136,10 @@ This aims to fix cross-builds for when the build-style is mixed: e.g. when in a - `qmake6` is like `qmake` but for Qt6. +> NOTE: the qmake build helpers internally use the `qmake_default_version` variable +to select the default qmake implementation (Qt5 or Qt6). This variable is part of +the helper workflow and is not commonly set in templates. + - `rust` specifies environment variables required for cross-compiling crates via cargo and for compiling cargo -sys crates. It also adds a `cargo` wrapper that detects and passes builds through `cargo-auditable`. diff --git a/srcpkgs/Kooha/template b/srcpkgs/Kooha/template index b8b86603ceaed8..660f57600b9a6d 100644 --- a/srcpkgs/Kooha/template +++ b/srcpkgs/Kooha/template @@ -1,13 +1,13 @@ # Template file for 'Kooha' pkgname=Kooha -version=2.3.0 +version=2.3.1 revision=1 build_style=meson build_helper="rust" hostmakedepends="cargo desktop-file-utils gettext glib-devel gtk-update-icon-cache pkg-config" makedepends="libadwaita-devel libglib-devel gtk4-devel pulseaudio-devel rust-std" -depends="gst-plugins-base1 gstreamer-vaapi gstreamer1 gstreamer1-pipewire +depends="gst-plugins-base1 gst-plugins-bad1 gstreamer1 gstreamer1-pipewire pipewire xdg-desktop-portal" checkdepends="appstream-glib" short_desc="Simple screen recorder with a minimal interface" @@ -16,7 +16,7 @@ license="GPL-3.0-or-later" homepage="https://github.com/SeaDve/Kooha" changelog="https://github.com/SeaDve/Kooha/releases" distfiles="https://github.com/SeaDve/Kooha/archive/refs/tags/v${version}.tar.gz" -checksum=a1aec108b44483664a6c680c5351c32de98862f5df4503a915d5f23e8ae24636 +checksum=33fa92fdd4f5d315f74d59f12fb30cc38c23238b29eb7cad306e8a9b55dd9155 make_check=no # Tests are broken, see https://github.com/SeaDve/Kooha/pull/206 post_patch() { diff --git a/srcpkgs/gst-libav/template b/srcpkgs/gst-libav/template index 03bb3c37348f2b..26d552a6d4af54 100644 --- a/srcpkgs/gst-libav/template +++ b/srcpkgs/gst-libav/template @@ -1,6 +1,6 @@ # Template file for 'gst-libav' pkgname=gst-libav -version=1.26.5 +version=1.28.1 revision=1 build_style=meson hostmakedepends="pkg-config yasm" @@ -12,7 +12,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-libav/gst-libav-${version}.tar.xz" -checksum=d6de05884ef42376dd8cde89940f7b50ced96f4f6f52888e764cd8233e74f052 +checksum=bfa91aaca38d0fd8addcdd559e35b7541e3f32a5f410194ec4ba18040defee9b case "$XBPS_TARGET_MACHINE" in *-musl) # Required by musl for M_SQRT1_2 diff --git a/srcpkgs/gst-plugins-bad1/template b/srcpkgs/gst-plugins-bad1/template index ff0b583cfe7ab7..2caf0b2cd14dea 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.26.5 -revision=2 +version=1.28.1 +revision=1 build_helper="gir" build_style=meson configure_args="-Dpackage-origin=https://voidlinux.org -Ddoc=disabled @@ -36,7 +36,7 @@ license="GPL-2.0-or-later, LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-bad/gst-plugins-bad-${version}.tar.xz" -checksum=9890f262f3b2a9564dcb629e9eb697d77b93d1f71897eda1a8170b7dcfe73294 +checksum=56c1593787f8b5550893d59e4ff29e6bcccf34973316fa55e34ce493e04313a2 build_options="gir gme libvpl wayland" build_options_default="gir wayland" diff --git a/srcpkgs/gst-plugins-base1/patches/null-pointer-deref.patch b/srcpkgs/gst-plugins-base1/patches/null-pointer-deref.patch new file mode 100644 index 00000000000000..ec1a0acbd6ff07 --- /dev/null +++ b/srcpkgs/gst-plugins-base1/patches/null-pointer-deref.patch @@ -0,0 +1,49 @@ +Patch-Source: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/commit/6f923de193748ddb3c76f59a173092097d299f63 +From 6f923de193748ddb3c76f59a173092097d299f63 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Sun, 1 Mar 2026 10:53:21 +0200 +Subject: [PATCH] glcolorconvert: Fix NULL pointer dereference on buffers + without video meta + +Fixes https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/4935 + +Part-of: +--- + .../gst-libs/gst/gl/gstglcolorconvert.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + +diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcolorconvert.c b/subprojects/gst-plugins-base/gst-libs/gst/gl/gstglcolorconvert.c +index f2dc2dc7bbb..c13b4df69de 100644 +--- a/gst-libs/gst/gl/gstglcolorconvert.c ++++ b/gst-libs/gst/gl/gstglcolorconvert.c +@@ -3428,10 +3428,12 @@ _init_convert (GstGLColorConvert * convert) + } + + GstVideoMeta *v_meta = gst_buffer_get_video_meta (convert->inbuf); +- if (v_meta->width != convert->priv->padded_width +- || v_meta->height != convert->priv->padded_height) { +- gdouble padded_width = v_meta->width; +- gdouble padded_height = v_meta->height; ++ if ((v_meta && (v_meta->width != convert->priv->padded_width ++ || v_meta->height != convert->priv->padded_height)) || ++ (!v_meta && (convert->in_info.width != convert->priv->padded_width || ++ convert->in_info.height != convert->priv->padded_height))) { ++ gdouble padded_width = v_meta ? v_meta->width : convert->in_info.width; ++ gdouble padded_height = v_meta ? v_meta->height : convert->in_info.height; + gdouble display_width = GST_VIDEO_INFO_WIDTH (&convert->in_info); + gdouble display_height = GST_VIDEO_INFO_HEIGHT (&convert->in_info); + +@@ -3449,8 +3451,8 @@ _init_convert (GstGLColorConvert * convert) + crop_vertices, GL_STATIC_DRAW); + gl->BindBuffer (GL_ARRAY_BUFFER, 0); + +- convert->priv->padded_width = v_meta->width; +- convert->priv->padded_height = v_meta->height; ++ convert->priv->padded_width = padded_width; ++ convert->priv->padded_height = padded_height; + } + + gl->BindTexture (GL_TEXTURE_2D, 0); +-- +GitLab + diff --git a/srcpkgs/gst-plugins-base1/patches/sndio.patch b/srcpkgs/gst-plugins-base1/patches/sndio.patch index 1826ae0497bd00..42d27601955d71 100644 --- a/srcpkgs/gst-plugins-base1/patches/sndio.patch +++ b/srcpkgs/gst-plugins-base1/patches/sndio.patch @@ -1,4 +1,4 @@ -Source: OpenBSD ports, adapted to work with meson +Source: OpenBSD ports Upstream: No Reason: sndio support @@ -15,10 +15,10 @@ index d984b50..5f0becc 100644 subdir('vorbis') diff --git a/ext/sndio/gstsndio.c b/ext/sndio/gstsndio.c new file mode 100644 -index 0000000..2321dc2 +index 0000000..e358b48 --- /dev/null +++ b/ext/sndio/gstsndio.c -@@ -0,0 +1,401 @@ +@@ -0,0 +1,407 @@ +/* + * Copyright (C) 2008 Jacob Meuser + * Copyright (C) 2012 Alexandre Ratchov @@ -42,6 +42,7 @@ index 0000000..2321dc2 + +#include +#include "gstsndio.h" ++#include "sndiodeviceprovider.h" + +GST_DEBUG_CATEGORY (gst_sndio_debug); +#define GST_CAT_DEFAULT gst_sndio_debug @@ -62,6 +63,9 @@ index 0000000..2321dc2 + if (!gst_element_register (plugin, "sndiosink", GST_RANK_PRIMARY + 20, + gst_sndiosink_get_type())) + return FALSE; ++ if (!gst_device_provider_register (plugin, "sndiodeviceprovider", GST_RANK_PRIMARY + 20, ++ gst_sndio_device_provider_get_type())) ++ return FALSE; + return TRUE; +} + @@ -81,6 +85,8 @@ index 0000000..2321dc2 + sio->obj = obj; + sio->hdl = NULL; + sio->device = g_strdup (SIO_DEVANY); ++ /* XXX not implemented; only used for src, not sink */ ++ // sio->driver_timestamps = FALSE; +} + +void @@ -422,10 +428,10 @@ index 0000000..2321dc2 +} diff --git a/ext/sndio/gstsndio.h b/ext/sndio/gstsndio.h new file mode 100644 -index 0000000..77ec4e6 +index 0000000..1d54126 --- /dev/null +++ b/ext/sndio/gstsndio.h -@@ -0,0 +1,78 @@ +@@ -0,0 +1,79 @@ +/* + * Copyright (C) 2012 Alexandre Ratchov + * @@ -483,6 +489,7 @@ index 0000000..77ec4e6 + guint volume; /* volume level */ + GstCaps *cur_caps; /* saved capabilities of opened device */ + GObject *obj; /* for logging */ ++ gboolean driver_timestamps; +}; + +#define GST_SNDIO_DELAY(s) ((s)->delay / (s)->bpf) @@ -506,31 +513,262 @@ index 0000000..77ec4e6 +#endif diff --git a/ext/sndio/meson.build b/ext/sndio/meson.build new file mode 100644 -index 0000000..3f9a9fe +index 0000000..52d3da9 --- /dev/null +++ b/ext/sndio/meson.build @@ -0,0 +1,21 @@ +sndio_sources = [ + 'gstsndio.c', ++ 'sndiodevice.c', ++ 'sndiodeviceprovider.c', + 'sndiosink.c', + 'sndiosrc.c', +] + -+cc = meson.get_compiler('c') -+ -+sndio_dep = cc.find_library('sndio', required : get_option('sndio')) ++sndio_dep = dependency('sndio', required : get_option('sndio')) + +if sndio_dep.found() + gstsndio = library('gstsndio', + sndio_sources, -+ c_args : gst_plugins_base_args, -+ include_directories: [configinc, libsinc], -+ dependencies: [gst_base_dep, sndio_dep, audio_dep], ++ c_args : gst_plugins_base_args, ++ include_directories: [configinc, libsinc], ++ dependencies : [sndio_dep, audio_dep, tag_dep, gst_dep, gst_base_dep], + install : true, + install_dir : plugins_install_dir, -+ ) ++ ) + pkgconfig.generate(gstsndio, install_dir : plugins_pkgconfig_install_dir) +endif +diff --git a/ext/sndio/sndiodevice.c b/ext/sndio/sndiodevice.c +new file mode 100644 +index 0000000..7e04c9c +--- /dev/null ++++ b/ext/sndio/sndiodevice.c +@@ -0,0 +1,79 @@ ++#include ++#include ++#include ++#include ++#include "gstsndio.h" ++#include "sndiodevice.h" ++ ++G_DEFINE_TYPE (GstSndioDevice, gst_sndio_device, GST_TYPE_DEVICE); ++ ++GstDevice * ++gst_sndio_device_new (const gchar *name, int mode) ++{ ++ static GstStaticCaps sndio_caps = GST_STATIC_CAPS (GST_SNDIO_CAPS_STRING); ++ GstSndioDevice *sndio_device; ++ GstCaps *caps; ++ GstStructure *props; ++ const gchar *klass; ++ ++ klass = (mode == SIO_REC) ? "Audio/Source" : "Audio/Sink"; ++ ++ caps = gst_static_caps_get (&sndio_caps); ++ ++ props = gst_structure_new ("sndio-proplist", ++ "device.api", G_TYPE_STRING, "sndio", ++ "device.class", G_TYPE_STRING, "sound", ++ NULL); ++ ++ sndio_device = g_object_new (GST_TYPE_SNDIO_DEVICE, ++ "display-name", name, ++ "caps", caps, ++ "device-class", klass, ++ "properties", props, ++ NULL); ++ ++ sndio_device->mode = mode; ++ ++ /* sndio_device owns 'caps' and 'props', so free ours */ ++ ++ gst_structure_free (props); ++ gst_caps_unref (caps); ++ ++ return GST_DEVICE (sndio_device); ++} ++ ++static GstElement * ++gst_sndio_device_create_element (GstDevice *device, const gchar *name) ++{ ++ GstSndioDevice *sndio_device = GST_SNDIO_DEVICE (device); ++ GstElement *element; ++ const char *element_name; ++ ++ element_name = (sndio_device->mode == SIO_REC) ? "sndiosrc" : "sndiosink"; ++ ++ element = gst_element_factory_make (element_name, name); ++ g_object_set (element, "device", gst_device_get_display_name(device), NULL); ++ ++ return element; ++} ++ ++static void ++gst_sndio_device_finalize (GObject *object) ++{ ++ G_OBJECT_CLASS (gst_sndio_device_parent_class)->finalize (object); ++} ++ ++static void ++gst_sndio_device_class_init (GstSndioDeviceClass *klass) ++{ ++ GstDeviceClass *dev_class = GST_DEVICE_CLASS (klass); ++ GObjectClass *object_class = G_OBJECT_CLASS (klass); ++ ++ dev_class->create_element = gst_sndio_device_create_element; ++ object_class->finalize = gst_sndio_device_finalize; ++} ++ ++static void ++gst_sndio_device_init (GstSndioDevice *device) ++{ ++} +diff --git a/ext/sndio/sndiodevice.h b/ext/sndio/sndiodevice.h +new file mode 100644 +index 0000000..c5e5a96 +--- /dev/null ++++ b/ext/sndio/sndiodevice.h +@@ -0,0 +1,40 @@ ++#ifndef __GST_SNDIODEVICE_H__ ++#define __GST_SNDIODEVICE_H__ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++typedef struct _GstSndioDevice GstSndioDevice; ++typedef struct _GstSndioDeviceClass GstSndioDeviceClass; ++ ++#define GST_TYPE_SNDIO_DEVICE \ ++ (gst_sndio_device_get_type()) ++#define GST_IS_SNDIO_DEVICE(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SNDIO_DEVICE)) ++#define GST_IS_SNDIO_DEVICE_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SNDIO_DEVICE)) ++#define GST_SNDIO_DEVICE_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SNDIO_DEVICE, GstSndioDeviceClass)) ++#define GST_SNDIO_DEVICE(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SNDIO_DEVICE, GstSndioDevice)) ++#define GST_SNDIO_DEVICE_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DEVICE, GstSndioDeviceClass)) ++#define GST_SNDIO_DEVICE_CAST(obj) \ ++ ((GstSndioDevice *)(obj)) ++ ++struct _GstSndioDevice { ++ GstDevice parent; ++ int mode; ++}; ++ ++struct _GstSndioDeviceClass { ++ GstDeviceClass parent_class; ++}; ++ ++GstDevice *gst_sndio_device_new (const gchar *, int); ++GType gst_sndio_device_get_type (void); ++ ++G_END_DECLS ++ ++#endif +diff --git a/ext/sndio/sndiodeviceprovider.c b/ext/sndio/sndiodeviceprovider.c +new file mode 100644 +index 0000000..e8d47af +--- /dev/null ++++ b/ext/sndio/sndiodeviceprovider.c +@@ -0,0 +1,50 @@ ++#include ++#include ++#include ++#include ++#include "sndiodeviceprovider.h" ++#include "sndiodevice.h" ++ ++G_DEFINE_TYPE (GstSndioDeviceProvider, gst_sndio_device_provider, GST_TYPE_DEVICE_PROVIDER); ++ ++static GList * ++gst_sndio_device_provider_probe (GstDeviceProvider *provider) ++{ ++ GList *list = NULL; ++ GstDevice *device; ++ struct sio_hdl *hdl; ++ ++ /* ++ * There's no way to discover all devices on the network, so ++ * just return the default device. The user can point it to ++ * any device. ++ */ ++ ++ device = gst_sndio_device_new (SIO_DEVANY, SIO_PLAY); ++ if (device) ++ list = g_list_prepend (list, device); ++ ++ device = gst_sndio_device_new (SIO_DEVANY, SIO_REC); ++ if (device) ++ list = g_list_prepend (list, device); ++ ++ return list; ++} ++ ++static void ++gst_sndio_device_provider_class_init (GstSndioDeviceProviderClass *klass) ++{ ++ GstDeviceProviderClass *dm_class = GST_DEVICE_PROVIDER_CLASS (klass); ++ ++ dm_class->probe = gst_sndio_device_provider_probe; ++ ++ gst_device_provider_class_set_static_metadata (dm_class, ++ "Sndio Device Provider", "Sink/Source/Audio", ++ "List and provide sndio source and sink devices", ++ "Alexandre Ratchov "); ++} ++ ++static void ++gst_sndio_device_provider_init (GstSndioDeviceProvider *self) ++{ ++} +diff --git a/ext/sndio/sndiodeviceprovider.h b/ext/sndio/sndiodeviceprovider.h +new file mode 100644 +index 0000000..5e961de +--- /dev/null ++++ b/ext/sndio/sndiodeviceprovider.h +@@ -0,0 +1,38 @@ ++#ifndef __GST_SNDIODEVICEPROVIDER_H__ ++#define __GST_SNDIODEVICEPROVIDER_H__ ++ ++#include ++ ++G_BEGIN_DECLS ++ ++typedef struct _GstSndioDeviceProvider GstSndioDeviceProvider; ++typedef struct _GstSndioDeviceProviderClass GstSndioDeviceProviderClass; ++ ++#define GST_TYPE_SNDIO_DEVICE_PROVIDER \ ++ (gst_sndio_device_provider_get_type()) ++#define GST_IS_SNDIO_DEVICE_PROVIDER(obj) \ ++ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_SNDIO_DEVICE_PROVIDER)) ++#define GST_IS_SNDIO_DEVICE_PROVIDER_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_SNDIO_DEVICE_PROVIDER)) ++#define GST_SNDIO_DEVICE_PROVIDER_GET_CLASS(obj) \ ++ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_SNDIO_DEVICE_PROVIDER, GstSndioDeviceProviderClass)) ++#define GST_SNDIO_DEVICE_PROVIDER(obj) \ ++ (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_SNDIO_DEVICE_PROVIDER, GstSndioDeviceProvider)) ++#define GST_SNDIO_DEVICE_PROVIDER_CLASS(klass) \ ++ (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_DEVICE_PROVIDER, GstSndioDeviceProviderClass)) ++#define GST_SNDIO_DEVICE_PROVIDER_CAST(obj) \ ++ ((GstSndioDeviceProvider *)(obj)) ++ ++struct _GstSndioDeviceProvider { ++ GstDeviceProvider parent; ++}; ++ ++struct _GstSndioDeviceProviderClass { ++ GstDeviceProviderClass parent_class; ++}; ++ ++GType gst_sndio_device_provider_get_type (void); ++ ++G_END_DECLS ++ ++#endif diff --git a/ext/sndio/sndiosink.c b/ext/sndio/sndiosink.c new file mode 100644 index 0000000..cc68bd2 @@ -828,10 +1066,10 @@ index 0000000..314e622 +#endif /* __GST_SNDIOSINK_H__ */ diff --git a/ext/sndio/sndiosrc.c b/ext/sndio/sndiosrc.c new file mode 100644 -index 0000000..5b6d787 +index 0000000..d050942 --- /dev/null +++ b/ext/sndio/sndiosrc.c -@@ -0,0 +1,225 @@ +@@ -0,0 +1,228 @@ +/* + * Copyright (C) 2008 Jacob Meuser + * Copyright (C) 2012 Alexandre Ratchov @@ -888,7 +1126,7 @@ index 0000000..5b6d787 + GstAudioRingBufferSpec * spec); +static gboolean gst_sndiosrc_unprepare (GstAudioSrc * asrc); +static guint gst_sndiosrc_read (GstAudioSrc * asrc, gpointer data, -+ guint length); ++ guint length, GstClockTime * timestamp); +static guint gst_sndiosrc_delay (GstAudioSrc * asrc); +static void gst_sndiosrc_reset (GstAudioSrc * asrc); +static void gst_sndiosrc_set_property (GObject * object, guint prop_id, @@ -907,6 +1145,8 @@ index 0000000..5b6d787 +gst_sndiosrc_init (GstSndioSrc * src) +{ + gst_sndio_init (&src->sndio, G_OBJECT(src)); ++ /* XXX not implemented */ ++ src->sndio.driver_timestamps = FALSE; +} + +static void @@ -959,7 +1199,8 @@ index 0000000..5b6d787 +} + +static guint -+gst_sndiosrc_read (GstAudioSrc * asrc, gpointer data, guint length) ++gst_sndiosrc_read (GstAudioSrc * asrc, gpointer data, guint length, ++ GstClockTime * timestamp) +{ + GstSndioSrc *src = GST_SNDIOSRC (asrc); + guint done; @@ -1028,7 +1269,7 @@ index 0000000..5b6d787 + gobject_class->set_property = gst_sndiosrc_set_property; + + gst_element_class_set_static_metadata (gstelement_class, -+ "Audio src (sndio)", "Src/Audio", ++ "Audio src (sndio)", "Source/Audio", + "Input from a sound card via sndio", + "Jacob Meuser "); + @@ -1059,7 +1300,7 @@ index 0000000..5b6d787 +} diff --git a/ext/sndio/sndiosrc.h b/ext/sndio/sndiosrc.h new file mode 100644 -index 0000000..83fd29c +index 0000000..4499e4e --- /dev/null +++ b/ext/sndio/sndiosrc.h @@ -0,0 +1,57 @@ @@ -1093,26 +1334,26 @@ index 0000000..83fd29c +G_BEGIN_DECLS + +#define GST_TYPE_SNDIOSRC \ -+ (gst_sndiosrc_get_type()) ++(gst_sndiosrc_get_type()) +#define GST_SNDIOSRC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SNDIOSRC,GstSndioSrc)) ++(G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SNDIOSRC,GstSndioSrc)) +#define GST_SNDIOSRC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SNDIOSRC,GstSndioSrcClass)) ++(G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SNDIOSRC,GstSndioSrcClass)) +#define GST_IS_SNDIOSRC(obj) \ -+ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SNDIOSRC)) ++(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SNDIOSRC)) +#define GST_IS_SNDIOSRC_CLASS(klass) \ -+ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SNDIOSRC)) ++(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_SNDIOSRC)) + +typedef struct _GstSndioSrc GstSndioSrc; +typedef struct _GstSndioSrcClass GstSndioSrcClass; + +struct _GstSndioSrc { -+ GstAudioSrc src; -+ struct gstsndio sndio; ++ GstAudioSrc src; ++ struct gstsndio sndio; +}; + +struct _GstSndioSrcClass { -+ GstAudioSrcClass parent_class; ++ GstAudioSrcClass parent_class; +}; + +GType gst_sndiosrc_get_type (void); @@ -1120,15 +1361,15 @@ index 0000000..83fd29c +G_END_DECLS + +#endif /* __GST_SNDIOSRC_H__ */ -diff --git a/meson_options.txt b/meson_options.txt -index e7af4dd..827507f 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -58,6 +58,7 @@ option('libvisual', type : 'feature', value : 'auto', description : 'libvisual a +diff --git a/meson.options b/meson.options +index c2131a1..4d5e905 100644 +--- a/meson.options ++++ b/meson.options +@@ -56,6 +56,7 @@ option('volume', type : 'feature', value : 'auto') + + # Feature options for plugins with external deps + option('alsa', type : 'feature', value : 'auto', description : 'ALSA audio source/sink plugin') ++option('sndio', type : 'feature', value : 'auto', description : 'SNDIO audio source/sink plugin') + option('cdparanoia', type : 'feature', value : 'auto', description : 'cdparanoia plugin') + option('libvisual', type : 'feature', value : 'auto', description : 'libvisual audio visualization plugin') option('ogg', type : 'feature', value : 'auto', description : 'ogg parser, muxer, demuxer plugin') - option('opus', type : 'feature', value : 'auto', description : 'OPUS audio codec plugin') - option('pango', type : 'feature', value : 'auto', description : 'Pango text rendering and overlay plugin') -+option('sndio', type : 'feature', value : 'auto', description : 'sndio support') - option('theora', type : 'feature', value : 'auto', description : 'Theora video parser and codec plugin') - option('tremor', type : 'feature', value : 'auto', description : 'Integer Vorbis decoder plugin for devices without floating point') - option('vorbis', type : 'feature', value : 'auto', description : 'Vorbis audio parser, tagger, and codec plugin') diff --git a/srcpkgs/gst-plugins-base1/template b/srcpkgs/gst-plugins-base1/template index 5326495fde9d11..a6a8f67e861603 100644 --- a/srcpkgs/gst-plugins-base1/template +++ b/srcpkgs/gst-plugins-base1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-base1' pkgname=gst-plugins-base1 -version=1.26.5 +version=1.28.1 revision=1 build_style=meson build_helper="gir" @@ -15,14 +15,14 @@ makedepends="gstreamer1-devel glib-devel libxml2-devel pango-devel $(vopt_if libvisual libvisual-devel) $(vopt_if sndio sndio-devel) $(vopt_if wayland 'wayland-devel wayland-protocols')" depends="orc>=0.4.18 gstreamer1>=${version}" -checkdepends="mesa-dri" +checkdepends="mesa-dri dejavu-fonts-ttf" short_desc="GStreamer Base Plug-ins (v1.x)" maintainer="Orphaned " license="GPL-2.0-or-later, LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${version}.tar.xz" -checksum=f0c0e26cbedaa57732cb6a578e8cc13a1164bf18d737d55c333061c52f0c48d7 +checksum=1446a4c2a92ff5d78d88e85a599f0038441d53333236f0c72d72f21a9c132497 build_options="cdparanoia gir libvisual sndio wayland" build_options_default="cdparanoia gir wayland" diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index 8967161dbd5a28..4fc1266774ab0b 100644 --- a/srcpkgs/gst-plugins-good1/template +++ b/srcpkgs/gst-plugins-good1/template @@ -1,7 +1,7 @@ # Template file for 'gst-plugins-good1' pkgname=gst-plugins-good1 -version=1.26.5 -revision=4 +version=1.28.1 +revision=1 build_style=meson build_helper="qmake qmake6" qmake_default_version=none @@ -27,7 +27,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${version}.tar.xz" -checksum=eb0862e93404b073e98ec50350ece7e6685ea2936cab8118c2b8e938e2cbea8b +checksum=738e26aee41b7a62050e40b81adc017a110a7f32d1ec49fa6a0300846c44368d build_options="gtk3 wayland" build_options_default="gtk3 wayland" diff --git a/srcpkgs/gst-plugins-ugly1/template b/srcpkgs/gst-plugins-ugly1/template index 1c6a2f7f485473..924cdd506d73d3 100644 --- a/srcpkgs/gst-plugins-ugly1/template +++ b/srcpkgs/gst-plugins-ugly1/template @@ -1,6 +1,6 @@ # Template file for 'gst-plugins-ugly1' pkgname=gst-plugins-ugly1 -version=1.26.5 +version=1.28.1 revision=1 build_style=meson configure_args=" -Dsidplay=disabled -Dgpl=enabled -Dx264=enabled @@ -17,4 +17,4 @@ license="LGPL-2.1-or-later, GPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-${version}.tar.xz" -checksum=3dfc43435be97e110816bac6d602b0f206a038546279683d9d25372ff127db52 +checksum=4082f3cb063fccc3ffc04e5ab0854bafde82d1b373eb3c9eaa28115dd3f95a78 diff --git a/srcpkgs/gst-rtsp-server/template b/srcpkgs/gst-rtsp-server/template index 69b3b5b729c14d..e6f5dbd987cb6a 100644 --- a/srcpkgs/gst-rtsp-server/template +++ b/srcpkgs/gst-rtsp-server/template @@ -1,6 +1,6 @@ # Template file for 'gst-rtsp-server' pkgname=gst-rtsp-server -version=1.26.5 +version=1.28.1 revision=1 build_style=meson build_helper=gir @@ -14,7 +14,7 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-rtsp-server/gst-rtsp-server-${version}.tar.xz" -checksum=328dff2457419683f2a4f06ca119cfd22beb632cee1ad6830591213325353c44 +checksum=6cd0e86af20cfb749bdc24d2f5c30f4e60a3e8d198ae4e02e754b9937bdbf832 gst-rtsp-server-devel_package() { depends="${sourcepkg}>=${version}_${revision} gst-plugins-base1-devel" diff --git a/srcpkgs/gst1-editing-services/template b/srcpkgs/gst1-editing-services/template index 93f14982932204..b11596cec62e7b 100644 --- a/srcpkgs/gst1-editing-services/template +++ b/srcpkgs/gst1-editing-services/template @@ -1,7 +1,7 @@ # Template file for 'gst1-editing-services' pkgname=gst1-editing-services -version=1.26.2 -revision=2 +version=1.28.1 +revision=1 build_style=meson build_helper="gir" configure_args="-Ddoc=disabled $(vopt_feature gir introspection)" @@ -14,7 +14,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-editing-services/gst-editing-services-${version}.tar.xz" -checksum=2e5651276fd59af1de64757098b626b0f75c00fd49938f1aa527c56750ec15f6 +checksum=3d6000cbe1356beebe2a573dabd496e92348c30c843ffa13050469ec3da115dc build_options="gir" diff --git a/srcpkgs/gst1-python3/template b/srcpkgs/gst1-python3/template index b9392c87fb3f70..793c74e265aac2 100644 --- a/srcpkgs/gst1-python3/template +++ b/srcpkgs/gst1-python3/template @@ -1,7 +1,7 @@ # Template file for 'gst1-python3' pkgname=gst1-python3 -version=1.26.5 -revision=2 +version=1.28.1 +revision=1 build_style=meson hostmakedepends="pkg-config python3 python3-packaging-bootstrap" makedepends="libglib-devel python3-devel python3-gobject-devel gst-plugins-base1-devel @@ -13,5 +13,5 @@ license="LGPL-2.1-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gst-python/gst-python-${version}.tar.xz" -checksum=86e2fe2b1bba7ffc18b1d4abe1035fe1c33b20fe4e077cce2f90dbfa445b2341 +checksum=d47cea95adb95ba10443ed7812c7c5fa0807aef43b98cd1c6d8fb9f9a86f7085 make_check=no # Upstream didn't adjust checks to match their API changes diff --git a/srcpkgs/gstreamer-vaapi/template b/srcpkgs/gstreamer-vaapi/template deleted file mode 100644 index aa93330bc9f189..00000000000000 --- a/srcpkgs/gstreamer-vaapi/template +++ /dev/null @@ -1,19 +0,0 @@ -# Template file for 'gstreamer-vaapi' -pkgname=gstreamer-vaapi -version=1.26.5 -revision=1 -build_style=meson -hostmakedepends="pkg-config" -makedepends="libXrandr-devel libva-devel MesaLib-devel gst-plugins-bad1-devel" -short_desc="VA-API plugins for GStreamer 1.x" -maintainer="Orphaned " -license="LGPL-2.1-or-later" -homepage="https://gstreamer.freedesktop.org" -changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" -distfiles="https://gstreamer.freedesktop.org/src/gstreamer-vaapi/gstreamer-vaapi-${version}.tar.xz" -checksum=b42d44db63f3195a6f33296e1ead32c14d01ef27452b7068f1a2d86624f55ea9 - -pre_check() { - # Seems to need certain hardware to pass - vsed -i '/vaapipostproc/d' tests/check/meson.build -} diff --git a/srcpkgs/gstreamer-vaapi/update b/srcpkgs/gstreamer-vaapi/update deleted file mode 100644 index d878ca38b1e87f..00000000000000 --- a/srcpkgs/gstreamer-vaapi/update +++ /dev/null @@ -1 +0,0 @@ -ignore="1.*[13579].*" diff --git a/srcpkgs/gstreamer1/template b/srcpkgs/gstreamer1/template index 613170f483d445..12c6a1abb6a6c4 100644 --- a/srcpkgs/gstreamer1/template +++ b/srcpkgs/gstreamer1/template @@ -1,6 +1,6 @@ # Template file for 'gstreamer1' pkgname=gstreamer1 -version=1.26.5 +version=1.28.1 revision=1 build_style=meson build_helper="gir" @@ -17,7 +17,7 @@ license="LGPL-2.0-or-later" homepage="https://gstreamer.freedesktop.org" changelog="https://gstreamer.freedesktop.org/releases/${version%.*}/#${version}" distfiles="https://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${version}.tar.xz" -checksum=0a7edb0e7b42dbe6b575fce61a4808a3f6b20e085a1eaecbc025d0ec21f1e774 +checksum=b65e2ffa35bdbf8798cb75c23ffc3d05e484e48346ff7546844ba85217664504 pre_check() { # gst_gstdatetime is known to fail according to LFS diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template index ad66b81212ee2a..626fd3b4b58e12 100644 --- a/srcpkgs/removed-packages/template +++ b/srcpkgs/removed-packages/template @@ -226,6 +226,7 @@ replaces=" gssdp1.2<=1.4.0.1_1 gst-omx<=1.22.9_1 gst1-python<=1.18.3_1 + gstreamer-vaapi<=1.26.5_1 gtick<=0.5.4_1 gtk-sharp2<=2.12.45_2 gtkhtml-devel<=4.10.0_1