[mesa-freeworld] cleanup and sync with mesa.spec from fedora
by Thorsten Leemhuis
commit 52ea462bb2f94d09be1e9b027842feae7f6bccf7
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu May 9 10:04:41 2024 +0200
cleanup and sync with mesa.spec from fedora
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
mesa-freeworld.spec | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 093aaae..4a59c7f 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -3,10 +3,14 @@
algorithms and decoding only VC1 algorithm.
%ifnarch s390x
%global with_hardware 1
+%global with_radeonsi 1
+%global with_vmware 1
%global with_vulkan_hw 0
%global with_vdpau 1
%global with_va 1
%if !0%{?rhel}
+%global with_r300 1
+%global with_r600 1
%global with_nine 0
%global with_nvk 0
%global with_omx 0
@@ -18,11 +22,11 @@ algorithms and decoding only VC1 algorithm.
%ifarch %{ix86} x86_64
%global with_crocus 0
%global with_i915 0
+%global with_iris 0
+%global with_xa 0
%if !0%{?rhel}
%global with_intel_clc 0
%endif
-%global with_iris 0
-%global with_xa 0
#%%global intel_platform_vulkan ,intel,intel_hasvk
%endif
#%%ifarch x86_64
@@ -44,15 +48,6 @@ algorithms and decoding only VC1 algorithm.
#%%global extra_platform_vulkan ,broadcom,freedreno,panfrost,imagination-experimental
%endif
-%ifnarch s390x
-%if !0%{?rhel}
-%global with_r300 1
-%global with_r600 1
-%endif
-%global with_radeonsi 1
-%global with_vmware 1
-%endif
-
%if !0%{?rhel}
%global with_libunwind 1
%global with_lmsensors 1
@@ -96,11 +91,6 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.97
%if 0%{?with_libunwind}
BuildRequires: pkgconfig(libunwind)
%endif
-BuildRequires: clang-devel
-BuildRequires: bindgen
-BuildRequires: pkgconfig(libclc)
-BuildRequires: pkgconfig(SPIRV-Tools)
-BuildRequires: pkgconfig(LLVMSPIRVLib)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(zlib) >= 1.2.3
BuildRequires: pkgconfig(libzstd)
@@ -145,14 +135,16 @@ BuildRequires: pkgconfig(libomxil-bellagio)
BuildRequires: pkgconfig(libelf)
BuildRequires: pkgconfig(libglvnd) >= 1.3.2
BuildRequires: llvm-devel >= 7.0.0
-%if 0%{?with_opencl} || 0%{?with_nvk}
+%ifarch %{ix86}
BuildRequires: clang-devel
BuildRequires: bindgen
-BuildRequires: rust-packaging
BuildRequires: pkgconfig(libclc)
BuildRequires: pkgconfig(SPIRV-Tools)
BuildRequires: pkgconfig(LLVMSPIRVLib)
%endif
+%if 0%{?with_opencl} || 0%{?with_nvk}
+BuildRequires: rust-packaging
+%endif
%if 0%{?with_nvk}
BuildRequires: cbindgen
BuildRequires: (crate(paste) >= 1.0.14 with crate(paste) < 2)
4 months, 1 week
[mesa-freeworld] Update to 24.1.0-rc3
by Thorsten Leemhuis
commit 2c78522958f64a4cbd562852ffd5948fe0460254
Author: Thorsten Leemhuis <linux(a)leemhuis.info>
Date: Thu May 9 09:43:46 2024 +0200
Update to 24.1.0-rc3
Sync with_intel_vk_rt bits with mesa.spec from fedora
Unconditionally BR clang-devel, bindgen, libclc, SPIRV-Tools, and
LLVMSPIRVLib which are needed now
Signed-off-by: Thorsten Leemhuis <linux(a)leemhuis.info>
.gitignore | 1 +
mesa-freeworld.spec | 22 +++++++++++++++++-----
sources | 2 +-
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 897b5d9..5566da1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,3 +34,4 @@
/mesa-24.0.5.tar.xz
/mesa-24.0.6.tar.xz
/mesa-24.1.0-rc2.tar.xz
+/mesa-24.1.0-rc3.tar.xz
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 5e5b944..093aaae 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -25,6 +25,9 @@ algorithms and decoding only VC1 algorithm.
%global with_xa 0
#%%global intel_platform_vulkan ,intel,intel_hasvk
%endif
+#%%ifarch x86_64
+%global with_intel_vk_rt 0
+#%%endif
%ifarch aarch64 x86_64 %{ix86}
%if !0%{?rhel}
@@ -65,10 +68,10 @@ algorithms and decoding only VC1 algorithm.
Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
-%global ver 24.1.0-rc2
+%global ver 24.1.0-rc3
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist}
-License: MIT
+License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
Source0: https://archive.mesa3d.org/%{srcname}-%{ver}.tar.xz
@@ -93,6 +96,11 @@ BuildRequires: pkgconfig(libdrm) >= 2.4.97
%if 0%{?with_libunwind}
BuildRequires: pkgconfig(libunwind)
%endif
+BuildRequires: clang-devel
+BuildRequires: bindgen
+BuildRequires: pkgconfig(libclc)
+BuildRequires: pkgconfig(SPIRV-Tools)
+BuildRequires: pkgconfig(LLVMSPIRVLib)
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(zlib) >= 1.2.3
BuildRequires: pkgconfig(libzstd)
@@ -235,6 +243,7 @@ export RUSTFLAGS="%build_rustflags"
%if 0%{?with_intel_clc}
-Dintel-clc=enabled \
%endif
+ -Dintel-rt=%{!?with_intel_vk_rt:enabled}%{?with_intel_vk_rt:disabled} \
-Dmicrosoft-clc=disabled \
-Dllvm=enabled \
-Dshared-llvm=enabled \
@@ -251,9 +260,6 @@ export RUSTFLAGS="%build_rustflags"
%ifarch %{ix86}
-Dglx-read-only-text=true \
%endif
-%ifnarch x86_64
- -Dintel-rt=disabled \
-%endif
%{nil}
%meson_build
@@ -331,6 +337,12 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
+* Thu May 9 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc3-1
+- Update to 24.1.0-rc3
+- Sync with_intel_vk_rt bits with mesa.spec from fedora
+- Unconditionally BR clang-devel, bindgen, libclc, SPIRV-Tools, and
+ LLVMSPIRVLib which are needed now
+
* Tue May 7 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.0~rc2-1
- Update to 24.1.0-rc2
diff --git a/sources b/sources
index a1304b0..d18ff33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-24.1.0-rc2.tar.xz) = 510655e49093077280d9fb65bc687032e4a0dade15c1e0d9ffbc73a0ac2841a7818621e491e16b45ae69090b6bac41ed4dd52233156776b728c877214e4b1370
+SHA512 (mesa-24.1.0-rc3.tar.xz) = d75641a023ba489b5117b369a2d9007bcf6079f31375c9aa70afd968f8acc3695468e9cf2ef1989ed28459cf245fccd60507a0e8b0931401b77a4b2b21f0fe03
4 months, 1 week
[cmus/f40] Update to git snapshot
by Leigh Scott
Summary of changes:
67777e8... Update to git snapshot (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[cmus] Update to git snapshot
by Leigh Scott
commit 67777e8a9e6e9e9de01d68bd3413b39aa1aaa3a3
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue May 7 21:06:04 2024 +0100
Update to git snapshot
cmus.spec | 25 +++++++++++++++++++++----
ffmpeg6.patch | 15 ---------------
sources | 2 +-
3 files changed, 22 insertions(+), 20 deletions(-)
---
diff --git a/cmus.spec b/cmus.spec
index 56be1b0..4b017b8 100644
--- a/cmus.spec
+++ b/cmus.spec
@@ -1,11 +1,21 @@
+%global commit0 89f1c935cbc0a345b796507bdc52c76086ecc26b
+%global date 20240324
+%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
+#global tag %{version}
+
+%global surl https://github.com/cmus/cmus
+
Name: cmus
-Version: 2.10.0
-Release: 8%{?dist}
+Version: 2.10.1
+Release: 0.1%{!?tag:.%{date}git%{shortcommit0}}%{?dist}
Summary: Ncurses-Based Music Player
License: GPLv2+
URL: https://cmus.github.io/
-Source0: https://github.com/cmus/%{name}/archive/v%{version}/%{name}-%{version}.ta...
-Patch0: ffmpeg6.patch
+%if 0%{?tag:1}
+Source0: %surl/archive/v%{version}/%{name}-%{version}.tar.gz
+%else
+Source0: %surl/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz
+%endif
BuildRequires: alsa-lib-devel
BuildRequires: faad2-devel
@@ -32,7 +42,11 @@ operating systems
%prep
+%if 0%{?tag:1}
%autosetup -p1
+%else
+%autosetup -p1 -n %{name}-%{commit0}
+%endif
%build
@@ -88,6 +102,9 @@ chmod -x examples/*
%changelog
+* Tue May 07 2024 Leigh Scott <leigh123linux(a)gmail.com> - 2.10.1-0.1.20240324git89f1c93
+- Update to git snapshot
+
* Sat Feb 03 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 2.10.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
diff --git a/sources b/sources
index e73b110..c631360 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (cmus-2.10.0.tar.gz) = c055dc974a88f32c7f19fb2e4260ede37fbddc3f23707a98e7f669032c1b4fd9a1032eb5c808cf5ee635617d3abf176e78d1e8596cbe669bbad95cd5c50dde7c
+SHA512 (cmus-89f1c93.tar.gz) = 51e0c7497b23abbd35668bfc5da63f93fda572d26b72124eb739bb39020c2ec617ff6fb0aa3baadbc5bc55efdfca5708650d83dc64c225f7cbd829d6a0840ccb
4 months, 2 weeks
[discord/f38] (3 commits) ...Update to 0.0.53
by Nicolas Chauvet
Summary of changes:
a6da00a... added disable-breaking-updates.py, wrapper.sh and edited di (*)
c1e1d04... Add changelog (*)
f5df6be... Update to 0.0.53 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[discord/f39] (3 commits) ...Update to 0.0.53
by Nicolas Chauvet
Summary of changes:
a6da00a... added disable-breaking-updates.py, wrapper.sh and edited di (*)
c1e1d04... Add changelog (*)
f5df6be... Update to 0.0.53 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[discord/f40] (3 commits) ...Update to 0.0.53
by Nicolas Chauvet
Summary of changes:
a6da00a... added disable-breaking-updates.py, wrapper.sh and edited di (*)
c1e1d04... Add changelog (*)
f5df6be... Update to 0.0.53 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months, 2 weeks
[discord] Update to 0.0.53
by Nicolas Chauvet
commit f5df6be81b1ea734852b11ec7a5818394e297d2f
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 7 10:18:16 2024 +0200
Update to 0.0.53
discord.spec | 7 +++++--
sources | 2 +-
2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/discord.spec b/discord.spec
index 8995f83..d525e0e 100644
--- a/discord.spec
+++ b/discord.spec
@@ -6,8 +6,8 @@
%global __provides_exclude_from %{_libdir}/discord/.*\\.s
Name: discord
-Version: 0.0.52
-Release: 2%{?dist}
+Version: 0.0.53
+Release: 1%{?dist}
Summary: All-in-one voice and text chat
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -85,6 +85,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
+* Tue May 07 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.53-1
+- Update to 0.0.53
+
* Tue May 07 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.52-2
- Disable discord check-update pop-up - Valentin Tainon
https://github.com/rpmfusion/discord/pull/20
diff --git a/sources b/sources
index 27c273b..960c92c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.52.tar.gz) = 42ff4b59a0dd846f06a297a1a8b5a1e28f37daa6951b4ce597d103492458c5ae90f69545908cd41238c5ed91b249ad2dd9b9cec3ef4feeb9ad22245c692eaa72
+SHA512 (discord-0.0.53.tar.gz) = dfc92d477397324383a4656a770c0aac153527002b07bac56ec5e3947443f2ab6d0958b2c508d6cf5ed2ecaff83b64616387b7a2459d340b438c3d73ab0f6f83
4 months, 2 weeks
[discord] Add changelog
by Nicolas Chauvet
commit c1e1d04347c2f052ff4a00f208c71d97d3b241d8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue May 7 10:17:09 2024 +0200
Add changelog
discord.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/discord.spec b/discord.spec
index 1a78b59..8995f83 100644
--- a/discord.spec
+++ b/discord.spec
@@ -7,7 +7,7 @@
Name: discord
Version: 0.0.52
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: All-in-one voice and text chat
# License Information: https://bugzilla.rpmfusion.org/show_bug.cgi?id=4441#c14
@@ -85,6 +85,10 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metain
%changelog
+* Tue May 07 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.52-2
+- Disable discord check-update pop-up - Valentin Tainon
+ https://github.com/rpmfusion/discord/pull/20
+
* Thu May 02 2024 Leigh Scott <leigh123linux(a)gmail.com> - 0.0.52-1
- Update to 0.0.51 release
4 months, 2 weeks
[discord] added disable-breaking-updates.py, wrapper.sh and edited discord.spec
by Nicolas Chauvet
commit a6da00a718680698b607be9025e7ebd2d4b4eaa2
Author: Valentin Tainon <valentin.tainon(a)outlook.fr>
Date: Sun Apr 21 19:03:23 2024 +0200
added disable-breaking-updates.py, wrapper.sh and edited discord.spec
Signed-off-by: Nicolas Chauvet <kwizart(a)gmail.com>
disable-breaking-updates.py | 40 ++++++++++++++++++++++++++++++++++++++++
discord.spec | 6 +++++-
wrapper.sh | 10 ++++++++++
3 files changed, 55 insertions(+), 1 deletion(-)
---
diff --git a/disable-breaking-updates.py b/disable-breaking-updates.py
new file mode 100755
index 0000000..1b5364a
--- /dev/null
+++ b/disable-breaking-updates.py
@@ -0,0 +1,40 @@
+#!/usr/bin/python3
+"""
+Disable breaking updates which will prompt users to download a deb or tar file
+and lock them out of Discord making the program unusable.
+
+This will dramatically improve the experience :
+
+ 1) The maintainer doesn't need to be worried at all times of an update which will break Discord.
+ 2) People will not be locked out of the program while the maintainer runs to update it.
+
+"""
+
+import json
+import os
+from pathlib import Path
+
+XDG_CONFIG_HOME = os.environ.get("XDG_CONFIG_HOME") or os.path.join(
+ os.path.expanduser("~"), ".config"
+)
+
+settings_path = Path(f"{XDG_CONFIG_HOME}/discord/settings.json")
+settings_path_temp = Path(f"{XDG_CONFIG_HOME}/discord/settings.json.tmp")
+try:
+ with settings_path.open() as settings_file:
+ settings = json.load(settings_file)
+except (IOError, json.decoder.JSONDecodeError):
+ settings_path.parent.mkdir(parents=True, exist_ok=True)
+ settings = {}
+
+if settings.get("SKIP_HOST_UPDATE"):
+ print("Disabling updates already done")
+else:
+ skip_host_update = {"SKIP_HOST_UPDATE":True}
+ settings.update(skip_host_update)
+
+ with settings_path_temp.open('w') as settings_file_temp:
+ json.dump(settings, settings_file_temp, indent=2)
+
+ settings_path_temp.rename(settings_path)
+ print("Disabled updates")
diff --git a/discord.spec b/discord.spec
index 8573acf..1a78b59 100644
--- a/discord.spec
+++ b/discord.spec
@@ -16,6 +16,8 @@ URL: https://discordapp.com/
Source0: https://dl.discordapp.net/apps/linux/%{version}/%{name}-%{version}.tar.gz
# Adapted from https://raw.githubusercontent.com/flathub/com.discordapp.Discord/master/c...
Source1: discord.metainfo.xml
+Source2: wrapper.sh
+Source3: disable-breaking-updates.py
ExclusiveArch: x86_64
BuildRequires: desktop-file-utils
@@ -56,7 +58,7 @@ mkdir -p %{buildroot}%{_metainfodir}/
desktop-file-install \
--set-icon=%{name} \
---set-key=Exec --set-value=%{_bindir}/Discord \
+--set-key=Exec --set-value='%{_libdir}/discord/wrapper.sh' \
--delete-original \
--dir=%{buildroot}/%{_datadir}/applications \
discord.desktop
@@ -67,6 +69,8 @@ install -p -D -m 644 %{name}.png \
%{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{name}.png
install -p -m 0644 %{SOURCE1} %{buildroot}%{_metainfodir}/
+install -p -m 755 %{SOURCE2} %{buildroot}%{_libdir}/discord/
+install -p -m 755 %{SOURCE3} %{buildroot}%{_libdir}/discord/
%check
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
diff --git a/wrapper.sh b/wrapper.sh
new file mode 100755
index 0000000..63e16ee
--- /dev/null
+++ b/wrapper.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/bash
+
+# Path to discord binary
+DISCORD_BIN=/usr/bin/Discord
+
+# Run python script to disable check updates
+/usr/lib64/discord/disable-breaking-updates.py
+
+# Launch discord
+exec "$DISCORD_BIN"
4 months, 2 weeks