CVS commit: pkgsrc/multimedia/gst-plugins1-bad

["Patrick Welche" <prlw1%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   prlw1
Date:           Thu Nov 28 10:29:18 UTC 2024

Modified Files:
        pkgsrc/multimedia/gst-plugins1-bad: distinfo
Added Files:
        pkgsrc/multimedia/gst-plugins1-bad/patches: patch-ext_x265_gstx265enc.c

Log Message:
gst-plugins1-x265: Allow building with x265-4.1

upstream commit ee3802cf71b386194e2a6318765e0547b37f52c8


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 pkgsrc/multimedia/gst-plugins1-bad/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/multimedia/gst-plugins1-bad/patches/patch-ext_x265_gstx265enc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/gst-plugins1-bad/distinfo
diff -u pkgsrc/multimedia/gst-plugins1-bad/distinfo:1.63 pkgsrc/multimedia/gst-plugins1-bad/distinfo:1.64
--- pkgsrc/multimedia/gst-plugins1-bad/distinfo:1.63    Tue Nov  5 20:58:37 2024
+++ pkgsrc/multimedia/gst-plugins1-bad/distinfo Thu Nov 28 10:29:17 2024
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.63 2024/11/05 20:58:37 adam Exp $
+$NetBSD: distinfo,v 1.64 2024/11/28 10:29:17 prlw1 Exp $
 
 BLAKE2s (gst-plugins-bad-1.24.9.tar.xz) = 02224b1d7ce86b23627a1d42b56d3601df935410159d5d543eef05c5fc8fdbda
 SHA512 (gst-plugins-bad-1.24.9.tar.xz) = 323ef17019f4ee1dd471567fef79aae429e45e4184553771b5108ac46c602633c9b9596188abb4fb1fbe533b9736d6fcb090cfcd7c1668dacafd278ddf97b150
 Size (gst-plugins-bad-1.24.9.tar.xz) = 7075040 bytes
 SHA1 (patch-ext_wayland_meson.build) = 5cb65148ba22af5ce206cb66a7a7430822ceb494
 SHA1 (patch-ext_webrtc_meson.build) = dc0179ebea4b8f1f990951a8a860dac3c3ac5385
+SHA1 (patch-ext_x265_gstx265enc.c) = b8281be30259121db8d5e905539af5e3c764d83a

Added files:

Index: pkgsrc/multimedia/gst-plugins1-bad/patches/patch-ext_x265_gstx265enc.c
diff -u /dev/null pkgsrc/multimedia/gst-plugins1-bad/patches/patch-ext_x265_gstx265enc.c:1.1
--- /dev/null   Thu Nov 28 10:29:18 2024
+++ pkgsrc/multimedia/gst-plugins1-bad/patches/patch-ext_x265_gstx265enc.c      Thu Nov 28 10:29:18 2024
@@ -0,0 +1,29 @@
+$NetBSD: patch-ext_x265_gstx265enc.c,v 1.1 2024/11/28 10:29:18 prlw1 Exp $
+
+upstream commit ee3802cf71b386194e2a6318765e0547b37f52c8
+
+  x265: Allow building with x265-4.1
+    
+  In x265-4.1 masteringDisplayColorVolume is changed from a pointer to a
+  character array embedded in struct x265_param.
+    
+  https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7968
+
+--- ext/x265/gstx265enc.c.orig 2024-10-30 20:33:30.000000000 +0000
++++ ext/x265/gstx265enc.c
+@@ -948,8 +948,13 @@ gst_x265_enc_init_encoder_locked (GstX26
+        * HEVC uses gbr order
+        * See spec D.3.28 display_primaries_x and display_primaries_y
+        */
+-      encoder->x265param.masteringDisplayColorVolume =
+-          g_strdup_printf ("G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
++#if X265_BUILD < 214
++      encoder->x265param.masteringDisplayColorVolume = g_strdup_printf (
++#else
++      snprintf (encoder->x265param.masteringDisplayColorVolume,
++          X265_MAX_STRING_SIZE,
++#endif
++          "G(%hu,%hu)B(%hu,%hu)R(%hu,%hu)WP(%hu,%hu)L(%u,%u)",
+           minfo.display_primaries[1].x, minfo.display_primaries[1].y,
+           minfo.display_primaries[2].x, minfo.display_primaries[2].y,
+           minfo.display_primaries[0].x, minfo.display_primaries[0].y,