[discord] Fixup gitignore
by Nicolas Chauvet
commit dd9737df43d1c98ba9a241c2938b1e1ba1659648
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 18 17:01:15 2022 +0100
Fixup gitignore
.gitignore | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index cf0f6f7..c06bdb0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1 @@
-/discord-0.0.4.tar.gz
-/discord-0.0.5.tar.gz
-/discord-0.0.8.tar.gz
-/discord-0.0.9.tar.gz
-/discord-0.0.10.tar.gz
-/discord-0.0.11.tar.gz
-/discord-0.0.12.tar.gz
-/discord-0.0.13.tar.gz
-/discord-0.0.14.tar.gz
-/discord-0.0.15.tar.gz
-/discord-0.0.16.tar.gz
-/discord-0.0.17.tar.gz
+discord-*.tar.gz
2 years, 10 months
[discord] Update 0.0.17
by Nicolas Chauvet
commit 76b9e1c17ccddad7a67bd36178996b90e5184286
Author: Eric Duvic <ericduvic(a)gmail.com>
Date: Thu Feb 17 18:04:28 2022 -0700
Update 0.0.17
.gitignore | 1 +
discord.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a288beb..cf0f6f7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/discord-0.0.14.tar.gz
/discord-0.0.15.tar.gz
/discord-0.0.16.tar.gz
+/discord-0.0.17.tar.gz
diff --git a/discord.spec b/discord.spec
index dbd3b3a..dc8f64d 100644
--- a/discord.spec
+++ b/discord.spec
@@ -3,7 +3,7 @@
%global __requires_exclude libffmpeg.so
Name: discord
-Version: 0.0.16
+Version: 0.0.17
Release: 2%{?dist}
Summary: All-in-one voice and text chat for gamers
@@ -63,6 +63,9 @@ discord.desktop
%changelog
+* Thu Feb 17 2022 Eric Duvic <eric(a)ericduvic.com> - 0.0.17-1
+- Update 0.0.17
+
* Thu Feb 10 2022 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 0.0.16-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
diff --git a/sources b/sources
index b0bd0d3..97dfc00 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (discord-0.0.16.tar.gz) = b95ae338c5abb7c4ba20af761822fc9fb53fd0cb79da16c00ee2df0518bb860a0300e4d0ad9c49b7e1a128ad9ac6d8294b77d2ac4fb8ae9844632c2d6ae7979e
+SHA512 (discord-0.0.17.tar.gz) = 728c760f04770b197635d1fc1a2833c707ab462708cc0bf6fb165691c1375e14e3192f3806d3719325790459b39bd3425f5942d69a53019695f02c965214a5c9
2 years, 10 months
[nvidia-kmod] Update changelog
by Nicolas Chauvet
commit e6e30375f3113f9123c623fccb7842db875d8200
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 18 14:03:01 2022 +0100
Update changelog
nvidia-kmod.spec | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index f908794..f62e30e 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -12,7 +12,7 @@ Name: nvidia-kmod
Epoch: 3
Version: 510.54
# Taken over by kmodtool
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA display driver kernel module
License: Redistributable, no modification permitted
URL: http://www.nvidia.com/
@@ -81,6 +81,10 @@ done
%changelog
+* Fri Feb 18 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:510.54-2
+- Update simpledrm patch
+- Add a conditional switch to disabled patch application.
+
* Tue Feb 15 2022 Nicolas Chauvet <kwizart(a)gmail.com> - 3:510.54-1
- Update to 510.54
2 years, 10 months
[nvidia-kmod] Add _without_nvidia_kmod_patches conditional
by Nicolas Chauvet
commit 9bc5268f6a26499773769107a1424dbfb7442397
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 18 14:01:03 2022 +0100
Add _without_nvidia_kmod_patches conditional
nvidia-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 4bf4787..f908794 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -43,7 +43,7 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
%setup -T -c
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
-%if 0%{?fedora} && 0%{?fedora} > 35
+%if 0%{!?_without_nvidia_kmod_patches:1}
%patch0 -p0
%patch1 -p1
%endif
2 years, 10 months
[nvidia-kmod] Update simpledrm.patch from javierm
by Nicolas Chauvet
commit e25ab844f79ee70ff728dd45d12415c5d08ec1e6
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Feb 18 13:57:11 2022 +0100
Update simpledrm.patch from javierm
nvidia-kmod-simpledrm.patch | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
---
diff --git a/nvidia-kmod-simpledrm.patch b/nvidia-kmod-simpledrm.patch
index 8607bba..3ac1479 100644
--- a/nvidia-kmod-simpledrm.patch
+++ b/nvidia-kmod-simpledrm.patch
@@ -1,8 +1,8 @@
-From 4f64c5eb6abb6bc75d3d49d2a0b409366068f0e7 Mon Sep 17 00:00:00 2001
+From b1912480539b4dd23ce8ba901b1a16e915561437 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm(a)redhat.com>
-Date: Fri, 21 Jan 2022 18:10:25 +0100
-Subject: [PATCH] nvidia-drm: remove existing generic drivers to take over the
- device
+Date: Fri, 18 Feb 2022 13:48:46 +0100
+Subject: [PATCH 1/2] nvidia-drm: remove existing generic drivers to take over
+ the device
There are drivers that register framebuffer devices very early in the boot
process and make use of the existing framebuffer as setup by the firmware.
@@ -16,11 +16,11 @@ early fbdev (i.e: simpledrm) to the one registered by the real DRM drivers.
Signed-off-by: Javier Martinez Canillas <javierm(a)redhat.com>
---
- kernel/nvidia-drm/nvidia-drm-drv.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
+ kernel/nvidia-drm/nvidia-drm-drv.c | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
diff --git a/kernel/nvidia-drm/nvidia-drm-drv.c b/kernel/nvidia-drm/nvidia-drm-drv.c
-index 0d29d1d6bf4d..3f7725de6b91 100644
+index 0d29d1d6bf4d..9149f87b6244 100644
--- a/kernel/nvidia-drm/nvidia-drm-drv.c
+++ b/kernel/nvidia-drm/nvidia-drm-drv.c
@@ -60,6 +60,8 @@
@@ -41,18 +41,20 @@ index 0d29d1d6bf4d..3f7725de6b91 100644
DRM_DEBUG(
"Registering device for NVIDIA GPU ID 0x08%x",
gpu_info->gpu_id);
-@@ -917,6 +921,16 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
+@@ -917,6 +921,18 @@ static void nv_drm_register_drm_device(const nv_gpu_info_t *gpu_info)
mutex_init(&nv_dev->lock);
#endif
-+ /* Remove existing drivers that may own the framebuffer memory. */
++ if (IS_ENABLED(CONFIG_DRM_SIMPLEDRM)) {
++ /* Remove existing drivers that may own the framebuffer memory. */
+
-+ ret = drm_aperture_remove_framebuffers(false, &nv_drm_driver);
-+ if (ret) {
-+ NV_DRM_DEV_LOG_ERR(nv_dev,
-+ "Failed to remove existing framebuffers - %d.\n",
-+ ret);
-+ return;
++ ret = drm_aperture_remove_framebuffers(false, &nv_drm_driver);
++ if (ret) {
++ NV_DRM_DEV_LOG_ERR(nv_dev,
++ "Failed to remove existing framebuffers - %d.\n",
++ ret);
++ return;
++ }
+ }
+
/* Allocate DRM device */
@@ -60,4 +62,3 @@ index 0d29d1d6bf4d..3f7725de6b91 100644
dev = drm_dev_alloc(&nv_drm_driver, device);
--
2.34.1
-
2 years, 10 months
[bino/f36] fix
by Leigh Scott
Summary of changes:
f687deb... fix (*)
(*) This commit already existed in another branch; no separate mail sent
2 years, 10 months
