[rfpkg/f28] (4 commits) ...Fix --dist/--release option for 'master' %dist detection
by Leigh Scott
Summary of changes:
b17af39... Patch F30 to use python3 (*)
0950819... Add requires and Buildrequires python3-future (*)
435b206... Fix python2 shebang in python3 build (*)
7d80e7e... Fix --dist/--release option for 'master' %dist detection (*)
(*) This commit already existed in another branch; no separate mail sent
5 years
[rfpkg] Fix --dist/--release option for 'master' %dist detection
by Leigh Scott
commit 7d80e7eedd59f6e2615faae81662375f81b05540
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Fri Mar 29 14:05:50 2019 +0000
Fix --dist/--release option for 'master' %dist detection
koji_destname.patch | 40 ++++++++++++++++++++++++++++++++++++++++
rfpkg.spec | 7 ++++++-
2 files changed, 46 insertions(+), 1 deletion(-)
---
diff --git a/koji_destname.patch b/koji_destname.patch
new file mode 100644
index 0000000..2b86a5d
--- /dev/null
+++ b/koji_destname.patch
@@ -0,0 +1,40 @@
+--- a/src/rfpkg/__init__.py
++++ b/src/rfpkg/__init__.py
+@@ -228,6 +228,10 @@
+ 'default method: %s' % e)
+ super(Commands, self).load_user()
+
++ def _tag2version(self, dest_tag):
++ """ get the '26' part of 'f26-foo' string """
++ return dest_tag.split('-')[0].replace('f', '')
++
+ # New functionality
+ def _findmasterbranch(self):
+ """Find the right "rpmfusion" for master"""
+@@ -235,11 +239,7 @@
+ # If we already have a koji session, just get data from the source
+ if self._kojisession:
+ rawhidetarget = self.kojisession.getBuildTarget('rawhide-free')
+- desttag = rawhidetarget['dest_tag_name']
+- desttag=desttag.split('-')
+- desttag.remove('free')
+- desttag=''.join(desttag)
+- return desttag.replace('f', '')
++ return self._tag2version(rawhidetarget['dest_tag_name'])
+ else:
+ # We may not have Fedoras. Find out what rawhide target does.
+ try:
+@@ -249,11 +249,7 @@
+ # We couldn't hit koji, bail.
+ raise pyrpkg.rpkgError('Unable to query koji to find rawhide \
+ target')
+- desttag = rawhidetarget['dest_tag_name']
+- desttag=desttag.split('-')
+- desttag.remove('free')
+- desttag=''.join(desttag)
+- return desttag.replace('f', '')
++ return self._tag2version(rawhidetarget['dest_tag_name'])
+
+ def _determine_runtime_env(self):
+ """Need to know what the runtime env is, so we can unset anything
+
diff --git a/rfpkg.spec b/rfpkg.spec
index 2c66da4..ed01296 100644
--- a/rfpkg.spec
+++ b/rfpkg.spec
@@ -5,13 +5,14 @@
Name: rfpkg
Version: 1.25.6
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: RPM Fusion utility for working with dist-git
License: GPLv2+
Group: Applications/System
URL: https://github.com/rpmfusion-infra/rfpkg
Source0: %url/archive/v%{version}/%{name}-%{version}.tar.gz
Patch0: py3.patch
+Patch1: koji_destname.patch
BuildArch: noarch
@@ -88,6 +89,7 @@ RPM Fusion utility for working with dist-git.
%if 0%{?fedora} > 29 || 0%{?rhel} > 8
%patch0 -p1
%endif
+%patch1 -p1
%build
%if %{with python2}
@@ -143,6 +145,9 @@ install -p -m 0644 rfpkg.1 $RPM_BUILD_ROOT%{_mandir}/man1
%changelog
+* Fri Mar 29 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.6-4
+- Fix --dist/--release option for 'master' %dist detection
+
* Tue Mar 26 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 1.25.6-3
- Fix python2 shebang in python3 build
5 years
[kdenlive] respin melt patch to give mlt-melt priority over melt
by Rex Dieter
commit b02624fe9fd70fedd987ea94a20bdf00e4ed52ed
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Mar 29 08:35:27 2019 -0500
respin melt patch to give mlt-melt priority over melt
kdenlive.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/kdenlive.spec b/kdenlive.spec
index 1544848..2ecec33 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -2,7 +2,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 18.12.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -160,6 +160,9 @@ fi
%changelog
+* Fri Mar 29 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-2
+- respin melt patch to give mlt-melt priority over melt
+
* Thu Mar 28 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-1
- 18.12.3
- backport upstream fix for mlt-melt (kde#405564)
5 years
[ffmpeg/f28: 2/2] Merge branch 'f29' into f28
by Leigh Scott
commit aa225a59008446e238979813b0864e08ea4da77a
Merge: f1b76f1 cb23698
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Mar 28 23:04:46 2019 +0000
Merge branch 'f29' into f28
...lsubtitles-Fixes-denial-of-service-due-to.patch | 65 ----------------------
...lsubtitles-Fixes-denial-of-service-due-to.patch | 64 ---------------------
...aomenc-remove-AVOption-related-to-frame-p.patch | 34 -----------
ffmpeg.spec | 24 +++-----
sources | 2 +-
5 files changed, 9 insertions(+), 180 deletions(-)
---
5 years
[ffmpeg/f29] Update to 4.0.4 release
by Leigh Scott
commit cb23698755d5abe833922a19012b692d6f59fd4f
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Thu Mar 28 23:04:17 2019 +0000
Update to 4.0.4 release
...lsubtitles-Fixes-denial-of-service-due-to.patch | 65 ----------------------
...lsubtitles-Fixes-denial-of-service-due-to.patch | 64 ---------------------
...aomenc-remove-AVOption-related-to-frame-p.patch | 34 -----------
ffmpeg.spec | 24 +++-----
sources | 2 +-
5 files changed, 9 insertions(+), 180 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index f226dc3..b16f606 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -88,8 +88,8 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 4.0.3
-Release: 4%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 4.0.4
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -97,17 +97,8 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
-# Upstream commit to fix aom build issue
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/b69ea742ab23ad74b2ae2...
-Patch0: avcodec-libaomenc-remove-AVOption-related-to-frame-p.patch
# Backport from master to allow vmaf 1.3.9
-Patch1: 87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch
-# https://nvd.nist.gov/vuln/detail/CVE-2019-9718
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/1f00c97bc3475c477f3c468cf...
-Patch2: 0001-avcodec-htmlsubtitles-Fixes-denial-of-service-due-to.patch
-# https://nvd.nist.gov/vuln/detail/CVE-2019-9721
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/894995c41e0795c7a44f81adc...
-Patch3: 0002-avcodec-htmlsubtitles-Fixes-denial-of-service-due-to.patch
+Patch0: 87cc7e8d4ef8fa643d8d4822525b9c95cc9e7307.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel}
%{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})}
@@ -332,10 +323,8 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
%setup -q -n ffmpeg-%{version}
%endif
-%patch0 -p1 -b .aom_build_fix
-%patch1 -p1 -b .vmaf_build
-%patch2 -p1 -b .CVE-2019-9718
-%patch3 -p1 -b .CVE-2019-9721
+%patch0 -p1 -b .vmaf_build
+
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -442,6 +431,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Thu Mar 28 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.4-1
+- Update to 4.0.4 release
+
* Tue Mar 19 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 4.0.3-4
- Patch to fix CVE-2019-9718 and CVE-2019-9721
diff --git a/sources b/sources
index 77eb023..2fd6121 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-91b52d8cacbb9693e29c8d2d95c21a9d ffmpeg-4.0.3.tar.xz
+43c1f822382dac85f31bc059bbff117d ffmpeg-4.0.4.tar.xz
5 years
[kdenlive] 18.12.3 backport upstream fix for mlt-melt (kde#405564)
by Rex Dieter
commit aac2d4e1522e2fdfe1838d2a2983e60e6f517801
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Thu Mar 28 16:33:46 2019 -0500
18.12.3
backport upstream fix for mlt-melt (kde#405564)
.gitignore | 1 +
kdenlive-18.12.3-mlt_melt.patch | 13 +++++++++++++
kdenlive.spec | 11 +++++++++--
sources | 2 +-
4 files changed, 24 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ab1a1d6..bec0ad4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@
/kdenlive-18.08.1.tar.xz
/kdenlive-18.08.2.tar.xz
/kdenlive-18.12.2.tar.xz
+/kdenlive-18.12.3.tar.xz
diff --git a/kdenlive-18.12.3-mlt_melt.patch b/kdenlive-18.12.3-mlt_melt.patch
new file mode 100644
index 0000000..328f75d
--- /dev/null
+++ b/kdenlive-18.12.3-mlt_melt.patch
@@ -0,0 +1,13 @@
+diff -up kdenlive-18.12.3/src/mltconnection.cpp.mlt kdenlive-18.12.3/src/mltconnection.cpp
+--- kdenlive-18.12.3/src/mltconnection.cpp.mlt 2019-02-27 19:43:02.000000000 -0600
++++ kdenlive-18.12.3/src/mltconnection.cpp 2019-03-28 16:26:00.482603257 -0500
+@@ -74,6 +74,9 @@ void MltConnection::locateMeltAndProfile
+ }
+ if (!QFile::exists(meltPath)) {
+ meltPath = QStandardPaths::findExecutable("melt");
++ if (meltPath.isEmpty()) {
++ meltPath = QStandardPaths::findExecutable("mlt-melt");
++ }
+ }
+ KdenliveSettings::setRendererpath(meltPath);
+
diff --git a/kdenlive.spec b/kdenlive.spec
index ccacd4b..1544848 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -1,8 +1,8 @@
Name: kdenlive
Summary: Non-linear video editor
-Version: 18.12.2
-Release: 2%{?dist}
+Version: 18.12.3
+Release: 1%{?dist}
License: GPLv2+
URL: http://www.kdenlive.org
@@ -15,6 +15,9 @@ URL: http://www.kdenlive.org
Source0: http://download.kde.org/%{stable}/applications/%{version}/src/kdenlive-%{...
Source100: kdenlive-find-lang.sh
+## backport from master branch
+Patch100: kdenlive-18.12.3-mlt_melt.patch
+
# Add support for finding html files with find-lang.sh --with-html on epel
# https://github.com/rpm-software-management/rpm/commit/0c42871ff407a3eeb1e...
%if 0%{?rhel}
@@ -157,6 +160,10 @@ fi
%changelog
+* Thu Mar 28 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-1
+- 18.12.3
+- backport upstream fix for mlt-melt (kde#405564)
+
* Mon Mar 04 2019 RPM Fusion Release Engineering <leigh123linux(a)gmail.com> - 18.12.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
diff --git a/sources b/sources
index c2373c3..6a93a44 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-65964a00da12dd45839d255bc23111d5 kdenlive-18.12.2.tar.xz
+57e49c3995117945938669e24aff9352 kdenlive-18.12.3.tar.xz
5 years