From 3e6818d9f1a931ba5cfb43904908808e28a621a4 Mon Sep 17 00:00:00 2001 From: 1is7ac3 Date: Mon, 2 Jun 2025 02:38:47 -0400 Subject: [PATCH] gst-plugins-good1: update to 1.26.2. --- .../patches/musl-ioctl.patch | 62 ------------------- srcpkgs/gst-plugins-good1/template | 6 +- 2 files changed, 3 insertions(+), 65 deletions(-) delete mode 100644 srcpkgs/gst-plugins-good1/patches/musl-ioctl.patch diff --git a/srcpkgs/gst-plugins-good1/patches/musl-ioctl.patch b/srcpkgs/gst-plugins-good1/patches/musl-ioctl.patch deleted file mode 100644 index 9d842baf70e..00000000000 --- a/srcpkgs/gst-plugins-good1/patches/musl-ioctl.patch +++ /dev/null @@ -1,62 +0,0 @@ -From dd1fc2b7931f5789815e17dda2ef7c31b9fba563 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Tue, 11 Mar 2025 16:36:58 +0100 -Subject: [PATCH] v4l2object: fix type mismatch when ioctl takes int - -v4l2object->ioctl can either be set to v4l2_ioctl() or ioctl(). -v4l2_ioctl() always takes the request number as unsigned long int, but ioctl() -may take (at least) unsigned long int, int, or unsigned, depending on libc. -This means that there isn't one function pointer type that can be used for -v4l2object->ioctl that will always be able to accomodate being set to either of -v4l2_ioctl() and ioctl(). It's therefore necessary to wrap one of them so that -both options can have the same type. This fixes an assignment from incompatible -pointer type error when building for musl. - -Part-of: ---- - .../gst-plugins-good/sys/v4l2/gstv4l2object.c | 21 +++++++++++++++++++ - 1 file changed, 21 insertions(+) - -diff --git a/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c b/subprojects/gst-plugins-good/sys/v4l2/gstv4l2object.c -index 288ff74477d7..5b7f45512459 100644 ---- a/sys/v4l2/gstv4l2object.c -+++ b/sys/v4l2/gstv4l2object.c -@@ -528,6 +528,23 @@ v4l2_mmap_wrapper (gpointer start, gsize length, gint prot, gint flags, gint fd, - #define v4l2_mmap v4l2_mmap_wrapper - - #endif /* SIZEOF_OFF_T < 8 */ -+ -+#if defined(__linux__) && !defined(__GLIBC__) -+/* v4l2_ioctl always takes request as unsigned long int, not ioctl_req_t */ -+static gint -+v4l2_ioctl_wrapper (gint fd, ioctl_req_t request, ...) -+{ -+ void *arg; -+ va_list ap; -+ -+ va_start (ap, request); -+ arg = va_arg (ap, void *); -+ va_end (ap); -+ -+ return v4l2_ioctl (fd, request, arg); -+} -+#endif /* defined(__linux__) && !defined(__GLIBC__) */ -+ - #endif /* HAVE_LIBV4L2 */ - - GstV4l2Object * -@@ -578,7 +595,11 @@ gst_v4l2_object_new (GstElement * element, - v4l2object->fd_open = v4l2_fd_open; - v4l2object->close = v4l2_close; - v4l2object->dup = v4l2_dup; -+#ifdef __GLIBC__ - v4l2object->ioctl = v4l2_ioctl; -+#else -+ v4l2object->ioctl = v4l2_ioctl_wrapper; -+#endif - v4l2object->read = v4l2_read; - v4l2object->mmap = v4l2_mmap; - v4l2object->munmap = v4l2_munmap; --- -GitLab - diff --git a/srcpkgs/gst-plugins-good1/template b/srcpkgs/gst-plugins-good1/template index dadf10f4792..bc60593a6e6 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.24.11 -revision=2 +version=1.26.2 +revision=1 build_style=meson configure_args="-Ddv=disabled -Ddv1394=disabled -Dshout2=disabled -Dqt5=enabled $(vopt_feature gtk3 gtk3)" @@ -23,7 +23,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=94bf3b5118dd4213af66048faac830569cc9a94a8c8e59e8a6d33b315f518462 +checksum=d864b9aec28c3a80895468c909dd303e5f22f92d6e2b1137f80e2a1454584339 build_options="gtk3 wayland" build_options_default="gtk3 wayland"