- updated to 50

- updated sse2 patch
- updated genericarch,python-3.8 patches

diff --git a/python-3.8.patch b/python-3.8.patch
deleted file mode 100644 (file)
index fcae7ca..0000000
--- a/python-3.8.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- vapoursynth-R47.2/configure.ac~    2019-08-15 21:01:45.000000000 +0200
-+++ vapoursynth-R47.2/configure.ac     2019-10-30 00:23:01.770277122 +0100
-@@ -232,7 +232,7 @@
-       [
-        AM_PATH_PYTHON([3])
- 
--       PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])
-+       PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION-embed])
- 
-        AC_CONFIG_FILES([pc/vapoursynth-script.pc])
-       ]
-@@ -290,7 +290,7 @@
- 
-               AS_IF(
-                     [test -z "$PYTHON3_LIBS"],
--                    [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION])]
-+                    [PKG_CHECK_MODULES([PYTHON3], [python-$PYTHON_VERSION-embed])]
-               )
- 
-               AS_CASE(

diff --git a/vapoursynth-genericarch.patch b/vapoursynth-genericarch.patch
deleted file mode 100644 (file)
index 048fa27..0000000
--- a/vapoursynth-genericarch.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur vapoursynth-R48.orig/src/core/cpufeatures.cpp vapoursynth-R48/src/core/cpufeatures.cpp
---- vapoursynth-R48.orig/src/core/cpufeatures.cpp      2019-10-25 08:16:07.000000000 +0200
-+++ vapoursynth-R48/src/core/cpufeatures.cpp   2019-12-14 14:11:01.285000000 +0100
-@@ -103,6 +103,7 @@
-     }
- }
- #elif defined(VS_TARGET_OS_LINUX)
-+#if defined(VS_TARGET_CPU_ARM) || defined(VS_TARGET_CPU_POWERPC)
- #include <sys/auxv.h>
- 
- static void doGetCPUFeatures(CPUFeatures *cpuFeatures) {
-@@ -131,6 +132,12 @@
- #endif
- }
- #else
-+static void doGetCPUFeatures(CPUFeatures *cpuFeatures) {
-+    memset(cpuFeatures, 0, sizeof(CPUFeatures));
-+    cpuFeatures->can_run_vs = 1;
-+}
-+#endif
-+#else
- #warning "Do not know how to get CPU features."
- #endif
- 
-diff -ur vapoursynth-R48.orig/src/core/cpufeatures.h vapoursynth-R48/src/core/cpufeatures.h
---- vapoursynth-R48.orig/src/core/cpufeatures.h        2019-10-25 08:16:07.000000000 +0200
-+++ vapoursynth-R48/src/core/cpufeatures.h     2019-12-14 13:40:09.419000000 +0100
-@@ -63,8 +63,6 @@
-     char efp_double;
-     char dfp;
-     char vsx;
--#else
--#warning "No VS_TARGET_CPU_* defined/handled!"
- #endif
- } CPUFeatures;
- 

diff --git a/vapoursynth-sse2.patch b/vapoursynth-sse2.patch
index 38dab8fc17bf2ae16fb627b75b37b419f90ba7be..a5a8258fe0494d433bd6507f1f7166cd3e529773 100644 (file)
--- a/vapoursynth-sse2.patch
+++ b/vapoursynth-sse2.patch
@@ -1,47 +1,32 @@
---- vapoursynth-R48/Makefile.am.orig   2019-10-25 08:16:07.000000000 +0200
-+++ vapoursynth-R48/Makefile.am        2020-03-14 14:04:19.049683857 +0100
-@@ -29,7 +29,7 @@
+--- vapoursynth-R50/Makefile.am.orig   2020-07-06 20:53:20.109771817 +0200
++++ vapoursynth-R50/Makefile.am        2020-07-06 20:53:23.166421924 +0200
+@@ -85,7 +85,7 @@
  
  
- if VSCORE
--noinst_LTLIBRARIES = libexprfilter.la libvapoursynth_avx2.la
-+noinst_LTLIBRARIES = libexprfilter.la libvapoursynth_avx2.la libvapoursynth_sse2.la
+ if X86ASM
+-noinst_LTLIBRARIES += libvapoursynth_avx2.la
++noinst_LTLIBRARIES += libvapoursynth_avx2.la libvapoursynth_sse2.la
  
- libexprfilter_la_SOURCES = src/core/exprfilter.cpp
- libexprfilter_la_CPPFLAGS = $(AM_CXXFLAGS) -fno-strict-aliasing
-@@ -40,6 +40,15 @@
+ libvapoursynth_avx2_la_SOURCES = src/core/kernel/x86/generic_avx2.cpp \
+                                                                src/core/kernel/x86/merge_avx2.c \
+@@ -93,13 +93,18 @@
  libvapoursynth_avx2_la_CFLAGS = $(AM_CFLAGS) $(AVX2FLAGS)
  libvapoursynth_avx2_la_CXXFLAGS = $(AM_CXXFLAGS) $(AVX2FLAGS)
  
+-libvapoursynth_la_SOURCES += src/core/jitasm.h \
 +libvapoursynth_sse2_la_SOURCES = \
-+                                                      src/core/kernel/x86/generic_sse2.cpp \
-+                                                      src/core/kernel/x86/merge_sse2.c \
-+                                                      src/core/kernel/x86/planestats_sse2.c \
-+                                                      src/core/kernel/x86/transpose_sse2.c
-+
+                                                        src/core/kernel/x86/generic_sse2.cpp \
+                                                        src/core/kernel/x86/merge_sse2.c \
+                                                        src/core/kernel/x86/planestats_sse2.c \
+                                                        src/core/kernel/x86/transpose_sse2.c
+ 
+-libvapoursynth_la_LIBADD += libvapoursynth_avx2.la
 +libvapoursynth_sse2_la_CFLAGS = $(AM_CFLAGS) -msse2
 +libvapoursynth_sse2_la_CXXFLAGS = $(AM_CFLAGS) -msse2
 +
- lib_LTLIBRARIES += libvapoursynth.la
- 
- libvapoursynth_la_SOURCES = src/core/boxblurfilter.cpp \
-@@ -61,10 +70,6 @@
-                                                       src/core/kernel/planestats.h \
-                                                       src/core/kernel/transpose.c \
-                                                       src/core/kernel/transpose.h \
--                                                      src/core/kernel/x86/generic_sse2.cpp \
--                                                      src/core/kernel/x86/merge_sse2.c \
--                                                      src/core/kernel/x86/planestats_sse2.c \
--                                                      src/core/kernel/x86/transpose_sse2.c \
-                                                       src/core/lutfilters.cpp \
-                                                       src/core/mergefilters.c \
-                                                       src/core/reorderfilters.c \
-@@ -91,7 +96,7 @@
- 
- libvapoursynth_la_LDFLAGS = -no-undefined -avoid-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 libvapoursynth_avx2.la libvapoursynth_sse2.la
- 
++libvapoursynth_la_SOURCES += src/core/jitasm.h
++
++libvapoursynth_la_LIBADD += libvapoursynth_avx2.la libvapoursynth_sse2.la
+ endif # X86ASM
  
  if PYTHONMODULE

diff --git a/vapoursynth.spec b/vapoursynth.spec
index 0e8b728154d6a1a40586cc2cd30802dfdc13c097..17066e4a25602c5e7ad12664528f2e334ff6a81e 100644 (file)
--- a/vapoursynth.spec
+++ b/vapoursynth.spec
@@ -13,16 +13,14 @@
 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:       48
+Version:       50
 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: 4acbd7521e0aa3d403c93532271d6880
-Patch0:                %{name}-genericarch.patch
-Patch1:                python-3.8.patch
-Patch2:                %{name}-sse2.patch
+# Source0-md5: 78d4a1f608c1b986337579d6dd9db0f9
+Patch0:                %{name}-sse2.patch
 URL:           http://www.vapoursynth.com/
 %{?with_im:BuildRequires:      ImageMagick-c++-devel >= 1:7}
 BuildRequires: autoconf >= 2.50
@@ -144,10 +142,6 @@ Dokumentacja do biblioteki VapourSynth.
 %prep
 %setup -q -n %{name}-R%{version}
 %patch0 -p1
-%if "%{py3_ver}" >= "3.8"
-%patch1 -p1
-%endif
-%patch2 -p1
 
 %if %{without sse}
 %{__sed} -i -e 's/"-mfpmath=sse -msse2"/""/' configure.ac