CVS commit: pkgsrc/multimedia/ssr

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Wed Feb 26 11:15:39 UTC 2025

Modified Files:
        pkgsrc/multimedia/ssr: Makefile distinfo
        pkgsrc/multimedia/ssr/patches: patch-ffmpeg_updates

Log Message:
ssr: use ffmpeg7


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/multimedia/ssr/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/ssr/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates

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

Modified files:

Index: pkgsrc/multimedia/ssr/Makefile
diff -u pkgsrc/multimedia/ssr/Makefile:1.58 pkgsrc/multimedia/ssr/Makefile:1.59
--- pkgsrc/multimedia/ssr/Makefile:1.58 Wed Feb 12 06:45:29 2025
+++ pkgsrc/multimedia/ssr/Makefile      Wed Feb 26 11:15:39 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.58 2025/02/12 06:45:29 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2025/02/26 11:15:39 markd Exp $
 #
 
 DISTNAME=      ssr-0.4.4
-PKGREVISION=   4
+PKGREVISION=   5
 CATEGORIES=    multimedia
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=MaartenBaert/}
 
@@ -32,7 +32,7 @@ BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLI
 .include "../../audio/alsa-lib/buildlink3.mk"
 .include "../../audio/jack/buildlink3.mk"
 .include "../../audio/pulseaudio/buildlink3.mk"
-.include "../../multimedia/ffmpeg6/buildlink3.mk"
+.include "../../multimedia/ffmpeg7/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/libXinerama/buildlink3.mk"
 .include "../../x11/qt5-qtbase/buildlink3.mk"

Index: pkgsrc/multimedia/ssr/distinfo
diff -u pkgsrc/multimedia/ssr/distinfo:1.10 pkgsrc/multimedia/ssr/distinfo:1.11
--- pkgsrc/multimedia/ssr/distinfo:1.10 Wed Aug 21 12:25:55 2024
+++ pkgsrc/multimedia/ssr/distinfo      Wed Feb 26 11:15:39 2025
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.10 2024/08/21 12:25:55 markd Exp $
+$NetBSD: distinfo,v 1.11 2025/02/26 11:15:39 markd Exp $
 
 BLAKE2s (ssr-0.4.4.tar.gz) = 797f74e3a7272b0738990114d3d0f08f553f43847fade594ea80684e114263bd
 SHA512 (ssr-0.4.4.tar.gz) = a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525
 Size (ssr-0.4.4.tar.gz) = 1961269 bytes
-SHA1 (patch-ffmpeg_updates) = 8a37d422315d05c77a1da85cfa47056b44f0a80d
+SHA1 (patch-ffmpeg_updates) = 8dcb5983e3c231438b7d7ee708a09a40f32f3162
 SHA1 (patch-glinject_elfhacks.c) = 4d416e0ea6b160d34583e737ba5bd1981a8a94ef

Index: pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates
diff -u pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates:1.1 pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates:1.2
--- pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates:1.1      Wed Aug 21 12:25:55 2024
+++ pkgsrc/multimedia/ssr/patches/patch-ffmpeg_updates  Wed Feb 26 11:15:39 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-ffmpeg_updates,v 1.1 2024/08/21 12:25:55 markd Exp $
+$NetBSD: patch-ffmpeg_updates,v 1.2 2025/02/26 11:15:39 markd Exp $
 
 From f4cbde38021d9330dc73d2e3dfa8a70da3ff5721 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero%lindev.ch@localhost>
@@ -300,7 +300,7 @@ index 3efde703..3a38a619 100644
  #endif
  #if SSR_USE_AVFRAME_CHANNELS
 -              assert(frame->GetFrame()->channels == GetCodecContext()->channels);
-+              assert(frame->GetFrame()->channels == GetCodecContext()->ch_layout.nb_channels);
++              assert(frame->GetFrame()->ch_layout.nb_channels == GetCodecContext()->ch_layout.nb_channels);
  #endif
  #if SSR_USE_AVFRAME_SAMPLE_RATE
                assert(frame->GetFrame()->sample_rate == GetCodecContext()->sample_rate);