[nvidia-modprobe] Update to 415.25 release
by Leigh Scott
commit 58c829f4b4ee2aa0bd451eb8412251b1c3e5a1d2
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Dec 26 20:25:00 2018 +0000
Update to 415.25 release
.gitignore | 1 +
nvidia-modprobe.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dced5b4..c30fec2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,4 @@ nvidia-modprobe-*.tar.gz
/nvidia-modprobe-415.18.tar.bz2
/nvidia-modprobe-415.22.tar.bz2
/nvidia-modprobe-415.23.tar.bz2
+/nvidia-modprobe-415.25.tar.bz2
diff --git a/nvidia-modprobe.spec b/nvidia-modprobe.spec
index 61ce227..d19a43a 100644
--- a/nvidia-modprobe.spec
+++ b/nvidia-modprobe.spec
@@ -1,6 +1,6 @@
Name: nvidia-modprobe
Epoch: 3
-Version: 415.23
+Version: 415.25
Release: 1%{?dist}
Summary: Load the NVIDIA kernel module and create NVIDIA character device files
@@ -42,6 +42,9 @@ chmod -x %{buildroot}%{_mandir}/man1/nvidia-modprobe.1.*
%changelog
+* Wed Dec 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.25-1
+- Update to 415.25 release
+
* Fri Dec 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.23-1
- Update to 415.23 release
diff --git a/sources b/sources
index eb28679..8eaf846 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-31600188b2178986df87f3c44fe0b57f nvidia-modprobe-415.23.tar.bz2
+bc27cdb3cda53fabe7133abf570a0675 nvidia-modprobe-415.25.tar.bz2
5 years, 3 months
[nvidia-kmod/el7: 5/5] Merge branch 'master' into el7
by Leigh Scott
commit 9bf8425419ea750c9fb8d1578ad9869ae8ad99df
Merge: d40e29a 6e7eaf7
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Dec 26 20:22:46 2018 +0000
Merge branch 'master' into el7
nvidia-kmod.spec | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
5 years, 3 months
[nvidia-kmod/el7] (5 commits) ...Merge branch 'master' into el7
by Leigh Scott
Summary of changes:
f401afc... Update to 415.18 release (*)
2a2eda1... Update to 415.22 release (*)
a2ed652... Update to 415.23 release (*)
6e7eaf7... Update to 415.25 release (*)
9bf8425... Merge branch 'master' into el7
(*) This commit already existed in another branch; no separate mail sent
5 years, 3 months
[nvidia-kmod/f28: 5/5] Merge branch 'master' into f28
by Leigh Scott
commit e2a481f0a319de72566903cb2c9bbbf904c32b7f
Merge: 89a0a0d 6e7eaf7
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Dec 26 20:22:23 2018 +0000
Merge branch 'master' into f28
nvidia-kmod.spec | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
---
5 years, 3 months
[nvidia-kmod/f28] (5 commits) ...Merge branch 'master' into f28
by Leigh Scott
Summary of changes:
f401afc... Update to 415.18 release (*)
2a2eda1... Update to 415.22 release (*)
a2ed652... Update to 415.23 release (*)
6e7eaf7... Update to 415.25 release (*)
e2a481f... Merge branch 'master' into f28
(*) This commit already existed in another branch; no separate mail sent
5 years, 3 months
[nvidia-kmod/f29] (4 commits) ...Update to 415.25 release
by Leigh Scott
Summary of changes:
f401afc... Update to 415.18 release (*)
2a2eda1... Update to 415.22 release (*)
a2ed652... Update to 415.23 release (*)
6e7eaf7... Update to 415.25 release (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 3 months
[nvidia-kmod] Update to 415.25 release
by Leigh Scott
commit 6e7eaf716f8e57ad03f41b6b0569b9f73d8181d7
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Wed Dec 26 20:21:50 2018 +0000
Update to 415.25 release
nvidia-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/nvidia-kmod.spec b/nvidia-kmod.spec
index 83d72ff..44f7d0c 100644
--- a/nvidia-kmod.spec
+++ b/nvidia-kmod.spec
@@ -8,7 +8,7 @@
Name: nvidia-kmod
Epoch: 3
-Version: 415.23
+Version: 415.25
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA display driver kernel module
@@ -66,6 +66,9 @@ done
%changelog
+* Wed Dec 26 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.25-1
+- Update to 415.25 release
+
* Fri Dec 14 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3:415.23-1
- Update to 415.23 release
5 years, 3 months
[lives/f28] Patch mencoder3 plugins
by Antonio
Summary of changes:
33fd87f... Patch mencoder3 plugins (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 3 months
[lives/f29] Patch mencoder3 plugins
by Antonio
Summary of changes:
33fd87f... Patch mencoder3 plugins (*)
(*) This commit already existed in another branch; no separate mail sent
5 years, 3 months
[lives] Patch mencoder3 plugins
by Antonio
commit 33fd87fa22ecb25fe75d4c652e40f2945c010d96
Author: sagitter <sagitter(a)fedoraproject.org>
Date: Wed Dec 26 17:59:59 2018 +0100
Patch mencoder3 plugins
lives-fix-py3_mencoder.patch | 26 ++++++++++++++++++++++++++
lives.spec | 9 +++++++--
2 files changed, 33 insertions(+), 2 deletions(-)
---
diff --git a/lives-fix-py3_mencoder.patch b/lives-fix-py3_mencoder.patch
new file mode 100644
index 0000000..c624c2d
--- /dev/null
+++ b/lives-fix-py3_mencoder.patch
@@ -0,0 +1,26 @@
+diff --git a/lives-plugins/marcos-encoders/lives_avi_encoder3 b/lives-plugins/marcos-encoders/lives_avi_encoder3
+index be0f4e3..fc3a002 100644
+--- a/lives-plugins/marcos-encoders/lives_avi_encoder3
++++ b/lives-plugins/marcos-encoders/lives_avi_encoder3
+@@ -27,7 +27,7 @@ See my vids at http://amv.reimeika.ca !
+
+ Copyright (C) 2008 - 2018 Salsaman (salsaman+lives(a)gmail.com)
+ """
+-
++import os
+ version = '0.0.19'
+ if os.name == 'nt':
+ convert = 'mgkvert'
+diff --git a/lives-plugins/plugins/encoders/multi_encoder3 b/lives-plugins/plugins/encoders/multi_encoder3
+index f4e4a77..9a78c93 100644
+--- a/lives-plugins/plugins/encoders/multi_encoder3
++++ b/lives-plugins/plugins/encoders/multi_encoder3
+@@ -189,7 +189,7 @@ def is_installed(prog):
+ std_in.close()
+
+
+- if 'command not found' in std_out_err.read():
++ if b'command not found' in std_out_err.read():
+ if verbose:
+ print(prog + ': missing dependencies', file=sys.stderr)
+ found = 0
diff --git a/lives.spec b/lives.spec
index 3b69600..d922387 100644
--- a/lives.spec
+++ b/lives.spec
@@ -14,7 +14,7 @@
Name: lives
Version: 2.10.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Video editor and VJ tool
License: GPLv3+ and LGPLv3+
URL: http://lives-video.com
@@ -22,6 +22,8 @@ Source0: http://lives-video.com/releases/LiVES-%{version}.tar.bz2
## Appdata file
Source1: LiVES.appdata.xml
+Patch0: %{name}-fix-py3_mencoder.patch
+
BuildRequires: pkgconfig(jack)
BuildRequires: pkgconfig(sdl)
BuildRequires: pkgconfig(libpulse)
@@ -92,7 +94,7 @@ designed to be simple to use, yet powerful.
It is small in size, yet it has many advanced features.
%prep
-%autosetup -n lives-%{version}
+%autosetup -p1 -n lives-%{version}
# Remove spurious executable permissions
find . -type f -name "*.h" -exec chmod 0644 '{}' \;
@@ -176,6 +178,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.appdata.xml
%{_metainfodir}/LiVES.appdata.xml
%changelog
+* Wed Dec 26 2018 Antonio Trande <sagitterATfedoraproject.org> - 2.10.1-2
+- Patch mencoder3 plugins
+
* Sun Dec 23 2018 Antonio Trande <sagitterATfedoraproject.org> - 2.10.1-1
- Release 2.10.1
5 years, 3 months