[nvidia-340xx-kmod/f31] remove old patch
by Leigh Scott
commit 260eb441f1cb8e98feeb1fe760382a021fc9f195
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 20:04:10 2020 +0000
remove old patch
xf86-video-nvidia-legacy-02-fix-linux-5.1.patch | 15 ---------------
1 file changed, 15 deletions(-)
4 years, 4 months
[nvidia-340xx-kmod/f30: 8/8] fix
by Leigh Scott
commit df8d62baa5d13ee8fc3609807765b2146b6e1ae9
Merge: 799147b 4d103f6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Tue Jan 7 19:59:30 2020 +0000
fix
buildfix_kernel_5.0.patch | 256 ------------------------
nvidia-340xx-kmod.spec | 26 ++-
xf86-video-nvidia-legacy-02-fix-linux-5.1.patch | 15 --
3 files changed, 15 insertions(+), 282 deletions(-)
---
4 years, 4 months
[nvidia-340xx-kmod/f30] (8 commits) ...fix
by Leigh Scott
Summary of changes:
1d375a4... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
95d5946... Exclude i686 for F31+ (*)
4be42dd... No one could be bothered to volunteer to maintain package (*)
d3b51cb... Revert "No one could be bothered to volunteer to maintain p (*)
b468ffc... patch for kernel-5.3.0 (*)
e7754f5... patch for kernel-5.4.0 (*)
4d103f6... Update to 340.108 (*)
df8d62b... fix
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[nvidia-340xx-kmod/f31: 7/8] Update to 340.108
by Leigh Scott
commit 97d01399094e49ed0cf76171a26fcbd0bddacb1d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Mon Dec 23 20:28:27 2019 +0000
Update to 340.108
buildfix_kernel_5.0.patch | 256 ----------------------------------------------
buildfix_kernel_5.3.patch | 49 ---------
buildfix_kernel_5.4.patch | 117 ---------------------
nvidia-340xx-kmod.spec | 17 +--
4 files changed, 5 insertions(+), 434 deletions(-)
---
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index c77dca3..d5fbc34 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -8,9 +8,9 @@
Name: nvidia-340xx-kmod
Epoch: 1
-Version: 340.107
+Version: 340.108
# Taken over by kmodtool
-Release: 12%{?dist}
+Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -18,15 +18,8 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
-Patch1: buildfix_kernel_5.0.patch
-Patch2: buildfix_kernel_5.3.patch
-Patch3: buildfix_kernel_5.4.patch
-%if 0%{?fedora} > 30
-ExclusiveArch: x86_64
-%else
ExclusiveArch: i686 x86_64
-%endif
# get the needed BuildRequires (in parts depending on what we build for)
%global AkmodsBuildRequires %{_bindir}/kmodtool, xorg-x11-drv-nvidia-340xx-kmodsrc >= %{epoch}:%{version}
@@ -49,9 +42,6 @@ kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterf
tar --use-compress-program xz -xf %{_datadir}/%{name}-%{version}/%{name}-%{version}-%{_target_cpu}.tar.xz
# patch loop
%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
for kernel_version in %{?kernel_versions} ; do
cp -a kernel _kmod_build_${kernel_version%%___*}
@@ -81,6 +71,9 @@ done
%{?akmod_install}
%changelog
+* Mon Dec 23 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:340.108-1
+- Update to 340.108
+
* Fri Dec 20 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:340.107-12
- patch for kernel-5.4.0
4 years, 4 months
[nvidia-340xx-kmod/f31: 6/8] patch for kernel-5.4.0
by Leigh Scott
commit d643482cd5a25637c9020c4a7e87fcae813841f5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Dec 20 01:18:47 2019 +0000
patch for kernel-5.4.0
buildfix_kernel_5.4.patch | 117 ++++++++++++++++++++++++++++++++++++++++++++++
nvidia-340xx-kmod.spec | 9 ++--
2 files changed, 123 insertions(+), 3 deletions(-)
---
diff --git a/buildfix_kernel_5.4.patch b/buildfix_kernel_5.4.patch
new file mode 100644
index 0000000..49b8559
--- /dev/null
+++ b/buildfix_kernel_5.4.patch
@@ -0,0 +1,117 @@
+From f90c388c755a6bd9b72cb51c712a0ae686e0b377 Mon Sep 17 00:00:00 2001
+From: Alberto Milone <alberto.milone(a)canonical.com>
+Date: Wed, 27 Nov 2019 13:01:18 +0100
+Subject: [PATCH 1/1] Add support for Linux 5.4
+
+---
+ conftest.sh | 46 ++++++++++++++++++++++++++++++++++++++++
+ nv-drm.c | 9 +++++---
+ nvidia-modules-common.mk | 2 +-
+ 3 files changed, 53 insertions(+), 4 deletions(-)
+
+diff --git a/kernel/conftest.sh b/kernel/conftest.sh
+index fb0bf60..babbb50 100755
+--- a/kernel/conftest.sh
++++ b/kernel/conftest.sh
+@@ -265,6 +265,23 @@ build_cflags() {
+ if [ -n "$BUILD_PARAMS" ]; then
+ CFLAGS="$CFLAGS -D$BUILD_PARAMS"
+ fi
++
++ # Check if gcc supports asm goto and set CC_HAVE_ASM_GOTO if it does.
++ # Older kernels perform this check and set this flag in Kbuild, and since
++ # conftest.sh runs outside of Kbuild it ends up building without this flag.
++ # Starting with commit e9666d10a5677a494260d60d1fa0b73cc7646eb3 this test
++ # is done within Kconfig, and the preprocessor flag is no longer needed.
++
++ GCC_GOTO_SH="$SOURCES/build/gcc-goto.sh"
++
++ if [ -f "$GCC_GOTO_SH" ]; then
++ # Newer versions of gcc-goto.sh don't print anything on success, but
++ # this is okay, since it's no longer necessary to set CC_HAVE_ASM_GOTO
++ # based on the output of those versions of gcc-goto.sh.
++ if [ `/bin/sh "$GCC_GOTO_SH" "$CC"` = "y" ]; then
++ CFLAGS="$CFLAGS -DCC_HAVE_ASM_GOTO"
++ fi
++ fi
+ }
+
+ CONFTEST_PREAMBLE="#include \"conftest.h\"
+@@ -1521,6 +1538,35 @@ compile_test() {
+ compile_check_conftest "$CODE" "NV_DRM_AVAILABLE" "" "generic"
+ ;;
+
++ drm_driver_prime_flag_present)
++ #
++ # Determine whether driver feature flag DRIVER_PRIME is present.
++ #
++ # The DRIVER_PRIME flag was added by commit 3248877ea179 (drm:
++ # base prime/dma-buf support (v5)) in v3.4 (2011-11-25) and is
++ # removed by commit 0424fdaf883a (drm/prime: Actually remove
++ # DRIVER_PRIME everywhere) on 2019-06-17.
++ #
++ # DRIVER_PRIME definition moved from drmP.h to drm_drv.h by
++ # commit 85e634bce01a (drm: Extract drm_drv.h) in v4.10
++ # (2016-11-14).
++ #
++ # DRIVER_PRIME define is changed to enum value by commit
++ # 0e2a933b02c9 (drm: Switch DRIVER_ flags to an enum) in v5.1
++ # (2019-01-29).
++ #
++ CODE="
++ #include <drm/drmP.h>
++ #if defined(NV_DRM_DRM_DRV_H_PRESENT)
++ #include <drm/drm_drv.h>
++ #endif
++ unsigned int drm_driver_prime_flag_present_conftest(void) {
++ return DRIVER_PRIME;
++ }"
++
++ compile_check_conftest "$CODE" "NV_DRM_DRIVER_PRIME_FLAG_PRESENT" "" "types"
++ ;;
++
+ proc_create_data)
+ #
+ # Determine if the proc_create_data() function is present.
+diff --git a/kernel/nv-drm.c b/kernel/nv-drm.c
+index 76719bb..12f7029 100644
+--- a/kernel/nv-drm.c
++++ b/kernel/nv-drm.c
+@@ -156,11 +156,14 @@
+ };
+
+ static struct drm_driver nv_drm_driver = {
+-#if defined(DRIVER_LEGACY)
+- .driver_features = DRIVER_GEM | DRIVER_PRIME | DRIVER_LEGACY,
+-#else
+- .driver_features = DRIVER_GEM | DRIVER_PRIME,
+-#endif
++ .driver_features =
++#if defined(NV_DRM_DRIVER_PRIME_FLAG_PRESENT)
++ DRIVER_PRIME |
++#endif
++#if defined(DRIVER_LEGACY) || LINUX_VERSION_CODE >= KERNEL_VERSION(5, 1, 0)
++ DRIVER_LEGACY |
++#endif
++ DRIVER_GEM,
+ .load = nv_drm_load,
+ .unload = nv_drm_unload,
+ .fops = &nv_drm_fops,
+
+diff --git a/kernel/nvidia-modules-common.mk b/kernel/nvidia-modules-common.mk
+index 8ac7058..7418005 100644
+--- a/kernel/nvidia-modules-common.mk
++++ b/kernel/nvidia-modules-common.mk
+@@ -176,7 +176,7 @@ ifndef NV_VERBOSE
+ endif
+
+ KBUILD_PARAMS += KBUILD_VERBOSE=$(NV_VERBOSE)
+-KBUILD_PARAMS += -C $(KERNEL_SOURCES) SUBDIRS=$(PWD)
++KBUILD_PARAMS += -C $(KERNEL_SOURCES) M=$(PWD)
+ KBUILD_PARAMS += ARCH=$(ARCH)
+
+ #
+--
+2.20.1
+
+
diff --git a/nvidia-340xx-kmod.spec b/nvidia-340xx-kmod.spec
index 6997025..c77dca3 100644
--- a/nvidia-340xx-kmod.spec
+++ b/nvidia-340xx-kmod.spec
@@ -10,7 +10,7 @@ Name: nvidia-340xx-kmod
Epoch: 1
Version: 340.107
# Taken over by kmodtool
-Release: 11%{?dist}
+Release: 12%{?dist}
Summary: NVIDIA display driver kernel module
Group: System Environment/Kernel
License: Redistributable, no modification permitted
@@ -19,8 +19,8 @@ URL: http://www.nvidia.com/
Source11: nvidia-kmodtool-excludekernel-filterfile
Patch0: nv-linux-arm.patch
Patch1: buildfix_kernel_5.0.patch
-Patch2: xf86-video-nvidia-legacy-02-fix-linux-5.1.patch
-Patch3: buildfix_kernel_5.3.patch
+Patch2: buildfix_kernel_5.3.patch
+Patch3: buildfix_kernel_5.4.patch
%if 0%{?fedora} > 30
ExclusiveArch: x86_64
@@ -81,6 +81,9 @@ done
%{?akmod_install}
%changelog
+* Fri Dec 20 2019 Leigh Scott <leigh123linux(a)gmail.com> - 1:340.107-12
+- patch for kernel-5.4.0
+
* Sun Nov 24 2019 João Carlos Mendes Luís <redhat(a)jonny.eng.br> - 1:340.107-11
- patch for kernel-5.3.0
4 years, 4 months
[nvidia-340xx-kmod/f31] (8 commits) ...Merge branch 'master' into f31
by Leigh Scott
Summary of changes:
4be42dd... No one could be bothered to volunteer to maintain package (*)
d3b51cb... Revert "No one could be bothered to volunteer to maintain p (*)
b468ffc... patch for kernel-5.3.0 (*)
e7754f5... patch for kernel-5.4.0 (*)
4d103f6... Update to 340.108 (*)
d643482... patch for kernel-5.4.0
97d0139... Update to 340.108
7f27675... Merge branch 'master' into f31
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[xorg-x11-drv-nvidia-340xx/f31] (3 commits) ...Update to 340.108
by Leigh Scott
Summary of changes:
f4db2c6... No one could be bothered to volunteer to maintain package (*)
4565ab2... Revert "No one could be bothered to volunteer to maintain p (*)
974845f... Update to 340.108 (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 4 months
[ldoce5viewer/f31] Add missing patch
by Damian Wrobel
commit 51a2d05205cc49281c94661a04f3a9f2cd5f8b11
Author: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
Date: Tue Jan 7 13:59:13 2020 +0100
Add missing patch
...oce5viewer-not-starting-after-sip-upgrade.patch | 23 ++++++++++++++++++++++
ldoce5viewer.spec | 5 ++++-
2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/ldoce5viewer-Fixes-Ldoce5viewer-not-starting-after-sip-upgrade.patch b/ldoce5viewer-Fixes-Ldoce5viewer-not-starting-after-sip-upgrade.patch
new file mode 100644
index 0000000..d77faee
--- /dev/null
+++ b/ldoce5viewer-Fixes-Ldoce5viewer-not-starting-after-sip-upgrade.patch
@@ -0,0 +1,23 @@
+From 85690cc4bec3f0c9352d64a2150528724d679386 Mon Sep 17 00:00:00 2001
+From: Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl>
+Date: Tue, 7 Jan 2020 13:18:42 +0100
+Subject: [PATCH] Fixes "Ldoce5viewer not starting after sip upgrade"
+
+Fix for https://bugzilla.rpmfusion.org/show_bug.cgi?id=5502 as per
+https://www.riverbankcomputing.com/static/Docs/PyQt5/incompatibilities.html#pyqt-v5-11
+---
+ ldoce5viewer/qtgui/__init__.py | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/ldoce5viewer/qtgui/__init__.py b/ldoce5viewer/qtgui/__init__.py
+index 56fa851..5f2eb78 100644
+--- a/ldoce5viewer/qtgui/__init__.py
++++ b/ldoce5viewer/qtgui/__init__.py
+@@ -7,6 +7,7 @@
+ from .. import __author__
+
+ # use PyQt API v2
++from PyQt5 import QtCore
+ import sip
+ sip.setapi('QString', 2)
+ sip.setapi('QVariant', 2)
diff --git a/ldoce5viewer.spec b/ldoce5viewer.spec
index 98c2303..c87c0ed 100644
--- a/ldoce5viewer.spec
+++ b/ldoce5viewer.spec
@@ -4,7 +4,7 @@
Name: ldoce5viewer
Version: 0
-Release: 9.%{date}git%{shortcommit0}%{?dist}
+Release: 10.%{date}git%{shortcommit0}%{?dist}
Summary: Viewer Application for the Longman Dictionary (LDOCE 5)
License: GPLv3+ and Public Domain
URL: https://forward-backward.co.jp/ldoce5viewer/
@@ -138,6 +138,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/*.appdata
%changelog
+* Tue Jan 07 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 0-10.20180309git377ff48
+- Add missing patch.
+
* Tue Jan 07 2020 Damian Wrobel <dwrobel(a)ertelnet.rybnik.pl> - 0-9.20180309git377ff48
- Fix for "Ldoce5viewer not starting after sip upgrade" (rfbz#5502).
4 years, 4 months