CVS commit: pkgsrc/graphics/digikam

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Feb 25 08:32:38 UTC 2025

Modified Files:
        pkgsrc/graphics/digikam: Makefile distinfo
Added Files:
        pkgsrc/graphics/digikam/patches:
            patch-core_libs_threadimageio_video_videothumbdecoder.cpp

Log Message:
digikam: switch to ffmpeg7

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.246 -r1.247 pkgsrc/graphics/digikam/Makefile
cvs rdiff -u -r1.64 -r1.65 pkgsrc/graphics/digikam/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/digikam/patches/patch-core_libs_threadimageio_video_videothumbdecoder.cpp

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

Modified files:

Index: pkgsrc/graphics/digikam/Makefile
diff -u pkgsrc/graphics/digikam/Makefile:1.246 pkgsrc/graphics/digikam/Makefile:1.247
--- pkgsrc/graphics/digikam/Makefile:1.246      Tue Feb 18 10:33:20 2025
+++ pkgsrc/graphics/digikam/Makefile    Tue Feb 25 08:32:38 2025
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.246 2025/02/18 10:33:20 wiz Exp $
+# $NetBSD: Makefile,v 1.247 2025/02/25 08:32:38 wiz Exp $
 
 DISTNAME=      digiKam-8.5.0
 PKGNAME=       ${DISTNAME:tl}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    graphics
 MASTER_SITES=  ${MASTER_SITE_KDE:=digikam/${PKGVERSION_NOREV}/}
 
@@ -50,7 +50,7 @@ CHECK_PORTABILITY_SKIP+=      *.desktop.cmake
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../misc/marble/buildlink3.mk"
-.include "../../multimedia/ffmpeg6/buildlink3.mk"
+.include "../../multimedia/ffmpeg7/buildlink3.mk"
 .include "../../multimedia/x265/buildlink3.mk"
 .include "../../sysutils/kfilemetadata5/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"

Index: pkgsrc/graphics/digikam/distinfo
diff -u pkgsrc/graphics/digikam/distinfo:1.64 pkgsrc/graphics/digikam/distinfo:1.65
--- pkgsrc/graphics/digikam/distinfo:1.64       Fri Feb  7 21:58:54 2025
+++ pkgsrc/graphics/digikam/distinfo    Tue Feb 25 08:32:38 2025
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.64 2025/02/07 21:58:54 wiz Exp $
+$NetBSD: distinfo,v 1.65 2025/02/25 08:32:38 wiz Exp $
 
 BLAKE2s (digiKam-8.5.0.tar.xz) = 356a19d55d5c56017907d0a28f5bd52bb80b7bb589867803aa60391cf290c08b
 SHA512 (digiKam-8.5.0.tar.xz) = 5610f0173043e29a2b5ff62b2ed2c2bea79e10cd20a0c2416ebb425457cee55aa8b8d575ba57e8e188a899cc909516ea05e6c80e73e3316742cc9e8119855509
 Size (digiKam-8.5.0.tar.xz) = 62028432 bytes
+SHA1 (patch-core_libs_threadimageio_video_videothumbdecoder.cpp) = 1bf7c4e32055bb9765b56d43f874b7d070cd5217

Added files:

Index: pkgsrc/graphics/digikam/patches/patch-core_libs_threadimageio_video_videothumbdecoder.cpp
diff -u /dev/null pkgsrc/graphics/digikam/patches/patch-core_libs_threadimageio_video_videothumbdecoder.cpp:1.1
--- /dev/null   Tue Feb 25 08:32:39 2025
+++ pkgsrc/graphics/digikam/patches/patch-core_libs_threadimageio_video_videothumbdecoder.cpp   Tue Feb 25 08:32:38 2025
@@ -0,0 +1,25 @@
+$NetBSD: patch-core_libs_threadimageio_video_videothumbdecoder.cpp,v 1.1 2025/02/25 08:32:38 wiz Exp $
+
+fix FFmpeg 7 deprecated warning for avcodec_close() 
+https://invent.kde.org/graphics/digikam/-/commit/b813e82e5d2daaeb9bdf9f2f757060008db94e7c
+
+--- core/libs/threadimageio/video/videothumbdecoder.cpp.orig   2024-11-15 14:51:34.000000000 +0000
++++ core/libs/threadimageio/video/videothumbdecoder.cpp
+@@ -91,7 +91,17 @@ void VideoThumbDecoder::destroy()
+ 
+     if (d->pVideoCodecContext)
+     {
++
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(61, 3, 100)
++
++        avcodec_free_context(&d->pVideoCodecContext);
++
++#else
++
+         avcodec_close(d->pVideoCodecContext);
++
++#endif
++
+         d->pVideoCodecContext = nullptr;
+     }
+