pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/multimedia
Module Name: pkgsrc
Committed By: mrg
Date: Sat Oct 11 20:11:22 UTC 2025
Modified Files:
pkgsrc/multimedia/ffmpeg4: distinfo
pkgsrc/multimedia/ffmpeg5: distinfo
pkgsrc/multimedia/ffmpeg6: distinfo
Added Files:
pkgsrc/multimedia/ffmpeg4/patches: patch-libavcodec_pcm-bluray.c
patch-libavcodec_pcm-dvd.c
pkgsrc/multimedia/ffmpeg5/patches: patch-libavcodec_pcm-bluray.c
patch-libavcodec_pcm-dvd.c
pkgsrc/multimedia/ffmpeg6/patches: patch-libavcodec_pcm-bluray.c
patch-libavcodec_pcm-dvd.c
Log Message:
port some changes from ffmpeg 7 back that GCC 14 needs (type mismatch.)
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 pkgsrc/multimedia/ffmpeg4/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-bluray.c \
pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-dvd.c
cvs rdiff -u -r1.13 -r1.14 pkgsrc/multimedia/ffmpeg5/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-bluray.c \
pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-dvd.c
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ffmpeg6/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-bluray.c \
pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-dvd.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/ffmpeg4/distinfo
diff -u pkgsrc/multimedia/ffmpeg4/distinfo:1.34 pkgsrc/multimedia/ffmpeg4/distinfo:1.35
--- pkgsrc/multimedia/ffmpeg4/distinfo:1.34 Mon Sep 22 14:26:13 2025
+++ pkgsrc/multimedia/ffmpeg4/distinfo Sat Oct 11 20:11:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.34 2025/09/22 14:26:13 adam Exp $
+$NetBSD: distinfo,v 1.35 2025/10/11 20:11:21 mrg Exp $
BLAKE2s (ffmpeg-4.4.6.tar.xz) = c2f1bd55544ecd8aa0ff98d4402864a6413841302d855a8773a4863c9caa43a4
SHA512 (ffmpeg-4.4.6.tar.xz) = 3805c5ff4661217cd2f85a7443a796b9dece67b6eba7686f5f348a1c6c4c678d26f97f9674bb9552b74cfa5bffaf8048885e57e765ad3e09a31274172c57725b
@@ -10,6 +10,8 @@ SHA1 (patch-doc_general__contents.texi)
SHA1 (patch-doc_indevs.texi) = 066a6ead2132ec05796bdcc000071dfca76d220c
SHA1 (patch-doc_outdevs.texi) = 0a6930b835fb24e0008adeeb6c34990db1e16fc1
SHA1 (patch-ffbuild_libversion.sh) = 7671eced5a8135a900c2f1d30343fc072ebb84ec
+SHA1 (patch-libavcodec_pcm-bluray.c) = 2eda39f3022e965de483ef1a3e8b28cf62a8b49a
+SHA1 (patch-libavcodec_pcm-dvd.c) = 7fb03a979f9f8d42c82553d7fc32812e46c8b5b2
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = 8f835f8ec7b057ddcd6303bc2178cdb6f4541e2a
SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a
Index: pkgsrc/multimedia/ffmpeg5/distinfo
diff -u pkgsrc/multimedia/ffmpeg5/distinfo:1.13 pkgsrc/multimedia/ffmpeg5/distinfo:1.14
--- pkgsrc/multimedia/ffmpeg5/distinfo:1.13 Mon Sep 22 14:25:04 2025
+++ pkgsrc/multimedia/ffmpeg5/distinfo Sat Oct 11 20:11:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.13 2025/09/22 14:25:04 adam Exp $
+$NetBSD: distinfo,v 1.14 2025/10/11 20:11:21 mrg Exp $
BLAKE2s (ffmpeg-5.1.7.tar.xz) = 542554a5ead92dc8402a6c2ad4bd330c6bc5073beb6e154d3c44d7d6d79dbd53
SHA512 (ffmpeg-5.1.7.tar.xz) = 2fb54ef21c01b4702a4e8d18970fa84be74000af4704c456b32441ec673eb71be0c3042884f2f79ae867c5214ae99adf88e1f19aadc39ba19d1415a6c797048f
@@ -9,6 +9,8 @@ SHA1 (patch-doc_Makefile) = d45fc311f47e
SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2
+SHA1 (patch-libavcodec_pcm-bluray.c) = f700b404a0cc09a0e7c3b0210bda9e4663bdcf2b
+SHA1 (patch-libavcodec_pcm-dvd.c) = 315f6be60b7085ee78575a51863bc6a26f8cf155
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = 1d12f5b12d37a73512cd8e0f05272e9a64588e49
SHA1 (patch-libavdevice_sunau.c) = 44dba866c58d508c0f873ffdd9ad8d25c059cc8a
Index: pkgsrc/multimedia/ffmpeg6/distinfo
diff -u pkgsrc/multimedia/ffmpeg6/distinfo:1.10 pkgsrc/multimedia/ffmpeg6/distinfo:1.11
--- pkgsrc/multimedia/ffmpeg6/distinfo:1.10 Mon Sep 22 14:23:24 2025
+++ pkgsrc/multimedia/ffmpeg6/distinfo Sat Oct 11 20:11:21 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2025/09/22 14:23:24 adam Exp $
+$NetBSD: distinfo,v 1.11 2025/10/11 20:11:21 mrg Exp $
BLAKE2s (ffmpeg-6.1.3.tar.xz) = 0b44fa5b33df363ea3dd95d9c20442c995560289ac3c29f30d7ee782d36609f4
SHA512 (ffmpeg-6.1.3.tar.xz) = 5700b06f6abc23e8e968e52322ad7845ba43cbfe15c4db72b33e4cd3874057bc60b894f64bd95240f9145db218419fff5e96fec6afc2dfc3acde4b030c41b606
@@ -9,6 +9,8 @@ SHA1 (patch-doc_Makefile) = c513af183e37
SHA1 (patch-doc_general__contents.texi) = 13704795d2688dc0377a512dc6e65025ad674724
SHA1 (patch-doc_indevs.texi) = 8cd421a67f34ebbe6099102bf1de7c6cdb13dcb7
SHA1 (patch-doc_outdevs.texi) = 0aec04682b516016abe9b81f6efcbbef97b1c3b2
+SHA1 (patch-libavcodec_pcm-bluray.c) = b4b9446622e7c247c3af49840b9fa9855fbeb60d
+SHA1 (patch-libavcodec_pcm-dvd.c) = 28251c6c4c6f597c3f00b4d3a09b83235edfb9a3
SHA1 (patch-libavdevice_Makefile) = 526efd20021068245d8904c0d55508a540ae4054
SHA1 (patch-libavdevice_alldevices.c) = a9e2a2027fb2c18d5509b68deb5fd8523305dfc7
SHA1 (patch-libavdevice_sunau.c) = 554a5fc77c0e94828e9eadc7f1f9d4067a76d4ae
Added files:
Index: pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-bluray.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-bluray.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-bluray.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavcodec_pcm-bluray.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-bluray.c.orig 2025-05-17 06:52:31.000000000 -0700
++++ libavcodec/pcm-bluray.c 2025-10-11 11:49:55.174531799 -0700
+@@ -169,7 +169,7 @@ static int pcm_bluray_decode_frame(AVCod
+ samples *= num_source_channels;
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, buf_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+@@ -189,7 +189,8 @@ static int pcm_bluray_decode_frame(AVCod
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, avctx->channels * 2);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16,
++ avctx->channels * 2);
+ dst16 += avctx->channels;
+ #else
+ channel = avctx->channels;
Index: pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-dvd.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-dvd.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg4/patches/patch-libavcodec_pcm-dvd.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-libavcodec_pcm-dvd.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-dvd.c.orig 2025-05-17 06:52:31.000000000 -0700
++++ libavcodec/pcm-dvd.c 2025-10-11 11:50:14.404417701 -0700
+@@ -152,7 +152,7 @@ static void *pcm_dvd_decode_samples(AVCo
+ switch (avctx->bits_per_coded_sample) {
+ case 16: {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+ dst16 += blocks * s->block_size / 2;
+ #else
+ int samples = blocks * avctx->channels;
Index: pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-bluray.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-bluray.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-bluray.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavcodec_pcm-bluray.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-bluray.c.orig 2025-08-13 17:31:30.000000000 -0700
++++ libavcodec/pcm-bluray.c 2025-10-11 11:55:48.657403888 -0700
+@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCod
+ samples *= num_source_channels;
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, buf_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCod
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16,
++ avctx->ch_layout.nb_channels * 2);
+ dst16 += avctx->ch_layout.nb_channels;
+ #else
+ channel = avctx->ch_layout.nb_channels;
Index: pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-dvd.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-dvd.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg5/patches/patch-libavcodec_pcm-dvd.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-libavcodec_pcm-dvd.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-dvd.c.orig 2025-08-13 17:31:30.000000000 -0700
++++ libavcodec/pcm-dvd.c 2025-10-11 11:59:30.893893419 -0700
+@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCo
+ switch (avctx->bits_per_coded_sample) {
+ case 16: {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+ dst16 += blocks * s->block_size / 2;
+ #else
+ int samples = blocks * avctx->ch_layout.nb_channels;
Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-bluray.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-bluray.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-bluray.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-libavcodec_pcm-bluray.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-bluray.c.orig 2025-08-14 16:31:16.000000000 -0700
++++ libavcodec/pcm-bluray.c 2025-09-14 12:20:04.000000000 -0700
+@@ -167,7 +167,7 @@ static int pcm_bluray_decode_frame(AVCod
+ samples *= num_source_channels;
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, buf_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, buf_size);
+ #else
+ do {
+ *dst16++ = bytestream2_get_be16u(&gb);
+@@ -187,7 +187,8 @@ static int pcm_bluray_decode_frame(AVCod
+ if (AV_SAMPLE_FMT_S16 == avctx->sample_fmt) {
+ do {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, avctx->ch_layout.nb_channels * 2);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16,
++ avctx->ch_layout.nb_channels * 2);
+ dst16 += avctx->ch_layout.nb_channels;
+ #else
+ channel = avctx->ch_layout.nb_channels;
Index: pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-dvd.c
diff -u /dev/null pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-dvd.c:1.1
--- /dev/null Sat Oct 11 20:11:22 2025
+++ pkgsrc/multimedia/ffmpeg6/patches/patch-libavcodec_pcm-dvd.c Sat Oct 11 20:11:21 2025
@@ -0,0 +1,16 @@
+$NetBSD: patch-libavcodec_pcm-dvd.c,v 1.1 2025/10/11 20:11:21 mrg Exp $
+
+Port ffmpeg 7 change to satisfy GCC 14.
+
+
+--- libavcodec/pcm-dvd.c.orig 2025-08-14 16:31:16.000000000 -0700
++++ libavcodec/pcm-dvd.c 2025-09-14 12:20:04.000000000 -0700
+@@ -157,7 +157,7 @@ static void *pcm_dvd_decode_samples(AVCo
+ switch (avctx->bits_per_coded_sample) {
+ case 16: {
+ #if HAVE_BIGENDIAN
+- bytestream2_get_buffer(&gb, dst16, blocks * s->block_size);
++ bytestream2_get_buffer(&gb, (uint8_t*)dst16, blocks * s->block_size);
+ dst16 += blocks * s->block_size / 2;
+ #else
+ int samples = blocks * avctx->ch_layout.nb_channels;
Home |
Main Index |
Thread Index |
Old Index