[steam/el8] Fix libxcrypt compatibility with CentOS/RHEL 7+
by Simone Caronni
commit 239456d3a0b51ac5a1f47506c42e84a71ed6bb9b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Thu Nov 12 14:20:49 2020 +0100
Fix libxcrypt compatibility with CentOS/RHEL 7+
steam.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/steam.spec b/steam.spec
index 868323f..44ed0c0 100644
--- a/steam.spec
+++ b/steam.spec
@@ -64,7 +64,7 @@ Requires: vulkan-loader
# Minimum requirements for starting the steam client for the first time
Requires: alsa-lib%{?_isa}
Requires: gtk2%{?_isa}
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if 0%{?fedora} || 0%{?rhel} > 8
Requires: libnsl%{?_isa}
Requires: libxcrypt-compat%{?_isa}
%endif
@@ -199,6 +199,7 @@ fi
%changelog
* Thu Nov 12 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-3
- Raise file descriptor limit again for Proton (#5834).
+- Fix libxcrypt compatibility with CentOS/RHEL 7+ (5825).
* Mon Sep 14 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-2
- Add missing libxcrypt-compat dependency (#5752).
4 years
[steam/el8] Raise file descriptor limit again for Proton
by Simone Caronni
commit 38398689e52d50955463cd0ebef9c1c93b42f3d5
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Thu Nov 12 14:07:51 2020 +0100
Raise file descriptor limit again for Proton
01-steam.conf | 16 +++++++++-------
steam.spec | 19 ++++++++-----------
2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/01-steam.conf b/01-steam.conf
index 4ede9f5..1aa3ddf 100644
--- a/01-steam.conf
+++ b/01-steam.conf
@@ -2,10 +2,12 @@
# This belongs into /usr/lib/systemd/{system,user}.conf.d/
[Manager]
-# Increase the file descriptor limit to make Steam Proton/Wine esync work
-# out of the box. The same limit is increased by default in systemd 240, and
-# this patch is no longer needed.
-# More info:
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
-# https://github.com/systemd/systemd/pull/10244
-DefaultLimitNOFILE=1024:524288
+# Increase the file descriptor limit to make Steam Proton/Wine esync work out of
+# the box. The same limit is increased by default in systemd 240 to 524288:
+#
+# cat /etc/systemd/system.conf | grep DefaultLimitNOFILE
+# DefaultLimitNOFILE=1024:524288
+#
+# As of Proton 5, the limit should be 1048576:
+# https://github.com/zfigura/wine/blob/esync/README.esync#L26
+DefaultLimitNOFILE=1024:1048576
diff --git a/steam.spec b/steam.spec
index e49ab56..868323f 100644
--- a/steam.spec
+++ b/steam.spec
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT.
License: Steam License Agreement and MIT
@@ -24,7 +24,7 @@ Source5: README.Fedora
# Input devices seen as joysticks:
Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-blacklist/mast...
-# Configure limits in systemd < 240
+# Configure limits in systemd
Source7: 01-steam.conf
# Newer UDEV rules
@@ -151,13 +151,11 @@ install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_metainfodir}
install -p -m 0644 %{SOURCE4} %{buildroot}%{_metainfodir}/
-# Since systemd 240 we don't need to raise NOFILE limit
-%if 0%{?rhel} >= 7
+# Raise file descriptor limit
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
-%endif
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -193,16 +191,15 @@ fi
%{_metainfodir}/%{name}.appdata.xml
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_udevrulesdir}/*
-
-# Since systemd 240 we don't need to raise NOFILE limit
-%if 0%{?rhel} >= 7
-%{_prefix}/lib/systemd/system.conf.d/
+%dir %{_prefix}/lib/systemd/system.conf.d/
%{_prefix}/lib/systemd/system.conf.d/01-steam.conf
-%{_prefix}/lib/systemd/user.conf.d/
+%dir %{_prefix}/lib/systemd/user.conf.d/
%{_prefix}/lib/systemd/user.conf.d/01-steam.conf
-%endif
%changelog
+* Thu Nov 12 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-3
+- Raise file descriptor limit again for Proton (#5834).
+
* Mon Sep 14 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-2
- Add missing libxcrypt-compat dependency (#5752).
4 years
[steam/el7] Fix libxcrypt compatibility with CentOS/RHEL 7+
by Simone Caronni
commit 1fe37d7ce901660046a0f7ce2e553380f93e17f8
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Thu Nov 12 14:20:49 2020 +0100
Fix libxcrypt compatibility with CentOS/RHEL 7+
steam.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/steam.spec b/steam.spec
index 813c3e2..9deb9a9 100644
--- a/steam.spec
+++ b/steam.spec
@@ -64,7 +64,7 @@ Requires: vulkan-loader
# Minimum requirements for starting the steam client for the first time
Requires: alsa-lib%{?_isa}
Requires: gtk2%{?_isa}
-%if 0%{?fedora} || 0%{?rhel} >= 8
+%if 0%{?fedora} || 0%{?rhel} > 8
Requires: libnsl%{?_isa}
Requires: libxcrypt-compat%{?_isa}
%endif
@@ -199,6 +199,7 @@ fi
%changelog
* Thu Nov 12 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-3
- Raise file descriptor limit again for Proton (#5834).
+- Fix libxcrypt compatibility with CentOS/RHEL 7+ (5825).
* Mon Sep 14 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-2
- Add missing libxcrypt-compat dependency (#5752).
4 years
[steam/el7] Raise file descriptor limit again for Proton
by Simone Caronni
commit ef73dda4a53a23f00159a3427164d7d9d29cee0d
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Thu Nov 12 14:07:51 2020 +0100
Raise file descriptor limit again for Proton
01-steam.conf | 16 +++++++++-------
steam.spec | 19 ++++++++-----------
2 files changed, 17 insertions(+), 18 deletions(-)
---
diff --git a/01-steam.conf b/01-steam.conf
index 4ede9f5..1aa3ddf 100644
--- a/01-steam.conf
+++ b/01-steam.conf
@@ -2,10 +2,12 @@
# This belongs into /usr/lib/systemd/{system,user}.conf.d/
[Manager]
-# Increase the file descriptor limit to make Steam Proton/Wine esync work
-# out of the box. The same limit is increased by default in systemd 240, and
-# this patch is no longer needed.
-# More info:
-# https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.o...
-# https://github.com/systemd/systemd/pull/10244
-DefaultLimitNOFILE=1024:524288
+# Increase the file descriptor limit to make Steam Proton/Wine esync work out of
+# the box. The same limit is increased by default in systemd 240 to 524288:
+#
+# cat /etc/systemd/system.conf | grep DefaultLimitNOFILE
+# DefaultLimitNOFILE=1024:524288
+#
+# As of Proton 5, the limit should be 1048576:
+# https://github.com/zfigura/wine/blob/esync/README.esync#L26
+DefaultLimitNOFILE=1024:1048576
diff --git a/steam.spec b/steam.spec
index b18002b..813c3e2 100644
--- a/steam.spec
+++ b/steam.spec
@@ -3,7 +3,7 @@
Name: steam
Version: 1.0.0.66
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Installer for the Steam software distribution service
# Redistribution and repackaging for Linux is allowed, see license file. udev rules are MIT.
License: Steam License Agreement and MIT
@@ -24,7 +24,7 @@ Source5: README.Fedora
# Input devices seen as joysticks:
Source6: https://raw.githubusercontent.com/denilsonsa/udev-joystick-blacklist/mast...
-# Configure limits in systemd < 240
+# Configure limits in systemd
Source7: 01-steam.conf
# Newer UDEV rules
@@ -151,13 +151,11 @@ install -pm 644 %{SOURCE1} %{SOURCE2} %{buildroot}%{_sysconfdir}/profile.d
mkdir -p %{buildroot}%{_metainfodir}
install -p -m 0644 %{SOURCE4} %{buildroot}%{_metainfodir}/
-# Since systemd 240 we don't need to raise NOFILE limit
-%if 0%{?rhel} >= 7
+# Raise file descriptor limit
mkdir -p %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
mkdir -p %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
install -m 644 -p %{SOURCE7} %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
-%endif
%check
desktop-file-validate %{buildroot}%{_datadir}/applications/%{name}.desktop
@@ -193,16 +191,15 @@ fi
%{_metainfodir}/%{name}.appdata.xml
%config(noreplace) %{_sysconfdir}/profile.d/%{name}.*sh
%{_udevrulesdir}/*
-
-# Since systemd 240 we don't need to raise NOFILE limit
-%if 0%{?rhel} >= 7
-%{_prefix}/lib/systemd/system.conf.d/
+%dir %{_prefix}/lib/systemd/system.conf.d/
%{_prefix}/lib/systemd/system.conf.d/01-steam.conf
-%{_prefix}/lib/systemd/user.conf.d/
+%dir %{_prefix}/lib/systemd/user.conf.d/
%{_prefix}/lib/systemd/user.conf.d/01-steam.conf
-%endif
%changelog
+* Thu Nov 12 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-3
+- Raise file descriptor limit again for Proton (#5834).
+
* Mon Sep 14 2020 Simone Caronni <negativo17(a)gmail.com> - 1.0.0.66-2
- Add missing libxcrypt-compat dependency (#5752).
4 years
[wl-kmod] Add patch for kernel >= 5.9 - fixes RFBZ#5835
by Nicolas Viéville
commit c4602e64a43c2659cc19f8b2e83c913492ee02f0
Author: Nicolas Viéville <nicolas.vieville(a)uphf.fr>
Date: Wed Nov 11 18:28:19 2020 +0100
Add patch for kernel >= 5.9 - fixes RFBZ#5835
wl-kmod-019_kernel_5.9_segment_eq_removed.patch | 15 +++++++++++++++
wl-kmod.spec | 7 ++++++-
2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/wl-kmod-019_kernel_5.9_segment_eq_removed.patch b/wl-kmod-019_kernel_5.9_segment_eq_removed.patch
new file mode 100644
index 0000000..592be93
--- /dev/null
+++ b/wl-kmod-019_kernel_5.9_segment_eq_removed.patch
@@ -0,0 +1,15 @@
+diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c
+--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2020-03-19 10:24:18.154395810 +0100
++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2020-11-11 13:39:00.579562572 +0100
+@@ -1659,7 +1659,11 @@
+ goto done2;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0)
++ if (uaccess_kernel())
++#else
+ if (segment_eq(get_fs(), KERNEL_DS))
++#endif
+ buf = ioc.buf;
+
+ else if (ioc.buf) {
diff --git a/wl-kmod.spec b/wl-kmod.spec
index 9afbd50..b58f209 100644
--- a/wl-kmod.spec
+++ b/wl-kmod.spec
@@ -10,7 +10,7 @@
Name: wl-kmod
Version: 6.30.223.271
-Release: 33%{?dist}
+Release: 34%{?dist}
Summary: Kernel module for Broadcom wireless devices
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -36,6 +36,7 @@ Patch14: wl-kmod-015_kernel_5.1_get_ds_removed.patch
Patch15: wl-kmod-016_fix_unsupported_mesh_point.patch
Patch16: wl-kmod-017_fix_gcc_fallthrough_warning.patch
Patch17: wl-kmod-018_kernel_5.6_adaptations.patch
+Patch18: wl-kmod-019_kernel_5.9_segment_eq_removed.patch
# needed for plague to make sure it builds for i586 and i686
ExclusiveArch: i686 x86_64
@@ -94,6 +95,7 @@ pushd %{name}-%{version}-src
%patch15 -p1 -b .fix_unsupported_mesh_point
%patch16 -p1 -b .fix_gcc_fallthrough_warning.patch
%patch17 -p1 -b .kernel_5.6_adaptations.patch
+%patch18 -p1 -b .kernel_5.9_segment_eq_removed
# Manual patching to build for RHEL - inspired by CentOS wl-kmod.spec
# Actually works for RHEL 6.x and 7.x
@@ -283,6 +285,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || :
rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Nov 11 2020 Nicolas Viéville <nicolas.vieville(a)uphf.fr> - 6.30.223.271-34
+- Add patch for kernel >= 5.9 - fixes RFBZ#5835
+
* Wed Aug 19 2020 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 6.30.223.271-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
4 years
[mixxx/f32] Fix default resource folder for loading skins
by Uwe Klotz
commit ab36a915a5db5d54e2d438b543d97d3eec09e7f4
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Wed Nov 11 09:01:22 2020 +0100
Fix default resource folder for loading skins
github_3284_unix_share_path.patch | 38 ++++++++++++++++++++++++++++++++++++++
mixxx.spec | 6 +++++-
2 files changed, 43 insertions(+), 1 deletion(-)
---
diff --git a/github_3284_unix_share_path.patch b/github_3284_unix_share_path.patch
new file mode 100644
index 0000000..1e15c69
--- /dev/null
+++ b/github_3284_unix_share_path.patch
@@ -0,0 +1,38 @@
+From 6e8fb9f8283711b78b5bf6b214a342f0a8defaad Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Tue, 10 Nov 2020 19:12:34 +0100
+Subject: [PATCH] Set UNIX_SHARE_PATH to absolute path including install prefix
+
+Partially reverts and fixes commit:
+1122ae87ef9a085ed705a6a8761c6c7ad0f5dce3
+
+https://mixxx.zulipchat.com/#narrow/stream/109171-development/topic/CMake.20installation.20directories
+---
+ CMakeLists.txt | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a98c7be5b85..4481a75e371 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1038,8 +1038,10 @@ elseif(UNIX)
+ target_compile_definitions(mixxx-lib PUBLIC __APPLE__)
+ else()
+ target_compile_definitions(mixxx-lib PRIVATE __UNIX__)
++ # UNIX_SHARE_PATH must be set to the absolute path
++ # including the install prefix!
+ target_compile_definitions(
+- mixxx-lib PUBLIC UNIX_SHARE_PATH="${MIXXX_INSTALL_DATADIR}")
++ mixxx-lib PUBLIC UNIX_SHARE_PATH="${CMAKE_INSTALL_PREFIX}/${MIXXX_INSTALL_DATADIR}")
+ if(CMAKE_SYSTEM_NAME STREQUAL Linux)
+ target_compile_definitions(mixxx-lib PUBLIC __LINUX__)
+ elseif(CMAKE_SYSTEM_NAME MATCHES "^.*BSD$")
+@@ -1061,7 +1063,7 @@ if (APPLE)
+ set(MACOS_BUNDLE_VERSION "${CMAKE_PROJECT_VERSION}")
+ set(MACOS_BUNDLE_SHORTVERSION "${CMAKE_PROJECT_VERSION}")
+ set(MACOS_BUNDLE_MINOSVERSION "10.11.0")
+-
++
+ set_target_properties(mixxx PROPERTIES
+ MACOSX_BUNDLE true
+ MACOSX_BUNDLE_INFO_PLIST "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos_bundle.plist.in"
diff --git a/mixxx.spec b/mixxx.spec
index 92b1c02..a616361 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -24,12 +24,13 @@
Name: mixxx
Version: 2.3.0
-Release: 0.11%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 0.12%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}....
Source1: https://github.com/ibsh/libKeyFinder/archive/v2.2.2.zip#/libKeyFinder_v2....
+Patch0: github_3284_unix_share_path.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -186,6 +187,9 @@ appstream-util \
%changelog
+* Wed Nov 11 08:59:48 CET 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.12.beta.20201110git6b0fb69
+- Fix default folder for loading resources
+
* Tue Nov 10 11:35:54 CET 2020 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.0-0.11.beta.20201110git6b0fb69
- New upstream snapshot 2.3.0-beta
- Fix ALSA real-time scheduling
4 years