summaryrefslogtreecommitdiff
path: root/user/gst-plugins-bad
diff options
context:
space:
mode:
Diffstat (limited to 'user/gst-plugins-bad')
-rw-r--r--user/gst-plugins-bad/APKBUILD17
-rw-r--r--user/gst-plugins-bad/fix-arm-test-alignment.patch35
-rw-r--r--user/gst-plugins-bad/mpegts.patch120
3 files changed, 6 insertions, 166 deletions
diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD
index 2ddff96a5..4a6cef267 100644
--- a/user/gst-plugins-bad/APKBUILD
+++ b/user/gst-plugins-bad/APKBUILD
@@ -1,11 +1,12 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=gst-plugins-bad
-pkgver=1.20.2
-pkgrel=1
+pkgver=1.26.1
+pkgrel=0
pkgdesc="GStreamer multimedia framework - Lower-quality plugins"
url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html"
arch="all"
+options="!check" # nvidious
license="LGPL-2.1+"
# rtpmanagerbad depends on rtpmanager
# symptom: tests 'rtpsrc' and 'rtpsink' will fail
@@ -15,14 +16,11 @@ makedepends="gst-plugins-base-dev gstreamer-dev gobject-introspection-dev meson
curl-dev fluidsynth-dev gtk+3.0-dev ladspa-dev libdrm-dev libgudev-dev
libsndfile-dev libqrencode-dev librsvg-dev libsoup-dev libusb-dev
mesa-dev neon-dev nettle-dev openal-soft-dev opus-dev pango-dev sbc-dev
- wayland-dev wayland-protocols gsm-dev"
+ wayland-dev wayland-protocols gsm-dev vulkan-loader-dev libglvnd-dev"
subpackages="$pkgname-dev $pkgname-lang"
ldpath="/usr/lib/gstreamer-1.0"
source="https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz
- camerabin.patch
curlhttpsrc.patch
- mpegts.patch
- fix-arm-test-alignment.patch
"
build() {
@@ -43,8 +41,5 @@ package() {
DESTDIR="$pkgdir" ninja -C build install
}
-sha512sums="3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz
-7f6023e766895ac8213f9dabd4d8acbeb03f18c2d98fa27865e7656c439e0ea97d02f9e9f0ea98205238ddb8f6473062af524b799d1da0cbe41a3055a11df250 camerabin.patch
-d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch
-d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch
-566fbdc37c9f9fb5b671ecffa2f596a95f6431668ff8dd8b91bc827a280b5fb18a8fac3122a38f060263cb3f2d2138805af1e1c324eb619188f982c8cc575221 fix-arm-test-alignment.patch"
+sha512sums="69c78970f0396c08fbddbd44e080142688fcd1ecdc0fa88709b934f6c546754904338469ceecd0f16c6a6b8585bf5faec3230426272b7eb2b63a21b9034d94db gst-plugins-bad-1.26.1.tar.xz
+d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch"
diff --git a/user/gst-plugins-bad/fix-arm-test-alignment.patch b/user/gst-plugins-bad/fix-arm-test-alignment.patch
deleted file mode 100644
index 1a03eafa7..000000000
--- a/user/gst-plugins-bad/fix-arm-test-alignment.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 57a1296d5913b222be87ccee1ae981b84931a7da Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= <tim@centricular.com>
-Date: Tue, 13 Jun 2023 01:29:14 +0100
-Subject: [PATCH 2/2] asfmux: fix potentially unaligned write on 32-bit ARM
-
-Fixes #2665
----
- .../gst-plugins-bad/gst/asfmux/gstasfobjects.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c b/subprojects/gst-plugins-bad/gst/asfmux/gstasfobjects.c
-index d9739826384..fa0f2849d17 100644
---- a/gst/asfmux/gstasfobjects.c
-+++ b/gst/asfmux/gstasfobjects.c
-@@ -311,14 +311,10 @@ gst_asf_put_time (guint8 * buf, guint64 time)
- void
- gst_asf_put_guid (guint8 * buf, Guid guid)
- {
-- guint32 *aux32 = (guint32 *) buf;
-- guint16 *aux16 = (guint16 *) & (buf[4]);
-- guint64 *aux64 = (guint64 *) & (buf[8]);
-- *aux32 = GUINT32_TO_LE (guid.v1);
-- *aux16 = GUINT16_TO_LE (guid.v2);
-- aux16 = (guint16 *) & (buf[6]);
-- *aux16 = GUINT16_TO_LE (guid.v3);
-- *aux64 = GUINT64_TO_BE (guid.v4);
-+ GST_WRITE_UINT32_LE (buf + 0, guid.v1);
-+ GST_WRITE_UINT16_LE (buf + 4, guid.v2);
-+ GST_WRITE_UINT16_LE (buf + 6, guid.v3);
-+ GST_WRITE_UINT64_BE (buf + 8, guid.v4);
- }
-
- /**
---
-GitLab
diff --git a/user/gst-plugins-bad/mpegts.patch b/user/gst-plugins-bad/mpegts.patch
deleted file mode 100644
index 1579c4e32..000000000
--- a/user/gst-plugins-bad/mpegts.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1314
-
---- gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c.old 2022-05-02 17:29:29.000000000 -0500
-+++ gst-plugins-bad-1.20.2/gst-libs/gst/mpegts/gstmpegtsdescriptor.c 2022-07-02 23:19:51.027302943 -0500
-@@ -296,7 +296,7 @@
- dvb_text_from_utf8 (const gchar * text, gsize * out_size)
- {
- GError *error = NULL;
-- gchar *out_text;
-+ gchar *out_text = NULL;
- guint8 *out_buffer;
- guint encoding;
- GIConv giconv = (GIConv) - 1;
-@@ -304,7 +304,8 @@
- /* We test character maps one-by-one. Start with the default */
- encoding = _ICONV_ISO6937;
- giconv = _get_iconv (_ICONV_UTF8, encoding);
-- out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error);
-+ if (giconv != (GIConv) - 1)
-+ out_text = g_convert_with_iconv (text, -1, giconv, NULL, out_size, &error);
-
- if (out_text) {
- GST_DEBUG ("Using default ISO6937 encoding");
---- gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c.old 2022-05-02 17:29:29.000000000 -0500
-+++ gst-plugins-bad-1.20.2/tests/check/libs/mpegts.c 2022-07-02 23:41:27.379013955 -0500
-@@ -71,6 +71,14 @@
- 0xc0, 0x00, 0xc4, 0x86, 0x56, 0xa5
- };
-
-+static gboolean
-+_has_iso6937_iconv (void)
-+{
-+ GIConv test = (GIConv) - 1;
-+ test = g_iconv_open("iso6937", "utf-8");
-+ return (test != (GIConv) - 1);
-+}
-+
- GST_START_TEST (test_scte_sit)
- {
- GstMpegtsSCTESIT *sit;
-@@ -397,11 +405,12 @@
-
- fail_if (data == NULL);
-
-- for (i = 0; i < data_size; i++) {
-- if (data[i] != nit_data_check[i])
-- fail ("0x%X != 0x%X in byte %d of NIT section", data[i],
-- nit_data_check[i], i);
-- }
-+ if (_has_iso6937_iconv())
-+ for (i = 0; i < data_size; i++) {
-+ if (data[i] != nit_data_check[i])
-+ fail ("0x%X != 0x%X in byte %d of NIT section", data[i],
-+ nit_data_check[i], i);
-+ }
-
- /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */
- nit_section->data[nit_section->section_length - 1]++;
-@@ -486,11 +495,12 @@
-
- fail_if (data == NULL);
-
-- for (i = 0; i < data_size; i++) {
-- if (data[i] != sdt_data_check[i])
-- fail ("0x%X != 0x%X in byte %d of SDT section", data[i],
-- sdt_data_check[i], i);
-- }
-+ if (_has_iso6937_iconv())
-+ for (i = 0; i < data_size; i++) {
-+ if (data[i] != sdt_data_check[i])
-+ fail ("0x%X != 0x%X in byte %d of SDT section", data[i],
-+ sdt_data_check[i], i);
-+ }
-
- /* Check assertion on bad CRC. Reset parsed data, and make the CRC corrupt */
- sdt_section->data[sdt_section->section_length - 1]++;
-@@ -594,14 +604,15 @@
- /* Check creation of descriptor */
- desc = gst_mpegts_descriptor_from_dvb_network_name ("Name");
- fail_if (desc == NULL);
-- fail_unless (desc->length == 4);
-+ if (_has_iso6937_iconv()) fail_unless (desc->length == 4);
- fail_unless (desc->tag == 0x40);
-
-- for (i = 0; i < 6; i++) {
-- if (desc->data[i] != network_name_descriptor[i])
-- fail ("0x%X != 0x%X in byte %d of network name descriptor",
-- desc->data[i], network_name_descriptor[i], i);
-- }
-+ if (_has_iso6937_iconv())
-+ for (i = 0; i < 6; i++) {
-+ if (desc->data[i] != network_name_descriptor[i])
-+ fail ("0x%X != 0x%X in byte %d of network name descriptor",
-+ desc->data[i], network_name_descriptor[i], i);
-+ }
-
- /* Check parsing of descriptor */
- ret = gst_mpegts_descriptor_parse_dvb_network_name (desc, &string);
-@@ -623,14 +634,15 @@
- desc = gst_mpegts_descriptor_from_dvb_service
- (GST_DVB_SERVICE_DIGITAL_TELEVISION, "Name", "Provider");
- fail_if (desc == NULL);
-- fail_unless (desc->length == 15);
-+ if (_has_iso6937_iconv()) fail_unless (desc->length == 15);
- fail_unless (desc->tag == 0x48);
-
-- for (i = 0; i < 17; i++) {
-- if (desc->data[i] != service_descriptor[i])
-- fail ("0x%X != 0x%X in byte %d of service descriptor",
-- desc->data[i], service_descriptor[i], i);
-- }
-+ if (_has_iso6937_iconv())
-+ for (i = 0; i < 17; i++) {
-+ if (desc->data[i] != service_descriptor[i])
-+ fail ("0x%X != 0x%X in byte %d of service descriptor",
-+ desc->data[i], service_descriptor[i], i);
-+ }
-
- /* Check parsing of descriptor with data */
- ret = gst_mpegts_descriptor_parse_dvb_service
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-07-01 13:02:34 +0000