diff options
| author | Zach van Rijn <me@zv.io> | 2023-06-13 02:10:38 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2023-06-13 02:10:38 +0000 |
| commit | cd08458e24d8e1c5989bfd463293c0cde602fbee (patch) | |
| tree | 89a5a11de8e2d67ab2be04ae4f24dc35b8ef0a76 | |
| parent | aeef177ff67b31d0f1e2ab27d90652bf4a229894 (diff) | |
| download | packages-cd08458e24d8e1c5989bfd463293c0cde602fbee.tar.gz packages-cd08458e24d8e1c5989bfd463293c0cde602fbee.tar.bz2 packages-cd08458e24d8e1c5989bfd463293c0cde602fbee.tar.xz packages-cd08458e24d8e1c5989bfd463293c0cde602fbee.zip | |
user/gst-plugins-bad: pull upstream patch for 32-bit ARM. fixes #1040.
| -rw-r--r-- | user/gst-plugins-bad/APKBUILD | 6 | ||||
| -rw-r--r-- | user/gst-plugins-bad/fix-arm-test-alignment.patch | 35 |
2 files changed, 39 insertions, 2 deletions
diff --git a/user/gst-plugins-bad/APKBUILD b/user/gst-plugins-bad/APKBUILD index f3bd1cdaf..2ddff96a5 100644 --- a/user/gst-plugins-bad/APKBUILD +++ b/user/gst-plugins-bad/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=gst-plugins-bad pkgver=1.20.2 -pkgrel=0 +pkgrel=1 pkgdesc="GStreamer multimedia framework - Lower-quality plugins" url="https://gstreamer.freedesktop.org/modules/gst-plugins-good.html" arch="all" @@ -22,6 +22,7 @@ source="https://gstreamer.freedesktop.org/src/$pkgname/$pkgname-$pkgver.tar.xz camerabin.patch curlhttpsrc.patch mpegts.patch + fix-arm-test-alignment.patch " build() { @@ -45,4 +46,5 @@ package() { sha512sums="3f98973dc07ead745418e0a30f9f6b5c8d328e3d126f54d92c10ab5da04271768a5c5dffc36ea24ccf8fb516b1e3733be9fb18dc0db419dea4d37d17018f8a70 gst-plugins-bad-1.20.2.tar.xz 7f6023e766895ac8213f9dabd4d8acbeb03f18c2d98fa27865e7656c439e0ea97d02f9e9f0ea98205238ddb8f6473062af524b799d1da0cbe41a3055a11df250 camerabin.patch d4bf36560db0e6391cfca84f928d7147bb6b170431c521e78253b29f6bccf122309e1f92e241808855dfa112b9a06e17c1b6ed4363e011a0693f82e1bfe7ea3e curlhttpsrc.patch -d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch" +d70f409f86b072d689d51b87db6e9fb161c0914a381eccbf66f1ffcd61b9a793f9e4087cdd071e615aaa63687c6ee476f023239920dd1ebd0d3cde346031dc86 mpegts.patch +566fbdc37c9f9fb5b671ecffa2f596a95f6431668ff8dd8b91bc827a280b5fb18a8fac3122a38f060263cb3f2d2138805af1e1c324eb619188f982c8cc575221 fix-arm-test-alignment.patch" diff --git a/user/gst-plugins-bad/fix-arm-test-alignment.patch b/user/gst-plugins-bad/fix-arm-test-alignment.patch new file mode 100644 index 000000000..1a03eafa7 --- /dev/null +++ b/user/gst-plugins-bad/fix-arm-test-alignment.patch @@ -0,0 +1,35 @@ +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 |