From 713e5a00bd4385d79849aa890c16b26108d16889 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 29 Feb 2020 15:46:59 +0000 Subject: [PATCH 01/22] Added the README --- README.md | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..3f4d9d0 --- /dev/null +++ b/README.md @@ -0,0 +1,3 @@ +# vapoursynth + +The vapoursynth package \ No newline at end of file From 8f1ae30cbff8f4c09e61fc7cf5e02d53140e6120 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 29 Feb 2020 16:55:42 +0100 Subject: [PATCH 02/22] First import --- .gitignore | 1 + sources | 1 + vapoursynth-python38.patch | 46 ++++++++++ vapoursynth-version-info.patch | 12 +++ vapoursynth.spec | 148 +++++++++++++++++++++++++++++++++ 5 files changed, 208 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 vapoursynth-python38.patch create mode 100644 vapoursynth-version-info.patch create mode 100644 vapoursynth.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6c565b5 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/vapoursynth-R48.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..2dd9c19 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vapoursynth-R48.tar.gz) = 0d151dd384c97f103f8d96ea083909001e0b690af4362c64685c04efde874f4a8ff038b5149beb40688d6f9e0a4cc86d9618b6cc8a3066a270d81c2b6f1d068e diff --git a/vapoursynth-python38.patch b/vapoursynth-python38.patch new file mode 100644 index 0000000..94ba351 --- /dev/null +++ b/vapoursynth-python38.patch @@ -0,0 +1,46 @@ +From a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11 Mon Sep 17 00:00:00 2001 +From: cantabile +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 new file mode 100644 index 0000000..0ad2ed7 --- /dev/null +++ b/vapoursynth-version-info.patch @@ -0,0 +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 @@ + + 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 + diff --git a/vapoursynth.spec b/vapoursynth.spec new file mode 100644 index 0000000..bbdda53 --- /dev/null +++ b/vapoursynth.spec @@ -0,0 +1,148 @@ +#global _with_ffmpeg 1 +#global _with_ImageMagick 1 + +Name: vapoursynth +Version: 48 +Release: 4%{?dist} +Summary: A 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}.tar.gz +Patch0: %{name}-version-info.patch +Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11.patch#/%{name}-python38.patch + +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gcc-c++ +BuildRequires: libtool +BuildRequires: nasm +BuildRequires: pkgconfig(python3) +BuildRequires: pkgconfig(tesseract) +BuildRequires: pkgconfig(zimg) +BuildRequires: python3-Cython +BuildRequires: python3-setuptools + +%{?_with_ImageMagick: +BuildRequires: pkgconfig(Magick++) >= 7.0 +} + +%{?_with_ffmpeg: +BuildRequires: pkgconfig(libass) +BuildRequires: pkgconfig(libavcodec) +BuildRequires: pkgconfig(libavformat) +BuildRequires: pkgconfig(libavutil) +} + +%description +VapourSynth is an application for video manipulation. Or a plugin. Or a +library. It’s hard to tell because it has a core library written in C++ and a +Python module to allow video scripts to be created. + +%package libs +Summary: VapourSynth's core library with a C++ API +Obsoletes: lib%{name} < %{version}-%{release} +Provides: lib%{name} == %{version}-%{release} + +%description libs +VapourSynth's core library with a C++ API. + +%package -n python3-%{name} +Summary: Python interface for VapourSynth + +%description -n python3-%{name} +Python interface for VapourSynth/VSSCript. + +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel +Development files for %{name}. + +%package tools +Summary: Extra tools for VapourSynth + +%description tools +This package contains the vspipe tool for interfacing with VapourSynth. + +%package plugins +Summary: VapourSynth plugins +Requires: libvapoursynth%{?_isa} = %{version}-%{release} + +%description plugins +VapourSynth plugins. + +%prep +%autosetup -p1 -n %{name}-R%{version} + +%build +autoreconf -vif +%configure \ + --disable-static \ + --enable-x86-asm \ + --enable-core \ + --enable-vsscript \ + --enable-vspipe \ + --enable-python-module \ + --enable-eedi3 \ + --%{?_with_ImageMagick:enable}%{!?_with_ImageMagick:disable}-imwri \ + --enable-miscfilters \ + --enable-morpho \ + --enable-ocr \ + --enable-removegrain \ + --%{?_with_ffmpeg:enable}%{!?_with_ffmpeg:disable}-subtext \ + --enable-vinverse \ + --enable-vivtc \ + +%make_build + +%install +%py3_install +%make_install +find %{buildroot} -type f -name "*.la" -delete + +# Let RPM pick up docs in the files section +rm -fr %{buildroot}%{_docdir}/%{name} + +%ldconfig_scriptlets libs +%ldconfig_scriptlets -n python3-%{name} + +%files libs +%doc ChangeLog +%license COPYING.LGPLv2.1 ofl.txt +%dir %{_libdir}/%{name} +%{_libdir}/lib%{name}.so.* +%{_libdir}/lib%{name}-script.so.* + +%files -n python3-%{name} +%{python3_sitearch}/%{name}.so +%{python3_sitearch}/VapourSynth-*.egg-info + +%files devel +%{_includedir}/%{name} +%{_libdir}/lib%{name}.so +%{_libdir}/lib%{name}-script.so +%{_libdir}/pkgconfig/%{name}.pc +%{_libdir}/pkgconfig/%{name}-script.pc + +%files tools +%{_bindir}/vspipe + +%files plugins +%{_libdir}/%{name}/lib*.so + +%changelog +* Thu Feb 20 2020 Simone Caronni - 48-4 +- More review fixes. +- Use upstream patch for Python 3.8. + +* Fri Feb 07 2020 Simone Caronni - 48-3 +- Review fixes. + +* Sun Jan 26 2020 Simone Caronni - 48-2 +- Move script library into main library package. +- Fix build with Python 3.8. + +* Thu Jan 16 2020 Simone Caronni - 48-1 +- First build. From c5540be3d5f76571185eea39e82391dd76bd9c7a Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 29 Feb 2020 16:57:11 +0100 Subject: [PATCH 03/22] Add review patch from Artem --- vapoursynth.spec | 74 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 50 insertions(+), 24 deletions(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index bbdda53..a5462f8 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -1,10 +1,11 @@ +#global _with_tests 1 #global _with_ffmpeg 1 #global _with_ImageMagick 1 Name: vapoursynth Version: 48 -Release: 4%{?dist} -Summary: A video processing framework with simplicity in mind +Release: 5%{?dist} +Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -23,6 +24,11 @@ BuildRequires: pkgconfig(zimg) BuildRequires: python3-Cython BuildRequires: python3-setuptools +%{?_with_tests: +BuildRequires: %{name}-devel +BuildRequires: python3dist(pytest) +} + %{?_with_ImageMagick: BuildRequires: pkgconfig(Magick++) >= 7.0 } @@ -35,47 +41,54 @@ BuildRequires: pkgconfig(libavutil) } %description -VapourSynth is an application for video manipulation. Or a plugin. Or a -library. It’s hard to tell because it has a core library written in C++ and a -Python module to allow video scripts to be created. +VapourSynth is an application for video manipulation. Or a plugin. Or a library. +It’s hard to tell because it has a core library written in C++ and a Python +module to allow video scripts to be created. -%package libs -Summary: VapourSynth's core library with a C++ API -Obsoletes: lib%{name} < %{version}-%{release} -Provides: lib%{name} == %{version}-%{release} -%description libs +%package libs +Summary: VapourSynth's core library with a C++ API +Obsoletes: lib%{name} < %{version}-%{release} +Provides: lib%{name} == %{version}-%{release} + +%description libs VapourSynth's core library with a C++ API. -%package -n python3-%{name} -Summary: Python interface for VapourSynth + +%package -n python3-%{name} +Summary: Python interface for VapourSynth %description -n python3-%{name} Python interface for VapourSynth/VSSCript. -%package devel -Summary: Development files for %{name} -Requires: %{name}-libs%{?_isa} = %{version}-%{release} -%description devel +%package devel +Summary: Development files for %{name} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description devel Development files for %{name}. -%package tools -Summary: Extra tools for VapourSynth -%description tools +%package tools +Summary: Extra tools for VapourSynth + +%description tools This package contains the vspipe tool for interfacing with VapourSynth. -%package plugins -Summary: VapourSynth plugins -Requires: libvapoursynth%{?_isa} = %{version}-%{release} -%description plugins +%package plugins +Summary: VapourSynth plugins +Requires: libvapoursynth%{?_isa} = %{version}-%{release} + +%description plugins VapourSynth plugins. + %prep %autosetup -p1 -n %{name}-R%{version} + %build autoreconf -vif %configure \ @@ -97,6 +110,7 @@ autoreconf -vif %make_build + %install %py3_install %make_install @@ -108,6 +122,13 @@ rm -fr %{buildroot}%{_docdir}/%{name} %ldconfig_scriptlets libs %ldconfig_scriptlets -n python3-%{name} + +%{?_with_tests: +%check +%{python3} -m pytest -v +} + + %files libs %doc ChangeLog %license COPYING.LGPLv2.1 ofl.txt @@ -120,7 +141,7 @@ rm -fr %{buildroot}%{_docdir}/%{name} %{python3_sitearch}/VapourSynth-*.egg-info %files devel -%{_includedir}/%{name} +%{_includedir}/%{name}/ %{_libdir}/lib%{name}.so %{_libdir}/lib%{name}-script.so %{_libdir}/pkgconfig/%{name}.pc @@ -132,7 +153,12 @@ rm -fr %{buildroot}%{_docdir}/%{name} %files plugins %{_libdir}/%{name}/lib*.so + %changelog +* Tue Feb 25 2020 Artem Polishchuk - 48-5 +- Add tests +- Cosmetic spec file improvements + * Thu Feb 20 2020 Simone Caronni - 48-4 - More review fixes. - Use upstream patch for Python 3.8. From 2d74286a22e4d464ea396a7d0f31ed5f7adb42fd Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 29 Feb 2020 17:08:42 +0100 Subject: [PATCH 04/22] ExclusiveArch for i686 and x86_64 --- vapoursynth.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/vapoursynth.spec b/vapoursynth.spec index a5462f8..56324e6 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -13,6 +13,8 @@ Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{ve Patch0: %{name}-version-info.patch Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11.patch#/%{name}-python38.patch +ExclusiveArch: %{ix86} x86_64 + BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ From b21b5be7ad1ca533f71dc85c98f9b742541e830f Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 29 Feb 2020 17:22:00 +0100 Subject: [PATCH 05/22] Require python3 for building --- vapoursynth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vapoursynth.spec b/vapoursynth.spec index 56324e6..8d75492 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -23,6 +23,7 @@ BuildRequires: nasm BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(tesseract) BuildRequires: pkgconfig(zimg) +BuildRequires: python3 BuildRequires: python3-Cython BuildRequires: python3-setuptools From d9bfdd66102cc11857c0890245a346de21b26a79 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 29 Feb 2020 17:23:56 +0100 Subject: [PATCH 06/22] Update changelog --- vapoursynth.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 8d75492..c7cccb5 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -158,6 +158,10 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Sat Feb 29 2020 Simone Caronni - 48-6 +- Make it exclusive for i686/x86_64. +- Fix build on RHEL/CentOS 8. + * Tue Feb 25 2020 Artem Polishchuk - 48-5 - Add tests - Cosmetic spec file improvements From cdc0af2309a60f3ceb04659472b279d8db73d356 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sat, 7 Mar 2020 09:18:01 +0100 Subject: [PATCH 07/22] Fix broken dependency --- vapoursynth.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index c7cccb5..205b05f 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -82,7 +82,7 @@ This package contains the vspipe tool for interfacing with VapourSynth. %package plugins Summary: VapourSynth plugins -Requires: libvapoursynth%{?_isa} = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description plugins VapourSynth plugins. @@ -158,6 +158,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Sat Mar 07 2020 Simone Caronni - 48-7 +- Fix broken dependency. + * Sat Feb 29 2020 Simone Caronni - 48-6 - Make it exclusive for i686/x86_64. - Fix build on RHEL/CentOS 8. From 2648d175fa205a30129eb3afa142bf403af99186 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 26 May 2020 03:54:16 +0200 Subject: [PATCH 08/22] Rebuilt for Python 3.9 --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 205b05f..20a637f 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -158,6 +158,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Tue May 26 2020 Miro Hrončok - 48-8 +- Rebuilt for Python 3.9 + * Sat Mar 07 2020 Simone Caronni - 48-7 - Fix broken dependency. From 32e61f72b36786882c78cfd390073db0cb80bad9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 13:33:21 +0000 Subject: [PATCH 09/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 20a637f..f89afdb 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -158,6 +158,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 48-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue May 26 2020 Miro Hrončok - 48-8 - Rebuilt for Python 3.9 From 92baa573a3b302bdd8becda159e73000b03ee948 Mon Sep 17 00:00:00 2001 From: Jeff Law Date: Sat, 17 Oct 2020 11:22:29 -0600 Subject: [PATCH 10/22] Fix missing #includes for gcc-11 --- vapoursynth-gcc11.patch | 60 +++++++++++++++++++++++++++++++++++++++++ vapoursynth.spec | 6 ++++- 2 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 vapoursynth-gcc11.patch diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch new file mode 100644 index 0000000..fe8b2d8 --- /dev/null +++ b/vapoursynth-gcc11.patch @@ -0,0 +1,60 @@ +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 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #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 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + #include + #include + #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 +@@ -22,6 +22,7 @@ + #include + #include + #include ++#include + #include + #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 + #include + #include ++#include + #include + #include + #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. + */ + + #include "shared.h" ++#include + + #define CLENSE_RETERROR(x) do { vsapi->setError(out, (x)); vsapi->freeNode(d.cnode); vsapi->freeNode(d.pnode); vsapi->freeNode(d.nnode); return; } while (0) + #define CLAMP(value, lower, upper) do { if (value < lower) value = lower; else if (value > upper) value = upper; } while(0) diff --git a/vapoursynth.spec b/vapoursynth.spec index f89afdb..e3f047a 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 9%{?dist} +Release: 10%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -12,6 +12,7 @@ URL: http://www.vapoursynth.com Source0: https://github.com/%{name}/%{name}/archive/R%{version}/%{name}-R%{version}.tar.gz Patch0: %{name}-version-info.patch Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11.patch#/%{name}-python38.patch +Patch2: %{name}-gcc11.patch ExclusiveArch: %{ix86} x86_64 @@ -158,6 +159,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Sat Oct 17 2020 Jeff Law - 48-10 +- Fix missing #include for gcc-11 + * Wed Jul 29 2020 Fedora Release Engineering - 48-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1991e0f599c93577b5182d392c7a77b1d1542b2f Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 00:34:55 +0000 Subject: [PATCH 11/22] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- vapoursynth.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/vapoursynth.spec b/vapoursynth.spec index e3f047a..23a9660 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -16,6 +16,7 @@ Patch2: %{name}-gcc11.patch ExclusiveArch: %{ix86} x86_64 +BuildRequires: make BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ From be02be55074ba9c68aff93ffdea0e8ca6a03c7fc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 27 Jan 2021 22:54:56 +0000 Subject: [PATCH 12/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 23a9660..ba22267 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 48 -Release: 10%{?dist} +Release: 11%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -160,6 +160,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Wed Jan 27 2021 Fedora Release Engineering - 48-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Sat Oct 17 2020 Jeff Law - 48-10 - Fix missing #include for gcc-11 From 5cfca1ca8fb06df4140664c38f13a4d2ae7ee844 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Mar 2021 15:10:05 +0100 Subject: [PATCH 13/22] Update to R51, allow building for other archs beside x86 --- vapoursynth-gcc11.patch | 41 +++++++++++++----------------- vapoursynth-python38.patch | 46 ---------------------------------- vapoursynth-version-info.patch | 10 ++++---- vapoursynth.spec | 23 +++++++++-------- 4 files changed, 35 insertions(+), 85 deletions(-) delete mode 100644 vapoursynth-python38.patch 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 #include @@ -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 #include @@ -22,10 +20,9 @@ index 613d98f..327512c 100644 #include #include #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 #include @@ -34,23 +31,21 @@ index f4477bd..c00c619 100644 #include #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 +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 + #include #include +#include #include #include #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 -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}.tar.gz Patch0: %{name}-version-info.patch -Patch1: https://github.com/vapoursynth/vapoursynth/commit/a53ed4dda74d61d4cb56842dc0c6e6e7c3870e11.patch#/%{name}-python38.patch -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 - 51-1 +- Update to R51. +- Allow building for other archs beside x86. + * Wed Jan 27 2021 Fedora Release Engineering - 48-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From cdbbdd5b25b02632a8fa217cda4a3779b8e1ce4b Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Tue, 23 Mar 2021 15:31:00 +0100 Subject: [PATCH 14/22] Update sources --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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 From 417dd1753120352877ca460927323e9ec6c4c24f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 30 Mar 2021 19:40:34 +0100 Subject: [PATCH 15/22] Rebuilt for removed libstdc++ symbol (#1937698) --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index ba4d5dd..8a394af 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Tue Mar 30 2021 Jonathan Wakely - 51-2 +- Rebuilt for removed libstdc++ symbol (#1937698) + * Tue Mar 23 2021 Simone Caronni - 51-1 - Update to R51. - Allow building for other archs beside x86. From 1b1cffb0504208d962d2988a58a17467dd5c68d8 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 4 Jun 2021 21:19:08 +0200 Subject: [PATCH 16/22] Rebuilt for Python 3.10 --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 8a394af..212bf46 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Fri Jun 04 2021 Python Maint - 51-3 +- Rebuilt for Python 3.10 + * Tue Mar 30 2021 Jonathan Wakely - 51-2 - Rebuilt for removed libstdc++ symbol (#1937698) From 1ce9e4d893570ff906f0e2f69497ede1f8d4d0ec Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 20:18:42 +0000 Subject: [PATCH 17/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 212bf46..0cf9a3f 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 51-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri Jun 04 2021 Python Maint - 51-3 - Rebuilt for Python 3.10 From 0e9e174624bd266b4c08cbcf46f2e8a30305a671 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 14 Dec 2021 14:31:30 +0100 Subject: [PATCH 18/22] Rebuild (tesseract) --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 0cf9a3f..06045cc 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Tue Dec 14 2021 Sandro Mani - 51-5 +- Rebuild (tesseract) + * Fri Jul 23 2021 Fedora Release Engineering - 51-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From cf159cae5d7ed14b689721e1fa46091294b67544 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 19 Dec 2021 18:58:55 +0100 Subject: [PATCH 19/22] Rebuild (tesseract) --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 06045cc..7059460 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Sun Dec 19 2021 Sandro Mani - 51-6 +- Rebuild (tesseract) + * Tue Dec 14 2021 Sandro Mani - 51-5 - Rebuild (tesseract) From 06cb1fa1b0894557db00374043b21f5c2c0b8cc0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 03:48:00 +0000 Subject: [PATCH 20/22] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vapoursynth.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vapoursynth.spec b/vapoursynth.spec index 7059460..2d86bab 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -4,7 +4,7 @@ Name: vapoursynth Version: 51 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Video processing framework with simplicity in mind License: LGPLv2 URL: http://www.vapoursynth.com @@ -157,6 +157,9 @@ rm -fr %{buildroot}%{_docdir}/%{name} %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 51-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Sun Dec 19 2021 Sandro Mani - 51-6 - Rebuild (tesseract) From 398c3225739890ae8d5a26eed97c5745959fc631 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Wed, 2 Mar 2022 11:04:07 +0100 Subject: [PATCH 21/22] Update to 0.57, obsolete plugins --- .gitignore | 1 + sources | 2 +- vapoursynth-gcc11.patch | 55 ------------------------------ vapoursynth-version-info.patch | 16 ++++----- vapoursynth.spec | 61 +++++++--------------------------- 5 files changed, 22 insertions(+), 113 deletions(-) delete mode 100644 vapoursynth-gcc11.patch diff --git a/.gitignore b/.gitignore index be14818..4e557ee 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /vapoursynth-R48.tar.gz /vapoursynth-R51.tar.gz +/vapoursynth-R57.tar.gz diff --git a/sources b/sources index c687eb9..7f79272 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vapoursynth-R51.tar.gz) = feb218aa309e538a32054b4fdeaf291e5c817e1b49bd482cf9dfc6c17d055c367dc27f80863770ae3333a4d115c026ad47609ed70857d89c22ff16f5cc6d5292 +SHA512 (vapoursynth-R57.tar.gz) = 6310b35284acb436b8b49b3a116db736b40d8d51b40243d20e065e80685e66390fce7121c01a2654359673d87b5f589bc3f981d12befc438de14a58ba6614e5f diff --git a/vapoursynth-gcc11.patch b/vapoursynth-gcc11.patch deleted file mode 100644 index 29e4722..0000000 --- a/vapoursynth-gcc11.patch +++ /dev/null @@ -1,55 +0,0 @@ -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 - #include - #include -+#include - #include "VapourSynth.h" - #include "VSHelper.h" - #include "cpufeatures.h" -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 - #include - #include -+#include - #include - #include - #include "cpufeatures.h" -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 - #include - #include -+#include - #include - #include "generic.h" - -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 - #include - #include -+#include - #include - #include - #include "../src/core/filtersharedcpp.h" -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" -+#include - - #define CLENSE_RETERROR(x) do { vsapi->setError(out, (x)); vsapi->freeNode(d.cnode); vsapi->freeNode(d.pnode); vsapi->freeNode(d.nnode); return; } while (0) - #define CLAMP(value, lower, upper) do { if (value < lower) value = lower; else if (value > upper) value = upper; } while(0) diff --git a/vapoursynth-version-info.patch b/vapoursynth-version-info.patch index e7d1725..03f0614 100644 --- a/vapoursynth-version-info.patch +++ b/vapoursynth-version-info.patch @@ -1,12 +1,12 @@ -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 @@ +diff -Naur vapoursynth-R57.old/Makefile.am vapoursynth-R57/Makefile.am +--- vapoursynth-R57.old/Makefile.am 2022-03-02 08:35:44.861454145 +0100 ++++ vapoursynth-R57/Makefile.am 2022-03-02 08:36:52.981729877 +0100 +@@ -88,7 +88,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_la_LDFLAGS = -no-undefined -avoid-version $(UNDEFINEDLDFLAGS) ++libvapoursynth_la_LDFLAGS = -no-undefined -version-info $(PACKAGE_VERSION) $(UNDEFINEDLDFLAGS) + libvapoursynth_la_CPPFLAGS = $(PTHREAD_CFLAGS) $(ZIMG_CFLAGS) -DVS_PATH_PLUGINDIR='"$(PLUGINDIR)"' + libvapoursynth_la_LIBADD = $(PTHREAD_LIBS) $(ZIMG_LIBS) $(DLOPENLIB) diff --git a/vapoursynth.spec b/vapoursynth.spec index 2d86bab..1aecc18 100644 --- a/vapoursynth.spec +++ b/vapoursynth.spec @@ -1,17 +1,12 @@ -#global _with_tests 1 -#global _with_subtitles 1 -#global _with_ImageMagick 1 - Name: vapoursynth -Version: 51 -Release: 7%{?dist} +Version: 57 +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}.tar.gz Patch0: %{name}-version-info.patch -Patch1: %{name}-gcc11.patch BuildRequires: make BuildRequires: autoconf @@ -31,39 +26,27 @@ BuildRequires: %{name}-devel BuildRequires: python3dist(pytest) } -%{?_with_ImageMagick: -BuildRequires: pkgconfig(Magick++) >= 7.0 -} - -%{?_with_subtitles: -BuildRequires: pkgconfig(libass) -BuildRequires: pkgconfig(libavcodec) -BuildRequires: pkgconfig(libavformat) -BuildRequires: pkgconfig(libavutil) -} - %description VapourSynth is an application for video manipulation. Or a plugin. Or a library. It’s hard to tell because it has a core library written in C++ and a Python module to allow video scripts to be created. - %package libs Summary: VapourSynth's core library with a C++ API Obsoletes: lib%{name} < %{version}-%{release} Provides: lib%{name} == %{version}-%{release} +Obsoletes: %{name}-plugins < %{version}-%{release} +Provides: %{name}-plugins == %{version}-%{release} %description libs VapourSynth's core library with a C++ API. - %package -n python3-%{name} Summary: Python interface for VapourSynth %description -n python3-%{name} Python interface for VapourSynth/VSSCript. - %package devel Summary: Development files for %{name} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -71,26 +54,15 @@ Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel Development files for %{name}. - %package tools Summary: Extra tools for VapourSynth %description tools This package contains the vspipe tool for interfacing with VapourSynth. - -%package plugins -Summary: VapourSynth plugins -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description plugins -VapourSynth plugins. - - %prep %autosetup -p1 -n %{name}-R%{version} - %build autoreconf -vif %configure \ @@ -99,38 +71,29 @@ autoreconf -vif --enable-core \ --enable-vsscript \ --enable-vspipe \ - --enable-python-module \ - --enable-eedi3 \ - --%{?_with_ImageMagick:enable}%{!?_with_ImageMagick:disable}-imwri \ - --enable-miscfilters \ - --enable-morpho \ - --enable-ocr \ - --enable-removegrain \ - --%{?_with_subtitles:enable}%{!?_with_subtitles:disable}-subtext \ - --enable-vinverse \ - --enable-vivtc \ + --enable-python-module %make_build - %install %py3_install %make_install find %{buildroot} -type f -name "*.la" -delete +# Create plugin directory +mkdir -p %{buildroot}%{_libdir}/%{name} + # Let RPM pick up docs in the files section rm -fr %{buildroot}%{_docdir}/%{name} %ldconfig_scriptlets libs %ldconfig_scriptlets -n python3-%{name} - %{?_with_tests: %check %{python3} -m pytest -v } - %files libs %doc ChangeLog %license COPYING.LESSER @@ -152,11 +115,11 @@ rm -fr %{buildroot}%{_docdir}/%{name} %files tools %{_bindir}/vspipe -%files plugins -%{_libdir}/%{name}/lib*.so - - %changelog +* Wed Mar 02 2022 Simone Caronni - 57-1 +- Update to R57. +- Plugins are now separate. + * Sat Jan 22 2022 Fedora Release Engineering - 51-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 5639e84f727392bf7ccacb585ee0aafee33db800 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Tue, 31 Oct 2023 00:25:32 +0300 Subject: [PATCH 22/22] Remove unnecessary files --- README.md | 3 --- sources | 1 - 2 files changed, 4 deletions(-) delete mode 100644 README.md delete mode 100644 sources diff --git a/README.md b/README.md deleted file mode 100644 index 3f4d9d0..0000000 --- a/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# vapoursynth - -The vapoursynth package \ No newline at end of file diff --git a/sources b/sources deleted file mode 100644 index 7f79272..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -SHA512 (vapoursynth-R57.tar.gz) = 6310b35284acb436b8b49b3a116db736b40d8d51b40243d20e065e80685e66390fce7121c01a2654359673d87b5f589bc3f981d12befc438de14a58ba6614e5f