diff --git a/.github/actions/gstreamer/action.yml b/.github/actions/gstreamer/action.yml index 58cfc117c3c..6855f0c73e3 100644 --- a/.github/actions/gstreamer/action.yml +++ b/.github/actions/gstreamer/action.yml @@ -4,7 +4,7 @@ inputs: gst_version: description: Version of GStreamer to Build required: true - default: 1.22.12 + default: 1.24.8 build_type: description: Build Type "release" or "debug" required: true @@ -34,24 +34,27 @@ runs: run: meson setup --prefix=${{ inputs.install_directory }} --buildtype=${{ inputs.build_type }} - --default-library=static - --wrap-mode=forcefallback - --strip - -Dauto_features=disabled - -Dgst-full-libraries=gstreamer,base,video,gl + --wrap_mode=forcefallback + -Dgst-full-libraries=base,video,gl -Dgpl=enabled -Dlibav=enabled -Dorc=enabled -Dbase=enabled + -Dvaapi=enabled + -Dqt6=enabled -Dgst-plugins-base:gl=enabled - -Dgst-plugins-base:gl_platform=glx - -Dgst-plugins-base:gl_winsys=x11 + -Dgst-plugins-base:gl_platform=glx,egl + -Dgst-plugins-base:gl_winsys=x11,egl,wayland + -Dgst-plugins-base:gl_api=opengl,gles2 -Dgst-plugins-base:x11=enabled -Dgst-plugins-base:playback=enabled -Dgst-plugins-base:tcp=enabled + -Dgst-plugins-base:app=enabled -Dgood=enabled -Dgst-plugins-good:qt6=enabled -Dgst-plugins-good:qt-x11=enabled + -Dgst-plugins-good:qt-egl=enabled + -Dgst-plugins-good:qt-wayland=enabled -Dgst-plugins-good:qt-method=auto -Dgst-plugins-good:isomp4=enabled -Dgst-plugins-good:matroska=enabled @@ -66,17 +69,18 @@ runs: -Dgst-plugins-bad:videoparsers=enabled -Dgst-plugins-bad:sdp=enabled -Dgst-plugins-bad:x11=enabled + -Dgst-plugins-bad:wayland=enabled + -Dgst-plugins-bad:va=enabled + -Dgst-plugins-bad:x265=enabled -Dugly=enabled -Dgst-plugins-ugly:x264=enabled builddir - # -Dqt6=enabled + # --strip=true + # --default-library=static + # --prefer_static=true + # -Dauto_features=disabled # -Dgst-full-target-type=static_library - # -Dgst-plugins-base:gl_platform=glx,egl - # -Dgst-plugins-base:gl_winsys=x11,egl,wayland - # -Dgst-plugins-good:qt-wayland=enabled - # -Dgst-plugins-good:qt-egl=enabled - # -Dgst-plugins-bad:xshm=enabled - # -Dgst-plugins-bad:wayland=enabled + # -Dgstreamer:gstreamer-static-full=true shell: bash - name: Compile GStreamer diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 59a79602712..f10476ebb64 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -36,7 +36,7 @@ jobs: env: ARTIFACT: QGroundControl-x86_64.AppImage QT_VERSION: 6.6.3 - # GST_VERSION: 1.22.12 + GST_VERSION: 1.22.12 steps: - name: Free Disk Space (Ubuntu) @@ -58,8 +58,6 @@ jobs: sudo ./tools/setup/install-dependencies-debian.sh python3 -m pip install --user ninja cmake - - uses: lukka/get-cmake@latest - - name: Install Vulkan run: | wget -qO - http://packages.lunarg.com/lunarg-signing-key-pub.asc | sudo apt-key add - @@ -81,8 +79,6 @@ jobs: cd ccache-*-linux-x86_64 sudo make install - - uses: seanmiddleditch/gha-setup-ninja@v5 - - name: Set Up Cache uses: hendrikmuhs/ccache-action@v1.2 with: @@ -108,6 +104,15 @@ jobs: # - name: Build GStreamer # uses: ./.github/actions/gstreamer + - name: Install GStreamer + uses: blinemedical/setup-gstreamer@v1 + with: + version: ${{ env.GST_VERSION }} + + - uses: lukka/get-cmake@latest + + - uses: seanmiddleditch/gha-setup-ninja@v5 + - run: mkdir ${{ runner.temp }}/shadow_build_dir - name: Configure