summaryrefslogtreecommitdiff
path: root/multimedia
diff options
context:
space:
mode:
authorJason E. Hale <jhale@FreeBSD.org>2024-03-29 22:12:08 -0400
committerJason E. Hale <jhale@FreeBSD.org>2024-03-29 22:17:58 -0400
commit72d93f38b3af7a53f8e737c3e49a5eb97eae1b0c (patch)
treebe4a13aa986559791274186a6e1d29e428238e4c /multimedia
parentprint/harfbuzz: update to 8.4.0 (diff)
Qt6: Update to 6.6.3
As a patch release, Qt 6.6.3 does not introduce new features but contains more than 300 bug fixes, security updates, and other improvements on top of Qt 6.6.2 release. See more information about the most important changes and bug fixes in the Qt 6.6.3 release note. Announcement: https://www.qt.io/blog/qt-6.6.3-released Release note: https://code.qt.io/cgit/qt/qtreleasenotes.git/about/qt/6.6.3/release-note.md
Diffstat (limited to 'multimedia')
-rw-r--r--multimedia/qt6-multimedia/distinfo6
-rw-r--r--multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake11
-rw-r--r--multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h10
-rw-r--r--multimedia/qt6-multimedia/pkg-plist4
4 files changed, 21 insertions, 10 deletions
diff --git a/multimedia/qt6-multimedia/distinfo b/multimedia/qt6-multimedia/distinfo
index 1bac4d3765ab..5becbb32f2b0 100644
--- a/multimedia/qt6-multimedia/distinfo
+++ b/multimedia/qt6-multimedia/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707970200
-SHA256 (KDE/Qt/6.6.2/qtmultimedia-everywhere-src-6.6.2.tar.xz) = e2942599ba0ae106ab3e4f82d6633e8fc1943f8a35d91f99d1fca46d251804ec
-SIZE (KDE/Qt/6.6.2/qtmultimedia-everywhere-src-6.6.2.tar.xz) = 8305476
+TIMESTAMP = 1711663460
+SHA256 (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = be00f830d2b14c9a12f3b6812ba3a23fdaaceb2dd9c1c6394c329c8bf6e53ab2
+SIZE (KDE/Qt/6.6.3/qtmultimedia-everywhere-src-6.6.3.tar.xz) = 8266612
diff --git a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
index 70bcb85ffad6..6dc30b473b06 100644
--- a/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
+++ b/multimedia/qt6-multimedia/files/patch-src_multimedia_configure.cmake
@@ -1,4 +1,4 @@
---- src/multimedia/configure.cmake.orig 2023-10-03 20:42:53 UTC
+--- src/multimedia/configure.cmake.orig 2024-03-19 05:09:26 UTC
+++ src/multimedia/configure.cmake
@@ -76,7 +76,7 @@ qt_feature("ffmpeg" PRIVATE
LABEL "FFmpeg"
@@ -9,3 +9,12 @@
)
qt_feature("alsa" PUBLIC PRIVATE
LABEL "ALSA (experimental)"
+@@ -101,7 +101,7 @@ qt_feature("gstreamer_1_0" PRIVATE
+ )
+ qt_feature("gstreamer_1_0" PRIVATE
+ LABEL "GStreamer 1.0"
+- CONDITION ( LINUX AND GStreamer_FOUND )
++ CONDITION GStreamer_FOUND
+ ENABLE INPUT_gstreamer STREQUAL 'yes'
+ DISABLE INPUT_gstreamer STREQUAL 'no'
+ )
diff --git a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
index 7b34e678c026..f968a8db5070 100644
--- a/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
+++ b/multimedia/qt6-multimedia/files/patch-src_plugins_multimedia_ffmpeg_qv4l2camera__p.h
@@ -1,11 +1,11 @@
---- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2023-10-03 20:42:53 UTC
+--- src/plugins/multimedia/ffmpeg/qv4l2camera_p.h.orig 2024-03-19 05:09:26 UTC
+++ src/plugins/multimedia/ffmpeg/qv4l2camera_p.h
-@@ -23,6 +23,8 @@
- #include <qsocketnotifier.h>
- #include <qmutex.h>
+@@ -18,6 +18,8 @@
+ #include <private/qplatformcamera_p.h>
+ #include <sys/time.h>
+#include <sys/time.h> // timeval
+
QT_BEGIN_NAMESPACE
- class QV4L2CameraDevices : public QPlatformVideoDevices
+ class QV4L2FileDescriptor;
diff --git a/multimedia/qt6-multimedia/pkg-plist b/multimedia/qt6-multimedia/pkg-plist
index 688f6e8f3549..6e320bc0920e 100644
--- a/multimedia/qt6-multimedia/pkg-plist
+++ b/multimedia/qt6-multimedia/pkg-plist
@@ -22,6 +22,7 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiodecoder_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudioinput_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudiooutput_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformaudioresampler_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformcamera_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformcapturablewindows_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qplatformimagecapture_p.h
@@ -44,7 +45,8 @@
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qsamplecache_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimedia-config_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtmultimediaglobal_p.h
-%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideo_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qtvideo_p.h
+%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframe_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconversionhelper_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideoframeconverter_p.h
%%QT_INCDIR%%/QtMultimedia/%%FULLVER%%/QtMultimedia/private/qvideooutputorientationhandler_p.h