Merge branch 'nightly' into no-sink-path-rebased

psyke83 · Oct 11, 2022 · 907798f · 907798f
2 parents cf61079 + 4352541
commit 907798f
Show file tree

Hide file tree

Showing 10 changed files with 53 additions and 47 deletions.
diff --git a/.flake8 b/.flake8
@@ -1,6 +1,7 @@
 [flake8]
 filename =
-    *.py
+    *.py,
+    *.pys
 max-line-length = 120
 extend-exclude =
     venv/
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
@@ -5,15 +5,9 @@
 
 blank_issues_enabled: false
 contact_links:
-  - name: Discord support
-    url: https://docs.lizardbyte.dev/about/support.html#discord
-    about: Ask questions in Discord
-  - name: Reddit support
-    url: https://www.reddit.com/r/LizardByte
-    about: Get community support on Reddit
-  - name: Facebook support
-    url: https://www.facebook.com/groups/lizardbyte
-    about: Get community support on Facebook
+  - name: Support Center
+    url: https://app.lizardbyte.dev/support
+    about: Official LizardByte support
   - name: Feature request
-    url: https://feedback.lizardbyte.dev
+    url: https://app.lizardbyte.dev/feedback
     about: Share your suggestions or ideas to help us improve
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -5,6 +5,14 @@
 
 version: 2
 updates:
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "00:00"
+    target-branch: "nightly"
+    open-pull-requests-limit: 10
+
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

diff --git a/.github/label-actions.yml b/.github/label-actions.yml
@@ -25,8 +25,8 @@ invalid:duplicate:
 invalid:support:
   comment: >
     :wave: @{issue-author}, we use the issue tracker exclusively for bug reports.
-    However, this issue appears to be a support request. Please use
-    [Discord](https://docs.lizardbyte.dev/about/support.html#discord) for support issues. Thanks.
+    However, this issue appears to be a support request. Please use our
+    [Support Center](https://app.lizardbyte.dev/support) for support issues. Thanks.
   close: true
   lock: true
   lock-reason: 'off-topic'

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -157,7 +157,7 @@ jobs:
 
       - name: Publish AUR package
         if: ${{ env.aur_publish == 'true' }}
-        uses: KSXGitHub/github-actions-deploy-aur@v2.4.1
+        uses: KSXGitHub/github-actions-deploy-aur@v2.5.0
         with:
           pkgname: ${{ env.aur_pkg }}
           pkgbuild: ./artifacts/PKGBUILD
@@ -171,7 +171,7 @@ jobs:
 
   build_linux_flatpak:
     name: Linux Flatpak
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     needs: check_changelog
 
     steps:

diff --git a/.github/workflows/issues-stale.yml b/.github/workflows/issues-stale.yml
@@ -15,10 +15,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Stale
-        uses: actions/stale@v5
+        uses: actions/stale@v6
         with:
           close-issue-message: >
-            This issue was closed because it has been stalled for 5 days with no activity.
+            This issue was closed because it has been stalled for 10 days with no activity.
           close-pr-message: >
             This PR was closed because it has been stalled for 10 days with no activity.
           days-before-stale: 90
@@ -28,15 +28,16 @@ jobs:
           exempt-pr-labels: 'dependencies,l10n'
           stale-issue-label: 'stale'
           stale-issue-message: >
-            This issue is stale because it has been open for 30 days with no activity.
-            Comment or remove the stale label, otherwise this will be closed in 5 days.
+            This issue is stale because it has been open for 90 days with no activity.
+            Comment or remove the stale label, otherwise this will be closed in 10 days.
           stale-pr-label: 'stale'
           stale-pr-message: >
             This PR is stale because it has been open for 90 days with no activity.
             Comment or remove the stale label, otherwise this will be closed in 10 days.
+          repo-token: ${{ secrets.GH_BOT_TOKEN }}
 
       - name: Invalid Template
-        uses: actions/stale@v5
+        uses: actions/stale@v6
         with:
           close-issue-message: >
             This issue was closed because the the template was not completed after 5 days.
@@ -52,3 +53,4 @@ jobs:
           stale-pr-label: 'invalid:template-incomplete'
           stale-pr-message: >
             Invalid PR template.
+          repo-token: ${{ secrets.GH_BOT_TOKEN }}
diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
@@ -19,4 +19,4 @@ jobs:
       - name: Label Actions
         uses: dessant/label-actions@v2
         with:
-          github-token: ${{ github.token }}
+          github-token: ${{ secrets.GH_BOT_TOKEN }}
diff --git a/.github/workflows/yaml-lint.yml b/.github/workflows/yaml-lint.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: yaml lint
         id: yaml-lint
@@ -39,7 +39,7 @@ jobs:
           echo ${{ steps.yaml-lint.outputs.logfile }}
 
       - name: Upload logs
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         if: failure()
         with:
           name: yamllint-logfile

diff --git a/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml b/packaging/linux/flatpak/dev.lizardbyte.sunshine.yml
@@ -54,16 +54,19 @@ modules:
         dest-filename: cuda.run
 
   - name: boost
+    disabled: false
     buildsystem: simple
     build-commands:
-      - ./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=system,thread,log
+      - cd tools/build && bison -y -d -o src/engine/jamgram.cpp src/engine/jamgram.y
+      - ./bootstrap.sh --prefix=$FLATPAK_DEST --with-libraries=system,thread,log || cat bootstrap.log
       - ./b2 install variant=release link=static,shared runtime-link=shared cxxflags="$CXXFLAGS" linkflags="$LDFLAGS" -j $FLATPAK_BUILDER_N_JOBS  # yamllint disable-line rule:line-length
     sources:
       - type: archive
-        url: https://boostorg.jfrog.io/artifactory/main/release/1.80.0/source/boost_1_80_0.tar.bz2
-        sha256: 1e19565d82e43bc59209a168f5ac899d3ba471d55c7610c677d4ccf2c9c500c0
+        url: http://archive.ubuntu.com/ubuntu/pool/main/b/boost1.74/boost1.74_1.74.0.orig.tar.xz
+        sha256: 2467be4af625b5ae4b3c93fc7af196a09eba39c11a7338cd9e8b356fa44d2f45
 
   - name: ffmpeg
+    disabled: false
     config-opts:
       - --enable-gpl
       - --disable-static
@@ -94,23 +97,15 @@ modules:
         url: http://archive.ubuntu.com/ubuntu/pool/universe/f/ffmpeg/ffmpeg_4.4.2.orig.tar.xz
         sha256: af419a7f88adbc56c758ab19b4c708afbcae15ef09606b82b855291f6a6faa93
     modules:
-      - name: vmaf
-        buildsystem: meson
-        subdir: libvmaf
-        cleanup:
-          - /bin
-        sources:
-          - type: archive
-            url: https://github.com/Netflix/vmaf/archive/refs/tags/v2.3.1.tar.gz
-            sha256: 8d60b1ddab043ada25ff11ced821da6e0c37fd7730dd81c24f1fc12be7293ef2
       - name: x264
         config-opts:
           - --disable-cli
           - --enable-shared
         sources:
           - type: archive
-            url: https://code.videolan.org/videolan/x264/-/archive/stable/x264-stable.tar.bz2
-            sha256: 8fedb184045722d8cc39353099373a5b7350171d0964d01fff8eced21b959b29
+            url: http://archive.ubuntu.com/ubuntu/pool/universe/x/x264/x264_0.163.3060+git5db6aa6.orig.tar.gz
+            sha256: 0c7a5585f1b160c91eab8114d8493e65d08d2dfdc5b5d6ae46bbe5523469df9d
+
       - name: x265
         buildsystem: cmake-ninja
         builddir: true
@@ -120,20 +115,22 @@ modules:
           - -DENABLE_CLI=OFF
         sources:
           - type: archive
-            url: https://bitbucket.org/multicoreware/x265_git/downloads/x265_3.5.tar.gz
+            url: http://archive.ubuntu.com/ubuntu/pool/universe/x/x265/x265_3.5.orig.tar.gz
             sha256: e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8
-      - name: ffnvcodec
+
+      - name: nv-codec-headers
         no-autogen: true
         make-install-args:
           - PREFIX=${FLATPAK_DEST}
         cleanup:
           - '*'
         sources:
           - type: archive
-            url: https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n11.1.5.1.tar.gz
+            url: http://archive.ubuntu.com/ubuntu/pool/universe/n/nv-codec-headers/nv-codec-headers_11.1.5.1.orig.tar.gz
             sha256: d095fbd56aa93772471a323be0ebe65504a0f43f06c76a30b6d25da77b06ae9c
 
   - name: avahi
+    disabled: false
     cleanup:
       - /bin
       - /lib/avahi
@@ -162,34 +159,38 @@ modules:
       - --disable-xmltoman
     sources:
       - type: archive
-        url: https://avahi.org/download/avahi-0.8.tar.gz
+        url: http://archive.ubuntu.com/ubuntu/pool/main/a/avahi/avahi_0.8.orig.tar.gz
         sha256: 060309d7a333d38d951bc27598c677af1796934dbd98e1024e7ad8de798fedda
+
     modules:
       - name: libevent
         cleanup:
           - /bin
         sources:
           - type: archive
-            url: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz  # yamllint disable-line rule:line-length
+            url: http://archive.ubuntu.com/ubuntu/pool/main/libe/libevent/libevent_2.1.12-stable.orig.tar.gz
             sha256: 92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb
 
   - name: libevdev
     buildsystem: meson
+    config-opts:
+      - -Ddocumentation=disabled
     cleanup:
       - /bin
     sources:
       - type: archive
-        url: https://www.freedesktop.org/software/libevdev/libevdev-1.12.1.tar.xz
-        sha256: 1dbba41bc516d3ca7abc0da5b862efe3ea8a7018fa6e9b97ce9d39401b22426c
+        url: http://archive.ubuntu.com/ubuntu/pool/main/libe/libevdev/libevdev_1.12.1+dfsg.orig.tar.xz
+        sha256: a9aadd9c1ac64e47ca88776555ea6d0030d678b518f593082a13354e0d8016db
+
     modules:
       - name: libcheck
         buildsystem: cmake
         cleanup:
           - /bin
         sources:
           - type: archive
-            url: https://github.com/libcheck/check/archive/refs/tags/0.15.2.tar.gz
-            sha256: 998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e
+            url: http://archive.ubuntu.com/ubuntu/pool/universe/c/check/check_0.15.2.orig.tar.gz
+            sha256: 8451b68ac5d6f3157b24f22eceff575bcf566264f6d78f3852f89d4e08cf42e1
 
   - name: sunshine
     buildsystem: cmake

diff --git a/scripts/requirements.txt b/scripts/requirements.txt
@@ -1,5 +1,5 @@
 Babel==2.10.3
 m2r2==0.3.2
-Sphinx==5.1.1
+Sphinx==5.2.3
 sphinx-copybutton==0.5.0
 sphinx-rtd-theme==1.0.0