Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(sync): frawhide -> f40 #1959

Merged
merged 2 commits into from
Aug 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions anda/apps/envision/envision.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit 932aa05fbf7e7803a9fe2b4641d845d8b6f1a57c
%global commit_date 20240813
%global commit 96b15c05f027f5ce7c9ee9896823c6e71986c087
%global commit_date 20240819
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: envision
Expand Down
4 changes: 2 additions & 2 deletions anda/apps/mpv/mpv-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit e3f426aa4a29b7c6ebc6c7b6177dee658b956180
%global commit a3baf94ab9f3b43a8027d74c43991a3c2da732e0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240812
%global commit_date 20240817
%global ver 0.38.0

Name: mpv-nightly
Expand Down
4 changes: 4 additions & 0 deletions anda/apps/voicevox/voicevox.spec
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@
# do not strip binaries
%define __strip /bin/true

# do not perform compression in cpio
%define _source_payload w0.ufdio
%define _binary_payload w0.gzdio

# Exclude private libraries
%global __requires_exclude libffmpeg.so
%global __provides_exclude_from %{_datadir}/%{name}/.*\\.so
Expand Down
4 changes: 2 additions & 2 deletions anda/devs/flow/flow-control-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global commit 7f0f8c9ed32942a5543a4268e56ac01eead808b9
%global commit ea31e414ee4b8583cb396e468a74058e65133d72
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240813
%global commit_date 20240819

Name: flow-control-nightly
Version: %commit_date.%shortcommit
Expand Down
6 changes: 3 additions & 3 deletions anda/devs/zed/nightly/zed-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
%global commit 0bc9fc94870a737de25ba28dcb4684f9b2d986b6
%global commit 43e13df9f327c1694eefbfec54cdbb0ec9efaab1
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240813
%global ver 0.149.0
%global commit_date 20240819
%global ver 0.150.0

%bcond_with check

Expand Down
1 change: 0 additions & 1 deletion anda/devs/zed/preview/update.rhai
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
let releases = "https://api.github.com/repos/zed-industries/zed/releases".get().json_arr();
for release in releases {
let tag = release.tag_name;
tag.pop(4); // remove the "-pre" suffix
tag.crop(1); // remove "v"
rpm.global("ver", tag);
break;
Expand Down
8 changes: 4 additions & 4 deletions anda/devs/zed/preview/zed-preview.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%bcond_with check

%global ver 0.149.1
%global ver 0.149.1-pre
# Exclude input files from mangling
%global __brp_mangle_shebangs_exclude_from ^/usr/src/.*$
# Use Mold as the linker
Expand All @@ -10,13 +10,13 @@
%global app_id dev.zed.Zed-Preview

Name: zed-preview
Version: %ver
Version: %(echo %ver | sed 's/-/~/')
Release: pre1%?dist
Summary: Zed is a high-performance, multiplayer code editor

License: MIT
URL: https://zed.dev/
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}-pre.tar.gz
Source0: https://github.com/zed-industries/zed/archive/refs/tags/v%{ver}.tar.gz

Conflicts: zed
Provides: zed
Expand Down Expand Up @@ -44,7 +44,7 @@ BuildRequires: vulkan-loader
Code at the speed of thought - Zed is a high-performance, multiplayer code editor from the creators of Atom and Tree-sitter.

%prep
%autosetup -n %{crate}-%{ver}-pre -p1
%autosetup -n %{crate}-%{ver} -p1
%cargo_prep_online

export DO_STARTUP_NOTIFY="true"
Expand Down
4 changes: 2 additions & 2 deletions anda/games/prismlauncher-nightly/prismlauncher-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
%global real_name prismlauncher
%global nice_name PrismLauncher

%global commit d6a825dd4704172c6115919ff8550d3074b950f9
%global commit efac06379756dff61b6fd05602bf58686f42a1a0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global libnbtplusplus_commit a5e8fd52b8bf4ab5d5bcc042b2a247867589985f

%global commit_date 20240813
%global commit_date 20240819
%global snapshot_info %{commit_date}.%{shortcommit}

%bcond_without qt6
Expand Down
4 changes: 2 additions & 2 deletions anda/langs/nim/nim-nightly/nim-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
%global csrc_commit 561b417c65791cd8356b5f73620914ceff845d10
%global commit c5b206d4ac6704147d9ec27506b9d0171f3a9501
%global commit 2e4d344b43b040a4dce2c478ca13e49979e491fc
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global ver 2.1.9
%global commit_date 20240813
%global commit_date 20240819
%global debug_package %nil

Name: nim-nightly
Expand Down
4 changes: 2 additions & 2 deletions anda/lib/tdlib/tdlib-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit 81dc2e242b6c3ea358dba6b5a750727c378dc098
%global ver 1.8.34
%global commit 9b6ff5863e5d0b2a07b50f4aa1a3344a51a1f80f
%global ver 1.8.35
%global commit_date 20240219
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%global ver 2.0.0
%global commit 2e6d0996c1e7f58889b222ae2fdece110b737433
%global commit_date 20240813
%global commit c036b843513ead56c37463c7fde5875271751f22
%global commit_date 20240817
%global shortcommit %(c=%{commit}; echo ${c:0:7})

Name: openbangla-keyboard-nightly
Expand Down
4 changes: 2 additions & 2 deletions anda/system/cros-keyboard-map/cros-keyboard-map.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global commit 3e3c31c227b3b91572ce4a2591281d16a9753f33
%global commit_date 20240801
%global commit b2e69368f96bdf7562dc1a95a0d863c794756842
%global commit_date 20240814
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global debug_package %{nil}
%define __os_install_post %{nil}
Expand Down
25 changes: 15 additions & 10 deletions anda/system/mesa-freeworld/mesa-freeworld.spec
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ algorithms and decoding only VC1 algorithm.
%global with_radeonsi 1
%global with_vmware 1
%global with_vulkan_hw 0
#global with_vdpau 1
%global with_vdpau 1
%global with_va 1
%if !0%{?rhel}
%global with_r300 1
Expand Down Expand Up @@ -69,7 +69,7 @@ algorithms and decoding only VC1 algorithm.

Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.1.6
%global ver 24.2.0-rc4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
Expand Down Expand Up @@ -173,6 +173,7 @@ BuildRequires: python3-mako
BuildRequires: python3-ply
%endif
BuildRequires: python3-pycparser
BuildRequires: python3-pyyaml
BuildRequires: vulkan-headers
BuildRequires: glslang
%if 0%{?with_vulkan_hw}
Expand Down Expand Up @@ -219,7 +220,7 @@ export RUSTFLAGS="%build_rustflags"
-Ddri3=enabled \
-Dosmesa=false \
%if 0%{?with_hardware}
-Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_kmsro:,kmsro}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
-Dgallium-drivers=swrast,virgl,nouveau%{?with_r300:,r300}%{?with_crocus:,crocus}%{?with_i915:,i915}%{?with_iris:,iris}%{?with_vmware:,svga}%{?with_radeonsi:,radeonsi}%{?with_r600:,r600}%{?with_freedreno:,freedreno}%{?with_etnaviv:,etnaviv}%{?with_tegra:,tegra}%{?with_vc4:,vc4}%{?with_v3d:,v3d}%{?with_lima:,lima}%{?with_panfrost:,panfrost}%{?with_vulkan_hw:,zink} \
%else
-Dgallium-drivers=swrast,virgl \
%endif
Expand Down Expand Up @@ -300,6 +301,7 @@ rm -rf %{buildroot}%{_libdir}/{d3d,EGL,gallium-pipe,libGLX,pkgconfig}
rm -rf %{buildroot}%{_includedir}/{d3dadapter,EGL,GL,KHR}
rm -fr %{buildroot}%{_sysconfdir}/OpenGL
rm -fr %{buildroot}%{_libdir}/libGL.so*
rm -fr %{buildroot}%{_libdir}/libgallium-*.so
rm -fr %{buildroot}%{_libdir}/libglapi.so*
rm -fr %{buildroot}%{_libdir}/libOSMesa.so*
rm -fr %{buildroot}%{_libdir}/pkgconfig/osmesa.pc
Expand All @@ -312,11 +314,6 @@ rm -fr %{buildroot}%{_libdir}/dri/*_dri.so
rm -fr %{buildroot}%{_libdir}/libvulkan*.so
rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so

%if 0%{?with_vdpau}
%else
rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%endif

%if 0%{?with_va}
%files -n %{srcname}-va-drivers-freeworld
%{_libdir}/dri/nouveau_drv_video.so
Expand All @@ -326,6 +323,7 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%if 0%{?with_radeonsi}
%{_libdir}/dri/radeonsi_drv_video.so
%endif
%{_libdir}/dri/libgallium_drv_video.so
%{_libdir}/dri/virtio_gpu_drv_video.so
%{_metainfodir}/org.mesa3d.vaapi.freeworld.metainfo.xml
%license docs/license.rst
Expand All @@ -340,14 +338,21 @@ rm %buildroot%_datadir/metainfo/org.mesa3d.vdpau.freeworld.metainfo.xml
%if 0%{?with_radeonsi}
%{_libdir}/vdpau/libvdpau_radeonsi.so.1*
%endif
%{_libdir}/vdpau/libvdpau_gallium.so.1*
%{_libdir}/vdpau/libvdpau_virtio_gpu.so.1*
%{_metainfodir}/org.mesa3d.vdpau.freeworld.metainfo.xml
%license docs/license.rst
%endif

%changelog
* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.1.5-1
- Update to 24.1.5
* Thu Aug 8 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc4-1
- Update to 24.2.0-rc4

* Fri Aug 02 2024 RPM Fusion Release Engineering <[email protected]> - 24.2.0~rc3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

* Thu Aug 1 2024 Thorsten Leemhuis <[email protected]> - 24.2.0~rc3-1
- Update to 24.2.0-rc3
- Drop upstreamed patch

* Fri Jul 19 2024 Thorsten Leemhuis <[email protected]> - 24.1.4-2
Expand Down
2 changes: 1 addition & 1 deletion anda/system/opentabletdriver/update.rhai
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# todo: Check latest .NET runtime version from Fedora repos and set macros accordingly
// todo: Check latest .NET runtime version from Fedora repos and set macros accordingly

rpm.version(gh("OpenTabletDriver/OpenTabletDriver"));
4 changes: 2 additions & 2 deletions anda/tools/keyd/keyd.spec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Name: keyd
Version: 2.5.0
Release: 2%?dist
Version: 2.4.3
Release: 1%?dist
Summary: Key remapping daemon for linux
URL: https://github.com/rvaiya/keyd
License: MIT
Expand Down
4 changes: 2 additions & 2 deletions anda/tools/yt-dlp/yt-dlp-nightly.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#bcond_without tests
%global commit 49f3741a820ed142f6866317c2e7d247b130960e
%global commit a7d3235c84dac57a127cbe0ff38f7f7c2fdd8fa0
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commit_date 20240813
%global commit_date 20240819
%global ver 2024.08.06

Name: yt-dlp-nightly
Expand Down
Loading