- updated to 45.1

- updated genericarch patch
- disable imwri plugin by default, it requires HDRI enabled ImageMagick and our is not

diff --git a/vapoursynth-genericarch.patch b/vapoursynth-genericarch.patch
index c2b597318fff3a9b8c728704f51765039dceda7c..b92217bc61ea86fbb251f1b3cb905ce97cdd0487 100644 (file)
--- a/vapoursynth-genericarch.patch
+++ b/vapoursynth-genericarch.patch
@@ -1,6 +1,6 @@
---- vapoursynth-R38/src/core/cpufeatures.c.orig        2017-05-29 13:09:06.000000000 +0200
-+++ vapoursynth-R38/src/core/cpufeatures.c     2017-07-21 21:43:00.895082739 +0200
-@@ -61,6 +61,7 @@ void getCPUFeatures(CPUFeatures *cpuFeat
+--- vapoursynth-R45.1/src/core/cpufeatures.c.orig      2018-10-26 23:11:05.000000000 +0200
++++ vapoursynth-R45.1/src/core/cpufeatures.c   2019-04-27 11:23:33.512030568 +0200
+@@ -70,6 +70,7 @@
      }
  }
  #elif defined(VS_TARGET_OS_LINUX)
@@ -8,7 +8,7 @@
  #include <sys/auxv.h>
  
  void getCPUFeatures(CPUFeatures *cpuFeatures) {
-@@ -89,5 +90,11 @@ void getCPUFeatures(CPUFeatures *cpuFeat
+@@ -98,5 +99,11 @@
  #endif
  }
  #else
@@ -18,16 +18,16 @@
 +}
 +#endif
 +#else
- #error Do not know how to get CPU features.
+ #warning "Do not know how to get CPU features."
  #endif
---- vapoursynth-R38/src/core/cpufeatures.h.orig        2017-05-29 13:09:06.000000000 +0200
-+++ vapoursynth-R38/src/core/cpufeatures.h     2017-07-21 21:41:25.271750498 +0200
-@@ -51,8 +51,6 @@ typedef struct CPUFeatures {
+--- vapoursynth-R45.1/src/core/cpufeatures.h.orig      2019-04-27 09:40:11.058965473 +0200
++++ vapoursynth-R45.1/src/core/cpufeatures.h   2019-04-27 11:14:27.121657286 +0200
+@@ -59,8 +59,6 @@
      char efp_double;
      char dfp;
      char vsx;
 -#else
--#error No VS_TARGET_CPU_* defined/handled!
+-#warning "No VS_TARGET_CPU_* defined/handled!"
  #endif
  } CPUFeatures;
  

diff --git a/vapoursynth.spec b/vapoursynth.spec
index dc21ef043e7fa385a0e48e7cad99a2a508e8e16e..c3aa76af4fe1558be1a5cc259d4348b9842a94bc 100644 (file)
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -2,6 +2,7 @@
 # Conditional build:
 %bcond_without doc             # documentation
 %bcond_without ffmpeg          # subtext plugin (libass+ffmpeg based)
+%bcond_with    im              # imwri plugin (requires ImageMagick with Q16 or Q32 and HDRI support)
 %bcond_with    sse             # use SSE/SSE2 instructions on x86 (no runtime detection)
 %bcond_without static_libs     # static libraries
 #
@@ -12,16 +13,16 @@
 Summary:       A video processing framework with simplicity in mind
 Summary(pl.UTF-8):     Szkielet do przetwarzania obrazu stworzony z myślą o prostocie
 Name:          vapoursynth
-Version:       38
-Release:       7
+Version:       45.1
+Release:       1
 License:       LGPL v2.1+
 Group:         Libraries
 #Source0Download: https://github.com/vapoursynth/vapoursynth/releases
 Source0:       https://github.com/vapoursynth/vapoursynth/archive/R%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 78d0183f0afd3702f3edc176b2491f5d
+# Source0-md5: a8fb4e106028bb006ca1ee13724fe1f3
 Patch0:                %{name}-genericarch.patch
 URL:           http://www.vapoursynth.com/
-BuildRequires: ImageMagick-c++-devel >= 1:7
+%{?with_im:BuildRequires:      ImageMagick-c++-devel >= 1:7}
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.11
 # libavcodec libavformat libavutil
@@ -29,21 +30,24 @@ BuildRequires:      automake >= 1:1.11
 %{?with_ffmpeg:BuildRequires:  libass-devel}
 BuildRequires: libstdc++-devel >= 6:4.8
 BuildRequires: libtool >= 2:2
+%if %{with sse}
+BuildRequires: nasm
+%endif
 BuildRequires: pkgconfig
 BuildRequires: python3-Cython
 BuildRequires: python3-devel >= 1:3.2
 BuildRequires: sed >= 4.0
 %{?with_doc:BuildRequires:     sphinx-pdg}
 BuildRequires: tesseract-devel >= 3
-%if %{with sse}
-BuildRequires: yasm
-%endif
 BuildRequires: zimg-devel >= 2.5
 %if %{with sse}
 Requires:      cpuinfo(sse2)
 %endif
 Requires:      python3-libs >= 1:3.2
 Requires:      zimg >= 2.5
+%if %{without im}
+Obsoletes:     vapoursynth-plugin-imwri
+%endif
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # non-function std::__once_call, std::__once_callable symbols
@@ -149,6 +153,7 @@ Dokumentacja do biblioteki VapourSynth.
 %{__autoconf}
 %{__automake}
 %configure \
+       %{!?with_im:--disable-imwri} \
        --disable-silent-rules \
        %{!?with_ffmpeg:--disable-subtext} \
        %{!?with_static_libs:--disable-static} \
@@ -193,10 +198,12 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/vapoursynth/libvinverse.so
 %attr(755,root,root) %{_libdir}/vapoursynth/libvivtc.so
 
+%if %{with im}
 %files plugin-imwri
 %defattr(644,root,root,755)
 # R: ImageMagick-c++ >= 1:7
 %attr(755,root,root) %{_libdir}/vapoursynth/libimwri.so
+%endif
 
 %files plugin-ocr
 %defattr(644,root,root,755)