Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / gstreamer
Commits:
0e177f66 by Jan Alexander Steffens (heftig) at 2024-11-14T15:55:42+01:00
Prepare x265enc patch to work with even newer x265
Mostly to help custom builds and for posterity. When we officially
upgrade to x265 4.1/5.0 or whatever we should drop the patch instead.
- - - - -
3 changed files:
- .SRCINFO
- 0002-x265enc-Unbreak-build-with-x265-4.0.patch
- PKGBUILD
Changes:
=====================================
.SRCINFO
=====================================
@@ -182,7 +182,7 @@ pkgbase = gstreamer
b2sums =
45a454b6b53a16b89cf1e9bac5928f7886e666b0c82fa0cc9610a09bf35871424f291e8bdd1ae4f7fba6e18a8c98c846a2d8024b9df3ce3043e8074b912e58ff
b2sums = SKIP
b2sums =
b58019ca02e388925af02a98d6cc7b2c7f67692bb25b7d947f0759669c13027a069cbadd20c1119b98020085341199b5a7085ba32cc28777ed60bd2a2647d845
- b2sums =
23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44
+ b2sums =
7b431619dfe1ce506f6b7302abcb8800d321b2db6f6ecef8959f60b0484121d86a951d4c2c8172733fbea9a0b25dccd69609cb23d8fb54e84b8172dda1774407
pkgname = gstreamer
pkgdesc = Multimedia graph framework - core
=====================================
0002-x265enc-Unbreak-build-with-x265-4.0.patch
=====================================
@@ -3,15 +3,17 @@ From: "Jan Alexander Steffens (heftig)" <[email protected]>
Date: Sat, 5 Oct 2024 04:21:10 +0200
Subject: [PATCH] x265enc: Unbreak build with x265 4.0
-Following a [similar change][1] in FFmpeg.
+Following a [similar change][1] in FFmpeg. x265 also reverted the change
+post-4.0 and FFmpeg [adapted again][2].
[1]:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/1f801dfdb5066aadf0ade9cb5e94d620f33eacdc
+[2]:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/099f88b8641dfc299f3896d17d9addc5b9ae7799
---
.../gst-plugins-bad/ext/x265/gstx265enc.c | 29 ++++++++++++++-----
1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
-index e6aa973ac7cc..77de727061b1 100644
+index e6aa973ac7cc..44cb74fc690b 100644
--- a/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
+++ b/subprojects/gst-plugins-bad/ext/x265/gstx265enc.c
@@ -1514,7 +1514,12 @@ gst_x265_enc_encode_frame (GstX265Enc * encoder,
x265_picture * pic_in,
@@ -19,7 +21,7 @@ index e6aa973ac7cc..77de727061b1 100644
GstVideoCodecFrame *frame = NULL;
GstBuffer *out_buf = NULL;
- x265_picture pic_out;
-+#if (X265_BUILD >= 210)
++#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ x265_picture pics_out[MAX_SCALABLE_LAYERS], *pics_outp[MAX_SCALABLE_LAYERS];
+#else
+ x265_picture pics_out[1];
@@ -32,7 +34,7 @@ index e6aa973ac7cc..77de727061b1 100644
if (G_UNLIKELY (update_latency))
gst_x265_enc_set_latency (encoder);
-+#if (X265_BUILD >= 210)
++#if (X265_BUILD >= 210) && (X265_BUILD < 213)
+ for (i = 0; i < MAX_SCALABLE_LAYERS; i++)
+ pics_outp[i] = &pics_out[i];
+
=====================================
PKGBUILD
=====================================
@@ -213,7 +213,7 @@
b2sums=('53c72d3d88d48ab5bfe114f0d5ae8e224469811552000cba8952b8f64e8b283266bc6a3
'45a454b6b53a16b89cf1e9bac5928f7886e666b0c82fa0cc9610a09bf35871424f291e8bdd1ae4f7fba6e18a8c98c846a2d8024b9df3ce3043e8074b912e58ff'
'SKIP'
'b58019ca02e388925af02a98d6cc7b2c7f67692bb25b7d947f0759669c13027a069cbadd20c1119b98020085341199b5a7085ba32cc28777ed60bd2a2647d845'
-
'23596f6e5ba9628629f9fca36e3518427ffacdc54505224b4a6e6f039bb3fc168e20093c645b1c093ceb8280fe549a2f6d2af857afad55c28fcc5f9f26917e44')
+
'7b431619dfe1ce506f6b7302abcb8800d321b2db6f6ecef8959f60b0484121d86a951d4c2c8172733fbea9a0b25dccd69609cb23d8fb54e84b8172dda1774407')
validpgpkeys=(
D637032E45B8C6585B9456565D2EEE6F6F349D7C # Tim Müller
<[email protected]>
)
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gstreamer/-/commit/0e177f666bfdfef03e492d6fb9d8d007e4bb560f
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/gstreamer/-/commit/0e177f666bfdfef03e492d6fb9d8d007e4bb560f
You're receiving this email because of your account on gitlab.archlinux.org.
