diff --git a/.github/workflows/qctools.yml b/.github/workflows/qctools.yml index a8b72c68b..45a87e11e 100644 --- a/.github/workflows/qctools.yml +++ b/.github/workflows/qctools.yml @@ -44,7 +44,7 @@ jobs: - name: Set Qt5 environment path run: | - echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH + echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH - name: Build QCTools env: @@ -63,7 +63,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@9 + packages: llvm@13 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - qt_version: "6.3.0" qt_modules: "qtmultimedia" @@ -150,7 +150,7 @@ jobs: - name: Set Qt5 environment path run: | - echo "/usr/local/opt/qt5/bin" >> $GITHUB_PATH + echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH - name: Build qwt run: | @@ -192,7 +192,7 @@ jobs: compiler: ['clang-9'] include: - compiler: clang-9 - packages: llvm@9 + packages: llvm@13 env: { 'CC': 'clang-9', 'CXX': 'clang++-9', 'HOMEBREW_NO_INSTALL_CLEANUP': '1', 'HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK': '1' } - qt_version: "6.3.0" qt_modules: "qtmultimedia" @@ -491,22 +491,16 @@ jobs: arch: win64_mingw81 version: ${{ matrix.qt_version }} - - name: Install wget & unzip - run: | - choco install wget unzip xidel - - name: Install FFmpeg - shell: cmd + shell: pwsh run: | - cd .. - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name - set /P FFMPEG_URL=< ffmpeg.url - set /P FFMPEG_NAME=< ffmpeg.name - wget https://github.com%FFMPEG_URL% - unzip %FFMPEG_NAME%.zip - ren %FFMPEG_NAME% ffmpeg - dir ffmpeg + Set-Location .. + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') + $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url') + Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" + Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath . + Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt run: | @@ -579,22 +573,16 @@ jobs: version: ${{ matrix.qt_version }} modules: ${{ matrix.qt_modules }} - - name: Install wget & unzip - run: | - choco install wget unzip xidel - - name: Install FFmpeg - shell: cmd + shell: pwsh run: | - cd .. - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name - set /P FFMPEG_URL=< ffmpeg.url - set /P FFMPEG_NAME=< ffmpeg.name - wget https://github.com%FFMPEG_URL% - unzip %FFMPEG_NAME%.zip - ren %FFMPEG_NAME% ffmpeg - dir ffmpeg + Set-Location .. + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') + $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url') + Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" + Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath . + Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt run: | @@ -668,22 +656,16 @@ jobs: with: version: ${{ matrix.qt_version }} - - name: Install wget & unzip - run: | - choco install wget unzip xidel - - name: Install FFmpeg - shell: cmd + shell: pwsh run: | - cd .. - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name - set /P FFMPEG_URL=< ffmpeg.url - set /P FFMPEG_NAME=< ffmpeg.name - wget https://github.com%FFMPEG_URL% - unzip %FFMPEG_NAME%.zip - ren %FFMPEG_NAME% ffmpeg - dir ffmpeg + Set-Location .. + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') + $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url') + Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" + Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath . + Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt run: | @@ -761,22 +743,16 @@ jobs: version: ${{ matrix.qt_version }} modules: ${{ matrix.qt_modules }} - - name: Install wget & unzip - run: | - choco install wget unzip xidel - - name: Install FFmpeg - shell: cmd - run: | - cd .. - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "//a[contains(@href, '-gpl-shared.zip')]/@href[1]" --silent > ffmpeg.url - xidel https://github.com/BtbN/FFmpeg-Builds/releases -e "(//a[contains(@href, '-gpl-shared.zip')])[1]/substring(., 0, string-length(.) - 3)" --silent > ffmpeg.name - set /P FFMPEG_URL=< ffmpeg.url - set /P FFMPEG_NAME=< ffmpeg.name - wget https://github.com%FFMPEG_URL% - unzip %FFMPEG_NAME%.zip - ren %FFMPEG_NAME% ffmpeg - dir ffmpeg + shell: pwsh + run: | + Set-Location .. + $json = $(curl -L -H "Accept: application/vnd.github+json" https://api.github.com/repos/BtbN/FFmpeg-Builds/releases/latest) + $ffmpeg_name = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).name | sub("\\.zip$";"")') + $ffmpeg_url = $($json | jq -r '.assets[] | select(.name | endswith("-gpl-shared-6.1.zip")).browser_download_url') + Invoke-WebRequest -Uri "$ffmpeg_url" -OutFile "$ffmpeg_name.zip" + Expand-Archive -Path "$ffmpeg_name.zip" -DestinationPath . + Rename-Item -Path "$ffmpeg_name" -NewName "ffmpeg" - name: Download and configure qwt run: | diff --git a/Project/QtCreator/qctools-QtAVPlayer b/Project/QtCreator/qctools-QtAVPlayer index d28e58b66..fea4ed2dc 160000 --- a/Project/QtCreator/qctools-QtAVPlayer +++ b/Project/QtCreator/qctools-QtAVPlayer @@ -1 +1 @@ -Subproject commit d28e58b66e2429f90ca6fa3265d030b6ecd71996 +Subproject commit fea4ed2dca930f79586c742dd9d6c047089ba494 diff --git a/Project/QtCreator/qctools-cli/qctools-cli.pro b/Project/QtCreator/qctools-cli/qctools-cli.pro index 830268ba1..9170127c6 100644 --- a/Project/QtCreator/qctools-cli/qctools-cli.pro +++ b/Project/QtCreator/qctools-cli/qctools-cli.pro @@ -3,7 +3,7 @@ message('entering qctools-cli.pro') QT += core network QT -= gui -CONFIG += c++11 +CONFIG += c++1z TARGET = qcli CONFIG += console diff --git a/Project/QtCreator/qctools-gui/qctools-gui.pro b/Project/QtCreator/qctools-gui/qctools-gui.pro index 493f7d5d7..2c7112ec7 100644 --- a/Project/QtCreator/qctools-gui/qctools-gui.pro +++ b/Project/QtCreator/qctools-gui/qctools-gui.pro @@ -7,7 +7,7 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets printsupport qml TARGET = QCTools TEMPLATE = app -CONFIG += c++11 qt +CONFIG += c++1z qt message("PWD = " $$PWD) diff --git a/Project/QtCreator/qctools-lib/qctools-lib.pro b/Project/QtCreator/qctools-lib/qctools-lib.pro index eb5af46fb..6c3dfec20 100644 --- a/Project/QtCreator/qctools-lib/qctools-lib.pro +++ b/Project/QtCreator/qctools-lib/qctools-lib.pro @@ -2,7 +2,7 @@ QT = core network multimedia concurrent TARGET = qctools TEMPLATE = lib -CONFIG += c++11 +CONFIG += c++1z CONFIG += staticlib message('qctools-lib: including ffmpeg')