[lives] Patch mencoder3 plugins
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