[ffmpeg/f32] Fix conditionals
by Leigh Scott
commit 7d4c249e9d7797189734724e1a1fae57bda8fb06
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 12:21:34 2020 +0100
Fix conditionals
ffmpeg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b772898..33b907e 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -14,10 +14,12 @@
%global _without_opus 1
%global _without_srt 1
%global _without_vpx 1
-%global _without_vapoursynth 1
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
+%ifarch x86_64 i686
+%global _with_vapoursynth 1
+%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_vmaf 1
@@ -142,7 +144,7 @@ BuildRequires: libv4l-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-%{?!_without_vapoursynth:BuildRequires: vapoursynth-devel}
+%{?_with_vapoursynth:BuildRequires: vapoursynth-devel}
%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
%ifarch %{ix86} x86_64
@@ -300,7 +302,7 @@ This package contains development files for %{name}
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
%{?_with_vmaf:--enable-libvmaf --enable-version3} \\\
- %{!?_without_vapoursynth:--enable-vapoursynth} \\\
+ %{?_with_vapoursynth:--enable-vapoursynth} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{?_with_webp:--enable-libwebp} \\\
%{!?_without_x264:--enable-libx264} \\\
4 years, 5 months
[ffmpeg] Fix conditionals
by Leigh Scott
commit 5f4f3566dc1056d0d8f15038bae61959efddc02d
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 12:21:34 2020 +0100
Fix conditionals
ffmpeg.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 1fd86e6..fcf8103 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -19,10 +19,12 @@
%global _without_frei0r 1
%global _without_opus 1
%global _without_vpx 1
-%global _without_vapoursynth 1
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
+%ifarch x86_64 i686
+%global _with_vapoursynth 1
+%endif
%ifarch x86_64
%global _with_mfx 1
%global _with_vmaf 1
@@ -151,7 +153,7 @@ BuildRequires: libv4l-devel
%{?!_without_vaapi:BuildRequires: libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
-%{?!_without_vapoursynth:BuildRequires: vapoursynth-devel}
+%{?_with_vapoursynth:BuildRequires: vapoursynth-devel}
%{?!_without_vpx:BuildRequires: libvpx-devel >= 1.4.0}
%{?_with_mfx:BuildRequires: pkgconfig(libmfx) >= 1.23-1}
%ifarch %{ix86} x86_64
@@ -313,7 +315,7 @@ This package contains development files for %{name}
--enable-libv4l2 \\\
%{!?_without_vidstab:--enable-libvidstab} \\\
%{?_with_vmaf:--enable-libvmaf --enable-version3} \\\
- %{!?_without_vapoursynth:--enable-vapoursynth} \\\
+ %{?_with_vapoursynth:--enable-vapoursynth} \\\
%{!?_without_vpx:--enable-libvpx} \\\
%{!?_without_vulkan:--enable-vulkan --enable-libglslang} \\\
%{?_with_webp:--enable-libwebp} \\\
4 years, 5 months
[telegram-desktop/f31] Updated to version 2.1.13.
by Vitaly Zaitsev
commit f2421831c1569543e796d235d6dea4f85bc4f146
Author: Vitaly Zaitsev <vitaly(a)easycoding.org>
Date: Wed Jun 24 12:42:11 2020 +0200
Updated to version 2.1.13.
.gitignore | 1 +
sources | 2 +-
telegram-desktop.spec | 8 ++++----
3 files changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 166691b..bc0891c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -144,3 +144,4 @@
/tdesktop-2.1.10-full.tar.gz
/tdesktop-2.1.11-full.tar.gz
/tdesktop-2.1.12-full.tar.gz
+/tdesktop-2.1.13-full.tar.gz
diff --git a/sources b/sources
index 5e659cd..25620d6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tdesktop-2.1.12-full.tar.gz) = 961f7e4900f782d58d5d1b1045590a7029777c3daa8d26f47a61663de9ab0c3c3cdfa7507c0710af2fb231e480ffe67de0bcbd61b72acb751ae8133b73d86cff
+SHA512 (tdesktop-2.1.13-full.tar.gz) = f28ae7c8c9a9eb8094fc52784742b470235234a3df7487902152858bc7c297b2dcfe5c8b939cdb9653a356b3835609e7289f53cdf7d5fb3f009823d3dbeb1bd8
diff --git a/telegram-desktop.spec b/telegram-desktop.spec
index 9e1619a..f7cfd9d 100644
--- a/telegram-desktop.spec
+++ b/telegram-desktop.spec
@@ -21,7 +21,7 @@
%endif
Name: telegram-desktop
-Version: 2.1.12
+Version: 2.1.13
Release: 1%{?dist}
# Application and 3rd-party modules licensing:
@@ -194,11 +194,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/%{launcher}.desktop
%{_metainfodir}/%{launcher}.appdata.xml
%changelog
+* Wed Jun 24 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.13-1
+- Updated to version 2.1.13.
+
* Thu Jun 18 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.12-1
- Updated to version 2.1.12.
* Mon Jun 15 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.11-2
- Rebuilt due to Qt 5.14.2 update.
-
-* Mon Jun 08 2020 Vitaly Zaitsev <vitaly(a)easycoding.org> - 2.1.11-1
-- Updated to version 2.1.11.
4 years, 5 months
[ffmpeg/el8] (3 commits) ...Update changelog
by Leigh Scott
Summary of changes:
23d70ba... fixup vmaf needs version3 (*)
68146d4... Enable vapoursynth (*)
bd85a43... Update changelog (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months
[ffmpeg/f31: 5/5] Merge branch 'f32' into f31
by Leigh Scott
commit 8cf08050e2fb4a149ff1a8246a6bff9abc93bbb3
Merge: ebf0ebb bd85a43
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 10:02:54 2020 +0100
Merge branch 'f32' into f31
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
4 years, 5 months
[ffmpeg/f31: 3/5] Merge branch 'f32' into f31
by Leigh Scott
commit ebf0ebbf100067350ce0010dce98b8bf38b77464
Merge: c091713 68146d4
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Jun 24 10:00:02 2020 +0100
Merge branch 'f32' into f31
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
4 years, 5 months
[ffmpeg/f31] (5 commits) ...Merge branch 'f32' into f31
by Leigh Scott
Summary of changes:
23d70ba... fixup vmaf needs version3 (*)
68146d4... Enable vapoursynth (*)
ebf0ebb... Merge branch 'f32' into f31
bd85a43... Update changelog (*)
8cf0805... Merge branch 'f32' into f31
(*) This commit already existed in another branch; no separate mail sent
4 years, 5 months