CVS commit: pkgsrc/x11/qt5-qtmultimedia

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri May 31 06:17:46 UTC 2024

Modified Files:
        pkgsrc/x11/qt5-qtmultimedia: buildlink3.mk distinfo
Added Files:
        pkgsrc/x11/qt5-qtmultimedia/patches:
            patch-src_plugins_avfoundation_camera_avfcamerautility.mm

Log Message:
qt5-qtmultimedia: fix for deprecated std::unary_function; applied pkglint suggestions


To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
cvs rdiff -u -r1.36 -r1.37 pkgsrc/x11/qt5-qtmultimedia/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_plugins_avfoundation_camera_avfcamerautility.mm

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

Modified files:

Index: pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk
diff -u pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.66 pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.67
--- pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk:1.66      Sat Apr  6 08:07:10 2024
+++ pkgsrc/x11/qt5-qtmultimedia/buildlink3.mk   Fri May 31 06:17:46 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.66 2024/04/06 08:07:10 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.67 2024/05/31 06:17:46 adam Exp $
 
 BUILDLINK_TREE+=       qt5-qtmultimedia
 
@@ -16,13 +16,13 @@ BUILDLINK_LIBDIRS.qt5-qtmultimedia+=        qt5
 pkgbase := qt5-qtmultimedia
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mgstreamer)
+.if ${PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mgstreamer}
 .include "../../multimedia/gst-plugins1-base/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mopenal)
+.if ${PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mopenal}
 .include "../../audio/openal-soft/buildlink3.mk"
 .endif
-.if !empty(PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mpulseaudio)
+.if ${PKG_BUILD_OPTIONS.qt5-qtmultimedia:Mpulseaudio}
 .include "../../audio/pulseaudio/buildlink3.mk"
 .endif
 .include "../../x11/qt5-qtdeclarative/buildlink3.mk"

Index: pkgsrc/x11/qt5-qtmultimedia/distinfo
diff -u pkgsrc/x11/qt5-qtmultimedia/distinfo:1.36 pkgsrc/x11/qt5-qtmultimedia/distinfo:1.37
--- pkgsrc/x11/qt5-qtmultimedia/distinfo:1.36   Sat May 25 14:21:20 2024
+++ pkgsrc/x11/qt5-qtmultimedia/distinfo        Fri May 31 06:17:46 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.36 2024/05/25 14:21:20 adam Exp $
+$NetBSD: distinfo,v 1.37 2024/05/31 06:17:46 adam Exp $
 
 BLAKE2s (qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz) = db7d8e76ca1878a9b300de4c1ae6df3350fc4b706cb80c615c8e3fa30dc91104
 SHA512 (qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz) = 6059bd9aec65888ed6f3a1f87506a94ea567f9e064bb4a586859bc8f76ee4dca573eb256623452ddd9daf2305f49c707673425ea08edca9cd2db7b56bf5cab9c
 Size (qtmultimedia-everywhere-opensource-src-5.15.14.tar.xz) = 3842164 bytes
 SHA1 (patch-src_multimedia_configure.json) = d53c1bf2712e9a32b383beff0025c4ab0b5b6232
+SHA1 (patch-src_plugins_avfoundation_camera_avfcamerautility.mm) = 1849dd537e9fb2ffe8810f2947a39756f18d0438

Added files:

Index: pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_plugins_avfoundation_camera_avfcamerautility.mm
diff -u /dev/null pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_plugins_avfoundation_camera_avfcamerautility.mm:1.1
--- /dev/null   Fri May 31 06:17:46 2024
+++ pkgsrc/x11/qt5-qtmultimedia/patches/patch-src_plugins_avfoundation_camera_avfcamerautility.mm       Fri May 31 06:17:46 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_plugins_avfoundation_camera_avfcamerautility.mm,v 1.1 2024/05/31 06:17:46 adam Exp $
+
+std::unary_function is deprecated in C++11.
+
+--- src/plugins/avfoundation/camera/avfcamerautility.mm.orig   2024-05-31 06:13:49.304697096 +0000
++++ src/plugins/avfoundation/camera/avfcamerautility.mm
+@@ -101,7 +101,7 @@ struct ByResolution
+     }
+ };
+ 
+-struct FormatHasNoFPSRange : std::unary_function<AVCaptureDeviceFormat *, bool>
++struct FormatHasNoFPSRange : std::function<bool (AVCaptureDeviceFormat *)>
+ {
+     bool operator() (AVCaptureDeviceFormat *format)
+     {