[xorg-x11-drv-nvidia/f30: 3/3] Merge branch 'master' into f30
by Nicolas Chauvet
commit fbc75700753b7851e972bcd3089321abdc87c6dc
Merge: 566efce 681eb86
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 11 10:53:21 2020 +0100
Merge branch 'master' into f30
xorg-x11-drv-nvidia.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
4 years, 11 months
[xorg-x11-drv-nvidia] Deal with cuda-drivers insanity
by Nicolas Chauvet
commit 681eb866f369a10344ffdb1980d6e3de7b6d5611
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 11 10:41:02 2020 +0100
Deal with cuda-drivers insanity
xorg-x11-drv-nvidia.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 4bba8c5..54ecf4c 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -20,7 +20,7 @@
Name: xorg-x11-drv-nvidia
Epoch: 3
Version: 440.64
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: NVIDIA's proprietary display driver for NVIDIA graphic cards
License: Redistributable, no modification permitted
@@ -498,6 +498,9 @@ fi ||:
%{_libdir}/libnvidia-encode.so
%changelog
+* Wed Mar 11 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 3:440.64-2
+- Deal with cuda-drivers insanity
+
* Fri Feb 28 2020 leigh123linux <leigh123linux(a)googlemail.com> - 3:440.64-1
- rebuilt
4 years, 11 months
[x264/f32] (2 commits) ...Boostrap
by Nicolas Chauvet
Summary of changes:
582677f... Rebuild for ffmpeg-4.3 git (*)
4136657... Boostrap (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[x265/f32] rebuilt
by Nicolas Chauvet
Summary of changes:
083372c... rebuilt (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 11 months
[x265] rebuilt
by Nicolas Chauvet
commit 083372c7230ead03ebff6f98279f7e0b0148fb70
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 11 09:57:10 2020 +0100
rebuilt
x265.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x265.spec b/x265.spec
index 3c1c499..76ccd41 100644
--- a/x265.spec
+++ b/x265.spec
@@ -3,7 +3,7 @@
Summary: H.265/HEVC encoder
Name: x265
Version: 3.3
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://x265.org/
# source/Lib/TLibCommon - BSD
# source/Lib/TLibEncoder - BSD
@@ -139,6 +139,9 @@ done
%{_libdir}/pkgconfig/x265.pc
%changelog
+* Wed Mar 11 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 3.3-2
+- Rebuilt for i686
+
* Sun Feb 23 2020 Leigh Scott <leigh123linux(a)googlemail.com> - 3.3-1
- Update to 3.3
4 years, 11 months
[xorg-x11-drv-nvidia] new insanity by cuda repo
by Nicolas Chauvet
commit 4f8942ade15e4ce4cd45529cc5d286c37e6358b3
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Wed Mar 11 09:37:41 2020 +0100
new insanity by cuda repo
xorg-x11-drv-nvidia.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xorg-x11-drv-nvidia.spec b/xorg-x11-drv-nvidia.spec
index 7a3b5e0..4bba8c5 100644
--- a/xorg-x11-drv-nvidia.spec
+++ b/xorg-x11-drv-nvidia.spec
@@ -95,8 +95,8 @@ Requires: %{name}-libs%{?_isa} = %{?epoch}:%{version}-%{release}
Requires: %{name}-cuda-libs%{?_isa} = %{?epoch}:%{version}-%{release}
#Don't put an epoch here
-Provides: cuda-drivers-devel = %{version}-100
-Provides: cuda-drivers-devel%{?_isa} = %{version}-100
+Provides: cuda-drivers-devel = %{version}.100
+Provides: cuda-drivers-devel%{?_isa} = %{version}.100
Provides: nvidia-driver-devel = %{version}-100
Provides: nvidia-driver-devel%{?_isa} = %{version}-100
Provides: nvidia-drivers-devel = %{version}-100
@@ -125,8 +125,8 @@ Requires: opencl-filesystem
Conflicts: xorg-x11-drv-nvidia-340xx-cuda
#Don't put an epoch here
-Provides: cuda-drivers = %{version}-100
-Provides: cuda-drivers%{?_isa} = %{version}-100
+Provides: cuda-drivers = %{version}.100
+Provides: cuda-drivers%{?_isa} = %{version}.100
Provides: nvidia-driver = %{version}-100
Provides: nvidia-driver%{?_isa} = %{version}-100
Provides: nvidia-drivers = %{version}-100
4 years, 11 months