diff --git a/build/media-suite_compile.sh b/build/media-suite_compile.sh index 4600cab92a..afc65f4d3a 100644 --- a/build/media-suite_compile.sh +++ b/build/media-suite_compile.sh @@ -2813,11 +2813,12 @@ EOF sed -e 's,add_subdirectory(labs),#add_subdirectory(labs),' \ -e 's,add_subdirectory(quickdialogs),#add_subdirectory(quickdialogs),' \ -e 's,add_subdirectory(qmldom),#add_subdirectory(qmldom),' \ + -e 's,add_subdirectory(effects),#add_subdirectory(effects),' \ -e 's,add_subdirectory(quickwidgets),#add_subdirectory(quickwidgets),' \ -i src/CMakeLists.txt do_qt_cmakeinstall -DFEATURE_qml_{debug,profiler,preview,network}=OFF \ - -DFEATURE_quick_{animatedimage,canvas,designer,flipable,particles,sprite}=OFF \ + -DFEATURE_quick_{animatedimage,canvas,designer,flipable,particles,path,sprite}=OFF \ -DFEATURE_quickcontrols2_{imagine,material,universal,macos,ios}=OFF \ -DFEATURE_quicktemplates2_calendar=OFF do_checkIfExist @@ -2883,7 +2884,6 @@ EOF _check=(medialibrary.pc libmedialibrary.a medialibrary/IAlbum.h) if do_vcs "$SOURCE_REPO_MEDIALIBRARY"; then do_uninstall include/medialibrary "${_check[@]}" - do_patch "$_vlc/medialibrary/Fix-CacheWorker.patch" am sed -e 's;;&\n#include ;' \ -i include/medialibrary/IChapter.h -i include/medialibrary/ISubtitleTrack.h do_mesoninstall -Dtests=disabled -Dlibvlc=disabled -Dlibtool_workaround=true @@ -2936,7 +2936,7 @@ EOF --disable-{avisynth,iconv,libgsm,libopenjpeg,libvpx,linux-perf,nvenc} \ --enable-dxva2 --enable-gpl --enable-postproc "${vlc_ffmpeg_opts[@]}" do_make && do_makeinstall - files_exist "${_check[@]}" && touch ../"build_successful${bits}_vlc" + do_checkIfExist && touch ../"build_successful${bits}_vlc" unset vlc_ffmpeg_opts fi @@ -2957,9 +2957,10 @@ EOF # generate qtvlcdeps.pc from contribs cd_safe contrib/src/qtvlcdeps - [[ -f Makefile ]] && rm Makefile{,.debug,.release} - do_qmake - QT_LIBS=$(awk -F '=' '/LIBS/ {print $2; exit}' Makefile.Release) + [[ -f build.ninja ]] && rm build.ninja + log "cmake" cmake -DBUILD_SHARED_LIBS=off -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_TOOLCHAIN_FILE="$(cygpath -pm $LOCALDESTDIR/lib/cmake/Qt6/qt.toolchain.cmake)" + QT_LIBS=$(awk -F '=' '/LINK_LIBRARIES/ {print $2; exit}' build.ninja) cat qtvlcdeps.pc.in | sed \ -e "s|%1|$QT_LIBS|" -e "s|}/plugins|}/share/qt6/plugins|" -e "s|}/qml|}/share/qt6/qml|" \ -e "s|$(cygpath -pm $LOCALDESTDIR/lib/)|$\{libdir\}/|g" \