[ffmpeg/f32] Update changelog
by Leigh Scott
commit 8538a7ebd515f04c38ac13346426e0ca3842ffeb
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 23 13:00:13 2020 +0100
Update changelog
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 174c8c4..5d97753 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -84,7 +84,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.2.3
-Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 2%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -428,6 +428,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat May 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.3-2
+- Fix vmaf model path
+
* Thu May 21 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.2.3-1
- Update to 4.2.3 release
3 years, 12 months
[ffmpeg/f32] fix vmaf model path
by Leigh Scott
commit cee8b537784209ca32f34614e7b65c5503563851
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 23 12:39:22 2020 +0100
fix vmaf model path
ffmpeg.spec | 6 +++---
fix-vmaf-model-path.patch | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index bf6510a..174c8c4 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -93,6 +93,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
Patch0: fix_ppc_build.patch
+Patch1: fix-vmaf-model-path.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})}
@@ -318,12 +319,11 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
-%setup -q -n ffmpeg-%{?branch}%{date}
+%autosetup -p1 -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}
+%autosetup -p1 -n ffmpeg-%{version}
%endif
-%patch0 -p1
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
mkdir -p _doc/examples
diff --git a/fix-vmaf-model-path.patch b/fix-vmaf-model-path.patch
new file mode 100644
index 0000000..88a949b
--- /dev/null
+++ b/fix-vmaf-model-path.patch
@@ -0,0 +1,25 @@
+From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Sat, 23 May 2020 12:32:44 +0100
+Subject: [PATCH] fix vmaf model path
+
+---
+ libavfilter/vf_libvmaf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 14c3216b3a..e7273b6d1d 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+--
+2.26.2
+
3 years, 12 months
[ffmpeg] Update to 20200523git
by Leigh Scott
commit 5059ea86be935673e741ec23e70af56c03623fb6
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 23 12:48:48 2020 +0100
Update to 20200523git
.gitignore | 1 +
ffmpeg.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6b992ab..18c7588 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ ffmpeg-*.rpm
/ffmpeg-20200501.tar.bz2
/ffmpeg-20200508.tar.bz2
/ffmpeg-20200516.tar.bz2
+/ffmpeg-20200523.tar.bz2
diff --git a/ffmpeg.spec b/ffmpeg.spec
index d6c99d2..8b1c412 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -1,7 +1,7 @@
# TODO: add make test to %%check section
#global branch oldabi-
-%global date 20200516
+%global date 20200523
#global rel rc1
# rav1e has a broken .pc file
@@ -89,7 +89,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 4.3
-Release: 0.18.%{?date}%{?date:git}%{?rel}%{?dist}
+Release: 0.19.%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
%if 0%{?date}
@@ -435,6 +435,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Sat May 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.19.20200523git
+- Update to 20200523git
+
* Sat May 16 2020 Leigh Scott <leigh123linux(a)gmail.com> - 4.3-0.18.20200516git
- Update to 20200516git
diff --git a/sources b/sources
index bb60782..4d2dd05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-20200516.tar.bz2) = a61ca1e91976c5e313b05a7c6167bb28464245c02094ca6c121b33ae4f4ab2146cb7578ade753def19313ea869f3ec195d86c8a4608b9b22792866bbe6883dc2
+SHA512 (ffmpeg-20200523.tar.bz2) = 1d8d606f262b3c96b0428c3809e484c23be2aa54bd2ca372e57d43c85c3c4fb6badef1948722ecd55f56083e47ddbeed933904273e3a49202b05e85cde98c912
3 years, 12 months
[ffmpeg] fix vmaf model path
by Leigh Scott
commit d4ac6461183681e71a5f96ed52e9c6ebb091a143
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat May 23 12:39:22 2020 +0100
fix vmaf model path
ffmpeg.spec | 5 +++--
fix-vmaf-model-path.patch | 25 +++++++++++++++++++++++++
2 files changed, 28 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 5e95ece..d6c99d2 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -97,6 +97,7 @@ Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.xz
%endif
+Patch0: fix-vmaf-model-path.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})}
@@ -325,10 +326,10 @@ This package contains development files for %{name}
%prep
%if 0%{?date}
-%setup -q -n ffmpeg-%{?branch}%{date}
+%autosetup -p1 -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-rpmfusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}
+%autosetup -p1 -n ffmpeg-%{version}
%endif
# fix -O3 -g in host_cflags
sed -i "s|check_host_cflags -O3|check_host_cflags %{optflags}|" configure
diff --git a/fix-vmaf-model-path.patch b/fix-vmaf-model-path.patch
new file mode 100644
index 0000000..88a949b
--- /dev/null
+++ b/fix-vmaf-model-path.patch
@@ -0,0 +1,25 @@
+From 37b8f54578ac1bcb7a63dc9038a5238fd6a58793 Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Sat, 23 May 2020 12:32:44 +0100
+Subject: [PATCH] fix vmaf model path
+
+---
+ libavfilter/vf_libvmaf.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libavfilter/vf_libvmaf.c b/libavfilter/vf_libvmaf.c
+index 14c3216b3a..e7273b6d1d 100644
+--- a/libavfilter/vf_libvmaf.c
++++ b/libavfilter/vf_libvmaf.c
+@@ -72,7 +72,7 @@ typedef struct LIBVMAFContext {
+ #define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM
+
+ static const AVOption libvmaf_options[] = {
+- {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/local/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
++ {"model_path", "Set the model to be used for computing vmaf.", OFFSET(model_path), AV_OPT_TYPE_STRING, {.str="/usr/share/model/vmaf_v0.6.1.pkl"}, 0, 1, FLAGS},
+ {"log_path", "Set the file path to be used to store logs.", OFFSET(log_path), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"log_fmt", "Set the format of the log (xml or json).", OFFSET(log_fmt), AV_OPT_TYPE_STRING, {.str=NULL}, 0, 1, FLAGS},
+ {"enable_transform", "Enables transform for computing vmaf.", OFFSET(enable_transform), AV_OPT_TYPE_BOOL, {.i64=0}, 0, 1, FLAGS},
+--
+2.26.2
+
3 years, 12 months
[ripcord/f30] Update to 0.4.25
by sentry
Summary of changes:
3169190... Update to 0.4.25 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 12 months
[ripcord/f31] Update to 0.4.25
by sentry
Summary of changes:
3169190... Update to 0.4.25 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 12 months
[ripcord/f32] Update to 0.4.25
by sentry
Summary of changes:
3169190... Update to 0.4.25 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 12 months
[ripcord] Update to 0.4.25
by sentry
commit 3169190d02fba7a8e5cdf1793b926fd0ec22a708
Author: Jan200101 <sentrycraft123(a)gmail.com>
Date: Sat May 23 00:27:34 2020 +0200
Update to 0.4.25
.gitignore | 1 +
ripcord.spec | 5 ++++-
sources | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f04ff4..6c41586 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
/Ripcord-0.4.22-x86_64.AppImage
/Ripcord-0.4.23-x86_64.AppImage
/Ripcord-0.4.24-x86_64.AppImage
+/Ripcord-0.4.25-x86_64.AppImage
diff --git a/ripcord.spec b/ripcord.spec
index 86d5302..8e50b8e 100644
--- a/ripcord.spec
+++ b/ripcord.spec
@@ -3,7 +3,7 @@
Summary: a lightweight chat client for Slack and Discord
Name: ripcord
-Version: 0.4.24
+Version: 0.4.25
Release: 1%{dist}
License: Redistributable, no modification permitted
@@ -51,6 +51,9 @@ desktop-file-install
%license redistribution.txt
%changelog
+* Fri May 22 2020 Jan Drögehoff <sentrycraft123(a)gmail.com> - 0.4.25-1
+- Update to version 0.4.25
+
* Sat Mar 14 2020 Jan Drögehoff <sentrycraft123(a)gmail.com> - 0.4.24-1
- Update to version 0.4.24
diff --git a/sources b/sources
index 7252b70..5682035 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Ripcord-0.4.24-x86_64.AppImage) = 8703fd4a0336d7097bdd215eef9cd7d1b1f6c7b1ba92e8128822b904d6cb57154e01615b58d7a1e815de05896f928035784b97886ec7168b2c9dd6c95567cd43
+SHA512 (Ripcord-0.4.25-x86_64.AppImage) = 682df0dbedd611014d13083273b7412d62ab27a949faa60db254fad9197ccc2e485f416be6640cc7a12667aa10d441643966169e40a533a53cfa4511f61b775e
3 years, 12 months
