chore(rebuild): unity-settings-daemon

Signed-off-by: madomado <madonuko@outlook.com>
bump: zellij
2026-05-31 09:01:55 +00:00 · 2024-05-02 19:56:57 +08:00 · 2024-05-02 07:46:05 +00:00 · 2024-05-02 06:18:54 +00:00 · 2024-05-02 12:45:22 +08:00 · 2024-05-02 12:14:23 +08:00
698 changed files with 11273 additions and 3960 deletions
@@ -0,0 +1,9 @@
+{
+  "repoOwner": "terrapkg",
+  "repoName": "packages",
+  "resetAuthor": true,
+  "targetBranchChoices": ["f38", "f39", "f40", "frawhide"],
+  "branchLabelMapping": {
+    "^sync-(.+)$": "$1"
+  }
+}
@@ -6,13 +6,13 @@ on:
    paths:
      - anda/**
    branches:
-      - f38
+      - frawhide
  pull_request:
    branches:
-      - f38
+      - frawhide
  merge_group:
    branches:
-      - f38
+      - frawhide
  workflow_dispatch:
  workflow_call:

@@ -23,13 +23,13 @@ jobs:
    outputs:
      build_matrix: ${{ steps.generate_build_matrix.outputs.build_matrix }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Set workspace as safe
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Generate build matrix
@@ -40,33 +40,26 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.manifest.outputs.build_matrix) }}
-        version: ["38"]
+        version: ["rawhide"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version}}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
        run: git config --global --add safe.directory "$GITHUB_WORKSPACE"

-      - name: Cache buildroot
-        id: br-cache
-        uses: actions/cache@v3
-        with:
-          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
-
      - name: Include custom build template instead of package default
        run: |
-          cp -v anda/mock-configs/terra.tpl /etc/mock/templates/terra.tpl
+          cp -v anda/terra/mock-configs/terra.tpl /etc/mock/templates/terra.tpl

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -75,10 +68,13 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          compression-level: 0 # The RPMs are already compressed :p
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        if: github.event_name == 'push'
@@ -88,69 +84,17 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
        if: success() && github.event_name == 'push'
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
        if: ( cancelled() || failure() ) && github.event_name == 'push'
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
-
-      - name: Lint RPMs and SRPMs
-        id: lint
-        if: success()
-        run: |
-          echo 'LINT_ERR=false' >> $GITHUB_ENV
-          rpmlint anda-build/ > rpmlint.txt || f=1
-          if [[ $f -eq 1 ]]; then
-            EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-            echo "ESC_LINT_OUT<<$EOF" >> $GITHUB_ENV
-            cat rpmlint.txt | sed 's/`/\\`/g' >> $GITHUB_ENV
-            echo $EOF >> $GITHUB_ENV
-            echo "lint_out<<$EOF" >> $GITHUB_ENV
-            echo '```' >> $GITHUB_ENV
-            cat rpmlint.txt >> $GITHUB_ENV
-            echo '```' >> $GITHUB_ENV
-            echo $EOF >> $GITHUB_ENV
-            echo 'LINT_ERR=true' >> $GITHUB_ENV
-          fi
-
-      - name: Try to install package
-        id: dnf
-        if: success()
-        run: |
-          echo 'INSTALL_ERR=false' >> $GITHUB_ENV
-          touch out
-          for f in anda-build/rpm/rpms/*.rpm; do
-            dnf in --downloadonly -y $f > $f.dnfout.txt 2>&1 || fail=1
-            if [[ $fail -eq 1 ]]; then
-              echo "### $f" >> out
-              echo '```' >> out
-              cat $f.dnfout.txt >> out
-              echo '```' >> out
-              echo >> out
-              echo 'INSTALL_ERR=true' >> $GITHUB_ENV
-            fi
-          done
-          cat out
-          EOF=$(dd if=/dev/urandom bs=15 count=1 status=none | base64)
-          echo "ESC_DNF_OUT<<$EOF" >> $GITHUB_ENV
-          cat out | sed 's/`/\\`/g' >> $GITHUB_ENV
-          echo $EOF >> $GITHUB_ENV
-          echo "dnf_out<<$EOF" >> $GITHUB_ENV
-          cat out >> $GITHUB_ENV
-          echo $EOF >> $GITHUB_ENV
-
-      - name: Generate RPMLint/DNF summary
-        if: success()
-        run: |
-          # Remind me to make all of this not weird later ~ lleyton
-
-          if [[ $LINT_ERR == "true" ]]; then
-            echo -e "## ❌ Lint: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
-            echo -e "```\n${{ env.ESC_LINT_OUT }}\n```\n" >> $GITHUB_STEP_SUMMARY
-          fi
-
-          if [[ $INSTALL_ERR == "true" ]]; then
-            echo -e "## ❌ DNF: [${{matrix.pkg.pkg}} (${{matrix.pkg.arch}})](https://github.com/terrapkg/packages/actions/runs/${{github.run_id}})\n" >> $GITHUB_STEP_SUMMARY
-            echo "${{ env.ESC_DNF_OUT }}" >> $GITHUB_STEP_SUMMARY
-          fi
@@ -7,56 +7,55 @@ jobs:
  bootstrap:
    strategy:
      matrix:
-        version: ["38"]
+        version: ["rawhide"]
        arch: ["x86_64", "aarch64"]
      fail-fast: true
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: fedora:38
+      image: registry.fedoraproject.org/fedora-minimal:${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
-      - uses: actions/setup-go@v3
-        with:
-          go-version: "^1.19"
-
      - name: Install repositories
-        run: |
-          sudo dnf install -y dnf-plugins-core
-          sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra${{ matrix.version }}.repo
-          sudo dnf install -y mock createrepo_c rpm-build terra-mock-configs gcc curl wget git-core openssl-devel
+        run: dnf5 install -y --setopt=install_weak_deps=False mock curl wget git-core openssl-devel cargo podman fuse-overlayfs

-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/subatomic
-          set-safe-directory: true
-          fetch-depth: 1
-
-      - uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
      - name: Install Anda
-        uses: actions-rs/cargo@v1
+        run: cargo install anda
+
+      - uses: actions/checkout@v4
        with:
-          command: install
-          args: anda
+          ref: f${{ matrix.version }}
+          fetch-depth: 1
+      - name: Build terra-mock-configs
+        run: |
+          echo "PATH=$PATH:/github/home/.cargo/bin" >> $GITHUB_ENV
+          export PATH=$PATH:/github/home/.cargo/bin
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          anda build -c fedora-${{ matrix.version }}-${{ matrix.arch }} anda/terra/mock-configs/pkg -p rpm
+      - name: Install terra-mock-configs
+        run: dnf5 install -y anda-build/rpm/rpms/terra-mock-configs*.rpm
+
+      - name: Build anda-srpm-macros
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/terra/srpm-macros/pkg

      - name: Build Subatomic
-        run: |
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} subatomic -p rpm -D "autogitcommit $(git log -1 --format='%H')"
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/subatomic/pkg
      - name: Install Subatomic
-        run: sudo dnf install -y ./anda-build/rpm/rpms/subatomic-*.rpm
-
-      - uses: actions/checkout@v3
-        with:
-          repository: FyraLabs/anda
+        run: dnf5 install -y ./anda-build/rpm/rpms/subatomic-*.rpm

      - name: Build Andaman
-        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda -p rpm
+        run: anda build -c terra-${{ matrix.version }}-${{ matrix.arch }} anda/tools/buildsys/anda/pkg

-      - name: Upload to Subatomic
+      - name: Upload packages to subatomic
        run: |
          subatomic-cli upload --prune \
            --server https://subatomic.fyralabs.com \
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*
+
+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
@@ -21,16 +21,16 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(needs.parse.outputs.pkgs) }}
-        version: ["38"]
+        version: ["rawhide"]
        arch: ["x86_64", "aarch64"]
      fail-fast: false
    runs-on: ${{ matrix.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -38,13 +38,13 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
-          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}
+          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.arch }}-${{ matrix.pkg }}

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build anda/${{ matrix.pkg }}pkg --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -53,10 +53,13 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          compression-level: 0 # The RPMs are already compressed :p
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        run: |
@@ -65,9 +68,16 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
-        if: success() && github.event_name == 'push'
+        if: success()
        run: ./.github/workflows/mg.sh true ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name == 'push'
+        if: cancelled() || failure()
        run: ./.github/workflows/mg.sh false ${{matrix.pkg}} ${{matrix.version}} ${{matrix.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -11,15 +11,15 @@ jobs:
    strategy:
      matrix:
        pkg: ${{ fromJson(inputs.packages) }}
-        version: ["38"]
+        version: ["rawhide"]
      fail-fast: false
    runs-on: ${{ matrix.pkg.arch == 'aarch64' && 'ARM64' || 'ubuntu-latest' }}
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:f${{ matrix.version }}
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
      - name: Set up git repository
@@ -27,13 +27,13 @@ jobs:

      - name: Cache buildroot
        id: br-cache
-        uses: actions/cache@v3
+        uses: actions/cache@v4
        with:
          path: /var/cache
          key: ${{ runner.os }}-br-${{ matrix.version }}-${{ matrix.pkg.arch }}-${{ matrix.pkg.pkg }}

      - name: Build with Andaman
-        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg
+        run: anda build ${{ matrix.pkg.pkg }} --package rpm -c anda/terra/mock-configs/terra-${{ matrix.version }}-${{ matrix.pkg.arch }}.cfg

      - name: Generating artifact name
        id: art
@@ -42,10 +42,13 @@ jobs:
          x=${NAME//\//@}
          echo "name=$x" >> $GITHUB_OUTPUT

-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
        with:
          name: ${{ steps.art.outputs.name }}
-          path: anda-build/rpm/rpms/*
+          compression-level: 0 # The RPMs are already compressed :p
+          path: |
+            anda-build/rpm/rpms/*
+            anda-build/rpm/srpm/*

      - name: Upload packages to subatomic
        run: |
@@ -54,9 +57,17 @@ jobs:
            --token ${{ secrets.SUBATOMIC_TOKEN }} \
            terra${{ matrix.version }} anda-build/rpm/rpms/*

+      - name: Upload source packages to subatomic
+        if: github.event_name == 'push'
+        run: |
+          subatomic-cli upload --prune \
+            --server https://subatomic.fyralabs.com \
+            --token ${{ secrets.SUBATOMIC_TOKEN }} \
+            terra${{ matrix.version }}-source anda-build/rpm/srpm/*
+
      - name: Notify Madoguchi (Success)
-        if: success() && github.event_name == 'push'
+        if: success()
        run: ./.github/workflows/mg.sh true ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
      - name: Notify Madoguchi (Failure)
-        if: ( cancelled() || failure() ) && github.event_name == 'push'
+        if: cancelled() || failure()
        run: ./.github/workflows/mg.sh false ${{matrix.pkg.pkg}} ${{matrix.version}} ${{matrix.pkg.arch}} ${{github.run_id}} ${{secrets.MADOGUCHI_JWT}}
@@ -3,20 +3,20 @@ name: Lint
 on:
  push:
    branches:
-      - f38
+      - frawhide
  pull_request:
    branches:
-      - f38
+      - frawhide
  merge_group:
    branches:
-      - f38
+      - frawhide
 jobs:
  lint:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
      - name: Lint spec files
        run: rpmlint $(find anda -type f -name "*.spec" -type f)
@@ -0,0 +1,37 @@
+name: Automatic backport/sync action
+
+on:
+  pull_request_target:
+    types: ["labeled", "closed"]
+
+jobs:
+  backport:
+    name: Backport/sync PR
+    runs-on: ubuntu-latest
+    if: github.event.pull_request.merged
+    steps:
+      - name: Install SSH signing key
+        run: |
+          mkdir -p ${{ runner.temp }}
+          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
+          chmod 0700 ${{ runner.temp }}/signing_key
+
+      - name: Setup Raboneko Signing
+        run: |
+          git config --global gpg.format "ssh"
+          git config --global user.signingkey "${{ runner.temp }}/signing_key"
+          git config --global commit.gpgsign true
+
+      - name: Backport Action
+        uses: sorenlouv/backport-github-action@v9.3.0
+        with:
+          github_token: ${{ secrets.RABONEKO_BACKPORT_GITHUB_TOKEN }}
+          auto_backport_label_prefix: sync-
+
+      - name: Info log
+        if: ${{ success() }}
+        run: cat ~/.backport/backport.info.log
+
+      - name: Debug log
+        if: ${{ failure() }}
+        run: cat ~/.backport/backport.debug.log
@@ -1,38 +0,0 @@
-name: Sync PR to other branches
-on:
-  pull_request:
-    types:
-      - closed
-    branches:
-      - f38
-
-jobs:
-  sync:
-    strategy:
-      matrix:
-        branch: ["f37"]
-      fail-fast: false
-    if: github.event.pull_request.merged == true && !contains(github.event.pull_request.labels.*.name, 'nosync')
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}
-          ref: ${{ matrix.branch }}
-      - name: Install SSH key and Setup Git
-        run: |
-          mkdir -p ${{ runner.temp }}
-          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
-          chmod 0700 ${{ runner.temp }}/signing_key
-          git config --global --add safe.directory "$GITHUB_WORKSPACE"
-          git config user.name "Raboneko"
-          git config user.email "raboneko@fyralabs.com"
-          git config gpg.format "ssh"
-          git config user.signingkey "${{ runner.temp }}/signing_key"
-      - name: Apply patches and Push
-        run: |
-          curl https://github.com/terrapkg/packages/pull/${{ github.event.pull_request.number }}.patch > pr.patch
-          git am -S --keep-cr --signoff < pr.patch
-          git push -u origin --all
@@ -3,6 +3,8 @@ name: Push comps updates
 on:
  push:
    branches:
+      - frawhide
+      - f39
      - f38
      - f37
    paths:
@@ -13,14 +15,12 @@ jobs:
  update-comps:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:38
+      image: ghcr.io/terrapkg/builder:frawhide
    steps:
-      - uses: actions/checkout@v3
-      - id: get-branch
-        uses: grandmasterdev/github-action-get-branch@latest
+      - uses: actions/checkout@v4
      - name: Push to subatomic
        run: |
-          branch=${{steps.get-branch.outputs.branch-name}}
+          branch=${{ github.ref_name }}
          ver=${branch/f/}
          subatomic-cli upload-comps \
            --server https://subatomic.fyralabs.com \
@@ -8,20 +8,21 @@ jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Nightly Update
        run: anda update -vv --filters nightly=1
@@ -30,7 +31,6 @@ jobs:

      - name: Save
        run: |
-          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -38,13 +38,16 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump(nightly): $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            f37 () {
+            copy_over () {
              git format-patch HEAD^
-              git checkout f37
+              git checkout $1
              git apply *.patch || true
+              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            f37 || true
+            copy_over f38 || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -1,37 +1,37 @@
 name: Update
 on:
  schedule:
-    - cron: "*/30 * * * *"
+    - cron: "*/10 * * * *"
  workflow_dispatch:

 jobs:
  autoupdate:
    runs-on: ubuntu-latest
    container:
-      image: ghcr.io/terrapkg/builder:f38
+      image: ghcr.io/terrapkg/builder:frawhide
      options: --cap-add=SYS_ADMIN --privileged
    steps:
      - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
          ssh-key: ${{ secrets.SSH_AUTHENTICATION_KEY }}

-      - name: Install SSH signing key
+      - name: Install SSH signing key & Set up git repository
        run: |
          mkdir -p ${{ runner.temp }}
          echo "${{ secrets.SSH_SIGNING_KEY }}" > ${{ runner.temp }}/signing_key
          chmod 0700 ${{ runner.temp }}/signing_key
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"

      - name: Run Update
        run: anda update -vv
        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          GITHUB_TOKEN: ${{ secrets.AUTOUPDATE_GH_TOKEN }}
          RUST_BACKTRACE: full

      - name: Save
        run: |
-          git config --global --add safe.directory "*"
          if [[ `git status --porcelain` ]]; then
            git config user.name "Raboneko"
            git config user.email "raboneko@fyralabs.com"
@@ -39,13 +39,16 @@ jobs:
            git config user.signingkey "${{ runner.temp }}/signing_key"
            msg="bump: $(git status | grep modified | sed -r 's@.+/([^/]+)/[^/]+\n?@\1 @g' | tr -d '\n')"
            git commit -S -a -m "$msg"
-            f37 () {
+            copy_over () {
              git format-patch HEAD^
-              git checkout f37
+              git checkout $1
              git apply *.patch || true
+              rm *.patch
              git add *
              git commit -S -a -m "$msg"
            }
-            f37 || true
+            copy_over f38 || true
+            copy_over f39 || true
+            copy_over f40 || true
            git push -u origin --all
          fi
@@ -1,30 +0,0 @@
-# Repository
-/.github @lleyton 
-/.devcontainer @lleyton 
-/.gitignore @windowsboy111 
-/CODE_OF_CONDUCT.md @lleyton 
-/CONTRIBUTING.md @lleyton 
-/LICENSE @lleyton 
-/README.md @windowsboy111 
-/SECURITY.md @lleyton 
-/anda.hcl @lleyton 
-/comps.xml @lleyton 
-
-# Package maintainers
-/anda/lib/libbismuth @lainsce
-/anda/lib/libhelium @lainsce
-/anda/others/tau-helium @lainsce
-/anda/others/tau-hydrogen @lainsce
-
-/anda/tools/melody @lleyton
-/anda/go/curlie @lleyton
-
-/anda/games/prismlauncher @getchoo
-/anda/games/prismlauncher-nightly @getchoo
-/anda/games/prismlauncher-qt5-nightly @getchoo
-/anda/games/prismlauncher-qt5 @getchoo
-
-/anda/srpm-macros @korewaChino
-/anda/rust/starship @korewaChino
-/anda/rust/zellij @korewaChino
-/anda/audio/distrho @korewaChino
@@ -1,7 +1,9 @@
 # Contributing

-First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q). Since we use a GitHub Wiki for [documention](https://github.com/terrapkg/packages/wiki), our guidelines may be found there. See the links below:
+First of all, thanks for being interested in contributing to Terra! If you have any questions about contributing, please contact us on [Discord](https://discord.gg/5fdPuxTg5Q).

-* [Contribution Guide](https://github.com/terrapkg/packages/wiki/Contribute)
-* [FAQ](https://github.com/terrapkg/packages/wiki/FAQ)
-* [Policy](https://github.com/terrapkg/packages/wiki/Policy)
+## Documentations
+
+* [Contribution Guide](https://developer.fyralabs.com/terra/contributing)
+* [FAQ](https://developer.fyralabs.com/terra/faq)
+* [Policy](https://developer.fyralabs.com/terra/policy)
@@ -1,7 +1,9 @@
 # Terra Sources

-[![Repository status](https://repology.org/badge/repository-big/terra_37.svg?header=Terra+37)](https://repology.org/repository/terra_37)
 [![Repository status](https://repology.org/badge/repository-big/terra_38.svg?header=Terra+38)](https://repology.org/repository/terra_38)
+[![Repository status](https://repology.org/badge/repository-big/terra_39.svg?header=Terra+39)](https://repology.org/repository/terra_39)
+[![Repository status](https://repology.org/badge/repository-big/terra_40.svg?header=Terra+40)](https://repology.org/repository/terra_40)
+[![Repository status](https://repology.org/badge/repository-big/terra_rawhide.svg?header=Terra+Rawhide)](https://repology.org/repository/terra_rawhide)

 Terra is a rolling-release Fedora repository for all the software you need.
 With Terra, you can install the latest packages knowing that quality and security are assured.
@@ -12,6 +14,7 @@ This monorepo contains the package manifests for all packages in Terra.
 ```bash
 sudo dnf config-manager --add-repo https://github.com/terrapkg/subatomic-repos/raw/main/terra.repo
 ```
+You should also install the `terra-release` package so that when our infrastructure has any migrations, you can be assured that your Terra installation will still work as-is.

 ## Documentation
 Our documentation can be found on our [Devdocs](https://developer.fyralabs.com/terra/). Alternatively, the GitHub Wiki contains older versions of the documentations.
@@ -3,7 +3,7 @@
 ## Our Process

 Fyra Labs is committed to ensuring user security and privacy.
-As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://github.com/terrapkg/packages/wiki/FAQ#technical-details).
+As such, we constantly try our best to ensure that our infrastructure and process are secure, which you may read about in our [FAQ](https://developer.fyralabs.com/terra/faq#technical-details).

 As a part of Fyra Labs's transparency measures, we will publicize details of any known breaches. This information will include, but will not be limited to:
 * Affected users, infrastructure, and data.
@@ -11,7 +11,7 @@ As a part of Fyra Labs's transparency measures, we will publicize details of any
 * An in-depth explanation of how the breach occurred, including relevant security vulnerabilities.
 * How Fyra Labs will better protect user data in the future, ensuring our commitment to security and privacy.

-We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs) and [Discord](https://discord.gg/5fdPuxTg5Q).
+We will publish these updates on our [Twitter](https://twitter.com/TeamFyraLabs), [Fedi](https://fedi.fyralabs.com/@hq), and [Discord](https://discord.gg/5fdPuxTg5Q).

 ## Reporting a Vulnerability

@@ -1,13 +1,14 @@
 Name:			anki-bin
-Version:		2.1.65
-Release:		1%{?dist}
+Version:		24.04.1
+Release:		1%?dist
 Summary:		Flashcard program for using space repetition learning (Installed with wheel)
 License:		AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:			https://apps.ankiweb.net/
-BuildRequires:	python3-installer python3.11 rpm_macro(fdupes)
-Requires:		hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
-Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress
+BuildRequires:	python3-pip rpm_macro(fdupes)
+Requires:		python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-orjson
+Requires:		python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema
+Requires:		python3-flask-cors python3-protobuf python3-requests python3-waitress python3-pyqt6-webengine python3-send2trash
+Requires:       libxcrypt-compat hicolor-icon-theme sox mpv 
 ExclusiveArch:	x86_64
 Conflicts:		anki
 Source0:		https://files.pythonhosted.org/packages/cp39/a/anki/anki-%{version}-cp39-abi3-manylinux_2_28_%{_arch}.whl
@@ -28,29 +29,37 @@ Anki is based on a theory called spaced repetition.
 %build

 %install
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE0}
-python3.11 -m installer --destdir="%{buildroot}" %{SOURCE1}
+pip3 install --root=%{buildroot} %SOURCE0 %SOURCE1
 install -Dm755 %{SOURCE2} "%{buildroot}/usr/bin/anki"
 install -Dm644 %{SOURCE3} "%{buildroot}/usr/share/applications/anki.desktop"
 install -Dm644 %{SOURCE4} "%{buildroot}/usr/share/pixmaps/anki.png"
 install -Dm644 %{SOURCE5} "%{buildroot}/%{_datadir}/licenses/%{name}/LICENSE"
 install -Dm644 %{SOURCE6} "%{buildroot}/%{_datadir}/doc/%{name}/README.md"

-%fdupes %_libdir/python*/site-packages/_aqt/data/
+cp -r %buildroot%_libdir/python3*/site-packages/{_aqt,anki*,aqt*} .
+rm -rf %buildroot{%_libdir,/usr/lib}/python3*/site-packages/*
+cp -r ./{_aqt,anki*,aqt*} %buildroot/usr/lib/python3*/site-packages/
+
+rm -rf %buildroot%_bindir/{distro,flask,jsonschema,markdown_py,normalizer,send2trash,waitress-serve}
+
+%fdupes %buildroot%_libdir/python*/site-packages/_aqt/data/


 %files
 %license LICENSE
 %doc README.md
-/usr/bin/anki
-/usr/lib64/python*/site-packages/_aqt/
-/usr/lib64/python*/site-packages/anki-%{version}.dist-info/
-/usr/lib64/python*/site-packages/anki/
-/usr/lib64/python*/site-packages/aqt-%{version}.dist-info/
-/usr/lib64/python*/site-packages/aqt/
-/usr/share/applications/anki.desktop
-/usr/share/pixmaps/anki.png
+%_bindir/anki
+/usr/lib/python*/site-packages/_aqt/
+/usr/lib/python*/site-packages/anki-%{version}.dist-info/
+/usr/lib/python*/site-packages/anki/
+/usr/lib/python*/site-packages/aqt-%{version}.dist-info/
+/usr/lib/python*/site-packages/aqt/
+%_datadir/applications/anki.desktop
+%_datadir/pixmaps/anki.png

 %changelog
+* Fri Nov 10 2023 hazel-bunny <dabiswas112@gmail.com> - 23.10-2
+- Add python3-orjson and mpv as dependencies
+
 * Wed Jan 11 2023 windowsboy111 <windowsboy111@fyralabs.com> - 2.1.60
 - Initial package
@@ -1,20 +1,20 @@
-diff -uNr anki-2.1.55.old/qt/aqt/qt/__init__.py anki-2.1.55/qt/aqt/qt/__init__.py
--- anki-2.1.55.old/qt/aqt/qt/__init__.py	2023-01-02 18:34:13.716216913 +0800
-+++ anki-2.1.55/qt/aqt/qt/__init__.py	2023-01-02 18:34:00.410033708 +0800
-@@ -9,16 +9,7 @@
+--- a/qt/aqt/qt/__init__.py
+++ b/qt/aqt/qt/__init__.py
+@@ -9,16 +9,7 @@ import sys
 import traceback
 from typing import Callable, TypeVar, Union
- 
+
 -try:
 -    import PyQt6
 -except:
 -    from .qt5 import *  # type: ignore
 -else:
-    if not os.getenv("DISABLE_QT5_COMPAT"):
+-    if os.getenv("ENABLE_QT5_COMPAT"):
 -        print("Running with temporary Qt5 compatibility shims.")
-        print("Run with DISABLE_QT5_COMPAT=1 to confirm compatibility with Qt6.")
 -        from . import qt5_compat  # needs to be imported first
 -    from .qt6 import *
+-
 +from .qt5 import *  # type: ignore
- 
 from anki.utils import is_mac, is_win
+
+ # fix buggy ubuntu12.04 display of language selector
@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
-@@ -77,11 +77,11 @@
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 212ddf93d..6f716cc04 100644
+--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
 
- metaConf = dict(
-     ver=0,
-    updates=True,
-+    updates=False,
-     created=int_time(),
-     id=random.randrange(0, 2**63),
-     lastMsg=-1,
-    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )
+ 
+ def check_for_update() -> None:
+    return
+
+     from aqt import mw
+ 
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
@@ -1,14 +1,14 @@
 Name:           anki-qt5
-Version:        2.1.65
-Release:        1%{?dist}
+Version:        24.04.1
+Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson python3-pyqt5-sip
 BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc
-Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat
+Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash python3-orjson mpv python3-qt5-webengine
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt5-sip
 ExclusiveArch:  x86_64
 Conflicts:      anki
 Patch0:         0001-No-update.patch
@@ -22,7 +22,6 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %version
-%patch0 -p1
 %patch1 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki-qt5
@@ -1,17 +1,13 @@
-diff -uNr anki-2.1.55.old/qt/aqt/profiles.py anki-2.1.55/qt/aqt/profiles.py
--- anki-2.1.55.old/qt/aqt/profiles.py	2023-01-02 18:35:44.574467892 +0800
-+++ anki-2.1.55/qt/aqt/profiles.py	2023-01-02 18:34:00.412033736 +0800
-@@ -77,11 +77,11 @@
+diff --git a/qt/aqt/update.py b/qt/aqt/update.py
+index 212ddf93d..6f716cc04 100644
+--- a/qt/aqt/update.py
+++ b/qt/aqt/update.py
+@@ -11,6 +11,8 @@ from aqt.utils import openLink, show_warning, showText, tr
 
- metaConf = dict(
-     ver=0,
-    updates=True,
-+    updates=False,
-     created=int_time(),
-     id=random.randrange(0, 2**63),
-     lastMsg=-1,
-    suppressUpdate=False,
-+    suppressUpdate=True,
-     firstRun=True,
-     defaultLang=None,
- )
+ 
+ def check_for_update() -> None:
+    return
+
+     from aqt import mw
+ 
+     def do_check(_col: Collection) -> CheckForUpdateResponse:
@@ -1,4 +1,5 @@
 project pkg {
+	arches = ["x86_64"]
 	rpm {
 		spec = "anki.spec"
 	}
@@ -1,14 +1,14 @@
 Name:           anki
-Version:        2.1.65
-Release:        1%{?dist}
+Version:        24.04.1
+Release:        1%?dist
 Summary:        Flashcard program for using space repetition learning
 License:        AGPL-3.0-or-later AND GPL-3.0-or-later AND LGPL-3.0-or-later AND MIT AND BSD-3-Clause AND CC-BY-SA-3.0 AND CC-BY-3.0 AND Apache-2.0 AND CC-BY-2.5
 URL:            https://apps.ankiweb.net/
 BuildRequires:  python3-devel python3-setuptools python3-waitress python3-protobuf python3-pysocks rpm_macro(fdupes)
 BuildRequires:  python3-distro python3-flask-cors python3-jsonschema python3-send2trash python3-certifi python3-simplejson
-BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-devel python3-pyqt6
+BuildRequires:  python3-installer make mold cargo git rsync ninja-build libxcrypt-compat nodejs python3.9 python-unversioned-command gcc python3-pyqt6-webengine
 Requires:       hicolor-icon-theme python3-sqlalchemy python3-simplejson python3-matplotlib python3-decorator python3-markdown python3-send2trash
-Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-qt5-webengine python3-pyqt6
+Requires:       python3-requests python3-pygame python3-beautifulsoup4 python3-httplib2 python3-pyaudio python3-jsonschema sox libxcrypt-compat python3-pyqt6-webengine
 Recommends:     mpv
 Obsoletes:      anki <= 2.1.15
 Conflicts:      anki-qt5
@@ -22,7 +22,6 @@ Anki is based on a theory called spaced repetition.
 %prep
 git clone https://github.com/ankitects/anki .
 git checkout %{version}
-%patch 0 -p1

 # See https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=anki

@@ -1,4 +1,5 @@
 %define debug_package %nil
+%global _build_id_links none

 %ifarch x86_64
 %global src ArmCord-%version
@@ -8,9 +9,13 @@
 %global src ArmCord-%version-armv7l
 %endif

+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/armcord/.*\\.so
+
 Name:			armcord-bin
-Version:		3.2.0
-Release:		2%{?dist}
+Version:		3.2.6
+Release:		1%{?dist}
 License:		OSL-3.0
 Summary:		Custom lightweight Discord client designed to enhance your experience
 URL:			https://github.com/ArmCord/ArmCord
@@ -1,25 +1,25 @@
 %define debug_package %nil

-Name:			armcord
-Version:		3.2.0
-Release:		2%{?dist}
-License:		OSL-3.0
-Summary:		Custom lightweight Discord client designed to enhance your experience
-URL:			https://github.com/ArmCord/ArmCord
-Group:			Applications/Internet
-Source0:		%url/archive/refs/tags/v%version.tar.gz
-Source1:		launch.sh
-Requires:		electron xdg-utils
-BuildRequires:	nodejs-npm
-Conflicts:		armcord-bin
-BuildArch:		noarch
+Name:		armcord
+Version:	3.2.6
+Release:	1%{?dist}
+License:	OSL-3.0
+Summary:	Custom lightweight Discord client designed to enhance your experience
+URL:		https://github.com/ArmCord/ArmCord
+Group:		Applications/Internet
+Source1:	launch.sh
+Requires:	electron xdg-utils
+BuildRequires:	nodejs-npm git
+Conflicts:	armcord-bin
+BuildArch:	noarch

 %description
 ArmCord is a custom client designed to enhance your Discord experience
 while keeping everything lightweight.

 %prep
-%autosetup -n ArmCord-%version
+git clone %url .
+git checkout v%version

 cat <<EOF > armcord.desktop
 [Desktop Entry]
@@ -36,7 +36,7 @@ EOF


 %build
-npx pnpm@7 install --frozen-lockfile --ignore-scripts
+npx pnpm@7 install --no-frozen-lockfile
 npm run packageQuick


@@ -1,10 +1,17 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
 Name: authy
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.5.0
+Release: 1%{?dist}
 Summary: Two factor authentication desktop application
 License: Unlicense
 URL: https://authy.com/
-Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_19.snap
+Source0: https://api.snapcraft.io/api/v1/snaps/download/H8ZpNgIoPyvmkgxOWw5MSzsXK1wRZiHn_23.snap
 Requires: gtk3
 Requires: nss
 BuildRequires: squashfs-tools desktop-file-utils
@@ -0,0 +1,58 @@
+Name:           blackbox-terminal
+Version:        0.14.0
+Release:        1%{?dist}
+Summary:        A beautiful GTK 4 terminal
+License:        GPL-3.0
+URL:            https://gitlab.gnome.org/raggesilver/blackbox
+BuildRequires:  vala meson gettext 
+BuildRequires:  pkgconfig(gtk4) >= 4.6.2
+BuildRequires:  pkgconfig(gio-2.0) >= 2.50
+BuildRequires:  libadwaita-devel >= 1.1
+BuildRequires:  pkgconfig(pqmarble) >= 2
+BuildRequires:  pkgconfig(vte-2.91-gtk4) >= 0.69.0
+BuildRequires:  pkgconfig(json-glib-1.0) >= 1.4.4
+BuildRequires:  pkgconfig(libxml-2.0) >= 2.9.12
+BuildRequires:  pkgconfig(librsvg-2.0) >= 2.54.0
+BuildRequires:  pkgconfig(libpcre2-8)
+BuildRequires:  pkgconfig(graphene-gobject-1.0)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  desktop-file-utils libappstream-glib cmake
+Source0:        %url/-/archive/v%version/blackbox-v%version.tar.gz
+
+%description
+%{summary}.
+
+%prep
+%autosetup -p1 -n blackbox-v%version
+
+%build
+%meson
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %buildroot/%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+
+%files
+%doc README.md
+%license COPYING
+%_bindir/blackbox
+%_bindir/terminal-toolbox
+%_datadir/applications/com.raggesilver.BlackBox.desktop
+%_datadir/metainfo/com.raggesilver.BlackBox.metainfo.xml
+%_datadir/blackbox/
+%_datadir/glib-2.0/schemas/com.raggesilver.BlackBox.gschema.xml
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-fullscreen-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/com.raggesilver.BlackBox-show-headerbar-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/external-link-symbolic.svg
+%_datadir/icons/hicolor/scalable/actions/settings-symbolic.svg
+%_datadir/icons/hicolor/scalable/apps/com.raggesilver.BlackBox.svg
+%_datadir/locale/*/LC_MESSAGES/blackbox.mo
+
+
+
+%changelog
+* Sun Oct 23 2022 windowsboy111 <windowsboy111@fyralabs.com>
+- Initial package
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary-openasar
-Version:        0.0.161
-Release:        1%{?dist}
+Version:        0.0.376
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -52,4 +57,4 @@ chmod o+w %{buildroot}%{_datadir}/discord-canary-openasar/resources -R
 - Bundle discord-canary

 * Thu Oct 20 2022 Cappy Ishihara <cappy@cappuchino.xyz>
- 
+-
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-canary
-Version:        0.0.161
-Release:        1%{?dist}
+Version:        0.0.376
+Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers
 URL:            discord.com
 Source0:        https://dl-canary.discordapp.net/apps/linux/%{version}/discord-canary-%{version}.tar.gz
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-openasar
-Version:        0.0.27
-Release:        2%{?dist}
+Version:        0.0.52
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb-openasar
-Version:        0.0.43
-Release:        1%{?dist}
+Version:        0.0.81
+Release:        1%?dist
 Summary:        A snappier Discord rewrite with features like further customization and theming
 License:        MIT AND https://discord.com/terms
 URL:            https://github.com/GooseMod/OpenAsar
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:           discord-ptb
-Version:        0.0.43
-Release:        1%{?dist}
+Version:        0.0.81
+Release:        1%?dist
 Summary:        Free Voice and Text Chat for Gamers.
 URL:            https://discord.com
 Source0:        https://dl-ptb.discordapp.net/apps/linux/%{version}/discord-ptb-%{version}.tar.gz
@@ -1,8 +1,13 @@
 %define debug_package %{nil}
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			discord
-Version:		0.0.27
-Release:		2%{?dist}
+Version:		0.0.52
+Release:		1%?dist
 Summary:		Free Voice and Text Chat for Gamers
 URL:			https://discord.com
 Source0:		https://dl.discordapp.net/apps/linux/%{version}/discord-%{version}.tar.gz
@@ -0,0 +1,5 @@
+project pkg {
+  rpm {
+    spec = "feishin.spec"
+  }
+}
@@ -0,0 +1,69 @@
+%define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
+
+Name:			feishin
+Version:		0.6.1
+Release:		1%?dist
+Summary:		A modern self-hosted music player
+License:		GPL-3.0
+URL:			https://github.com/jeffvli/feishin
+Source0:		%url/archive/refs/tags/v%version.tar.gz
+Requires:		fuse mpv
+BuildRequires:	nodejs-npm jq libxcrypt-compat
+
+%description
+%summary.
+
+%prep
+%autosetup
+
+cat package.json | jq '.author += { "email": "jeffvictorli@gmail.com" }' | jq '.build.linux += { "maintainer": "mado@fyralabs.com", "vendor": "Fyra Labs Terra" }' > a
+mv a package.json
+cat package.json
+
+cat<<EOF > feishin.desktop
+[Desktop Entry]
+Type=Application
+Name=Feishin
+Comment=Rewrite of Sonixd
+Exec=/usr/bin/feishin
+Icon=feishin
+Terminal=false
+Categories=Network;Audio;Music
+Keywords=Music;Jellyfin;Audio;Stream;Sonixd
+EOF
+
+%build
+npm install --legacy-peer-deps
+npm run postinstall
+npm run build
+%ifarch x86_64
+
+%define a linux
+%elifarch aarch64
+%define a arm64
+%endif
+
+npx electron-builder --linux dir --%a
+
+%install
+mkdir -p %buildroot%_datadir/{pixmaps,applications} %buildroot%_bindir
+mv release/build/*-unpacked %buildroot%_datadir/feishin
+install -Dm644 assets/icons/icon.png %buildroot%_datadir/pixmaps/feishin.png
+ln -s %_datadir/feishin/feishin %buildroot%_bindir/feishin
+install -Dm644 feishin.desktop %buildroot%_datadir/applications/
+
+%files
+%doc README.md CHANGELOG.md
+%license LICENSE
+%_bindir/feishin
+%_datadir/feishin/
+%_datadir/applications/feishin.desktop
+%_datadir/pixmaps/feishin.png
+
+%changelog
+%autochangelog
@@ -0,0 +1 @@
+rpm.version(gh("jeffvli/feishin"));
@@ -0,0 +1,8 @@
+project pkg {
+  rpm {
+	  spec = "mpv-nightly.spec"
+  }
+  labels {
+    nightly = "1"
+  }
+}
@@ -0,0 +1,230 @@
+%global commit ec447fd4a266e8158519f5e89589c368211bfa14
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global commit_date 20240502
+%global ver v0.38.0
+
+Name:           mpv-nightly
+Version:        %ver^%commit_date.%shortcommit
+Release:        1%?dist
+
+License:        GPL-2.0-or-later AND LGPL-2.1-or-later
+Summary:        Movie player playing most video formats and DVDs
+URL:            https://mpv.io/
+Source0:        https://github.com/mpv-player/mpv/archive/%commit/mpv-%commit.tar.gz
+Conflicts:		mpv
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gcc
+BuildRequires:  libappstream-glib
+BuildRequires:  libatomic
+BuildRequires:  meson
+BuildRequires:  python3-docutils
+
+BuildRequires:  perl(Encode)
+BuildRequires:  perl(Math::BigInt)
+BuildRequires:  perl(Math::BigRat)
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(caca)
+BuildRequires:  pkgconfig(dvdnav)
+BuildRequires:  pkgconfig(egl)
+BuildRequires:  pkgconfig(ffnvcodec)
+BuildRequires:  pkgconfig(gbm)
+BuildRequires:  pkgconfig(gl)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(lcms2)
+BuildRequires:  pkgconfig(libarchive) >= 3.4.0
+BuildRequires:  pkgconfig(libass)
+BuildRequires:  pkgconfig(libavcodec) >= 59.27.100
+BuildRequires:  pkgconfig(libavdevice) >= 58.13.100
+BuildRequires:  pkgconfig(libavfilter) >= 7.110.100
+BuildRequires:  pkgconfig(libavformat) >= 59.24.100
+BuildRequires:  pkgconfig(libavutil) >= 57.24.100
+BuildRequires:  pkgconfig(libbluray)
+BuildRequires:  pkgconfig(libcdio)
+BuildRequires:  pkgconfig(libcdio_paranoia)
+BuildRequires:  pkgconfig(libdrm)
+BuildRequires:  pkgconfig(libjpeg)
+BuildRequires:  pkgconfig(libpipewire-0.3) >= 0.3.19
+BuildRequires:  pkgconfig(libplacebo) >= 6.338.0
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libswresample) >= 3.9.100
+BuildRequires:  pkgconfig(libswscale) >= 5.9.100
+BuildRequires:  pkgconfig(libva)
+BuildRequires:  pkgconfig(lua-5.1)
+BuildRequires:  pkgconfig(mujs)
+BuildRequires:  pkgconfig(openal)
+BuildRequires:  pkgconfig(rubberband)
+BuildRequires:  pkgconfig(sdl2)
+BuildRequires:  pkgconfig(shaderc)
+BuildRequires:  pkgconfig(uchardet) >= 0.0.5
+BuildRequires:  pkgconfig(vapoursynth)
+BuildRequires:  pkgconfig(vdpau)
+BuildRequires:  pkgconfig(vulkan)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-cursor)
+BuildRequires:  pkgconfig(wayland-egl)
+BuildRequires:  pkgconfig(wayland-protocols)
+BuildRequires:  pkgconfig(wayland-scanner)
+BuildRequires:  pkgconfig(x11)
+BuildRequires:  pkgconfig(xdamage)
+BuildRequires:  pkgconfig(xext)
+BuildRequires:  pkgconfig(xinerama)
+BuildRequires:  pkgconfig(xkbcommon)
+BuildRequires:  pkgconfig(xpresent)
+BuildRequires:  pkgconfig(xrandr)
+BuildRequires:  pkgconfig(xscrnsaver)
+BuildRequires:  pkgconfig(xv)
+BuildRequires:  pkgconfig(zimg) >= 2.9
+BuildRequires:  pkgconfig(zlib)
+
+Requires:       hicolor-icon-theme
+Provides:       mplayer-backend
+Recommends:     (yt-dlp or youtube-dl)
+Suggests:       yt-dlp
+
+%description
+Mpv is a movie player based on MPlayer and mplayer2. It supports a wide variety
+of video file formats, audio and video codecs, and subtitle types. Special
+input URL types are available to read input from a variety of sources other
+than disk files. Depending on platform, a variety of different video and audio
+output methods are supported.
+
+Mpv has an OpenGL, Vulkan, and D3D11 based video output that is capable of many
+features loved by videophiles, such as video scaling with popular high quality
+algorithms, color management, frame timing, interpolation, HDR, and more.
+
+While mpv strives for minimalism and provides no real GUI, it has a small
+controller on top of the video for basic control.
+
+Mpv can leverage most hardware decoding APIs on all platforms. Hardware
+decoding can be enabled at runtime on demand.
+
+Powerful scripting capabilities can make the player do almost anything. There
+is a large selection of user scripts on the wiki.
+
+A straightforward C API was designed from the ground up to make mpv usable as
+a library and facilitate easy integration into other applications.
+
+%package libs
+Summary: Dynamic library for Mpv frontends
+
+%description libs
+This package contains the dynamic library libmpv, which provides access to Mpv.
+
+%package devel
+Summary: Development package for libmpv
+Provides: mpv-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Provides: mpv-nightly-libs-devel = %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: mpv-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Obsoletes: mpv-nightly-libs-devel < %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: mpv-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+Requires: mpv-nightly-libs%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release}
+
+%description devel
+This package contains development header files and libraries for Mpv.
+
+%prep
+%autosetup -p1 -n mpv-%commit
+sed -e "s|/usr/local/etc|%{_sysconfdir}/mpv|" -i etc/mpv.conf
+
+%build
+%meson --auto-features=auto \
+    -Dalsa=enabled \
+    -Dbuild-date=false \
+    -Dcaca=enabled \
+    -Dcdda=enabled \
+    -Dcplayer=true \
+    -Dcplugins=enabled \
+    -Dcuda-hwaccel=enabled \
+    -Dcuda-interop=enabled \
+    -Ddmabuf-wayland=enabled \
+    -Ddrm=enabled \
+    -Ddvbin=enabled \
+    -Ddvdnav=enabled \
+    -Degl-drm=enabled \
+    -Degl-wayland=enabled \
+    -Degl-x11=enabled \
+    -Degl=enabled \
+    -Dgbm=enabled \
+    -Dgl-x11=enabled \
+    -Dgl=enabled \
+    -Dhtml-build=enabled \
+    -Diconv=enabled \
+    -Djack=enabled \
+    -Djavascript=enabled \
+    -Djpeg=enabled \
+    -Dlcms2=enabled \
+    -Dlibarchive=enabled \
+    -Dlibavdevice=enabled \
+    -Dlibbluray=enabled \
+    -Dlibmpv=true \
+    -Dlua=enabled \
+    -Dmanpage-build=enabled \
+    -Dopenal=enabled \
+    -Dopensles=disabled \
+    -Doss-audio=disabled \
+    -Dpipewire=enabled \
+    -Dplain-gl=enabled \
+    -Dpulse=enabled \
+    -Drubberband=enabled \
+    -Dsdl2-audio=enabled \
+    -Dsdl2-gamepad=enabled \
+    -Dsdl2-video=enabled \
+    -Dsdl2=enabled \
+    -Dsndio=disabled \
+    -Dspirv-cross=disabled \
+    -Duchardet=enabled \
+    -Dvaapi-drm=enabled \
+    -Dvaapi-wayland=enabled \
+    -Dvaapi-x11=enabled \
+    -Dvaapi=enabled \
+    -Dvapoursynth=enabled \
+    -Dvdpau-gl-x11=enabled \
+    -Dvdpau=enabled \
+    -Dvector=enabled \
+    -Dvulkan-interop=disabled \
+    -Dvulkan=enabled \
+    -Dwayland=enabled \
+    -Dwerror=false \
+    -Dx11=enabled \
+    -Dxv=enabled \
+    -Dzimg=enabled \
+    -Dzlib=enabled
+%meson_build
+
+%install
+%meson_install
+
+%check
+appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/mpv.metainfo.xml
+desktop-file-validate %{buildroot}%{_datadir}/applications/mpv.desktop
+
+%files
+%docdir %{_docdir}/mpv/
+%license LICENSE.GPL LICENSE.LGPL Copyright
+%{_docdir}/mpv/
+%{_bindir}/mpv
+%{_datadir}/applications/mpv.desktop
+%dir %{_datadir}/bash-completion/
+%dir %{_datadir}/bash-completion/completions/
+%{_datadir}/bash-completion/completions/mpv
+%{_datadir}/icons/hicolor/*/apps/mpv*.*
+%dir %{_datadir}/zsh/
+%dir %{_datadir}/zsh/site-functions/
+%{_datadir}/zsh/site-functions/_mpv
+%{_mandir}/man1/mpv.*
+%{_metainfodir}/mpv.metainfo.xml
+%dir %{_sysconfdir}/mpv/
+%config(noreplace) %{_sysconfdir}/mpv/encoding-profiles.conf
+
+%files libs
+%license LICENSE.GPL LICENSE.LGPL Copyright
+%{_libdir}/libmpv.so.2{,.*}
+
+%files devel
+%{_includedir}/mpv/
+%{_libdir}/libmpv.so
+%{_libdir}/pkgconfig/mpv.pc
+
+%changelog
+%autochangelog
@@ -0,0 +1,8 @@
+if filters.contains("nightly") {
+	rpm.global("commit", gh_commit("mpv-player/mpv"));
+	if rpm.changed() {
+		rpm.global("ver", gh("mpv-player/mpv"));
+		rpm.global("commit_date", date());
+		rpm.release();
+	}
+}
@@ -1,103 +0,0 @@
-From 04d3a21c6e72cd5574f7333adf548012d912c1ee Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Sat, 7 Jan 2023 23:15:13 -0500
-Subject: [PATCH 1/3] UI: Consistently reference the software H264 encoder
- properly
-
-The code here assumes that the only software encoder is the x264-based
-H.264 encoder. That may not always remain true. This change adjusts
-the encoder string to indicate that it's an H.264 encoder from x264.
---
- UI/data/locale/en-US.ini             | 4 ++--
- UI/window-basic-auto-config-test.cpp | 6 +++---
- UI/window-basic-settings-stream.cpp  | 2 +-
- UI/window-basic-settings.cpp         | 7 ++++---
- 4 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
-index 4c03aa7db..e44d99660 100644
--- a/UI/data/locale/en-US.ini
-+++ b/UI/data/locale/en-US.ini
-@@ -980,7 +980,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
- Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
- Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
- Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
-Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
-+Basic.Settings.Output.Simple.Encoder.Software.X264.H264="Software (x264)"
- Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)"
- Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Hardware (QSV, AV1)"
- Basic.Settings.Output.Simple.Encoder.Hardware.AMD.H264="Hardware (AMD, H.264)"
-@@ -991,7 +991,7 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.AV1="Hardware (NVENC, AV1)"
- Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Hardware (NVENC, HEVC)"
- Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (Apple, H.264)"
- Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HEVC)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usage preset, increases file size)"
-+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU.X264.H264="Software (x264 low CPU usage preset, increases file size)"
- Basic.Settings.Output.Simple.Codec.AAC="AAC"
- Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Default)"
- Basic.Settings.Output.Simple.Codec.Opus="Opus"
-diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp
-index 2d89d7347..09979c031 100644
--- a/UI/window-basic-auto-config-test.cpp
-+++ b/UI/window-basic-auto-config-test.cpp
-@@ -993,7 +993,7 @@ void AutoConfigTestPage::TestRecordingEncoderThread()
- }
- 
- #define ENCODER_TEXT(x) "Basic.Settings.Output.Simple.Encoder." x
-#define ENCODER_SOFTWARE ENCODER_TEXT("Software")
-+#define ENCODER_X264 ENCODER_TEXT("Software.X264.H264")
- #define ENCODER_NVENC ENCODER_TEXT("Hardware.NVENC.H264")
- #define ENCODER_QSV ENCODER_TEXT("Hardware.QSV.H264")
- #define ENCODER_AMD ENCODER_TEXT("Hardware.AMD.H264")
-@@ -1033,7 +1033,7 @@ void AutoConfigTestPage::FinalizeResults()
- 	auto encName = [](AutoConfig::Encoder enc) -> QString {
- 		switch (enc) {
- 		case AutoConfig::Encoder::x264:
-			return QTStr(ENCODER_SOFTWARE);
-+			return QTStr(ENCODER_X264);
- 		case AutoConfig::Encoder::NVENC:
- 			return QTStr(ENCODER_NVENC);
- 		case AutoConfig::Encoder::QSV:
-@@ -1046,7 +1046,7 @@ void AutoConfigTestPage::FinalizeResults()
- 			return QTStr(QUALITY_SAME);
- 		}
- 
-		return QTStr(ENCODER_SOFTWARE);
-+		return QTStr(ENCODER_X264);
- 	};
- 
- 	auto newLabel = [this](const char *str) -> QLabel * {
-diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
-index f6e0817a0..b056938e7 100644
--- a/UI/window-basic-settings-stream.cpp
-+++ b/UI/window-basic-settings-stream.cpp
-@@ -1585,7 +1585,7 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
- 
- #define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str)
- 
-	ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software"),
-+	ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software.X264.H264"),
- 					 QString(SIMPLE_ENCODER_X264));
- 	if (service_supports_encoder(vcodecs, "obs_qsv11"))
- 		ui->simpleOutStrEncoder->addItem(
-diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
-index fb170bfc1..48bb4bac6 100644
--- a/UI/window-basic-settings.cpp
-+++ b/UI/window-basic-settings.cpp
-@@ -5286,10 +5286,11 @@ void OBSBasicSettings::FillSimpleRecordingValues()
- 	ADD_QUALITY("HQ");
- 	ADD_QUALITY("Lossless");
- 
-	ui->simpleOutRecEncoder->addItem(ENCODER_STR("Software"),
-+	ui->simpleOutRecEncoder->addItem(ENCODER_STR("Software.X264.H264"),
- 					 QString(SIMPLE_ENCODER_X264));
-	ui->simpleOutRecEncoder->addItem(ENCODER_STR("SoftwareLowCPU"),
-					 QString(SIMPLE_ENCODER_X264_LOWCPU));
-+	ui->simpleOutRecEncoder->addItem(
-+		ENCODER_STR("SoftwareLowCPU.X264.H264"),
-+		QString(SIMPLE_ENCODER_X264_LOWCPU));
- 	if (EncoderAvailable("obs_qsv11"))
- 		ui->simpleOutRecEncoder->addItem(
- 			ENCODER_STR("Hardware.QSV.H264"),
-- 
-2.39.2
@@ -1,345 +0,0 @@
-From 4517d8d8bb4c43af1f5b757773a5f9550bd23d37 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Sun, 26 Mar 2023 06:06:31 -0400
-Subject: [PATCH 2/3] obs-ffmpeg: Add initial support for the OpenH264 H.264
- software codec
-
-This allows users to leverage the OpenH264 codec from Cisco to encode
-H.264 video content. It is significantly reduced in capability from
-alternatives, but it does the job.
-
-This also provides a framework for adding support for other H.264
-software codecs provided through FFmpeg.
---
- plugins/obs-ffmpeg/CMakeLists.txt        |   1 +
- plugins/obs-ffmpeg/cmake/legacy.cmake    |   1 +
- plugins/obs-ffmpeg/data/locale/en-US.ini |   3 +
- plugins/obs-ffmpeg/obs-ffmpeg-h264.c     | 260 +++++++++++++++++++++++
- plugins/obs-ffmpeg/obs-ffmpeg.c          |   2 +
- 5 files changed, 267 insertions(+)
- create mode 100644 plugins/obs-ffmpeg/obs-ffmpeg-h264.c
-
-diff --git a/plugins/obs-ffmpeg/CMakeLists.txt b/plugins/obs-ffmpeg/CMakeLists.txt
-index 3eba00932..f97622c22 100644
--- a/plugins/obs-ffmpeg/CMakeLists.txt
-+++ b/plugins/obs-ffmpeg/CMakeLists.txt
-@@ -34,6 +34,7 @@ target_sources(
-           obs-ffmpeg-video-encoders.c
-           obs-ffmpeg-audio-encoders.c
-           obs-ffmpeg-av1.c
-+          obs-ffmpeg-h264.c
-           obs-ffmpeg-nvenc.c
-           obs-ffmpeg-output.c
-           obs-ffmpeg-mux.c
-diff --git a/plugins/obs-ffmpeg/cmake/legacy.cmake b/plugins/obs-ffmpeg/cmake/legacy.cmake
-index 5540676ea..62f2cc7a1 100644
--- a/plugins/obs-ffmpeg/cmake/legacy.cmake
-+++ b/plugins/obs-ffmpeg/cmake/legacy.cmake
-@@ -40,6 +40,7 @@ target_sources(
-           obs-ffmpeg-video-encoders.c
-           obs-ffmpeg-audio-encoders.c
-           obs-ffmpeg-av1.c
-+          obs-ffmpeg-h264.c
-           obs-ffmpeg-nvenc.c
-           obs-ffmpeg-output.c
-           obs-ffmpeg-mux.c
-diff --git a/plugins/obs-ffmpeg/data/locale/en-US.ini b/plugins/obs-ffmpeg/data/locale/en-US.ini
-index 55bbe919d..0363ed82b 100644
--- a/plugins/obs-ffmpeg/data/locale/en-US.ini
-+++ b/plugins/obs-ffmpeg/data/locale/en-US.ini
-@@ -109,4 +109,7 @@ NVENC.CheckDrivers="Try installing the latest <a href=\"https://obsproject.com/g
- 
- AV1.8bitUnsupportedHdr="OBS does not support 8-bit output of Rec. 2100."
- 
-+H264.UnsupportedVideoFormat="Only video formats using 8-bit color are supported."
-+H264.UnsupportedColorSpace="Only the Rec. 709 color space is supported."
-+
- ReconnectDelayTime="Reconnect Delay"
-diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-h264.c b/plugins/obs-ffmpeg/obs-ffmpeg-h264.c
-new file mode 100644
-index 000000000..179a61ccf
--- /dev/null
-+++ b/plugins/obs-ffmpeg/obs-ffmpeg-h264.c
-@@ -0,0 +1,260 @@
-+/******************************************************************************
-+    Copyright (C) 2023 by Neal Gompa <neal@gompa.dev>
-+    Partly derived from obs-ffmpeg-av1.c by Hugh Bailey <obs.jim@gmail.com>
-+
-+    This program is free software: you can redistribute it and/or modify
-+    it under the terms of the GNU General Public License as published by
-+    the Free Software Foundation, either version 2 of the License, or
-+    (at your option) any later version.
-+
-+    This program is distributed in the hope that it will be useful,
-+    but WITHOUT ANY WARRANTY; without even the implied warranty of
-+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+    GNU General Public License for more details.
-+
-+    You should have received a copy of the GNU General Public License
-+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-+******************************************************************************/
-+
-+#include "obs-ffmpeg-video-encoders.h"
-+
-+#define do_log(level, format, ...)                   \
-+	blog(level, "[H.264 encoder: '%s'] " format, \
-+	     obs_encoder_get_name(enc->ffve.encoder), ##__VA_ARGS__)
-+
-+#define error(format, ...) do_log(LOG_ERROR, format, ##__VA_ARGS__)
-+#define warn(format, ...) do_log(LOG_WARNING, format, ##__VA_ARGS__)
-+#define info(format, ...) do_log(LOG_INFO, format, ##__VA_ARGS__)
-+#define debug(format, ...) do_log(LOG_DEBUG, format, ##__VA_ARGS__)
-+
-+enum h264_encoder_type {
-+	H264_ENCODER_TYPE_OH264,
-+};
-+
-+struct h264_encoder {
-+	struct ffmpeg_video_encoder ffve;
-+	enum h264_encoder_type type;
-+
-+	DARRAY(uint8_t) header;
-+};
-+
-+static const char *oh264_getname(void *unused)
-+{
-+	UNUSED_PARAMETER(unused);
-+	return "OpenH264";
-+}
-+
-+static void h264_video_info(void *data, struct video_scale_info *info)
-+{
-+	UNUSED_PARAMETER(data);
-+
-+	// OpenH264 only supports I420
-+	info->format = VIDEO_FORMAT_I420;
-+}
-+
-+static bool h264_update(struct h264_encoder *enc, obs_data_t *settings)
-+{
-+	const char *profile = obs_data_get_string(settings, "profile");
-+	int bitrate = (int)obs_data_get_int(settings, "bitrate");
-+	int keyint_sec = 0;              // This is not supported by OpenH264
-+	const char *rc_mode = "quality"; // We only want to use quality mode
-+	int allow_skip_frames = 1;       // This is required for quality mode
-+
-+	video_t *video = obs_encoder_video(enc->ffve.encoder);
-+	const struct video_output_info *voi = video_output_get_info(video);
-+	struct video_scale_info info;
-+
-+	info.format = voi->format;
-+	info.colorspace = voi->colorspace;
-+	info.range = voi->range;
-+
-+	enc->ffve.context->thread_count = 0;
-+
-+	h264_video_info(enc, &info);
-+
-+	av_opt_set(enc->ffve.context->priv_data, "rc_mode", rc_mode, 0);
-+	av_opt_set(enc->ffve.context->priv_data, "profile", profile, 0);
-+	av_opt_set_int(enc->ffve.context->priv_data, "allow_skip_frames",
-+		       allow_skip_frames, 0);
-+
-+	const char *ffmpeg_opts = obs_data_get_string(settings, "ffmpeg_opts");
-+	ffmpeg_video_encoder_update(&enc->ffve, bitrate, keyint_sec, voi, &info,
-+				    ffmpeg_opts);
-+	info("settings:\n"
-+	     "\tencoder:      %s\n"
-+	     "\trc_mode:      %s\n"
-+	     "\tbitrate:      %d\n"
-+	     "\tprofile:      %s\n"
-+	     "\twidth:        %d\n"
-+	     "\theight:       %d\n"
-+	     "\tffmpeg opts:  %s\n",
-+	     enc->ffve.enc_name, rc_mode, bitrate, profile,
-+	     enc->ffve.context->width, enc->ffve.height, ffmpeg_opts);
-+
-+	enc->ffve.context->flags |= AV_CODEC_FLAG_GLOBAL_HEADER;
-+	return ffmpeg_video_encoder_init_codec(&enc->ffve);
-+}
-+
-+static void h264_destroy(void *data)
-+{
-+	struct h264_encoder *enc = data;
-+
-+	ffmpeg_video_encoder_free(&enc->ffve);
-+	da_free(enc->header);
-+	bfree(enc);
-+}
-+
-+static void on_first_packet(void *data, AVPacket *pkt, struct darray *da)
-+{
-+	struct h264_encoder *enc = data;
-+
-+	da_copy_array(enc->header, enc->ffve.context->extradata,
-+		      enc->ffve.context->extradata_size);
-+
-+	darray_copy_array(1, da, pkt->data, pkt->size);
-+}
-+
-+static void *h264_create_internal(obs_data_t *settings, obs_encoder_t *encoder,
-+				  const char *enc_lib, const char *enc_name)
-+{
-+	video_t *video = obs_encoder_video(encoder);
-+	const struct video_output_info *voi = video_output_get_info(video);
-+
-+	switch (voi->format) {
-+	// planar 4:2:0 formats
-+	case VIDEO_FORMAT_I420: // three-plane
-+	case VIDEO_FORMAT_NV12: // two-plane, luma and packed chroma
-+	// packed 4:2:2 formats
-+	case VIDEO_FORMAT_YVYU:
-+	case VIDEO_FORMAT_YUY2: // YUYV
-+	case VIDEO_FORMAT_UYVY:
-+	// packed uncompressed formats
-+	case VIDEO_FORMAT_RGBA:
-+	case VIDEO_FORMAT_BGRA:
-+	case VIDEO_FORMAT_BGRX:
-+	case VIDEO_FORMAT_BGR3:
-+	case VIDEO_FORMAT_Y800: // grayscale
-+	// planar 4:4:4
-+	case VIDEO_FORMAT_I444:
-+	// planar 4:2:2
-+	case VIDEO_FORMAT_I422:
-+	// planar 4:2:0 with alpha
-+	case VIDEO_FORMAT_I40A:
-+	// planar 4:2:2 with alpha
-+	case VIDEO_FORMAT_I42A:
-+	// planar 4:4:4 with alpha
-+	case VIDEO_FORMAT_YUVA:
-+	// packed 4:4:4 with alpha
-+	case VIDEO_FORMAT_AYUV:
-+		break;
-+	default:; // Make the compiler do the right thing
-+		const char *const text =
-+			obs_module_text("H264.UnsupportedVideoFormat");
-+		obs_encoder_set_last_error(encoder, text);
-+		blog(LOG_ERROR, "[H.264 encoder] %s", text);
-+		return NULL;
-+	}
-+
-+	switch (voi->colorspace) {
-+	case VIDEO_CS_DEFAULT:
-+	case VIDEO_CS_709:
-+		break;
-+	default:; // Make the compiler do the right thing
-+		const char *const text =
-+			obs_module_text("H264.UnsupportedColorSpace");
-+		obs_encoder_set_last_error(encoder, text);
-+		blog(LOG_ERROR, "[H.264 encoder] %s", text);
-+		return NULL;
-+	}
-+
-+	struct h264_encoder *enc = bzalloc(sizeof(*enc));
-+
-+	if (strcmp(enc_lib, "libopenh264") == 0)
-+		enc->type = H264_ENCODER_TYPE_OH264;
-+
-+	if (!ffmpeg_video_encoder_init(&enc->ffve, enc, encoder, enc_lib, NULL,
-+				       enc_name, NULL, on_first_packet))
-+		goto fail;
-+	if (!h264_update(enc, settings))
-+		goto fail;
-+
-+	return enc;
-+
-+fail:
-+	h264_destroy(enc);
-+	return NULL;
-+}
-+
-+static void *oh264_create(obs_data_t *settings, obs_encoder_t *encoder)
-+{
-+	return h264_create_internal(settings, encoder, "libopenh264",
-+				    "OpenH264");
-+}
-+
-+static bool h264_encode(void *data, struct encoder_frame *frame,
-+			struct encoder_packet *packet, bool *received_packet)
-+{
-+	struct h264_encoder *enc = data;
-+	return ffmpeg_video_encode(&enc->ffve, frame, packet, received_packet);
-+}
-+
-+void h264_defaults(obs_data_t *settings)
-+{
-+	obs_data_set_default_int(settings, "bitrate", 2500);
-+	obs_data_set_default_string(settings, "profile", "main");
-+}
-+
-+obs_properties_t *h264_properties(enum h264_encoder_type type)
-+{
-+	UNUSED_PARAMETER(type); // Only one encoder right now...
-+	obs_properties_t *props = obs_properties_create();
-+	obs_property_t *p;
-+
-+	p = obs_properties_add_list(props, "profile",
-+				    obs_module_text("Profile"),
-+				    OBS_COMBO_TYPE_LIST,
-+				    OBS_COMBO_FORMAT_STRING);
-+	obs_property_list_add_string(p, "constrained_baseline",
-+				     "constrained_baseline");
-+	obs_property_list_add_string(p, "main", "main");
-+	obs_property_list_add_string(p, "high", "high");
-+
-+	p = obs_properties_add_int(props, "bitrate", obs_module_text("Bitrate"),
-+				   50, 300000, 50);
-+	obs_property_int_set_suffix(p, " Kbps");
-+
-+	obs_properties_add_text(props, "ffmpeg_opts",
-+				obs_module_text("FFmpegOpts"),
-+				OBS_TEXT_DEFAULT);
-+
-+	return props;
-+}
-+
-+obs_properties_t *oh264_properties(void *unused)
-+{
-+	UNUSED_PARAMETER(unused);
-+	return h264_properties(H264_ENCODER_TYPE_OH264);
-+}
-+
-+static bool h264_extra_data(void *data, uint8_t **extra_data, size_t *size)
-+{
-+	struct h264_encoder *enc = data;
-+
-+	*extra_data = enc->header.array;
-+	*size = enc->header.num;
-+	return true;
-+}
-+
-+struct obs_encoder_info oh264_encoder_info = {
-+	.id = "ffmpeg_openh264",
-+	.type = OBS_ENCODER_VIDEO,
-+	.codec = "h264",
-+	.get_name = oh264_getname,
-+	.create = oh264_create,
-+	.destroy = h264_destroy,
-+	.encode = h264_encode,
-+	.get_defaults = h264_defaults,
-+	.get_properties = oh264_properties,
-+	.get_extra_data = h264_extra_data,
-+	.get_video_info = h264_video_info,
-+};
-diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c
-index da0b2c2b4..a01a729c8 100644
--- a/plugins/obs-ffmpeg/obs-ffmpeg.c
-+++ b/plugins/obs-ffmpeg/obs-ffmpeg.c
-@@ -39,6 +39,7 @@ extern struct obs_encoder_info pcm24_encoder_info;
- extern struct obs_encoder_info pcm32_encoder_info;
- extern struct obs_encoder_info alac_encoder_info;
- extern struct obs_encoder_info flac_encoder_info;
-+extern struct obs_encoder_info oh264_encoder_info;
- extern struct obs_encoder_info h264_nvenc_encoder_info;
- #ifdef ENABLE_HEVC
- extern struct obs_encoder_info hevc_nvenc_encoder_info;
-@@ -387,6 +388,7 @@ bool obs_module_load(void)
- 	obs_register_output(&ffmpeg_hls_muxer);
- 	obs_register_output(&replay_buffer);
- 	obs_register_encoder(&aac_encoder_info);
-+	register_encoder_if_available(&oh264_encoder_info, "libopenh264");
- 	register_encoder_if_available(&svt_av1_encoder_info, "libsvtav1");
- 	register_encoder_if_available(&aom_av1_encoder_info, "libaom-av1");
- 	obs_register_encoder(&opus_encoder_info);
-- 
-2.39.2
@@ -1,544 +0,0 @@
-From 30f84455969071ff9aa826a44438a0402dd15123 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <neal@gompa.dev>
-Date: Tue, 28 Mar 2023 05:08:49 -0400
-Subject: [PATCH 3/3] UI: Add support for OpenH264 as the worst-case fallback
-
-OpenH264 exists as the codec of last resort, so it is implemented
-such that it is only used as the software codec if x264 is not
-available.
---
- UI/data/locale/en-US.ini             |  1 +
- UI/window-basic-auto-config-test.cpp | 50 +++++++++++++++++++---------
- UI/window-basic-auto-config.cpp      | 15 ++++++++-
- UI/window-basic-auto-config.hpp      |  3 ++
- UI/window-basic-main-outputs.cpp     |  6 ++--
- UI/window-basic-main-profiles.cpp    | 34 +++++++++++--------
- UI/window-basic-main.cpp             | 20 +++++++----
- UI/window-basic-main.hpp             |  3 +-
- UI/window-basic-settings-stream.cpp  | 16 ++++++---
- UI/window-basic-settings.cpp         | 23 ++++++++++---
- 10 files changed, 123 insertions(+), 48 deletions(-)
-
-diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
-index e44d99660..a5ba5d661 100644
--- a/UI/data/locale/en-US.ini
-+++ b/UI/data/locale/en-US.ini
-@@ -980,6 +980,7 @@ Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software en
- Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes! Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates. Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
- Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
- Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
-+Basic.Settings.Output.Simple.Encoder.Software.OpenH264.H264="Software (OpenH264)"
- Basic.Settings.Output.Simple.Encoder.Software.X264.H264="Software (x264)"
- Basic.Settings.Output.Simple.Encoder.Hardware.QSV.H264="Hardware (QSV, H.264)"
- Basic.Settings.Output.Simple.Encoder.Hardware.QSV.AV1="Hardware (QSV, AV1)"
-diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp
-index 09979c031..c791c8b8b 100644
--- a/UI/window-basic-auto-config-test.cpp
-+++ b/UI/window-basic-auto-config-test.cpp
-@@ -199,7 +199,8 @@ void AutoConfigTestPage::TestBandwidthThread()
- 						   : "rtmp_common";
- 
- 	OBSEncoderAutoRelease vencoder = obs_video_encoder_create(
-		"obs_x264", "test_x264", nullptr, nullptr);
-+		(wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"),
-+		"test_h264", nullptr, nullptr);
- 	OBSEncoderAutoRelease aencoder = obs_audio_encoder_create(
- 		"ffmpeg_aac", "test_aac", nullptr, 0, nullptr);
- 	OBSServiceAutoRelease service = obs_service_create(
-@@ -238,10 +239,11 @@ void AutoConfigTestPage::TestBandwidthThread()
- 	obs_data_set_string(service_settings, "key", key.c_str());
- 
- 	obs_data_set_int(vencoder_settings, "bitrate", wiz->startingBitrate);
-	obs_data_set_string(vencoder_settings, "rate_control", "CBR");
-	obs_data_set_string(vencoder_settings, "preset", "veryfast");
-	obs_data_set_int(vencoder_settings, "keyint_sec", 2);
-
-+	if (wiz->x264Available) {
-+		obs_data_set_string(vencoder_settings, "rate_control", "CBR");
-+		obs_data_set_string(vencoder_settings, "preset", "veryfast");
-+		obs_data_set_int(vencoder_settings, "keyint_sec", 2);
-+	}
- 	obs_data_set_int(aencoder_settings, "bitrate", 32);
- 
- 	OBSBasic *main = reinterpret_cast<OBSBasic *>(App()->GetMainWindow());
-@@ -567,7 +569,8 @@ bool AutoConfigTestPage::TestSoftwareEncoding()
- 	/* create obs objects                 */
- 
- 	OBSEncoderAutoRelease vencoder = obs_video_encoder_create(
-		"obs_x264", "test_x264", nullptr, nullptr);
-+		(wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"),
-+		"test_h264", nullptr, nullptr);
- 	OBSEncoderAutoRelease aencoder = obs_audio_encoder_create(
- 		"ffmpeg_aac", "test_aac", nullptr, 0, nullptr);
- 	OBSOutputAutoRelease output =
-@@ -581,17 +584,25 @@ bool AutoConfigTestPage::TestSoftwareEncoding()
- 	obs_data_set_int(aencoder_settings, "bitrate", 32);
- 
- 	if (wiz->type != AutoConfig::Type::Recording) {
-		obs_data_set_int(vencoder_settings, "keyint_sec", 2);
-+		if (wiz->x264Available) {
-+			obs_data_set_int(vencoder_settings, "keyint_sec", 2);
-+			obs_data_set_string(vencoder_settings, "rate_control",
-+					    "CBR");
-+			obs_data_set_string(vencoder_settings, "preset",
-+					    "veryfast");
-+		}
- 		obs_data_set_int(vencoder_settings, "bitrate",
- 				 wiz->idealBitrate);
-		obs_data_set_string(vencoder_settings, "rate_control", "CBR");
- 		obs_data_set_string(vencoder_settings, "profile", "main");
-		obs_data_set_string(vencoder_settings, "preset", "veryfast");
- 	} else {
-		obs_data_set_int(vencoder_settings, "crf", 20);
-		obs_data_set_string(vencoder_settings, "rate_control", "CRF");
-+		if (wiz->x264Available) {
-+			obs_data_set_int(vencoder_settings, "crf", 20);
-+			obs_data_set_string(vencoder_settings, "rate_control",
-+					    "CRF");
-+			obs_data_set_string(vencoder_settings, "preset",
-+					    "veryfast");
-+		}
- 		obs_data_set_string(vencoder_settings, "profile", "high");
-		obs_data_set_string(vencoder_settings, "preset", "veryfast");
- 	}
- 
- 	/* -----------------------------------*/
-@@ -944,7 +955,10 @@ void AutoConfigTestPage::TestStreamEncoderThread()
- 		else
- 			wiz->streamingEncoder = AutoConfig::Encoder::AMD;
- 	} else {
-		wiz->streamingEncoder = AutoConfig::Encoder::x264;
-+		if (wiz->x264Available)
-+			wiz->streamingEncoder = AutoConfig::Encoder::x264;
-+		else
-+			wiz->streamingEncoder = AutoConfig::Encoder::OpenH264;
- 	}
- 
- 	if (preferHardware && !softwareTested && wiz->hardwareEncodingAvailable)
-@@ -979,7 +993,10 @@ void AutoConfigTestPage::TestRecordingEncoderThread()
- 		else
- 			wiz->recordingEncoder = AutoConfig::Encoder::AMD;
- 	} else {
-		wiz->recordingEncoder = AutoConfig::Encoder::x264;
-+		if (wiz->x264Available)
-+			wiz->streamingEncoder = AutoConfig::Encoder::x264;
-+		else
-+			wiz->streamingEncoder = AutoConfig::Encoder::OpenH264;
- 	}
- 
- 	if (wiz->recordingEncoder != AutoConfig::Encoder::NVENC) {
-@@ -993,6 +1010,7 @@ void AutoConfigTestPage::TestRecordingEncoderThread()
- }
- 
- #define ENCODER_TEXT(x) "Basic.Settings.Output.Simple.Encoder." x
-+#define ENCODER_OPENH264 ENCODER_TEXT("Software.OpenH264.H264")
- #define ENCODER_X264 ENCODER_TEXT("Software.X264.H264")
- #define ENCODER_NVENC ENCODER_TEXT("Hardware.NVENC.H264")
- #define ENCODER_QSV ENCODER_TEXT("Hardware.QSV.H264")
-@@ -1032,6 +1050,8 @@ void AutoConfigTestPage::FinalizeResults()
- 
- 	auto encName = [](AutoConfig::Encoder enc) -> QString {
- 		switch (enc) {
-+		case AutoConfig::Encoder::OpenH264:
-+			return QTStr(ENCODER_OPENH264);
- 		case AutoConfig::Encoder::x264:
- 			return QTStr(ENCODER_X264);
- 		case AutoConfig::Encoder::NVENC:
-@@ -1046,7 +1066,7 @@ void AutoConfigTestPage::FinalizeResults()
- 			return QTStr(QUALITY_SAME);
- 		}
- 
-		return QTStr(ENCODER_X264);
-+		return QTStr(ENCODER_OPENH264);
- 	};
- 
- 	auto newLabel = [this](const char *str) -> QLabel * {
-diff --git a/UI/window-basic-auto-config.cpp b/UI/window-basic-auto-config.cpp
-index 3e9c36685..eace18067 100644
--- a/UI/window-basic-auto-config.cpp
-+++ b/UI/window-basic-auto-config.cpp
-@@ -961,6 +961,7 @@ AutoConfig::AutoConfig(QWidget *parent) : QWizard(parent)
- 	streamPage->ui->bitrate->setValue(bitrate);
- 	streamPage->ServiceChanged();
- 
-+	TestSoftwareEncoding();
- 	TestHardwareEncoding();
- 	if (!hardwareEncodingAvailable) {
- 		delete streamPage->ui->preferHardware;
-@@ -989,6 +990,16 @@ AutoConfig::~AutoConfig()
- 	EnableThreadedMessageBoxes(false);
- }
- 
-+void AutoConfig::TestSoftwareEncoding()
-+{
-+	size_t idx = 0;
-+	const char *id;
-+	while (obs_enum_encoder_types(idx++, &id)) {
-+		if (strcmp(id, "obs_x264") == 0)
-+			x264Available = true;
-+	}
-+}
-+
- void AutoConfig::TestHardwareEncoding()
- {
- 	size_t idx = 0;
-@@ -1061,8 +1072,10 @@ inline const char *AutoConfig::GetEncoderId(Encoder enc)
- 		return SIMPLE_ENCODER_AMD;
- 	case Encoder::Apple:
- 		return SIMPLE_ENCODER_APPLE_H264;
-	default:
-+	case Encoder::x264:
- 		return SIMPLE_ENCODER_X264;
-+	default:
-+		return SIMPLE_ENCODER_OPENH264;
- 	}
- };
- 
-diff --git a/UI/window-basic-auto-config.hpp b/UI/window-basic-auto-config.hpp
-index eb50701ff..e581791dd 100644
--- a/UI/window-basic-auto-config.hpp
-+++ b/UI/window-basic-auto-config.hpp
-@@ -43,6 +43,7 @@ class AutoConfig : public QWizard {
- 	};
- 
- 	enum class Encoder {
-+		OpenH264,
- 		x264,
- 		NVENC,
- 		QSV,
-@@ -91,6 +92,7 @@ class AutoConfig : public QWizard {
- 	bool qsvAvailable = false;
- 	bool vceAvailable = false;
- 	bool appleAvailable = false;
-+	bool x264Available = false;
- 
- 	int startingBitrate = 2500;
- 	bool customServer = false;
-@@ -106,6 +108,7 @@ class AutoConfig : public QWizard {
- 	int specificFPSNum = 0;
- 	int specificFPSDen = 0;
- 
-+	void TestSoftwareEncoding();
- 	void TestHardwareEncoding();
- 	bool CanTestServer(const char *server);
- 
-diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
-index 737ab966d..a4df630c4 100644
--- a/UI/window-basic-main-outputs.cpp
-+++ b/UI/window-basic-main-outputs.cpp
-@@ -515,7 +515,9 @@ void SimpleOutput::LoadStreamingPreset_Lossy(const char *encoderId)
- /* mistakes have been made to lead us to this. */
- const char *get_simple_output_encoder(const char *encoder)
- {
-	if (strcmp(encoder, SIMPLE_ENCODER_X264) == 0) {
-+	if (strcmp(encoder, SIMPLE_ENCODER_OPENH264) == 0) {
-+		return "ffmpeg_openh264";
-+	} else if (strcmp(encoder, SIMPLE_ENCODER_X264) == 0) {
- 		return "obs_x264";
- 	} else if (strcmp(encoder, SIMPLE_ENCODER_X264_LOWCPU) == 0) {
- 		return "obs_x264";
-@@ -549,7 +551,7 @@ const char *get_simple_output_encoder(const char *encoder)
- #endif
- 	}
- 
-	return "obs_x264";
-+	return "ffmpeg_openh264";
- }
- 
- void SimpleOutput::LoadRecordingPreset()
-diff --git a/UI/window-basic-main-profiles.cpp b/UI/window-basic-main-profiles.cpp
-index 4941359ea..1f3ffdc1d 100644
--- a/UI/window-basic-main-profiles.cpp
-+++ b/UI/window-basic-main-profiles.cpp
-@@ -794,7 +794,7 @@ void OBSBasic::ChangeProfile()
- 
- 	Auth::Load();
- 
-	CheckForSimpleModeX264Fallback();
-+	CheckForSimpleModeH264Fallback();
- 
- 	blog(LOG_INFO, "Switched to profile '%s' (%s)", newName, newDir);
- 	blog(LOG_INFO, "------------------------------------------------");
-@@ -815,12 +815,13 @@ void OBSBasic::ChangeProfile()
- 	}
- }
- 
-void OBSBasic::CheckForSimpleModeX264Fallback()
-+void OBSBasic::CheckForSimpleModeH264Fallback()
- {
- 	const char *curStreamEncoder =
- 		config_get_string(basicConfig, "SimpleOutput", "StreamEncoder");
- 	const char *curRecEncoder =
- 		config_get_string(basicConfig, "SimpleOutput", "RecEncoder");
-+	bool x264_supported = false;
- 	bool qsv_supported = false;
- 	bool qsv_av1_supported = false;
- 	bool amd_supported = false;
-@@ -837,7 +838,9 @@ void OBSBasic::CheckForSimpleModeX264Fallback()
- 	const char *id;
- 
- 	while (obs_enum_encoder_types(idx++, &id)) {
-		if (strcmp(id, "amd_amf_h264") == 0)
-+		if (strcmp(id, "obs_x264") == 0)
-+			x264_supported = true;
-+		else if (strcmp(id, "amd_amf_h264") == 0)
- 			amd_supported = true;
- 		else if (strcmp(id, "obs_qsv11") == 0)
- 			qsv_supported = true;
-@@ -865,68 +868,73 @@ void OBSBasic::CheckForSimpleModeX264Fallback()
- #endif
- 	}
- 
-+	// Check to see whether x264 is available
-+	const char *fallback_encoder_name = (x264_supported
-+						     ? SIMPLE_ENCODER_X264
-+						     : SIMPLE_ENCODER_OPENH264);
-+
- 	auto CheckEncoder = [&](const char *&name) {
- 		if (strcmp(name, SIMPLE_ENCODER_QSV) == 0) {
- 			if (!qsv_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_QSV_AV1) == 0) {
- 			if (!qsv_av1_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_NVENC) == 0) {
- 			if (!nve_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_NVENC_AV1) == 0) {
- 			if (!nve_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- #ifdef ENABLE_HEVC
- 		} else if (strcmp(name, SIMPLE_ENCODER_AMD_HEVC) == 0) {
- 			if (!amd_hevc_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_NVENC_HEVC) == 0) {
- 			if (!nve_hevc_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- #endif
- 		} else if (strcmp(name, SIMPLE_ENCODER_AMD) == 0) {
- 			if (!amd_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_AMD_AV1) == 0) {
- 			if (!amd_av1_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- 		} else if (strcmp(name, SIMPLE_ENCODER_APPLE_H264) == 0) {
- 			if (!apple_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- #ifdef ENABLE_HEVC
- 		} else if (strcmp(name, SIMPLE_ENCODER_APPLE_HEVC) == 0) {
- 			if (!apple_hevc_supported) {
- 				changed = true;
-				name = SIMPLE_ENCODER_X264;
-+				name = fallback_encoder_name;
- 				return false;
- 			}
- #endif
-diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
-index 6d9375eb4..c6aae8c7b 100644
--- a/UI/window-basic-main.cpp
-+++ b/UI/window-basic-main.cpp
-@@ -1379,6 +1379,8 @@ extern void CheckExistingCookieId();
- #define DEFAULT_CONTAINER "fragmented_mp4"
- #endif
- 
-+extern bool EncoderAvailable(const char *encoder);
-+
- bool OBSBasic::InitBasicConfigDefaults()
- {
- 	QList<QScreen *> screens = QGuiApplication::screens();
-@@ -1549,7 +1551,10 @@ bool OBSBasic::InitBasicConfigDefaults()
- 	config_set_default_bool(basicConfig, "AdvOut", "UseRescale", false);
- 	config_set_default_uint(basicConfig, "AdvOut", "TrackIndex", 1);
- 	config_set_default_uint(basicConfig, "AdvOut", "VodTrackIndex", 2);
-	config_set_default_string(basicConfig, "AdvOut", "Encoder", "obs_x264");
-+
-+	bool useX264 = EncoderAvailable("obs_x264");
-+	config_set_default_string(basicConfig, "AdvOut", "Encoder",
-+				  (useX264 ? "obs_x264" : "ffmpeg_openh264"));
- 
- 	config_set_default_string(basicConfig, "AdvOut", "RecType", "Standard");
- 
-@@ -1672,7 +1677,6 @@ bool OBSBasic::InitBasicConfigDefaults()
- 	return true;
- }
- 
-extern bool EncoderAvailable(const char *encoder);
- extern bool update_nvenc_presets(ConfigFile &config);
- 
- void OBSBasic::InitBasicConfigDefaults2()
-@@ -1681,12 +1685,14 @@ void OBSBasic::InitBasicConfigDefaults2()
- 					      "Pre23Defaults");
- 	bool useNV = EncoderAvailable("ffmpeg_nvenc") && !oldEncDefaults;
- 
-+	bool useX264 = EncoderAvailable("obs_x264");
-+	const char *h264_fallback =
-+		(useX264 ? SIMPLE_ENCODER_X264 : SIMPLE_ENCODER_OPENH264);
-+
- 	config_set_default_string(basicConfig, "SimpleOutput", "StreamEncoder",
-				  useNV ? SIMPLE_ENCODER_NVENC
-					: SIMPLE_ENCODER_X264);
-+				  useNV ? SIMPLE_ENCODER_NVENC : h264_fallback);
- 	config_set_default_string(basicConfig, "SimpleOutput", "RecEncoder",
-				  useNV ? SIMPLE_ENCODER_NVENC
-					: SIMPLE_ENCODER_X264);
-+				  useNV ? SIMPLE_ENCODER_NVENC : h264_fallback);
- 
- 	const char *aac_default = "ffmpeg_aac";
- 	if (EncoderAvailable("CoreAudio_AAC"))
-@@ -1967,7 +1973,7 @@ void OBSBasic::OBSInit()
- 
- 	InitBasicConfigDefaults2();
- 
-	CheckForSimpleModeX264Fallback();
-+	CheckForSimpleModeH264Fallback();
- 
- 	blog(LOG_INFO, STARTUP_SEPARATOR);
- 
-diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
-index cbce69832..74c6eb144 100644
--- a/UI/window-basic-main.hpp
-+++ b/UI/window-basic-main.hpp
-@@ -66,6 +66,7 @@ class OBSBasicVCamConfig;
- 
- #define SIMPLE_ENCODER_X264 "x264"
- #define SIMPLE_ENCODER_X264_LOWCPU "x264_lowcpu"
-+#define SIMPLE_ENCODER_OPENH264 "ffmpeg_openh264"
- #define SIMPLE_ENCODER_QSV "qsv"
- #define SIMPLE_ENCODER_QSV_AV1 "qsv_av1"
- #define SIMPLE_ENCODER_NVENC "nvenc"
-@@ -434,7 +435,7 @@ private:
- 	void DeleteProfile(const char *profile_name, const char *profile_dir);
- 	void RefreshProfiles();
- 	void ChangeProfile();
-	void CheckForSimpleModeX264Fallback();
-+	void CheckForSimpleModeH264Fallback();
- 
- 	void SaveProjectNow();
- 
-diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp
-index b056938e7..548e5f45f 100644
--- a/UI/window-basic-settings-stream.cpp
-+++ b/UI/window-basic-settings-stream.cpp
-@@ -1362,7 +1362,9 @@ static QString get_adv_fallback(const QString &enc)
- 		return "com.apple.videotoolbox.videoencoder.ave.avc";
- 	if (enc == "obs_qsv11_av1")
- 		return "obs_qsv11";
-	return "obs_x264";
-+	if (EncoderAvailable("obs_x264"))
-+		return "obs_x264";
-+	return "ffmpeg_openh264";
- }
- 
- static QString get_adv_audio_fallback(const QString &enc)
-@@ -1391,7 +1393,9 @@ static QString get_simple_fallback(const QString &enc)
- 		return SIMPLE_ENCODER_APPLE_H264;
- 	if (enc == SIMPLE_ENCODER_QSV_AV1)
- 		return SIMPLE_ENCODER_QSV;
-	return SIMPLE_ENCODER_X264;
-+	if (EncoderAvailable("obs_x264"))
-+		return SIMPLE_ENCODER_X264;
-+	return SIMPLE_ENCODER_OPENH264;
- }
- 
- bool OBSBasicSettings::ServiceSupportsCodecCheck()
-@@ -1585,8 +1589,12 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly)
- 
- #define ENCODER_STR(str) QTStr("Basic.Settings.Output.Simple.Encoder." str)
- 
-	ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software.X264.H264"),
-					 QString(SIMPLE_ENCODER_X264));
-+	ui->simpleOutStrEncoder->addItem(ENCODER_STR("Software.OpenH264.H264"),
-+					 QString(SIMPLE_ENCODER_OPENH264));
-+	if (service_supports_encoder(vcodecs, "obs_x264"))
-+		ui->simpleOutStrEncoder->addItem(
-+			ENCODER_STR("Software.X264.H264"),
-+			QString(SIMPLE_ENCODER_X264));
- 	if (service_supports_encoder(vcodecs, "obs_qsv11"))
- 		ui->simpleOutStrEncoder->addItem(
- 			ENCODER_STR("Hardware.QSV.H264"),
-diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp
-index 48bb4bac6..51fe280db 100644
--- a/UI/window-basic-settings.cpp
-+++ b/UI/window-basic-settings.cpp
-@@ -3831,6 +3831,11 @@ void OBSBasicSettings::SaveOutputSettings()
-          do. This only exists to make sure that the x264 preset doesn't
-          get overwritten with empty data. */
- 		presetType = "ApplePreset";
-+	else if (encoder == SIMPLE_ENCODER_OPENH264)
-+		/* The OpenH264 encoder does not have presets like the other encoders
-+         do. This only exists to make sure that the x264 preset doesn't
-+         get overwritten with empty data. */
-+		presetType = "OpenH264Preset";
- 	else
- 		presetType = "Preset";
- 
-@@ -5286,11 +5291,16 @@ void OBSBasicSettings::FillSimpleRecordingValues()
- 	ADD_QUALITY("HQ");
- 	ADD_QUALITY("Lossless");
- 
-	ui->simpleOutRecEncoder->addItem(ENCODER_STR("Software.X264.H264"),
-					 QString(SIMPLE_ENCODER_X264));
-	ui->simpleOutRecEncoder->addItem(
-		ENCODER_STR("SoftwareLowCPU.X264.H264"),
-		QString(SIMPLE_ENCODER_X264_LOWCPU));
-+	ui->simpleOutRecEncoder->addItem(ENCODER_STR("Software.OpenH264.H264"),
-+					 QString(SIMPLE_ENCODER_OPENH264));
-+	if (EncoderAvailable("obs_x264")) {
-+		ui->simpleOutRecEncoder->addItem(
-+			ENCODER_STR("Software.X264.H264"),
-+			QString(SIMPLE_ENCODER_X264));
-+		ui->simpleOutRecEncoder->addItem(
-+			ENCODER_STR("SoftwareLowCPU.X264.H264"),
-+			QString(SIMPLE_ENCODER_X264_LOWCPU));
-+	}
- 	if (EncoderAvailable("obs_qsv11"))
- 		ui->simpleOutRecEncoder->addItem(
- 			ENCODER_STR("Hardware.QSV.H264"),
-@@ -5463,6 +5473,9 @@ void OBSBasicSettings::SimpleStreamingEncoderChanged()
- 
- 		defaultPreset = "balanced";
- 		preset = curAMDAV1Preset;
-+	} else if (encoder == SIMPLE_ENCODER_OPENH264) {
-+		ui->simpleOutPreset->setVisible(false);
-+		ui->simpleOutPresetLabel->setVisible(false);
- 	} else {
- 
- #define PRESET_STR(val) \
-- 
-2.39.2
@@ -1,5 +0,0 @@
-project pkg {
-	rpm {
-		spec = "obs-studio.spec"
-	}
-}
@@ -1,106 +0,0 @@
-From 1e2fc3ade587a7a7c24e4238996ca382c4c0f719 Mon Sep 17 00:00:00 2001
-From: Neal Gompa <ngompa@fedoraproject.org>
-Date: Tue, 27 Dec 2022 09:15:08 -0500
-Subject: [PATCH] CMake: Use the system version of QRCodeGenCPP dependency
-
---
- CMakeLists.txt            |  9 +++++++--
- cmake/legacy.cmake        | 12 ++++++++----
- src/forms/ConnectInfo.cpp |  2 +-
- 3 files changed, 16 insertions(+), 7 deletions(-)
-
-diff --git a/plugins/obs-websocket/CMakeLists.txt b/plugins/obs-websocket/CMakeLists.txt
-index 871f92b..288cc87 100644
--- a/plugins/obs-websocket/CMakeLists.txt
-+++ b/plugins/obs-websocket/CMakeLists.txt
-@@ -13,7 +13,7 @@ endif()
- 
- # Submodule deps check
- if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp")
-  message(FATAL_ERROR "obs-websocket submodule deps not available.")
-+  message(INFO "obs-websocket submodule deps not available.")
- endif()
- 
- # Find Qt
-@@ -22,6 +22,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
- # Find nlohmann JSON
- find_package(nlohmann_json 3 REQUIRED)
- 
-+# Find qrcodegencpp
-+find_package(qrcodegencpp REQUIRED)
-+
- # Find WebSocket++
- find_package(Websocketpp 0.8 REQUIRED)
- 
-@@ -157,7 +160,9 @@ target_link_libraries(
-           Qt::Network
-           nlohmann_json::nlohmann_json
-           Websocketpp::Websocketpp
-          Asio::Asio)
-+          Asio::Asio
-+          qrcodegencpp
-+          )
- 
- set_target_properties_obs(
-   obs-websocket
-diff --git a/plugins/obs-websocket/cmake/legacy.cmake b/plugins/obs-websocket/cmake/legacy.cmake
-index ab25ec7..98ca704 100644
--- a/plugins/obs-websocket/cmake/legacy.cmake
-+++ b/plugins/obs-websocket/cmake/legacy.cmake
-@@ -10,7 +10,7 @@ endif()
- 
- # Submodule deps check
- if(NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/deps/qr/cpp/QrCode.hpp)
-  obs_status(FATAL_ERROR "obs-websocket submodule deps not available.")
-+  obs_status(INFO "obs-websocket submodule deps not available.")
- endif()
- 
- # Plugin tests flag
-@@ -22,6 +22,9 @@ find_qt(COMPONENTS Core Widgets Svg Network)
- # Find nlohmann JSON
- find_package(nlohmann_json 3 REQUIRED)
- 
-+# Find qrcodegencpp
-+find_package(qrcodegencpp REQUIRED)
-+
- # Find WebSocket++
- find_package(Websocketpp 0.8 REQUIRED)
- 
-@@ -129,8 +132,7 @@ target_sources(
-           src/utils/Compat.cpp
-           src/utils/Compat.h
-           src/utils/Utils.h
-          deps/qr/cpp/QrCode.cpp
-          deps/qr/cpp/QrCode.hpp)
-+          )
- 
- target_link_libraries(
-   obs-websocket
-@@ -142,7 +144,9 @@ target_link_libraries(
-           Qt::Network
-           nlohmann_json::nlohmann_json
-           Websocketpp::Websocketpp
-          Asio::Asio)
-+          Asio::Asio
-+          qrcodegencpp
-+          )
- 
- target_compile_features(obs-websocket PRIVATE cxx_std_17)
- 
-diff --git a/plugins/obs-websocket/src/forms/ConnectInfo.cpp b/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-index ddb979d..89a04c4 100644
--- a/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-+++ b/plugins/obs-websocket/src/forms/ConnectInfo.cpp
-@@ -21,9 +21,9 @@ with this program. If not, see <https://www.gnu.org/licenses/>
- #include <QPainter>
- #include <QUrl>
- #include <obs-module.h>
-+#include <qrcodegencpp/QrCode.hpp>
- 
- #include "ConnectInfo.h"
-#include "../../deps/qr/cpp/QrCode.hpp"
- #include "../obs-websocket.h"
- #include "../Config.h"
- #include "../utils/Platform.h"
-- 
-2.39.2
@@ -1,151 +0,0 @@
-%global obswebsocketver 5.2.2
-
-Name:			obs-studio
-Version:		29.1.1
-Release:		1%?dist
-Summary:		Open Broadcaster Software Studio
-License:		GPL-2.0-or-later and ISC and MIT and BSD-1-Clause and BSD-2-Clause and BSD-3-Clause and BSL-1.0 and LGPL-2.1-or-later and CC0-1.0 and (CC0-1.0 or OpenSSL or Apache-2.0) and LicenseRef-Fedora-Public-Domain and (BSD-3-Clause or GPL-2.0-only)
-URL:			https://obsproject.com/
-Source0:		https://github.com/obsproject/obs-studio/archive/refs/tags/%version.tar.gz
-Source1:		https://github.com/obsproject/obs-websocket/archive/%obswebsocketver/obs-websocket-%obswebsocketver.tar.gz
-
-BuildRequires:	gcc
-BuildRequires:	cmake >= 3.16
-BuildRequires:	ninja-build
-BuildRequires:	libappstream-glib
-BuildRequires:	desktop-file-utils
-
-BuildRequires:	alsa-lib-devel
-BuildRequires:	asio-devel
-BuildRequires:	fdk-aac-free-devel
-BuildRequires:	fontconfig-devel
-BuildRequires:	freetype-devel
-BuildRequires:	jansson-devel >= 2.5
-BuildRequires:	json-devel
-BuildRequires:	libcurl-devel
-BuildRequires:	libdrm-devel
-BuildRequires:	libGL-devel
-BuildRequires:	libglvnd-devel
-BuildRequires:	librist-devel
-BuildRequires:	srt-devel
-BuildRequires:	libuuid-devel
-BuildRequires:	libv4l-devel
-BuildRequires:	libva-devel
-BuildRequires:	libX11-devel
-BuildRequires:	libxcb-devel
-BuildRequires:	libXcomposite-devel
-BuildRequires:	libXinerama-devel
-BuildRequires:	libxkbcommon-devel
-BuildRequires:	luajit-devel
-BuildRequires:	mbedtls-devel
-BuildRequires:	pciutils-devel
-BuildRequires:	pipewire-devel
-BuildRequires:	pipewire-jack-audio-connection-kit-devel
-BuildRequires:	pulseaudio-libs-devel
-BuildRequires:	python3-devel
-BuildRequires:	libqrcodegencpp-devel
-BuildRequires:	qt6-qtbase-devel
-BuildRequires:	qt6-qtbase-private-devel
-BuildRequires:	qt6-qtsvg-devel
-BuildRequires:	qt6-qtwayland-devel
-BuildRequires:	speexdsp-devel
-BuildRequires:	swig
-BuildRequires:	systemd-devel
-BuildRequires:	wayland-devel
-BuildRequires:	websocketpp-devel
-BuildRequires:	ffmpeg-free-devel
-BuildRequires:	x264-devel
-BuildRequires:	vlc-devel
-# websocket deps
-BuildRequires:	nlohmann-json-devel websocketpp-devel asio-devel
-
-# Ensure QtWayland is installed when libwayland-client is installed
-Requires:		(qt6-qtwayland%{?_isa} if libwayland-client%{?_isa})
-# For icon folder heirarchy
-Requires:		hicolor-icon-theme
-# Virtual camera support
-Recommends:		kmod-v4l2loopback
-# NVIDIA Hardware accelerated encoding: CUDA
-Suggests:		xorg-x11-drv-nvidia-cuda
-# obs-studio-plugin-vlc-video
-# We dlopen() libvlc
-Requires:		libvlc.so.%{libvlc_soversion}%{?lib64_suffix}
-
-
-# These are modified sources that can't be easily unbundled
-## License: MIT and CC0-1.0
-## Newer version in Fedora with the same licensing
-## Request filed upstream for fixing it: https://github.com/simd-everywhere/simde/issues/999
-Provides:		bundled(simde) = 0.7.1
-## License: BSL-1.0
-Provides:		bundled(decklink-sdk)
-## License: CC0-1.0 or OpenSSL or Apache-2.0
-Provides:		bundled(blake2)
-## License: MIT
-Provides:		bundled(json11)
-## License: MIT
-Provides:		bundled(libcaption)
-## License: ISC
-Provides:		bundled(libff)
-## License: BSD-1-Clause
-Provides:		bundled(uthash)
-## License: BSD-3-Clause
-Provides:		bundled(rnnoise)
-## License: LGPL-2.1-or-later and LicenseRef-Fedora-Public-Domain
-Provides:		bundled(librtmp)
-## License: MIT
-Provides:		bundled(libnsgif)
-## License: MIT
-## Windows only dependency
-## Support for Linux will also unbundle it
-## Cf. https://github.com/obsproject/obs-studio/pull/8327
-Provides:		bundled(intel-mediasdk)
-
-%description
-Open Broadcaster Software is free and open source
-software for video recording and live streaming.
-
-
-%prep
-%autosetup -p1 -n obs-studio-%{?snapdate:%{commit}}%{!?snapdate:%{version_no_tilde}}
-# Prepare plugins/obs-websocket
-tar -xf %SOURCE1 --strip-components=1 -C plugins/obs-websocket/
-ls plugins/obs-websocket/
-sed -e 's|OBS_MULTIARCH_SUFFIX|LIB_SUFFIX|g' -i cmake/Modules/ObsHelpers.cmake
-# Kill rpath settings
-sed -e '\|set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/${OBS_LIBRARY_DESTINATION}")|d' -i cmake/Modules/ObsHelpers_Linux.cmake
-# touch the missing submodules
-touch plugins/obs-browser/CMakeLists.txt
-# remove -Werror flag to mitigate FTBFS with ffmpeg 5.1
-sed -e 's|-Werror-implicit-function-declaration||g' -i cmake/Modules/CompilerConfig.cmake
-sed -e '/-Werror/d' -i cmake/Modules/CompilerConfig.cmake
-
-
-%build
-%cmake -B build -S . \
-	-DUNIX_STRUCTURE=1 -GNinja \
-	-DCMAKE_SKIP_RPATH=1 \
-	-DBUILD_BROWSER=OFF \
-	-DENABLE_JACK=ON \
-	-DENABLE_LIBFDK=ON \
-	-DENABLE_AJA=OFF \
-	-DOBS_VERSION_OVERRIDE="%version-%release" \
-	-Wno-dev \
-	-DOpenGL_GL_PREFERENCE=GLVND
-%cmake_build
-
-
-%install
-%cmake_install
-
-
-%files
-%doc README.rst
-%license COPYING plugins/{{enc-amf,obs-websocket}/LICENSE,obs-{browser,filters,outputs}/COPYING}
-
-
-%changelog
-* Tue May 23 2023 windowsboy111 <windowsboy111@fyralabs.com> - 29.1.1-1
- Initial package
- Ref: https://pkgs.rpmfusion.org/cgit/free/obs-studio-freeworld.git/tree/obs-studio-freeworld.spec
- Ref: https://gitlab.archlinux.org/archlinux/packaging/packages/obs-studio/-/blob/main/PKGBUILD
@@ -1,2 +0,0 @@
-rpm.version(gh("obsproject/obs-studio"));
-rpm.global("obswebsocketver", gh("obsproject/obs-websocket"));
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "rust-sccache.spec"
+	}
+}
@@ -0,0 +1,599 @@
+# Generated by rust2rpm 25
+%bcond_with check
+# aarch64 dist is not available
+%ifarch aarch64
+%bcond_with dist_server
+%else
+%bcond_without dist_server
+%endif
+
+# Don't mangle shebangs
+%global __brp_mangle_shebangs %{nil}
+
+%global crate sccache
+
+Name:           rust-sccache
+Version:        0.8.0
+Release:        1%?dist
+Summary:        Ccache-like tool
+
+License:        Apache-2.0
+URL:            https://crates.io/crates/sccache
+Source:         %{crates_source}
+# Automatically generated patch to strip dependencies and normalize metadata
+Patch:          sccache-fix-metadata-auto.diff
+
+ExclusiveArch:  %{rust_arches}
+
+BuildRequires:  cargo-rpm-macros >= 24
+BuildRequires:  anda-srpm-macros
+BuildRequires:  openssl-devel
+BuildRequires:  gcc
+BuildRequires:  perl
+BuildRequires:  rust-packaging
+
+%global _description %{expand:
+Sccache is a ccache-like tool. It is used as a compiler wrapper and
+avoids compilation when possible. Sccache has the capability to utilize
+caching in remote storage environments, including various cloud storage
+options, or alternatively, in local storage.}
+
+%description %{_description}
+
+%package     -n %{crate}
+Summary:        %{summary}
+License:        MIT
+
+%description -n %{crate} %{_description}
+
+%files       -n %{crate}
+%license LICENSE
+%doc CODE_OF_CONDUCT.md
+%doc README.md
+%{_bindir}/sccache
+%if %{with dist_server}
+%{_bindir}/sccache-dist
+%endif
+
+%package        devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache) = 0.7.4
+Requires:       cargo
+Requires:       rust >= 1.67.1
+
+%description    devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files          devel
+%{crate_instdir}/
+
+%package     -n %{name}+default-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/default) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/all) = 0.7.4
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files       -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+all-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/all) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/azure) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/gcs) = 0.7.4
+Requires:       crate(sccache/gha) = 0.7.4
+Requires:       crate(sccache/memcached) = 0.7.4
+Requires:       crate(sccache/redis) = 0.7.4
+Requires:       crate(sccache/s3) = 0.7.4
+Requires:       crate(sccache/webdav) = 0.7.4
+
+%description -n %{name}+all-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "all" feature of the "%{crate}" crate.
+
+%files       -n %{name}+all-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+azure-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/azure) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+azure-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "azure" feature of the "%{crate}" crate.
+
+%files       -n %{name}+azure-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+dist-client-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/dist-client) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+dist-client-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "dist-client" feature of the "%{crate}" crate.
+
+%files       -n %{name}+dist-client-devel
+%ghost %{crate_instdir}/Cargo.toml
+%if %{with dist_server}
+%package     -n %{name}+dist-server-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/dist-server) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+dist-server-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "dist-server" feature of the "%{crate}" crate.
+
+%files       -n %{name}+dist-server-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+dist-tests-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/dist-tests) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/dist-client) = 0.7.4
+Requires:       crate(sccache/dist-server) = 0.7.4
+
+%description -n %{name}+dist-tests-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "dist-tests" feature of the "%{crate}" crate.
+
+%files       -n %{name}+dist-tests-devel
+%ghost %{crate_instdir}/Cargo.toml
+%endif
+%package     -n %{name}+flate2-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/flate2) = 0.7.4
+Requires:       (crate(flate2) >= 1.0.0 with crate(flate2) < 2.0.0~)
+Requires:       (crate(flate2/rust_backend) >= 1.0.0 with crate(flate2/rust_backend) < 2.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+flate2-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "flate2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+flate2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+gcs-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/gcs) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+gcs-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gcs" feature of the "%{crate}" crate.
+
+%files       -n %{name}+gcs-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+gha-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/gha) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4
+
+%description -n %{name}+gha-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "gha" feature of the "%{crate}" crate.
+
+%files       -n %{name}+gha-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+hyper-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/hyper) = 0.7.4
+Requires:       (crate(hyper/default) >= 0.14.27 with crate(hyper/default) < 0.15.0~)
+Requires:       (crate(hyper/server) >= 0.14.27 with crate(hyper/server) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+hyper-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "hyper" feature of the "%{crate}" crate.
+
+%files       -n %{name}+hyper-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+jwt-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/jwt) = 0.7.4
+Requires:       (crate(jsonwebtoken/default) >= 8.0.0 with crate(jsonwebtoken/default) < 9.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+jwt-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "jwt" feature of the "%{crate}" crate.
+
+%files       -n %{name}+jwt-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+libmount-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/libmount) = 0.7.4
+Requires:       (crate(libmount/default) >= 0.1.10 with crate(libmount/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+libmount-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "libmount" feature of the "%{crate}" crate.
+
+%files       -n %{name}+libmount-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+memcached-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/memcached) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-memcached) >= 0.40.0 with crate(opendal/services-memcached) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+memcached-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "memcached" feature of the "%{crate}" crate.
+
+%files       -n %{name}+memcached-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+native-zlib-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/native-zlib) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+native-zlib-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "native-zlib" feature of the "%{crate}" crate.
+
+%files       -n %{name}+native-zlib-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+nix-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/nix) = 0.7.4
+Requires:       (crate(nix/default) >= 0.26.2 with crate(nix/default) < 0.27.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+nix-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "nix" feature of the "%{crate}" crate.
+
+%files       -n %{name}+nix-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+opendal-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/opendal) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+opendal-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "opendal" feature of the "%{crate}" crate.
+
+%files       -n %{name}+opendal-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+openssl-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/openssl) = 0.7.4
+Requires:       (crate(openssl/default) >= 0.10.55 with crate(openssl/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+openssl-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "openssl" feature of the "%{crate}" crate.
+
+%files       -n %{name}+openssl-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+redis-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/redis) = 0.7.4
+Requires:       (crate(opendal/default) >= 0.40.0 with crate(opendal/default) < 0.41.0~)
+Requires:       (crate(opendal/services-redis) >= 0.40.0 with crate(opendal/services-redis) < 0.41.0~)
+Requires:       (crate(opendal/services-redis-rustls) >= 0.40.0 with crate(opendal/services-redis-rustls) < 0.41.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/url) = 0.7.4
+
+%description -n %{name}+redis-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "redis" feature of the "%{crate}" crate.
+
+%files       -n %{name}+redis-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+reqsign-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/reqsign) = 0.7.4
+Requires:       (crate(reqsign/default) >= 0.14.1 with crate(reqsign/default) < 0.15.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+reqsign-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "reqsign" feature of the "%{crate}" crate.
+
+%files       -n %{name}+reqsign-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+reqwest-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/reqwest) = 0.7.4
+Requires:       (crate(reqwest/blocking) >= 0.11.0 with crate(reqwest/blocking) < 0.12.0~)
+Requires:       (crate(reqwest/default) >= 0.11.0 with crate(reqwest/default) < 0.12.0~)
+Requires:       (crate(reqwest/json) >= 0.11.0 with crate(reqwest/json) < 0.12.0~)
+Requires:       (crate(reqwest/rustls-tls) >= 0.11.0 with crate(reqwest/rustls-tls) < 0.12.0~)
+Requires:       (crate(reqwest/stream) >= 0.11.0 with crate(reqwest/stream) < 0.12.0~)
+Requires:       (crate(reqwest/trust-dns) >= 0.11.0 with crate(reqwest/trust-dns) < 0.12.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+reqwest-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "reqwest" feature of the "%{crate}" crate.
+
+%files       -n %{name}+reqwest-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+rouille-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/rouille) = 0.7.4
+Requires:       (crate(rouille) >= 3.6.0 with crate(rouille) < 4.0.0~)
+Requires:       (crate(rouille/ssl) >= 3.6.0 with crate(rouille/ssl) < 4.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+rouille-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "rouille" feature of the "%{crate}" crate.
+
+%files       -n %{name}+rouille-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+s3-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/s3) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4
+Requires:       crate(sccache/reqsign) = 0.7.4
+
+%description -n %{name}+s3-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "s3" feature of the "%{crate}" crate.
+
+%files       -n %{name}+s3-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+sha2-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/sha2) = 0.7.4
+Requires:       (crate(sha2/default) >= 0.10.6 with crate(sha2/default) < 0.11.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+sha2-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "sha2" feature of the "%{crate}" crate.
+
+%files       -n %{name}+sha2-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+syslog-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/syslog) = 0.7.4
+Requires:       (crate(syslog/default) >= 6.0.0 with crate(syslog/default) < 7.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+syslog-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "syslog" feature of the "%{crate}" crate.
+
+%files       -n %{name}+syslog-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%{dnl ## BEGIN: multiline comment
+%package     -n %{name}+trust-dns-resolver-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/trust-dns-resolver) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+trust-dns-resolver-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "trust-dns-resolver" feature of the "%{crate}" crate.
+
+%files       -n %{name}+trust-dns-resolver-devel
+%ghost %{crate_instdir}/Cargo.toml
+}    ## END OF multiline comment
+
+%package     -n %{name}+unstable-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/unstable) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+unstable-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "unstable" feature of the "%{crate}" crate.
+
+%files       -n %{name}+unstable-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+url-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/url) = 0.7.4
+Requires:       (crate(url/default) >= 2.0.0 with crate(url/default) < 3.0.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+url-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "url" feature of the "%{crate}" crate.
+
+%files       -n %{name}+url-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+vendored-openssl-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/vendored-openssl) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+vendored-openssl-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "vendored-openssl" feature of the "%{crate}" crate.
+
+%files       -n %{name}+vendored-openssl-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+version-compare-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/version-compare) = 0.7.4
+Requires:       (crate(version-compare/default) >= 0.1.1 with crate(version-compare/default) < 0.2.0~)
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+
+%description -n %{name}+version-compare-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "version-compare" feature of the "%{crate}" crate.
+
+%files       -n %{name}+version-compare-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%package     -n %{name}+webdav-devel
+Summary:        %{summary}
+BuildArch:      noarch
+Provides:       crate(sccache/webdav) = 0.7.4
+Requires:       cargo
+Requires:       crate(sccache) = 0.7.4
+Requires:       crate(sccache/opendal) = 0.7.4
+
+%description -n %{name}+webdav-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "webdav" feature of the "%{crate}" crate.
+
+%files       -n %{name}+webdav-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep_online
+
+
+%build
+%if %{with dist_server}
+%cargo_build -f dist-server
+%else
+%cargo_build
+%endif
+
+%install
+%if %{with dist_server}
+%cargo_install -f dist-server
+%else
+%cargo_install
+%endif
+
+%if %{with check}
+%check
+%if %{with dist_server}
+%cargo_test -f dist-server
+%else
+%cargo_test
+%endif
+
+%endif
+
+%changelog
+* Mon Dec 18 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.7.4-1
+- Initial package
@@ -0,0 +1,14 @@
+--- sccache-0.7.6/Cargo.toml	1970-01-01T00:00:01+00:00
+++ sccache-0.7.6/Cargo.toml	2024-02-02T06:05:53.548100+00:00
+@@ -378,11 +378,3 @@
+ [target."cfg(unix)".dependencies.daemonize]
+ version = "0.5"
+ 
+-[target."cfg(windows)".dependencies.winapi]
+-version = "0.3"
+-features = [
+-    "fileapi",
+-    "handleapi",
+-    "stringapiset",
+-    "winnls",
+-]
@@ -0,0 +1 @@
+rpm.version(crates("sccache"));
@@ -0,0 +1 @@
+*.tar.gz
@@ -0,0 +1,5 @@
+project "pkg" {
+    rpm {
+        spec = "vencord-desktop.spec"
+    }
+}
@@ -0,0 +1 @@
+rpm.version(gh_tag("Vencord/Vesktop"));
@@ -0,0 +1,74 @@
+%define debug_package %nil
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/vesktop/.*\\.so
+
+Name:		vencord-desktop
+Provides:   VencordDesktop = %{version}-%{release}
+Version:	1.5.2
+Release:	1%?dist
+License:	GPL-3.0
+Summary:	Vesktop is a cross platform desktop app aiming to give you a snappier Discord experience with Vencord pre-installed
+URL:		https://github.com/Vencord/Vesktop
+Group:		Applications/Internet
+#Source1:	launch.sh
+Source0:    https://github.com/Vencord/Vesktop/archive/refs/tags/v%{version}.tar.gz
+Requires:   xdg-utils
+BuildRequires:	nodejs-npm git
+# Conflicts:	vesktop-bin
+
+%description
+vesktop is a custom client designed to enhance your Discord experience
+while keeping everything lightweight.
+
+%prep
+git init
+git remote add origin %url || :
+git reset --hard
+git fetch
+git checkout v%version
+
+cat <<EOF > vesktop.desktop
+[Desktop Entry]
+Name=Vesktop
+Comment=%summary
+GenericName=Internet Messenger
+Type=Application
+Exec=/usr/bin/vencorddesktop
+Icon=vesktop
+Categories=Network;InstantMessaging;
+StartupWMClass=VencordDesktop
+
+Keywords=discord;vesktop;vencord;shelter;armcord;electron;
+EOF
+
+
+%build
+npx pnpm@8 install --no-frozen-lockfile
+npx pnpm@8 package:dir
+
+
+%install
+
+mkdir -p %buildroot/usr/share/vesktop
+cp -r dist/*-unpacked/. %buildroot/usr/share/vesktop/.
+
+install -Dm755 dist/*-unpacked/vencorddesktop %buildroot/usr/bin/vencorddesktop
+ln -sf /usr/share/vesktop/vencorddesktop %buildroot/usr/bin/vencorddesktop
+install -Dm644 vesktop.desktop %buildroot/usr/share/applications/vesktop.desktop
+install -Dm644 build/icon.png %buildroot/usr/share/pixmaps/vesktop.png
+
+%files
+%doc README.md
+%license LICENSE
+/usr/bin/vencorddesktop
+/usr/share/applications/vesktop.desktop
+/usr/share/pixmaps/vesktop.png
+/usr/share/vesktop/*
+
+%changelog
+* Tue Nov 07 2023 Cappy Ishihara <cappy@cappuchino.xyz> - 0.4.3-1
+- Initial package
+
+
@@ -0,0 +1,5 @@
+let v = gh("VOICEVOX/voicevox");
+rpm.global("ver", v);
+let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
+rpm.global("nodev", find(">=([\\d.]+)", engines.node, 1));
+rpm.global("npmv", find(">=([\\d.]+)", engines.npm, 1));
@@ -1,10 +1,16 @@
-%global nodev 16.17.0
-%global npmv 8.11.0
+%global nodev 20.12.2
+%global npmv 10.5.0
+%global ver 0.19.1
 %define debug_package %nil
+%global _build_id_links none
+
+# Exclude private libraries
+%global __requires_exclude libffmpeg.so
+%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so

 Name:			voicevox
-Version:		0.14.7
-Release:		1%?dist
+Version:		%ver
+Release:		4%?dist
 Summary:		Free Japanese text-to-speech editor
 License:		LGPL-3.0
 URL:			https://voicevox.hiroshiba.jp
@@ -1,9 +0,0 @@
-// let v = gh("VOICEVOX/voicevox");
-// rpm.version(v);
-// let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
-// rpm.define("nodev", find(">=([\\d.]+)", engines.node, 1));
-// rpm.define("nodev", find(">=([\\d.]+)", engines.npm, 1));
-let v = "0.14.7";
-let engines = get(`https://raw.githubusercontent.com/VOICEVOX/voicevox/${v}/package.json`).json().engines;
-print(find(">=([\\d.]+)", engines.node, 1));
-print(find(">=([\\d.]+)", engines.npm, 1));
@@ -1,2 +0,0 @@
-let html = get("https://crystal-lang.org/");
-rpm.version(find("Latest release <.+>(.+)</a>", html, 1))
@@ -1,6 +1,6 @@
 Name:		budgie-extras
-Version:	1.6.0
-Release:	2%{?dist}
+Version:	1.8.0
+Release:	1%{?dist}

 License:	GPL-3.0
 Summary:	Additional Budgie Desktop enhancements for user experience
@@ -51,7 +51,6 @@ Requires:	budgie-applet-recentlyused
 Requires:	budgie-applet-rotation-lock
 Requires:	budgie-applet-showtime
 Requires:	budgie-applet-takeabreak
-Requires:	budgie-applet-trash
 Requires:	budgie-applet-visualspace
 Requires:	budgie-applet-wallstreet
 Requires:	budgie-applet-window-shuffler
@@ -208,14 +207,6 @@ upside down, dim the screen, lock screen or show a countdown message on break
 time. The applet can be accessed quickly from the panel to temporarily switch
 it off.

-%package -n	budgie-applet-trash
-Requires:	budgie-extras-common
-Summary:	Applet allows access to trash capabilities for the Budgie Desktop
-%description -n	budgie-applet-trash
-The trash applet allows the user access the desktop trash capabilities
-from the panel including the ability to delete and restore files stored
-in the trash folder.
-
 %package -n	budgie-applet-visualspace
 Requires:	budgie-extras-common
 Summary:	Shows the current workspace(s), as bullet(s)
@@ -393,9 +384,6 @@ rm -f %{buildroot}%{_bindir}/quickchar
 %{_datadir}/glib-2.0/schemas/org.ubuntubudgie.plugins.takeabreak.gschema.xml
 %{_datadir}/pixmaps/takeabreak*.svg

-%files -n budgie-applet-trash
-%{_libdir}/budgie-desktop/plugins/budgie-trash
-
 %files -n budgie-applet-visualspace
 %config %{_sysconfdir}/xdg/autostart/visualspace-autostart.desktop
 %{_libdir}/budgie-desktop/plugins/budgie-visualspace
@@ -1,4 +1,4 @@
-%define _ubuntu_rel 22.10.20220822-0ubuntu3
+%define _ubuntu_rel 22.10.20220822-0ubuntu12
 %global _hardened_build 0

 Name:           compiz9
@@ -77,7 +77,7 @@ Compiz Config Manager helps configure Compiz Window Manager, version 0.9 series
 Compiz 9 branch, which is newer then what Fedora packages and required by Unity 7.6 and higher.

 %prep
-%autosetup -p1 -n compiz
+%autosetup -p1 -n compiz-%version+%(echo %_ubuntu_rel | sed 's@-0ubuntu.@@')

 %build
 # The driver blacklist hack is obselete
@@ -0,0 +1,99 @@
+diff --git a/src/Core/Package.vala b/src/Core/Package.vala
+index 62d206fa..cbf05983 100644
+--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
+@@ -42,8 +42,29 @@ public enum RuntimeStatus {
+ }
+
+ public class AppCenterCore.Package : Object {
+    // locally installed packages
+     public const string APPCENTER_PACKAGE_ORIGIN = "appcenter";
+-    private const string ELEMENTARY_STABLE_PACKAGE_ORIGIN = "elementary-stable-jammy-main";
+
+    // Fedora repositories
+    private const string FEDORA_STABLE_PACKAGE_ORIGIN = "fedora";
+    private const string FEDORA_UPDATES_PACKAGE_ORIGIN = "updates";
+    private const string FEDORA_TESTING_PACKAGE_ORIGIN = "updates-testing";
+
+    // RPMFusion repositories
+    private const string RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-free";
+    private const string RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-free-updates";
+    private const string RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-free-updates-testing";
+    private const string RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN = "rpmfusion-nonfree";
+    private const string RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates";
+    private const string RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN = "rpmfusion-nonfree-updates-testing";
+
+    // Ultramarine repositories
+    private const string ULTRAMARINE_PACKAGE_ORIGIN = "ultramarine";
+    private const string AKMODS_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:akmods-secureboot";
+    private const string KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN = "copr::egeretto:kmodtool-secureboot";
+
+    // Terra repositories
+    private const string TERRA_PACKAGE_ORIGIN = "terra";
+
+     public RuntimeStatus runtime_status { get; set; default = RuntimeStatus.UP_TO_DATE; }
+
+@@ -216,8 +237,12 @@ public class AppCenterCore.Package : Object {
+     public bool is_native {
+         get {
+             switch (component.get_origin ()) {
+-                case APPCENTER_PACKAGE_ORIGIN:
+-                case ELEMENTARY_STABLE_PACKAGE_ORIGIN:
+                case FEDORA_STABLE_PACKAGE_ORIGIN:
+                case FEDORA_UPDATES_PACKAGE_ORIGIN:
+                case FEDORA_TESTING_PACKAGE_ORIGIN:
+                case ULTRAMARINE_PACKAGE_ORIGIN:
+                case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+                case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+                     return true;
+                 default:
+                     return false;
+@@ -328,12 +353,33 @@ public class AppCenterCore.Package : Object {
+         owned get {
+             unowned string origin = component.get_origin ();
+             if (backend is PackageKitBackend) {
+-                if (origin == APPCENTER_PACKAGE_ORIGIN) {
+-                    return _("AppCenter");
+-                } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
+-                    return _("elementary Updates");
+-                } else if (origin.has_prefix ("ubuntu-")) {
+-                    return _("Ubuntu (non-curated)");
+                switch (origin) {
+                    case FEDORA_STABLE_PACKAGE_ORIGIN:
+                        return "Fedora";
+                    case FEDORA_UPDATES_PACKAGE_ORIGIN:
+                        return "Fedora Updates";
+                    case FEDORA_TESTING_PACKAGE_ORIGIN:
+                        return "Fedora Updates (Testing)";
+                    case RPMFUSION_FREE_STABLE_PACKAGE_ORIGIN:
+                        return "RPMFusion";
+                    case RPMFUSION_FREE_UPDATES_PACKAGE_ORIGIN:
+                        return "RPMFusion Updates";
+                    case RPMFUSION_FREE_TESTING_PACKAGE_ORIGIN:
+                        return "RPMFusion Updates (Testing)";
+                    case RPMFUSION_NONFREE_STABLE_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software)";
+                    case RPMFUSION_NONFREE_UPDATES_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software) Updates";
+                    case RPMFUSION_NONFREE_TESTING_PACKAGE_ORIGIN:
+                        return "RPMFusion (Non-free Software) Updates (Testing)";
+                    case ULTRAMARINE_PACKAGE_ORIGIN:
+                        return "Ultramarine";
+                    case AKMODS_SECUREBOOT_PACKAGE_ORIGIN:
+                        return "Secureboot support for akmods";
+                    case KMODTOOL_SECUREBOOT_PACKAGE_ORIGIN:
+                        return "Secureboot support for kmodtool";
+                    case TERRA_PACKAGE_ORIGIN:
+                        return "Terra";
+                 }
+             } else if (backend is FlatpakBackend) {
+                 var fp_package = this as FlatpakPackage;
+@@ -342,8 +388,6 @@ public class AppCenterCore.Package : Object {
+                 }
+
+                 return fp_package.remote_title;
+-            } else if (backend is UbuntuDriversBackend) {
+-                return _("Ubuntu Drivers");
+             }
+
+             return _("Unknown Origin (non-curated)");
@@ -0,0 +1,5 @@
+project pkg {
+	rpm {
+		spec = "elementary-appcenter.spec"
+	}
+}
@@ -0,0 +1,10 @@
+# false positives
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/bh*")
+addFilter("E: invalid-lc-messages-dir /usr/share/locale/mo*")
+
+# don't care about manpages
+addFilter("W: no-manual-page-for-binary io.elementary.appcenter*")
+
+# don't care about no documentation for sub-packages
+addFilter("W: no-documentation*")
+
@@ -0,0 +1,315 @@
+%global appname io.elementary.appcenter
+
+Name:           elementary-appcenter
+Summary:        Software Center from elementary
+Version:        7.4.0
+Release:        2%{?dist}
+License:        GPL-3.0
+
+Provides:       appcenter = %{version}-%{release}
+Obsoletes:      appcenter < 7.2.1-2
+
+URL:            https://github.com/elementary/appcenter
+Source0:        %url/archive/%{version}/appcenter-%{version}.tar.gz
+
+Patch0:         pr2099.patch
+
+BuildRequires:  desktop-file-utils
+BuildRequires:  gettext
+BuildRequires:  libappstream-glib
+BuildRequires:  meson
+BuildRequires:  vala
+
+BuildRequires:  appstream-vala
+
+BuildRequires:  pkgconfig(appstream) >= 0.10.0
+BuildRequires:  pkgconfig(dbus-1)
+BuildRequires:  pkgconfig(flatpak)
+BuildRequires:  pkgconfig(gee-0.8)
+BuildRequires:  pkgconfig(granite) >= 6.0.0
+BuildRequires:  pkgconfig(gtk+-3.0) >= 3.10
+BuildRequires:  pkgconfig(json-glib-1.0)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(libsoup-2.4)
+BuildRequires:  pkgconfig(libxml-2.0)
+BuildRequires:  pkgconfig(packagekit-glib2)
+BuildRequires:  pkgconfig(polkit-gobject-1)
+
+Requires:       PackageKit
+Requires:       hicolor-icon-theme
+
+%description
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+
+%package        gnome-shell-search-provider
+Summary:        Software Center from elementary (gnome-shell search provider)
+
+Provides:       appcenter-gnome-shell-search-provider = %{version}-%{release}
+Obsoletes:      appcenter-gnome-shell-search-provider < 7.2.1-2
+
+BuildArch:      noarch
+
+Requires:       %{name} = %{version}-%{release}
+Requires:       gnome-shell
+
+Supplements:    (%{name} and gnome-shell)
+
+%description    gnome-shell-search-provider
+AppCenter is a native Gtk+ app store built on AppStream and Packagekit.
+
+This package contains the gnome-shell search provider.
+
+
+%prep
+%autosetup -p1 -n appcenter-%version
+
+
+%build
+%meson -Dpayments=false -Dcurated=false -Dhide_upstream_distro_apps=false
+%meson_build
+
+
+%install
+%meson_install
+
+%find_lang %{appname}
+
+# remove empty hidden apps file
+rm -r %{buildroot}/%{_sysconfdir}/%{appname}/appcenter.hiddenapps
+
+# create autostart entry symlink
+mkdir -p %{buildroot}/%{_sysconfdir}/xdg/autostart/
+
+ln -s %{_datadir}/applications/%{appname}-daemon.desktop \
+    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+
+%check
+desktop-file-validate \
+    %{buildroot}/%{_datadir}/applications/%{appname}*.desktop
+
+appstream-util validate-relax --nonet \
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml
+
+
+%files -f %{appname}.lang
+%doc README.md
+%license COPYING
+
+%dir %{_sysconfdir}/%{appname}
+%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+
+%{_bindir}/%{appname}
+
+%{_datadir}/applications/%{appname}*.desktop
+%{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
+%{_datadir}/icons/hicolor/*/apps/%{appname}{,-symbolic}.svg
+%{_datadir}/metainfo/%{appname}.metainfo.xml
+%{_datadir}/polkit-1/actions/%{appname}.policy
+
+
+%files gnome-shell-search-provider
+%{_datadir}/gnome-shell/search-providers/%{appname}.search-provider.ini
+
+
+%changelog
+* Tue Jun 07 2022 Fabio Valentini <decathorpe@gmail.com> - 3.10.0-1
+- Update to version 3.10.0.
+
+* Tue Dec 14 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.1-1
+- Update to version 3.9.1.
+
+* Wed Nov 24 2021 Fabio Valentini <decathorpe@gmail.com> - 3.9.0-1
+- Update to version 3.9.0.
+
+* Sat Oct 30 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.2-1
+- Update to version 3.8.2.
+
+* Wed Oct 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.1-1
+- Update to version 3.8.1.
+
+* Tue Sep 28 2021 Fabio Valentini <decathorpe@gmail.com> - 3.8.0-1
+- Update to version 3.8.0.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-3
+- Mark flatpak sources in the UI.
+
+* Fri Sep 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-2
+- Hard-code Fedora instead of ubuntu repository names.
+
+* Tue Aug 31 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.1-1
+- Update to version 3.7.1.
+
+* Fri Aug 27 2021 Fabio Valentini <decathorpe@gmail.com> - 3.7.0-1
+- Update to version 3.7.0.
+
+* Tue Aug 17 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.3-1
+- Update to version 3.6.3.
+
+* Wed Aug 11 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.2-1
+- Update to version 3.6.2.
+
+* Thu Aug 05 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.1-1
+- Update to version 3.6.1.
+
+* Fri Jul 16 2021 Fabio Valentini <decathorpe@gmail.com> - 3.6.0-1
+- Update to version 3.6.0.
+
+* Fri Oct 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.1-1
+- Update to version 3.5.1.
+
+* Wed Oct 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.5.0-1
+- Update to version 3.5.0.
+
+* Fri Aug 07 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.2-1
+- Update to version 3.4.2.
+
+* Thu Jul 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.1-1
+- Update to version 3.4.1.
+
+* Thu May 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.4.0-1
+- Update to version 3.4.0.
+
+* Thu Apr 30 2020 Fabio Valentini <decathorpe@gmail.com> - 3.3.0-1
+- Update to version 3.3.0.
+
+* Thu Apr 09 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.4-1
+- Update to version 3.2.4.
+
+* Thu Apr 02 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.3-1
+- Update to version 3.2.3.
+
+* Mon Mar 23 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.2-1
+- Update to version 3.2.2.
+
+* Fri Feb 28 2020 Fabio Valentini <decathorpe@gmail.com> - 3.2.1-1
+- Update to version 3.2.1.
+
+* Fri Feb 15 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.1-1
+- Update to version 3.1.1.
+
+* Wed Jan 02 2019 Fabio Valentini <decathorpe@gmail.com> - 3.1.0-1
+- Update to version 3.1.0.
+- Remove empty blacklist file.
+
+* Fri Nov 30 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-2
+- Drop elementaryOS blacklist in favor of the version shipped with appcenter.
+
+* Thu Oct 25 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0.1-1
+- Update to version 3.0.1.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-2
+- Add missing autostart entry symlink for the daemon.
+
+* Tue Oct 16 2018 Fabio Valentini <decathorpe@gmail.com> - 3.0-1
+- Update to version 3.0.
+- Add gnome-shell search provider sub-package.
+- Explicitly disable payment system and curated applications.
+- Update blacklist file to current version from elementaryOS.
+
+* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.9-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Wed Jun 13 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-2
+- Rebuild for granite5 soname bump.
+
+* Thu Mar 08 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.9-1
+- Update to version 0.2.9.
+- Add patch to fix build with the newer vala and PackageKit on f28+.
+
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Fri Jan 26 2018 Fabio Valentini <decathorpe@gmail.com> - 0.2.8-1
+- Update to version 0.2.8.
+
+* Tue Nov 07 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.7-1
+- Update to version 0.2.7.
+
+* Fri Nov 03 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-2
+- Rebuild for granite soname bump.
+
+* Mon Sep 18 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.6-1
+- Update to version 0.2.6.
+
+* Sat Aug 05 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.5-1
+- Update to version 0.2.5.
+- Include fedora-specific blacklist adapted from elementaryOS.
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Tue Jul 04 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.4-1
+- Update to version 0.2.4.
+
+* Thu Jun 01 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.3-1
+- Update to version 0.2.3.
+
+* Mon May 22 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.2-1
+- Update to version 0.2.2.
+
+* Sat May 20 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2.1-1
+- Update to version 0.2.1.
+
+* Wed May 17 2017 Fabio Valentini <decathorpe@gmail.com> - 0.2-1
+- Update to version 0.2.
+
+* Thu Mar 16 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.4-1
+- Update to version 0.1.4.
+- Depend on generic icon again, since it _should_ work.
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.3-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Fri Jan 27 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-7
+- Add patch to rename generic icon to something branded.
+
+* Wed Jan 25 2017 Fabio Valentini <decathorpe@gmail.com>
+- Remove explicit BR: /usr/bin/pkgconfig.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-6
+- Explicitly depend on /usr/bin/pkg-config.
+
+* Mon Jan 23 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-5
+- Add missing scriptlets.
+
+* Sat Jan 21 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-4
+- Include icon to fix appdata metadata generation.
+
+* Tue Jan 10 2017 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-3
+- Clean up spec file.
+
+* Sat Dec 24 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-2
+- Enable libunity support.
+
+* Mon Dec 05 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.3-1
+- Update to version 0.1.3.
+
+* Sun Nov 20 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-2
+- Build out of tree.
+
+* Sat Oct 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.2-1
+- Update to version 0.1.2.
+
+* Fri Oct 07 2016 Neal Gompa <ngompa13@gmail.com> - 0.1.1-4
+- Add patch to support AppStream 0.10.0 in F25 (LP#1626398)
+
+* Thu Sep 29 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-3
+- Mass rebuild.
+
+* Wed Sep 28 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-2
+- Spec file cleanups.
+
+* Tue Sep 27 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1.1-1
+- Update to version 0.1.1.
+
+* Sat Sep 17 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-2
+- Require PackageKit.
+
+* Thu Aug 18 2016 Fabio Valentini <decathorpe@gmail.com> - 0.1-1
+- Update to version 0.1.
+
@@ -0,0 +1,311 @@
+commit fce55d9373bfb82953191b32e276a2129ffcb8c1
+Author: Marius Meisenzahl <meisenzahl@users.noreply.github.com>
+Date:   Wed Feb 7 00:14:43 2024 +0100
+
+    Add support for AppStream 1.0 (#2099)
+
+diff --git a/src/Core/FlatpakBackend.vala b/src/Core/FlatpakBackend.vala
+index 98931505..10f2baab 100644
+--- a/src/Core/FlatpakBackend.vala
+++ b/src/Core/FlatpakBackend.vala
+@@ -400,8 +400,13 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+ 
+         var category_array = new GLib.GenericArray<AppStream.Category> ();
+         category_array.add (category);
+#if HAS_APPSTREAM_1_0
+        AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components ().as_array (), category_array, false);
+        AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components ().as_array (), category_array, false);
+#else
+         AppStream.utils_sort_components_into_categories (user_appstream_pool.get_components (), category_array, false);
+         AppStream.utils_sort_components_into_categories (system_appstream_pool.get_components (), category_array, false);
+#endif
+         components = category.get_components ();
+ 
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+@@ -417,13 +422,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+         var comps = user_appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 apps.add_all (packages);
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 foreach (var package in packages) {
+                     if (package in cat_packages) {
+@@ -435,13 +448,21 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+ 
+         comps = system_appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 apps.add_all (packages);
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var packages = get_packages_for_component_id (comp.get_id ());
+                 foreach (var package in packages) {
+                     if (package in cat_packages) {
+@@ -510,7 +531,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+                 continue;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            if (package.component.get_developer ().get_name () == author) {
+#else
+             if (package.component.developer_name == author) {
+#endif
+                 package_ids.add (package.component.id);
+ 
+                 AppCenterCore.Package? user_package = null;
+@@ -1095,7 +1120,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
+         } finally {
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            user_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             user_appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+@@ -1133,7 +1162,11 @@ public class AppCenterCore.FlatpakBackend : Backend, Object {
+             warning ("Errors found in flatpak appdata, some components may be incomplete/missing: %s", e.message);
+         } finally {
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            system_appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             system_appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+diff --git a/src/Core/Package.vala b/src/Core/Package.vala
+index 0f9a90c4..ed141292 100644
+--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
+@@ -306,7 +306,11 @@ public class AppCenterCore.Package : Object {
+                 return _author;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            _author = component.get_developer ().get_name ();
+#else
+             _author = component.developer_name;
+#endif
+ 
+             if (_author == null) {
+                 var project_group = component.project_group;
+@@ -677,7 +681,11 @@ public class AppCenterCore.Package : Object {
+             }
+ 
+             try {
+#if HAS_APPSTREAM_1_0
+                description = AppStream.markup_convert (description, TEXT);
+#else
+                 description = AppStream.markup_convert_simple (description);
+#endif
+             } catch (Error e) {
+                 warning ("Failed to convert description to markup: %s", e.message);
+             }
+@@ -919,7 +927,11 @@ public class AppCenterCore.Package : Object {
+     }
+ 
+     public AppStream.Release? get_newest_release () {
+#if HAS_APPSTREAM_1_0
+        var releases = component.get_releases_plain ().get_entries ();
+#else
+         var releases = component.get_releases ();
+#endif
+         releases.sort_with_data ((a, b) => {
+             if (a.get_version () == null || b.get_version () == null) {
+                 if (a.get_version () != null) {
+diff --git a/src/Core/PackageKitBackend.vala b/src/Core/PackageKitBackend.vala
+index 09da4074..a108831e 100644
+--- a/src/Core/PackageKitBackend.vala
+++ b/src/Core/PackageKitBackend.vala
+@@ -275,7 +275,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+         } finally {
+             var new_package_list = new Gee.HashMap<string, Package> ();
+             var comp_validator = ComponentValidator.get_default ();
+#if HAS_APPSTREAM_1_0
+            appstream_pool.get_components ().as_array ().foreach ((comp) => {
+#else
+             appstream_pool.get_components ().foreach ((comp) => {
+#endif
+                 if (!comp_validator.validate (comp)) {
+                     return;
+                 }
+@@ -317,7 +321,12 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+             component.set_id (id);
+             component.set_origin (Package.APPCENTER_PACKAGE_ORIGIN);
+ 
+-#if HAS_APPSTREAM_0_15
+#if HAS_APPSTREAM_1_0
+            var components = new AppStream.ComponentBox (AppStream.ComponentBoxFlags.NONE);
+            components.add (component);
+
+            appstream_pool.add_components (components);
+#elif HAS_APPSTREAM_0_15
+             var components = new GenericArray<AppStream.Component> ();
+             components.add (component);
+ 
+@@ -430,7 +439,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+                 break;
+             }
+ 
+#if HAS_APPSTREAM_1_0
+            if (package.component.get_developer ().get_name () == author) {
+#else
+             if (package.component.developer_name == author) {
+#endif
+                 packages.add (package);
+             }
+         }
+@@ -447,7 +460,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+ 
+         var category_array = new GLib.GenericArray<AppStream.Category> ();
+         category_array.add (category);
+#if HAS_APPSTREAM_1_0
+        AppStream.utils_sort_components_into_categories (appstream_pool.get_components ().as_array (), category_array, true);
+#else
+         AppStream.utils_sort_components_into_categories (appstream_pool.get_components (), category_array, true);
+#endif
+         components = category.get_components ();
+ 
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+@@ -465,7 +482,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+         var apps = new Gee.TreeSet<AppCenterCore.Package> ();
+         var comps = appstream_pool.search (query);
+         if (category == null) {
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var package = get_package_for_component_id (comp.get_id ());
+                 if (package != null) {
+                     apps.add (package);
+@@ -473,7 +494,11 @@ public class AppCenterCore.PackageKitBackend : Backend, Object {
+             });
+         } else {
+             var cat_packages = get_applications_for_category (category);
+#if HAS_APPSTREAM_1_0
+            comps.as_array ().foreach ((comp) => {
+#else
+             comps.foreach ((comp) => {
+#endif
+                 var package = get_package_for_component_id (comp.get_id ());
+                 if (package != null && package in cat_packages) {
+                     apps.add (package);
+diff --git a/src/Views/AppInfoView.vala b/src/Views/AppInfoView.vala
+index 5a3a361a..bef37f0e 100644
+--- a/src/Views/AppInfoView.vala
+++ b/src/Views/AppInfoView.vala
+@@ -310,8 +310,16 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+                 oars_flowbox.add (uncurated);
+             }
+ #endif
+
+#if HAS_APPSTREAM_1_0
+            var active_locale = "en-US";
+            if (package_component.get_context () != null) {
+                active_locale = package_component.get_context ().get_locale () ?? "en-US";
+            }
+#else
+             var active_locale = package_component.get_active_locale ();
+-            if (active_locale != "en_US") {
+#endif
+            if (active_locale != "en_US" && active_locale != "en-US") {
+                 var percent_translated = package_component.get_language (
+                     // Expects language without locale
+                     active_locale.split ("_")[0]
+@@ -492,7 +500,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+             }
+         }
+ 
+#if HAS_APPSTREAM_1_0
+        screenshots = package_component.get_screenshots_all ();
+#else
+         screenshots = package_component.get_screenshots ();
+#endif
+ 
+         if (screenshots.length > 0) {
+             screenshot_carousel = new Hdy.Carousel () {
+@@ -1030,7 +1042,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+             get_app_download_size.begin ();
+ 
+             Idle.add (() => {
+#if HAS_APPSTREAM_1_0
+                var releases = package.component.get_releases_plain ().get_entries ();
+#else
+                 var releases = package.component.get_releases ();
+#endif
+ 
+                 foreach (unowned var release in releases) {
+                     if (release.get_version () == null) {
+@@ -1049,7 +1065,11 @@ public class AppCenter.Views.AppInfoView : AppCenter.AbstractAppContainer {
+ 
+                         release_carousel.add (release_row);
+ 
+#if HAS_APPSTREAM_1_0
+                        if (package.installed && AppStream.vercmp_simple (release.get_version (), package.get_version ()) <= 0) {
+#else
+                         if (package.installed && AppStream.utils_compare_versions (release.get_version (), package.get_version ()) <= 0) {
+#endif
+                             break;
+                         }
+                     }
+diff --git a/src/Widgets/ReleaseRow.vala b/src/Widgets/ReleaseRow.vala
+index 3b487914..36fcbc76 100644
+--- a/src/Widgets/ReleaseRow.vala
+++ b/src/Widgets/ReleaseRow.vala
+@@ -116,7 +116,11 @@ public class AppCenter.Widgets.ReleaseRow : Gtk.Box {
+     private string format_release_description (string? description ) {
+         if (description != null) {
+             try {
+#if HAS_APPSTREAM_1_0
+                var markup = AppStream.markup_convert (description, TEXT);
+#else
+                 var markup = AppStream.markup_convert_simple (description);
+#endif
+ 
+                 if (markup.strip () != "") {
+                     return markup;
+diff --git a/src/meson.build b/src/meson.build
+index d3d558ef..df69a0bf 100644
+--- a/src/meson.build
+++ b/src/meson.build
+@@ -78,6 +78,10 @@ if appstream.version().version_compare('>=0.16')
+     args += '--define=HAS_APPSTREAM_0_16'
+ endif
+ 
+if appstream.version().version_compare('>=1.0')
+    args += '--define=HAS_APPSTREAM_1_0'
+endif
+
+ if get_option('packagekit_backend')
+     appcenter_files += files(
+         'Core/PackageKitBackend.vala',
@@ -0,0 +1 @@
+rpm.version(gh("elementary/appcenter"));
@@ -1,6 +1,6 @@
 Name:           contractor
 Version:        0.3.5
-Release:        %autorelease
+Release:        1%{?dist}
 Summary:        Desktop-wide extension service

 License:        GPL-3.0-or-later
@@ -3,8 +3,8 @@

 Name:           elementary-calculator
 Summary:        Calculator app designed for elementary
-Version:        2.0.2
-Release:        2%{?dist}
+Version:        2.0.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -5,15 +5,13 @@

 Name:           elementary-calendar
 Summary:        Desktop calendar app designed for elementary
-Version:        6.1.2
-Release:        2%{?dist}
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/calendar
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

-Patch0:         https://patch-diff.githubusercontent.com/raw/elementary/calendar/pull/758.patch
-
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -21,6 +19,8 @@ BuildRequires:  pkgconfig(champlain-0.12)
 BuildRequires:  pkgconfig(libecal-2.0)
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(libhandy-1)
+# BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk3)
 BuildRequires:  folks-devel
 BuildRequires:  libgee-devel
 BuildRequires:  pkgconfig(geocode-glib-2.0)
@@ -69,20 +69,17 @@ This package contains the development files.


 %check
-desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
-desktop-file-validate \
-    %{buildroot}/%{_datadir}/applications/%{appname}.desktop
+%dnl desktop-file-validate %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+desktop-file-validate %{buildroot}/%{_datadir}/applications/%{appname}.desktop

-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %files -f %{appname}.lang
 %doc README.md
 %license COPYING

-%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}-daemon.desktop

 %{_bindir}/%{appname}

@@ -92,7 +89,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml

 %files devel
 %{_includedir}/%{name}/
@@ -5,8 +5,8 @@

 Name:           elementary-code
 Summary:        Code editor from elementary
-Version:        7.0.0
-Release:        3%{?dist}
+Version:        7.2.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{srcname}
@@ -90,6 +90,7 @@ This package contains the development headers.
 %{_datadir}/gtksourceview-4/styles/elementary-light.xml
 %{_datadir}/metainfo/io.elementary.code.metainfo.xml
 %{_datadir}/polkit-1/actions/%{appname}.policy
+%{_mandir}/man1/%{appname}.1.gz

 %files devel
 %{_includedir}/codecore.h
@@ -5,8 +5,8 @@

 Name:           elementary-files
 Summary:        File manager from elementary
-Version:        6.3.1
-Release:        2%{?dist}
+Version:        6.5.3
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/%{srcname}
@@ -101,7 +101,7 @@ desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %post portal
@@ -127,7 +127,7 @@ appstream-util validate-relax --nonet \
 %{_datadir}/dbus-1/services/%{appname}.service
 %{_datadir}/dbus-1/services/%{appname}.Filemanager1.service
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 %{_datadir}/polkit-1/actions/%{appname}.policy

 %files portal
@@ -3,14 +3,15 @@

 Name:           elementary-greeter
 Summary:        LightDM Login Screen for the elementary desktop
-Version:        6.1.1
-Release:        3%{?dist}
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/greeter
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
 Source1:        40-%{appname}.conf
-Patch0:         https://github.com/elementary/greeter/compare/93bbca3..1b3879d.patch
+
+Patch0:         https://github.com/elementary/greeter/compare/7.0.0..42320c266395606b0c20782603e7407124c3f7a4.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -35,9 +36,9 @@ BuildRequires:  pkgconfig(granite) >= 5.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(liblightdm-gobject-1)
-BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-12)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)
 BuildRequires:  pkgconfig(x11)

 Provides:       pantheon-greeter = %{version}-%{release}
@@ -69,7 +70,7 @@ The elementary Greeter is a styled Login Screen for LightDM.


 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -p1 -n %{srcname}-%{version}


 %build
@@ -90,8 +91,7 @@ install -pm 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/


 %check
-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %files -f %{appname}.lang
@@ -105,7 +105,7 @@ appstream-util validate-relax --nonet \
 %{_sbindir}/%{appname}

 %{_datadir}/xgreeters/%{appname}.desktop
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 %{_datadir}/lightdm/lightdm.conf.d/40-%appname.conf


@@ -3,7 +3,7 @@

 Name:           elementary-icon-theme
 Summary:        Icons from the Elementary Project
-Version:        7.3.0
+Version:        7.3.1
 Release:        2%{?dist}
 License:        GPL-3.0-or-later

@@ -72,7 +72,7 @@ touch %{buildroot}/%{_datadir}/icons/elementary/icon-theme.cache
 %check
 # ignore validation until appstream-glib knows the "icon-theme" component type
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml || :
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml || :


 %transfiletriggerin -- %{_datadir}/icons/elementary
@@ -89,14 +89,12 @@ gtk-update-icon-cache --force %{_datadir}/icons/elementary &>/dev/null || :
 %dir %{_datadir}/icons/elementary
 %ghost %{_datadir}/icons/elementary/icon-theme.cache

-%{_datadir}/icons/elementary/*/
-%{_datadir}/icons/elementary/*@2x
-%{_datadir}/icons/elementary/*@3x
+%{_datadir}/icons/elementary/*

 %{_datadir}/icons/elementary/cursor.theme
 %{_datadir}/icons/elementary/index.theme

-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml

 %files gimp-palette
 %{_datadir}/gimp/2.0/palettes/elementary.gpl
@@ -3,8 +3,8 @@


 Name:           elementary-notifications
-Version:        6.0.3
-Release:        2%{?dist}
+Version:        7.0.1
+Release:        1%{?dist}
 Summary:        GTK Notification server for Pantheon

 License:        GPL-3.0
@@ -42,6 +42,10 @@ Provides:      %{name} = %{version}-%{release}
 %meson_install


+%check
+appstream-util validate-relax --nonet %buildroot%_datadir/metainfo/%appname.metainfo.xml
+
+
 %files
 %license LICENSE
 %doc README.md
@@ -52,7 +56,7 @@ Provides:      %{name} = %{version}-%{release}

 %config %{_sysconfdir}/xdg/autostart/%{appname}.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_metainfodir}/%{appname}.appdata.xml
+%{_metainfodir}/%{appname}.metainfo.xml


 %changelog
@@ -3,7 +3,7 @@

 Name:           elementary-onboarding
 Summary:        Onboarding app for new users
-Version:        7.1.0
+Version:        7.2.0
 Release:        2%{?dist}
 License:        GPL-3.0-or-later

@@ -12,15 +12,19 @@ License:        LGPL-2.0-or-later
 URL:            https://github.com/elementary/photos
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+# RIP the publishing plugins (sorry for the "wide" patch, having issues with just the relevant commits)
+Patch0:         https://github.com/elementary/photos/compare/7261606a05d1f41116aba5c86b62d1f739419ed1..09e55943b266bc2861b913251cb834169d81743e.patch
+
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson >= 0.46.0
 BuildRequires:  vala
 BuildRequires:  fdupes
+BuildRequires:  git-core

 BuildRequires:  pkgconfig(gee-0.8) >= 0.8.5
-BuildRequires:  pkgconfig(geocode-glib-1.0)
+BuildRequires:  pkgconfig(geocode-glib-2.0)
 BuildRequires:  pkgconfig(gexiv2) >= 0.4.90
 BuildRequires:  pkgconfig(gio-2.0) >= 2.20
 BuildRequires:  pkgconfig(gio-unix-2.0) >= 2.20
@@ -33,17 +37,12 @@ BuildRequires:  pkgconfig(gstreamer-plugins-base-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0) >= 1.0.0
 BuildRequires:  pkgconfig(gtk+-3.0) >= 3.6.0
 BuildRequires:  pkgconfig(gudev-1.0) >= 145
-BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libexif) >= 0.6.16
 BuildRequires:  pkgconfig(libgphoto2) >= 2.4.2
 BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libraw) >= 0.13.2
-BuildRequires:  pkgconfig(libsoup-2.4) >= 2.26.0
 BuildRequires:  pkgconfig(libwebp) >= 0.4.4
-BuildRequires:  pkgconfig(libxml-2.0) >= 2.6.32
-BuildRequires:  pkgconfig(rest-0.7) >= 0.7
 BuildRequires:  pkgconfig(sqlite3) >= 3.5.9
-BuildRequires:  pkgconfig(webkit2gtk-4.0) >= 2.0.0

 Requires:       hicolor-icon-theme

@@ -53,7 +52,8 @@ Foundation.


 %prep
-%autosetup -n %{srcname}-%{version} -p1
+%autosetup -n %{srcname}-%{version} -N
+git apply %PATCH0 # The .patch file has Git binary patches, so we need to apply it manually with Git


 %build
@@ -94,7 +94,6 @@ appstream-util validate-relax --nonet \
 %{_datadir}/applications/%{appname}.desktop
 %{_datadir}/applications/%{appname}-viewer.desktop
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/glib-2.0/schemas/%{appname}-extras.gschema.xml
 %{_datadir}/icons/hicolor/*/apps/%{appname}.svg
 %{_datadir}/icons/hicolor/*/apps/%{appname}-viewer.svg
 %{_datadir}/metainfo/%{appname}.appdata.xml
@@ -3,8 +3,8 @@
 %global iface   io.elementary.SettingsDaemon.AccountsService

 Name:           elementary-settings-daemon
-Version:        1.2.0
-Release:        2%{?dist}
+Version:        1.3.1
+Release:        1%{?dist}
 Summary:        Settings Daemon and Portal for Pantheon
 License:        GPL-3.0-or-later

@@ -25,6 +25,7 @@ BuildRequires:  pkgconfig(glib-2.0)
 BuildRequires:  pkgconfig(granite) >= 5.3.0
 BuildRequires:  pkgconfig(libgeoclue-2.0)
 BuildRequires:  pkgconfig(systemd)
+BuildRequires:  pkgconfig(fwupd)

 Requires:       xdg-desktop-portal

@@ -47,25 +48,27 @@ Requires:       xdg-desktop-portal

 %check
 desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/%{appname}.desktop
+    %{buildroot}/%{_datadir}/applications/%{appname}.desktop

 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{appname}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{appname}.metainfo.xml


 %post
 %systemd_user_post %{appname}.xdg-desktop-portal.service
+%systemd_post %{appname}.check-for-firmware-updates.timer


 %preun
 %systemd_user_preun %{appname}.xdg-desktop-portal.service
+%systemd_preun %{appname}.check-for-firmware-updates.timer


 %files
 %license LICENSE
 %doc README.md

-%config(noreplace) %{_sysconfdir}/xdg/autostart/%{appname}.desktop
+%config(noreplace) %{_datadir}/applications/%{appname}.desktop

 %{_bindir}/%{appname}

@@ -75,10 +78,16 @@ appstream-util validate-relax --nonet \
 %{_datadir}/dbus-1/interfaces/%{iface}.xml
 %{_datadir}/dbus-1/services/org.freedesktop.impl.portal.desktop.elementary.settings-daemon.service
 %{_datadir}/glib-2.0/schemas/%{appname}.gschema.xml
-%{_datadir}/metainfo/%{appname}.appdata.xml
+%{_datadir}/metainfo/%{appname}.metainfo.xml
 %{_datadir}/xdg-desktop-portal/portals/%{appname}.portal

 %{_userunitdir}/%{appname}.xdg-desktop-portal.service
+%{_unitdir}/%{appname}.check-for-firmware-updates.service
+%{_unitdir}/%{appname}.check-for-firmware-updates.timer
+
+%{_sysconfdir}/xdg/autostart/%appname.desktop
+
+%{_datadir}/icons/hicolor/*/apps/%{appname}.svg


 %changelog
@@ -3,8 +3,8 @@
 
 Name:           elementary-sideload
 Summary:        Sideload flatpaks on Pantheon
-Version:        6.2.0
-Release:        2%{?dist}
+Version:        6.2.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later
 
 URL:            https://github.com/elementary/sideload
@@ -3,8 +3,8 @@

 Name:           elementary-theme
 Summary:        Elementary GTK+ Stylesheet
-Version:        7.2.0
-Release:        2%{?dist}
+Version:        7.3.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/stylesheet
@@ -3,8 +3,8 @@

 Name:           elementary-videos
 Summary:        Video player and library app from elementary
-Version:        2.9.1
-Release:        2%{?dist}
+Version:        3.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%{srcname}
@@ -2,15 +2,17 @@

 Name:           gala
 Summary:        Gala window manager
-Version:        7.0.3
+Version:        7.1.3
 Release:        2%{?dist}
 License:        GPL-3.0-or-later
+Epoch:          1

 URL:            https://github.com/elementary/gala
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz

 # patch some default settings to better match Fedora
 Patch0:         0000-Modify-default-settings-for-Fedora.patch
+Patch:          https://github.com/elementary/gala/compare/7.1.3..43d1e6a01b56a84a4e752e1970a35c19402941eb.patch

 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
@@ -31,11 +33,13 @@ BuildRequires:  pkgconfig(granite) >= 5.4.0
 BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libbamf3)
 BuildRequires:  pkgconfig(libcanberra)
-BuildRequires:  pkgconfig(mutter-clutter-12)
-BuildRequires:  pkgconfig(mutter-cogl-12)
-BuildRequires:  pkgconfig(mutter-cogl-pango-12)
+BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(sqlite3)
+BuildRequires:  pkgconfig(mutter-clutter-14)
+BuildRequires:  pkgconfig(mutter-cogl-14)
+BuildRequires:  pkgconfig(mutter-cogl-pango-14)

-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 # gala provides a generic icon (apps/multitasking-view)
 Requires:       hicolor-icon-theme
@@ -61,7 +65,7 @@ This package contains the shared libraries.

 %package        devel
 Summary:        Gala window manager development files
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{epoch}:%{version}-%{release}

 %description    devel
 Gala is Pantheon's Window Manager, part of the elementary project.
@@ -85,20 +89,20 @@ This package contains the development headers.


 %check
-desktop-file-validate \
-    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl desktop-file-validate \
+%dnl    %{buildroot}/%{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 desktop-file-validate \
    %{buildroot}/%{_datadir}/applications/gala*.desktop

 #appstream-util validate-relax --nonet \
-#    %%{buildroot}/%%{_datadir}/metainfo/%%{name}.appdata.xml
+#    %%{buildroot}/%%{_datadir}/metainfo/%%{name}.metainfo.xml


 %files -f gala.lang
 %doc README.md
 %license COPYING
-%config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop
+%dnl %config(noreplace) %{_sysconfdir}/xdg/autostart/gala-daemon.desktop

 %{_bindir}/gala
 %{_bindir}/gala-daemon
@@ -108,7 +112,7 @@ desktop-file-validate \
 %{_datadir}/applications/gala*.desktop
 %{_datadir}/glib-2.0/schemas/20_elementary.pantheon.wm.gschema.override
 %{_datadir}/glib-2.0/schemas/org.pantheon.desktop.gala.gschema.xml
-%{_datadir}/metainfo/%{name}.appdata.xml
+%{_datadir}/metainfo/%{name}.metainfo.xml

 %files libs
 %doc AUTHORS README.md
@@ -5,8 +5,8 @@ apps built for elementary.}

 Name:           granite-7
 Summary:        Elementary companion library for GTK+ and GLib
-Version:        7.3.0
-Release:        2%{?dist}
+Version:        7.4.0
+Release:        1%{?dist}
 License:        LGPL-3.0-or-later

 URL:            https://github.com/elementary/granite
@@ -13,10 +13,11 @@ BuildArch:      noarch

 Requires:       elementary-settings-daemon
 Requires:       gala
+# Gala has a hard runtime dependency on... GNOME Disks' DBus service!?!
 Requires:       gnome-disk-utility
 Requires:       gnome-keyring
 Requires:       gnome-session
-Requires:       gnome-session-xsession
+#Requires:       gnome-session-xsession  # this pulls in gnome-shell
 Requires:       gnome-settings-daemon
 Requires:       orca
 Requires:       pantheon-agent-geoclue2
@@ -41,6 +42,8 @@ Requires:       elementary-sound-theme
 Requires:       elementary-theme
 Requires:       open-sans-fonts

+Source1:        https://github.com/elementary/default-settings/raw/master/xdg-desktop-portal/pantheon-portals.conf
+
 %description
 Configuration files and settings overrides for the Pantheon desktop session.

@@ -84,6 +87,9 @@ mkdir -p %{buildroot}/%{_datadir}/accountsservice/interfaces
 ln -s ../../dbus-1/interfaces/io.elementary.pantheon.AccountsService.xml \
    %{buildroot}/%{_datadir}/accountsservice/interfaces/io.elementary.pantheon.AccountsService.xml

+mkdir -p %{buildroot}/%{_datadir}/xdg-desktop-portal
+install -m 644 %{SOURCE1} %{buildroot}/%{_datadir}/xdg-desktop-portal/
+

 # these scriptlets are apparently still necessary, because
 # .override files don't seem to trigger schema recompilation
@@ -109,6 +115,7 @@ fi
 %{_datadir}/gnome-session/sessions/pantheon.session
 %{_datadir}/polkit-1/actions/io.elementary.pantheon.AccountsService.policy
 %{_datadir}/xsessions/pantheon.desktop
+%{_datadir}/xdg-desktop-portal/pantheon-portals.conf


 %changelog
@@ -1,5 +1,5 @@
 Name:			pantheon-tweaks
-Version:		1.1.0
+Version:		1.1.2
 Release:		1%{?dist}
 Summary:		A system settings panel for the Pantheon desktop environment
 License:		GPL-3.0
@@ -9,7 +9,7 @@
 Name:           switchboard-plug-a11y
 Summary:        Switchboard Accessibility plug
 Version:        2.3.0
-Release:        5%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-a11y
@@ -9,12 +9,14 @@
 Name:           switchboard-plug-about
 Summary:        Switchboard System Information plug
 Version:        6.2.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-about
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz

+Patch0:         https://github.com/elementary/switchboard-plug-about/compare/6.2.0..72d7da13da2824812908276751fd3024db2dd0f8.patch
+
 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
 BuildRequires:  meson
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-applications
 Summary:        Switchboard Applications plug
-Version:        6.0.1
-Release:        4%{?dist}
+Version:        7.0.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-applications
@@ -25,7 +25,9 @@ BuildRequires:  pkgconfig(flatpak) >= 1.1.2
 BuildRequires:  pkgconfig(glib-2.0) >= 2.34
 BuildRequires:  pkgconfig(granite)
 BuildRequires:  pkgconfig(gtk+-3.0)
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(switchboard-2.0)
+BuildRequires:  pkgconfig(libhandy-1)

 Requires:       switchboard%{?_isa}
 Supplements:    switchboard%{?_isa}
@@ -47,15 +49,16 @@ that allows the user to manage application settings.
 %install
 %meson_install
 %fdupes %buildroot%_datadir/locale/
+mv %buildroot%_datadir/metainfo/%plug_rdnn.appdata.xml %buildroot%_datadir/metainfo/%plug_rdnn.metainfo.xml || true
 %find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+sed -i '/icon type="stock"/d' %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %files -f %{plug_name}-plug.lang
@@ -64,7 +67,8 @@ appstream-util validate-relax --nonet \

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
+%{_datadir}/icons/hicolor/*/apps/io.elementary.settings.applications.svg


 %changelog
@@ -9,7 +9,7 @@
 Name:           switchboard-plug-bluetooth
 Summary:        Switchboard Bluetooth plug
 Version:        2.3.6
-Release:        4%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-bluetooth
@@ -9,7 +9,7 @@
 Name:           switchboard-plug-datetime
 Summary:        Switchboard Date & Time Plug
 Version:        2.2.0
-Release:        2%{?dist}
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-datetime
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-display
 Summary:        Switchboard Display plug
-Version:        2.3.3
-Release:        2%{?dist}
+Version:        7.0.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-display
@@ -52,7 +52,7 @@ them.

 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %files -f %{plug_name}-plug.lang
@@ -61,7 +61,7 @@ appstream-util validate-relax --nonet \

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %changelog
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-keyboard
 Summary:        Switchboard Keyboard plug
-Version:        3.1.1
-Release:        2%?dist
+Version:        3.2.1
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-keyboard
@@ -59,7 +59,7 @@ same time. Keyboard shortcuts are also part of this plug.

 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %files -f %{plug_name}-plug.lang
@@ -67,8 +67,8 @@ appstream-util validate-relax --nonet \
 %license COPYING

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so
-
-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+%{_datadir}/glib-2.0/schemas/keyboard.gschema.xml
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %changelog
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-networking
 Summary:        Switchboard Networking plug
-Version:        2.4.4
-Release:        2%{?dist}
+Version:        2.5.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-network
@@ -6,8 +6,8 @@

 Name:           switchboard-plug-onlineaccounts
 Summary:        Switchboard Online Accounts plug
-Version:        6.5.2
-Release:        2%{?dist}
+Version:        6.5.3
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-onlineaccounts
@@ -53,19 +53,19 @@ Manage online accounts and connected applications.
 %find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %check
 appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %files -f %{plug_name}-plug.lang
 %license LICENSE
 %doc README.md

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml
 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so


@@ -0,0 +1,23 @@
+From a3be778d1c4137d30af6ed9a08d0b54ee828687f Mon Sep 17 00:00:00 2001
+From: madomado <madonuko@outlook.com>
+Date: Tue, 21 Nov 2023 19:45:14 +0800
+Subject: [PATCH] fix(wallpaper): change wallpaper for dark theme settings
+
+Previously before the fix, the wallpaper cannot be changed via settings because it only sets the wallpaper for the light theme, not the dark theme.
+This fixes the issue.
+---
+ src/Views/Wallpaper.vala | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Views/Wallpaper.vala b/src/Views/Wallpaper.vala
+index 07251444..7141cad8 100644
+--- a/src/Views/Wallpaper.vala
+++ b/src/Views/Wallpaper.vala
+@@ -206,6 +206,7 @@ public class PantheonShell.Wallpaper : Gtk.Box {
+         }
+ 
+         gnome_background_settings.set_string ("picture-uri", uri);
+        gnome_background_settings.set_string ("picture-uri-dark", uri);
+     }
+ 
+     private void update_checked_wallpaper (Gtk.FlowBox box, Gtk.FlowBoxChild child) {
@@ -8,12 +8,13 @@

 Name:           switchboard-plug-pantheon-shell
 Summary:        Switchboard Pantheon Shell plug
-Version:        6.4.0
-Release:        2%{?dist}
+Version:        6.5.0
+Release:        1%{?dist}
 License:        GPL-3.0

 URL:            https://github.com/elementary/switchboard-plug-pantheon-shell
 Source0:        %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz
+Patch0:         dark-theme-wallpaper.patch

 BuildRequires:  gettext
 BuildRequires:  libappstream-glib
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-security-privacy
 Summary:        Switchboard Security & Privacy Plug
-Version:        7.0.0
-Release:        1%?dist
+Version:        7.1.0
+Release:        1%{?dist}
 License:        GPL-3.0-or-later

 URL:            https://github.com/elementary/%name
@@ -8,8 +8,8 @@

 Name:           switchboard-plug-sound
 Summary:        Switchboard Sound Plug
-Version:        2.3.2
-Release:        2%?dist
+Version:        2.3.3
+Release:        1%{?dist}
 License:        LGPL-2.0-or-later

 URL:            https://github.com/elementary/switchboard-plug-sound
@@ -27,6 +27,7 @@ BuildRequires:  pkgconfig(gtk+-3.0)
 BuildRequires:  pkgconfig(libcanberra)
 BuildRequires:  pkgconfig(libcanberra-gtk)
 BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libhandy-1)
 BuildRequires:  pkgconfig(libpulse-mainloop-glib)
 BuildRequires:  pkgconfig(switchboard-2.0)

@@ -52,12 +53,11 @@ A sound plug for Switchboard.
 %find_lang %{plug_name}-plug

 # remove the specified stock icon from appdata (invalid in libappstream-glib)
-sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+sed -i '/icon type="stock"/d' %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %check
-appstream-util validate-relax --nonet \
-    %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %files -f %{plug_name}-plug.lang
@@ -66,7 +66,7 @@ appstream-util validate-relax --nonet \

 %{_libdir}/switchboard/%{plug_type}/lib%{plug_name}.so

-%{_datadir}/metainfo/%{plug_rdnn}.appdata.xml
+%{_datadir}/metainfo/%{plug_rdnn}.metainfo.xml


 %changelog
--- a/Show More
+++ b/Show More