The package rpms/vapoursynth.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/vapoursynth.git/commit/?id=5cfca1....
Change:
-ExclusiveArch: %{ix86} x86_64
Thanks.
Full change:
============
commit cdbbdd5b25b02632a8fa217cda4a3779b8e1ce4b
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:31:00 2021 +0100
Update sources
diff --git a/.gitignore b/.gitignore
index 6c565b5..be14818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/vapoursynth-R48.tar.gz
+/vapoursynth-R51.tar.gz
diff --git a/sources b/sources
index 2dd9c19..c687eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vapoursynth-R48.tar.gz) =
0d151dd384c97f103f8d96ea083909001e0b690af4362c64685c04efde874f4a8ff038b5149beb40688d6f9e0a4cc86d9618b6cc8a3066a270d81c2b6f1d068e
+SHA512 (vapoursynth-R51.tar.gz) =
feb218aa309e538a32054b4fdeaf291e5c817e1b49bd482cf9dfc6c17d055c367dc27f80863770ae3333a4d115c026ad47609ed70857d89c22ff16f5cc6d5292
commit 5cfca1ca8fb06df4140664c38f13a4d2ae7ee844
Author: Simone Caronni <negativo17(a)gmail.com>
Date: Tue Mar 23 15:10:05 2021 +0100
Update to R51, allow building for other archs beside x86
diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch
index fe8b2d8..29e4722 100644
--- a/vapoursynth-gcc11.patch
+++ b/vapoursynth-gcc11.patch
@@ -1,7 +1,6 @@
-diff --git a/src/core/exprfilter.cpp b/src/core/exprfilter.cpp
-index 8e6f154..1971f18 100644
---- a/src/core/exprfilter.cpp
-+++ b/src/core/exprfilter.cpp
+diff -Naur vapoursynth-R51.old/src/core/exprfilter.cpp
vapoursynth-R51/src/core/exprfilter.cpp
+--- vapoursynth-R51.old/src/core/exprfilter.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/exprfilter.cpp 2021-03-23 14:36:17.148054372 +0100
@@ -32,6 +32,7 @@
#include <unordered_map>
#include <unordered_set>
@@ -10,10 +9,9 @@ index 8e6f154..1971f18 100644
#include "VapourSynth.h"
#include "VSHelper.h"
#include "cpufeatures.h"
-diff --git a/src/core/genericfilters.cpp b/src/core/genericfilters.cpp
-index 613d98f..327512c 100644
---- a/src/core/genericfilters.cpp
-+++ b/src/core/genericfilters.cpp
+diff -Naur vapoursynth-R51.old/src/core/genericfilters.cpp
vapoursynth-R51/src/core/genericfilters.cpp
+--- vapoursynth-R51.old/src/core/genericfilters.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/genericfilters.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -28,6 +28,7 @@
#include <array>
#include <memory>
@@ -22,10 +20,9 @@ index 613d98f..327512c 100644
#include <VapourSynth.h>
#include <VSHelper.h>
#include "cpufeatures.h"
-diff --git a/src/core/kernel/generic.cpp b/src/core/kernel/generic.cpp
-index f4477bd..c00c619 100644
---- a/src/core/kernel/generic.cpp
-+++ b/src/core/kernel/generic.cpp
+diff -Naur vapoursynth-R51.old/src/core/kernel/generic.cpp
vapoursynth-R51/src/core/kernel/generic.cpp
+--- vapoursynth-R51.old/src/core/kernel/generic.cpp 2021-03-23 14:34:50.273555518 +0100
++++ vapoursynth-R51/src/core/kernel/generic.cpp 2021-03-23 14:36:17.149054389 +0100
@@ -22,6 +22,7 @@
#include <array>
#include <cmath>
@@ -34,23 +31,21 @@ index f4477bd..c00c619 100644
#include <type_traits>
#include "generic.h"
-diff --git a/src/filters/misc/miscfilters.cpp b/src/filters/misc/miscfilters.cpp
-index b4a727a..8931cbb 100644
---- a/src/filters/misc/miscfilters.cpp
-+++ b/src/filters/misc/miscfilters.cpp
-@@ -25,6 +25,7 @@
- #include <cstddef>
+diff -Naur vapoursynth-R51.old/src/filters/misc/miscfilters.cpp
vapoursynth-R51/src/filters/misc/miscfilters.cpp
+--- vapoursynth-R51.old/src/filters/misc/miscfilters.cpp 2021-03-23 14:34:50.276555570
+0100
++++ vapoursynth-R51/src/filters/misc/miscfilters.cpp 2021-03-23 14:36:17.150054407 +0100
+@@ -26,6 +26,7 @@
#include <memory>
+ #include <stdexcept>
#include <vector>
+#include <limits>
#include <VapourSynth.h>
#include <VSHelper.h>
#include "../src/core/filtersharedcpp.h"
-diff --git a/src/filters/removegrain/clense.cpp b/src/filters/removegrain/clense.cpp
-index 5fdc6b2..2507119 100644
---- a/src/filters/removegrain/clense.cpp
-+++ b/src/filters/removegrain/clense.cpp
-@@ -26,6 +26,7 @@ OTHER DEALINGS IN THE SOFTWARE.
+diff -Naur vapoursynth-R51.old/src/filters/removegrain/clense.cpp
vapoursynth-R51/src/filters/removegrain/clense.cpp
+--- vapoursynth-R51.old/src/filters/removegrain/clense.cpp 2021-03-23 14:34:50.276555570
+0100
++++ vapoursynth-R51/src/filters/removegrain/clense.cpp 2021-03-23 14:36:17.150054407
+0100
+@@ -26,6 +26,7 @@
*/
#include "shared.h"
diff --git a/vapoursynth-python38.patch b/vapoursynth-python38.patch
deleted file mode 100644
index 94ba351..0000000
--- a/vapoursynth-python38.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11 Mon Sep 17 00:00:00 2001
-From: cantabile <cantabile.desu(a)gmail.com>
-Date: Sun, 26 Jan 2020 00:00:22 +0200
-Subject: [PATCH] Fix compilation with Python 3.8.
-
-Fixes
https://github.com/vapoursynth/vapoursynth/issues/518.
----
- configure.ac | 18 ++++++++++++++++--
- 1 file changed, 16 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1d1b05fc..7dcde996 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -234,7 +234,13 @@ AS_IF(
- [
- AM_PATH_PYTHON([3])
-
-- PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-
- AC_CONFIG_FILES([pc/vapoursynth-script.pc])
- ]
-@@ -292,7 +298,15 @@ AS_IF(
-
- AS_IF(
- [test -z "$PYTHON3_LIBS"],
-- [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])]
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION-embed],
-+ [],
-+ [
-+ PKG_CHECK_MODULES([PYTHON3],
-+ [python-$PYTHON_VERSION])
-+ ])
-+ ]
- )
-
- AS_CASE(
diff --git a/vapoursynth-version-info.patch b/vapoursynth-version-info.patch
index 0ad2ed7..e7d1725 100644
--- a/vapoursynth-version-info.patch
+++ b/vapoursynth-version-info.patch
@@ -1,12 +1,12 @@
-diff -U3 vapoursynth-R48.orig/Makefile.am vapoursynth-R48/Makefile.am
---- vapoursynth-R48.orig/Makefile.am 2019-10-25 09:16:07.000000000 +0300
-+++ vapoursynth-R48/Makefile.am 2019-12-01 01:28:57.161837465 +0300
-@@ -89,7 +89,7 @@
+diff -Naur vapoursynth-R51.old/Makefile.am vapoursynth-R51/Makefile.am
+--- vapoursynth-R51.old/Makefile.am 2021-03-23 14:27:12.519657875 +0100
++++ vapoursynth-R51/Makefile.am 2021-03-23 14:27:19.806783602 +0100
+@@ -79,7 +79,7 @@
pkgconfig_DATA += pc/vapoursynth.pc
-libvapoursynth_la_LDFLAGS = -no-undefined -avoid-version
+libvapoursynth_la_LDFLAGS = -no-undefined -version-info $(PACKAGE_VERSION)
libvapoursynth_la_CPPFLAGS = $(ZIMG_CFLAGS)
-DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"'
- libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
libvapoursynth_avx2.la
+ libvapoursynth_la_LIBADD = $(ZIMG_LIBS) $(DLOPENLIB) libexprfilter.la
diff --git a/vapoursynth.spec b/vapoursynth.spec
index ba22267..ba4d5dd 100644
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -1,22 +1,19 @@
#global _with_tests 1
-#global _with_ffmpeg 1
+#global _with_subtitles 1
#global _with_ImageMagick 1
Name: vapoursynth
-Version: 48
-Release: 11%{?dist}
+Version: 51
+Release: 1%{?dist}
Summary: Video processing framework with simplicity in mind
License: LGPLv2
URL:
http://www.vapoursynth.com
Source0:
https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version...
Patch0: %{name}-version-info.patch
-Patch1:
https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842...
-Patch2: %{name}-gcc11.patch
+Patch1: %{name}-gcc11.patch
-ExclusiveArch: %{ix86} x86_64
-
-BuildRequires: make
+BuildRequires: make
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
@@ -38,7 +35,7 @@ BuildRequires: python3dist(pytest)
BuildRequires: pkgconfig(Magick++) >= 7.0
}
-%{?_with_ffmpeg:
+%{?_with_subtitles:
BuildRequires: pkgconfig(libass)
BuildRequires: pkgconfig(libavcodec)
BuildRequires: pkgconfig(libavformat)
@@ -109,7 +106,7 @@ autoreconf -vif
--enable-morpho \
--enable-ocr \
--enable-removegrain \
- --%{?_with_ffmpeg:enable}%{!?_with_ffmpeg:disable}-subtext \
+ --%{?_with_subtitles:enable}%{!?_with_subtitles:disable}-subtext \
--enable-vinverse \
--enable-vivtc \
@@ -136,7 +133,7 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%files libs
%doc ChangeLog
-%license COPYING.LGPLv2.1 ofl.txt
+%license COPYING.LESSER
%dir %{_libdir}/%{name}
%{_libdir}/lib%{name}.so.*
%{_libdir}/lib%{name}-script.so.*
@@ -160,6 +157,10 @@ rm -fr %{buildroot}%{_docdir}/%{name}
%changelog
+* Tue Mar 23 2021 Simone Caronni <negativo17(a)gmail.com> - 51-1
+- Update to R51.
+- Allow building for other archs beside x86.
+
* Wed Jan 27 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 48-11
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild