Update to Qt 6.8

opengisch · Dec 5, 2024 · 3bbd51f · 3bbd51f
1 parent f3c1fb9
commit 3bbd51f
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 9,048 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@
 # CMake settings
 cmake_minimum_required(VERSION 3.19)
 
-set(VCPKG_TAG 9e0815331a5072a6851348482338ca2e7593947d)
+set(VCPKG_TAG 03b4aec0e94030ad6f8e386d9bc774cb0decee4f)
 
 set(QML_IMPORT_PATH ${CMAKE_SOURCE_DIR}/src/qml/imports CACHE PATH "QML import path for Qt Creator to detect custom modules properly")
 

diff --git a/vcpkg/ports/qtmultimedia/ffmpeg-compile-def.patch b/vcpkg/ports/qtmultimedia/ffmpeg-compile-def.patch
@@ -0,0 +1,13 @@
+diff --git a/src/plugins/multimedia/ffmpeg/CMakeLists.txt b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+index 77c459a..af5229e 100644
+--- a/src/plugins/multimedia/ffmpeg/CMakeLists.txt
++++ b/src/plugins/multimedia/ffmpeg/CMakeLists.txt
+@@ -273,7 +273,7 @@ if(BUILD_SHARED_LIBS)
+ else()
+     foreach(ffmpeg_lib IN LISTS ffmpeg_libs)
+         qt_internal_add_target_include_dirs(QFFmpegMediaPlugin ${ffmpeg_lib})
+-        target_include_directories(QFFmpegMediaPlugin PRIVATE
++        target_compile_definitions(QFFmpegMediaPlugin PRIVATE
+             "$<TARGET_PROPERTY:${ffmpeg_lib},INTERFACE_COMPILE_DEFINITIONS>")
+     endforeach()
+ endif()
diff --git a/vcpkg/ports/qtmultimedia/portfile.cmake b/vcpkg/ports/qtmultimedia/portfile.cmake
@@ -6,6 +6,7 @@ set(${PORT}_PATCHES
     fix_avfoundation_target.patch
     remove-static-ssl-stub.patch
     private_libs.patch
+    ffmpeg-compile-def.patch
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -21,10 +22,12 @@ INVERTED_FEATURES
     "vaapi"         CMAKE_DISABLE_FIND_PACKAGE_VAAPI # not in vpckg
 )
 
+set(unused "")
 if("gstreamer" IN_LIST FEATURES)
     list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'")
 else()
     list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'")
+    list(APPEND unused INPUT_gstreamer_gl INPUT_gstreamer_photography)
 endif()
 list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_gl='no'")
 list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer_photography='no'")
@@ -63,6 +66,7 @@ qt_install_submodule(PATCHES    ${${PORT}_PATCHES}
                         -DCMAKE_FIND_PACKAGE_TARGETS_GLOBAL=ON
                      CONFIGURE_OPTIONS_RELEASE
                      CONFIGURE_OPTIONS_DEBUG
+                     CONFIGURE_OPTIONS_MAYBE_UNUSED ${unused}
                     )
 
 if("gstreamer" IN_LIST FEATURES AND VCPKG_LIBRARY_LINKAGE STREQUAL "static")

diff --git a/vcpkg/ports/qtmultimedia/vcpkg.json b/vcpkg/ports/qtmultimedia/vcpkg.json
@@ -1,6 +1,6 @@
 {
   "name": "qtmultimedia",
-  "version": "6.7.3",
+  "version": "6.8.0",
   "description": "Qt Multimedia is an add-on module that provides a rich set of QML types and C++ classes to handle multimedia content.",
   "homepage": "https://www.qt.io/",
   "license": null,