[rpmfusion-nonfree-release/f30] Switch to branch layout
by Leigh Scott
commit 7835b825a79f96b1d854ed5c8f5195e3b3ed88e3
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 20:30:19 2019 +0100
Switch to branch layout
rpmfusion-nonfree-rawhide.repo | 2 +-
rpmfusion-nonfree-release.spec | 7 +++++--
rpmfusion-nonfree-updates-testing.repo | 2 +-
rpmfusion-nonfree.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-nonfree-rawhide.repo b/rpmfusion-nonfree-rawhide.repo
index 391cb3e..adb2f06 100644
--- a/rpmfusion-nonfree-rawhide.repo
+++ b/rpmfusion-nonfree-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-rawhi...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 62913a7..03d08ec 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -1,10 +1,10 @@
#global repo free
%global repo nonfree
-%global israwhide 1
+#global israwhide 1
Name: rpmfusion-%{repo}-release
Version: 30
-Release: 0.2
+Release: 0.3
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.3
+- Switch to branch layout
+
* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2
- Remove f28 key
- Add f31 key
diff --git a/rpmfusion-nonfree-updates-testing.repo b/rpmfusion-nonfree-updates-testing.repo
index 90ba1c0..36e4d55 100644
--- a/rpmfusion-nonfree-updates-testing.repo
+++ b/rpmfusion-nonfree-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Nonfree - Test Updates
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-updat...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-nonfree.repo b/rpmfusion-nonfree.repo
index 5f73f00..239b8fb 100644
--- a/rpmfusion-nonfree.repo
+++ b/rpmfusion-nonfree.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Nonfree
#baseurl=http://download1.rpmfusion.org/nonfree/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=nonfree-fedora-$rele...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
5 years
[rpmfusion-free-release/f30] Switch to branch layout
by Leigh Scott
commit 9cf903be1f70e04b0b98b6379a49b8d89c6603ff
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 20:27:33 2019 +0100
Switch to branch layout
rpmfusion-free-rawhide.repo | 2 +-
rpmfusion-free-release.spec | 7 +++++--
rpmfusion-free-updates-testing.repo | 2 +-
rpmfusion-free.repo | 4 ++--
4 files changed, 9 insertions(+), 6 deletions(-)
---
diff --git a/rpmfusion-free-rawhide.repo b/rpmfusion-free-rawhide.repo
index 5946aab..5a02334 100644
--- a/rpmfusion-free-rawhide.repo
+++ b/rpmfusion-free-rawhide.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora Rawhide - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/development/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-rawhide&...
-enabled=1
+enabled=0
enabled_metadata=1
type=rpm-md
gpgcheck=0
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index f094afb..8f153e5 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -1,10 +1,10 @@
%global repo free
#global repo nonfree
-%global israwhide 1
+#global israwhide 1
Name: rpmfusion-%{repo}-release
Version: 30
-Release: 0.2
+Release: 0.3
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.3
+- Switch to branch layout
+
* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2
- Remove f28 key
- Add f31 key
diff --git a/rpmfusion-free-updates-testing.repo b/rpmfusion-free-updates-testing.repo
index 9c39b34..54112fd 100644
--- a/rpmfusion-free-updates-testing.repo
+++ b/rpmfusion-free-updates-testing.repo
@@ -2,7 +2,7 @@
name=RPM Fusion for Fedora $releasever - Free - Test Updates
#baseurl=http://download1.rpmfusion.org/free/fedora/updates/testing/$releasever/$basearch/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-updates-...
-enabled=0
+enabled=1
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
diff --git a/rpmfusion-free.repo b/rpmfusion-free.repo
index 21ed42a..4f1611f 100644
--- a/rpmfusion-free.repo
+++ b/rpmfusion-free.repo
@@ -2,8 +2,8 @@
name=RPM Fusion for Fedora $releasever - Free
#baseurl=http://download1.rpmfusion.org/free/fedora/releases/$releasever/Everything/$basearch/os/
metalink=https://mirrors.rpmfusion.org/metalink?repo=free-fedora-$release...
-enabled=0
-metadata_expire=14d
+enabled=1
+#metadata_expire=14d
type=rpm-md
gpgcheck=1
repo_gpgcheck=0
5 years
[rpmfusion-nonfree-release] Bump for 31
by Leigh Scott
commit 8ada297c4f56bbf95f23ec18aad4547cdf736fd3
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 20:21:59 2019 +0100
Bump for 31
rpmfusion-nonfree-release.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-nonfree-release.spec b/rpmfusion-nonfree-release.spec
index 62913a7..52c75b6 100644
--- a/rpmfusion-nonfree-release.spec
+++ b/rpmfusion-nonfree-release.spec
@@ -3,8 +3,8 @@
%global israwhide 1
Name: rpmfusion-%{repo}-release
-Version: 30
-Release: 0.2
+Version: 31
+Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.1
+- Bump for 31
+
* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2
- Remove f28 key
- Add f31 key
5 years
[rpmfusion-free-release] Bump for 31
by Leigh Scott
commit 6d3b62cf7690df9ee19469db0a41b522863c243b
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 20:19:50 2019 +0100
Bump for 31
rpmfusion-free-release.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/rpmfusion-free-release.spec b/rpmfusion-free-release.spec
index f094afb..46de5db 100644
--- a/rpmfusion-free-release.spec
+++ b/rpmfusion-free-release.spec
@@ -3,8 +3,8 @@
%global israwhide 1
Name: rpmfusion-%{repo}-release
-Version: 30
-Release: 0.2
+Version: 31
+Release: 0.1
Summary: RPM Fusion (%{repo}) Repository Configuration
License: BSD
@@ -106,6 +106,9 @@ ln -s $(basename %{SOURCE31}) %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY
%config(noreplace) %{_sysconfdir}/yum.repos.d/rpmfusion-%{repo}-tainted.repo
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 31-0.1
+- Bump for 31
+
* Thu Oct 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 30-0.2
- Remove f28 key
- Add f31 key
5 years
[buildsys-build-rpmfusion] Bump for 31
by Leigh Scott
commit 280505846db1d5a43dc5db8ecf3a3a8145954e13
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 20:10:31 2019 +0100
Bump for 31
buildsys-build-rpmfusion.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 61a8b8e..2dbfcec 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -2,7 +2,7 @@
Name: buildsys-build-%{repo}
Epoch: 10
-Version: 30
+Version: 31
Release: 0.1
Summary: Tools and files used by the %{repo} buildsys
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 10:31-0.1
+- Bump for 31
+
* Thu Aug 23 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 10:30-0.1
- Bump for 30
5 years
[ffmpeg/el7] Release 3.4.6
by Leigh Scott
commit d67dc5d9599d989ae06c89b8691a737d37397c1d
Author: Leigh Scott <leigh123linux(a)googlemail.com>
Date: Sun Mar 31 17:11:18 2019 +0100
Release 3.4.6
...lsubtitles-Fixes-denial-of-service-due-to.patch | 65 ----------------------
...lsubtitles-Fixes-denial-of-service-due-to.patch | 64 ---------------------
ffmpeg.spec | 15 ++---
sources | 2 +-
4 files changed, 6 insertions(+), 140 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d2f3a0f..b4c9a1d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -67,8 +67,8 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.4.5
-Release: 3%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 3.4.6
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -78,12 +78,6 @@ Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
#Backport patch for arm neon
Patch0: 0001-arm-Fix-SIGBUS-on-ARM-when-compiled-with-binutils-2..patch
-# https://nvd.nist.gov/vuln/detail/CVE-2019-9718
-# https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/1f00c97bc3475c477f3c468cf...
-Patch1: 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...
-Patch2: 0002-avcodec-htmlsubtitles-Fixes-denial-of-service-due-to.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
%{?_with_cuda:BuildRequires: cuda-driver-dev-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-drivers-devel%{_isa}}
%{?_with_libnpp:BuildRequires: cuda-cudart-dev-%{_cuda_rpm_version} cuda-nvcc-%{_cuda_rpm_version} cuda-misc-headers-%{_cuda_rpm_version} cuda-npp-dev-%{_cuda_rpm_version}}
@@ -302,8 +296,6 @@ echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%endif
# backport patch for arm neon
%patch0 -p1
-%patch1 -p1 -b .CVE-2019-9718
-%patch2 -p1 -b .CVE-2019-9721
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
@@ -410,6 +402,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sun Mar 31 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.6-1
+- Release 3.4.6
+
* Tue Mar 19 2019 Leigh Scott <leigh123linux(a)googlemail.com> - 3.4.5-3
- Patch to fix CVE-2019-9718 and CVE-2019-9721
diff --git a/sources b/sources
index 13558d9..8195197 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b91ca21ff8ff6912226516fede49b0cb ffmpeg-3.4.5.tar.xz
+ff3e96b56edc485a91673392610afa08 ffmpeg-3.4.6.tar.xz
5 years
[kdenlive] respin melt.patch for real this time
by Rex Dieter
commit 208407c8fde16fdbc819328224aff9b3d4e97168
Author: Rex Dieter <rdieter(a)gmail.com>
Date: Fri Mar 29 10:59:56 2019 -0500
respin melt.patch for real this time
kdenlive-18.12.3-mlt_melt.patch | 10 ++++++----
kdenlive.spec | 5 ++++-
2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/kdenlive-18.12.3-mlt_melt.patch b/kdenlive-18.12.3-mlt_melt.patch
index 328f75d..bdf12dc 100644
--- a/kdenlive-18.12.3-mlt_melt.patch
+++ b/kdenlive-18.12.3-mlt_melt.patch
@@ -1,12 +1,14 @@
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
++++ kdenlive-18.12.3/src/mltconnection.cpp 2019-03-29 08:34:40.715613792 -0500
+@@ -73,7 +73,10 @@ void MltConnection::locateMeltAndProfile
+ meltPath = QDir::cleanPath(profilePath + QStringLiteral("/../../../bin/melt")) + exeSuffix;
}
if (!QFile::exists(meltPath)) {
- meltPath = QStandardPaths::findExecutable("melt");
+- meltPath = QStandardPaths::findExecutable("melt");
++ meltPath = QStandardPaths::findExecutable("mlt-melt");
+ if (meltPath.isEmpty()) {
-+ meltPath = QStandardPaths::findExecutable("mlt-melt");
++ meltPath = QStandardPaths::findExecutable("melt");
+ }
}
KdenliveSettings::setRendererpath(meltPath);
diff --git a/kdenlive.spec b/kdenlive.spec
index 2ecec33..ab6101f 100644
--- a/kdenlive.spec
+++ b/kdenlive.spec
@@ -2,7 +2,7 @@
Name: kdenlive
Summary: Non-linear video editor
Version: 18.12.3
-Release: 2%{?dist}
+Release: 3%{?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-3
+- respin melt.patch for real this time
+
* Fri Mar 29 2019 Rex Dieter <rdieter(a)fedoraproject.org> - 18.12.3-2
- respin melt patch to give mlt-melt priority over melt
5 years, 1 month
