Merge branch 'frawhide' into gil/chore/ffmpeg

This commit is contained in:
Gilver
2025-11-16 22:03:39 -06:00
committed by GitHub
39 changed files with 126 additions and 42 deletions
+63
View File
@@ -43,3 +43,66 @@ jobs:
with:
packages: ${{ needs.manifest.outputs.build_matrix }}
publish: ${{ github.event_name == 'push' }}
appstream:
needs: build
runs-on: ubuntu-latest
container:
image: ghcr.io/terrapkg/appstream-generator:main
steps:
- name: Download artifacts
uses: actions/download-artifact@v5
with:
merge-multiple: true
path: ./artifacts
- name: Generate test catalog
# run appstream-builder, then add step summary
run: |
set -x
appstream-builder -v \
--packages-dir=artifacts/rpms \
--icons-dir=icons \
--include-failed \
--output-dir=output \
--uncompressed-icons \
--origin=test \
--basename=test \
--veto-ignore=missing-parents \
--veto-ignore=missing-info 2>&1 | tee asb.log
- name: Export logs
id: export_logs
run: |
echo "## AppStream Builder Log" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo '```log' >> $GITHUB_STEP_SUMMARY
cat asb.log >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
echo '---' >> $GITHUB_STEP_SUMMARY
- name: Report Summary
id: report_summary
run: |
echo "## AppStream Builder Report" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
if grep -q "veto" asb.log; then
echo "::group::Vetoed packages"
echo "### Vetoed packages" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo '```xml' >> $GITHUB_STEP_SUMMARY
echo "$(grep -i 'veto' asb.log)" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
echo "::warning file=asb.log::Some packages were vetoed during AppStream generation. Please review the 'Vetoed packages' section in the summary for details."
echo "::endgroup::"
fi
echo "## Full Data Summary" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo "### Generated Appstream files:" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
for file in output/*.xml.gz; do
echo "#### \`$file\`" >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
echo '```xml' >> $GITHUB_STEP_SUMMARY
zcat "$file" >> $GITHUB_STEP_SUMMARY
echo '```' >> $GITHUB_STEP_SUMMARY
echo "" >> $GITHUB_STEP_SUMMARY
done
+2 -2
View File
@@ -1,9 +1,9 @@
#? https://github.com/flameshot-org/flameshot/blob/master/packaging/rpm/fedora/flameshot.spec
%global ver 13.3.0
%global commit 555d7231efef507f9fc76b21c1333a07916cc792
%global commit 37f3f7f948a5cf00ccfa986aafdc86f95fefc8a6
%global shortcommit %{sub %{commit} 1 7}
%global commit_date 20251116
%global commit_date 20251117
%global devel_name QtColorWidgets
%global _distro_extra_cflags -fuse-ld=mold
%global _distro_extra_cxxflags -fuse-ld=mold
+2 -2
View File
@@ -1,9 +1,9 @@
# Disable X11 for RHEL 10+
%bcond x11 %[%{undefined rhel} || 0%{?rhel} < 10]
%global commit 701201b13c95d00cc894b4f88551b5add740d409
%global commit 0a32f988ba5707a1f9df859b08efe5ba3174b471
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20251116
%global commit_date 20251117
%global ver 0.40.0
Name: mpv-nightly
+1 -1
View File
@@ -1,4 +1,4 @@
%global ver 2025-11-16
%global ver 2025-11-17
%global goodver %(echo %ver | sed 's/-//g')
%global __brp_mangle_shebangs %{nil}
%bcond_without mold
@@ -3,8 +3,8 @@
%global realname hyprutils
%global ver 0.10.2
%global commit e3cae692f6685a4e211d9ea1e7be0001ba8ea7b8
%global commit_date 20251116
%global commit 0c6411851cc779d551edc89b83966696201611aa
%global commit_date 20251117
%global shortcommit %{sub %commit 1 7}
Name: %realname.nightly
+2 -2
View File
@@ -1,6 +1,6 @@
%global commit 1683052e6ce44d206e947c397917b2ab7617c0fe
%global commit b0525a26a684ab2822baaa6c94ee5acd7f50a1d4
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20251116
%global commit_date 20251117
%global ver 0.214.0
%bcond_with check
@@ -1,10 +1,10 @@
%global real_name prismlauncher
%global nice_name PrismLauncher
%global commit 16066c9a15f09f92bb22e44d53e3aafc520f9f70
%global commit 8b4ad7aa49be5bff1473b9242a759945473a3c3b
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20251116
%global commit_date 20251117
%global snapshot_info %{commit_date}.%{shortcommit}
%bcond_without qt6
+2 -2
View File
@@ -11,8 +11,8 @@
# Need to get rid of everything Clang can't use and undefine -Wunused-command-line-argument where possible due to the project's build flags
%global build_cflags %(echo %{build_cflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument
%global build_cxxflags %(echo %{build_cxxflags} | sed 's:-Werror ::g' | sed 's:-Wunused-command-line-argument ::g' | sed 's:-specs\=/usr/lib/rpm/redhat/redhat-annobin-cc1 ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-hardened-ld-errors ::g' | sed 's:-specs=/usr/lib/rpm/redhat/redhat-package-notes ::g') -Wno-unused-command-line-argument
%global commit 0439b62257d6dc060d477fb0694e05001026209e
%global ver 0.0.38-18345
%global commit 42177add17e3386c03a1e798eb6345d37acbf29b
%global ver 0.0.38-18349
Name: rpcs3
Version: %(echo %{ver} | sed 's/-/^/g')
@@ -1,5 +1,5 @@
%global commit ebce8d766b41fbf4d83cf47c1297563a9508ff60
%global commit_date 20251116
%global commit 58da238f50afcdceae317864915a7f9a10ff8fd3
%global commit_date 20251117
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global pypi_name types-colorama
+1 -1
View File
@@ -5,7 +5,7 @@
%global crate bottom
Name: rust-bottom
Version: 0.11.3
Version: 0.11.4
Release: 1%?dist
Summary: Customizable cross-platform graphical process/system monitor for the terminal
@@ -5,7 +5,7 @@
%global crate television
Name: rust-television
Version: 0.13.9
Version: 0.13.10
Release: 1%?dist
Summary: Cross-platform, fast and extensible general purpose fuzzy finder TUI
@@ -7,7 +7,7 @@
%define llvm_compat 20
%endif
%global llvm_version 20.0.0
%global ver 0.16.0-dev.1334+06d08daba
%global ver 0.16.0-dev.1344+bc589c271
%bcond bootstrap 1
%bcond docs %{without bootstrap}
%bcond test 1
+1 -1
View File
@@ -15,7 +15,7 @@
%global mirror_url %(mirrors=%{zig_mirrors}; index=$(( RANDOM % ${#mirrors[@]} )); echo ${mirrors[$index]})
Name: zig-master
Version: 0.16.0~dev.1334+06d08daba
Version: 0.16.0~dev.1344+bc589c271
Release: 1%?dist
Summary: Master builds of the Zig language
License: MIT AND NCSA AND LGPL-2.1-or-later AND LGPL-2.1-or-later WITH GCC-exception-2.0 AND GPL-2.0-or-later AND GPL-2.0-or-later WITH GCC-exception-2.0 AND BSD-3-Clause AND Inner-Net-2.0 AND ISC AND LicenseRef-Fedora-Public-Domain AND GFDL-1.1-or-later AND ZPL-2.1
+1 -1
View File
@@ -3,7 +3,7 @@ project pkg {
spec = "fdk-aac.spec"
}
labels {
subrepo = "extras"
subrepo = "multimedia"
weekly = 1
}
}
+2
View File
@@ -2,8 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "libde265.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+1
View File
@@ -6,5 +6,6 @@ project pkg {
labels {
weekly = 1
mock = 1
subrepo = "multimedia"
}
}
+1 -1
View File
@@ -3,6 +3,6 @@ project pkg {
spec = "openh264.spec"
}
labels {
subrepo = "extras"
subrepo = "multimedia"
}
}
+2 -1
View File
@@ -4,6 +4,7 @@ project pkg {
spec = "rtmpdump.spec"
}
labels {
mock =1
mock = 1
subrepo = "multimedia"
}
}
+2 -2
View File
@@ -2,11 +2,11 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "ffmpeg.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-nvidia"]
extra_repos = ["https://repos.fyralabs.com/terrarawhide-nvidia", "https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
updbranch = 1
mock = 1
subrepo = "extras"
subrepo = "multimedia"
}
}
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gstreamer1-plugin-libav.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
subrepo = "extras"
subrepo = "multimedia"
mock = 1
updbranch = 1
}
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gstreamer1-plugins-bad.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
subrepo = "extras"
subrepo = "multimedia"
mock = 1
updbranch = 1
}
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gstreamer1-plugins-ugly.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
subrepo = "extras"
subrepo = "multimedia"
mock = 1
updbranch = 1
}
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "gstreamer1-vaapi.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
subrepo = "extras"
subrepo = "multimedia"
mock = 1
updbranch = 1
}
+1 -1
View File
@@ -4,6 +4,6 @@ project pkg {
spec = "kvazaar.spec"
}
labels {
mock =1
mock = 1
}
}
+2
View File
@@ -2,8 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "LCEVCdec.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+1
View File
@@ -5,5 +5,6 @@ project pkg {
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+2 -1
View File
@@ -4,6 +4,7 @@ project pkg {
spec = "uavs3d.spec"
}
labels {
mock =1
mock = 1
subrepo = "multimedia"
}
}
+1
View File
@@ -5,5 +5,6 @@ project pkg {
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+1
View File
@@ -5,5 +5,6 @@ project pkg {
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+2 -1
View File
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "x264-bootstrap.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "extras"
subrepo = "multimedia"
}
}
+2 -1
View File
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "x264.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "extras"
subrepo = "multimedia"
}
}
+2 -1
View File
@@ -2,9 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "x265.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "extras"
subrepo = "multimedia"
}
}
+2
View File
@@ -2,8 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "xevd.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "multimedia"
}
}
+2
View File
@@ -2,8 +2,10 @@ project pkg {
arches = ["x86_64", "aarch64", "i386"]
rpm {
spec = "xeve.spec"
extra_repos = ["https://repos.fyralabs.com/terrarawhide-multimedia"]
}
labels {
mock = 1
subrepo = "multimedia"
}
}
@@ -1,7 +1,7 @@
%global commit 4cebd851f5a90dbb11c48eba709ac27fe289ebf1
%global commit 1e0ee7079ab8227441359da5912644de4f4ad395
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20250904
%global ver 0.6.5.1
%global commit_date 20251117
%global ver 0.6.6.2
# We aren't using Mono but RPM expected Mono
%global __requires_exclude_from ^/usr/lib/opentabletdriver/.*$
@@ -1,6 +1,6 @@
%global commit 82dacccf33f4ffe0a8e6fbeea2a0e18780b4186b
%global commit f05e360ed2487b0200fd8326067d320ab1c08f36
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commitdate 20251116
%global commitdate 20251117
%global ver 1.0.18
Name: scx-scheds-nightly
@@ -1,5 +1,5 @@
Name: terra-appstream-helper
Version: 0.1.2
Version: 0.1.3
Release: 1%?dist
Summary: Scripts and RPM macros to help with AppStream metadata generation for Terra
License: GPL-3.0-or-Later
+2 -2
View File
@@ -1,5 +1,5 @@
%global commit f05444fa057e5cc3b700b43cdffc84fd18d1c4ec
%global commit_date 20251027
%global commit 97c7608a47da7a32a5046c8dc86e5cbaca8569a8
%global commit_date 20251117
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%define _unpackaged_files_terminate_build 0
+1 -1
View File
@@ -2,7 +2,7 @@
%global oldpkgname yt-dlp-nightly
Name: yt-dlp-git
Version: 2025.11.16.190803
Version: 2025.11.16.231809
Release: 1%?dist
Summary: A command-line program to download videos from online video platforms