.gitignore

@@ -1 +1 @@
-SOURCES/vmaf-1.3.15.tar.gz
+vmaf-*.tar.gz

.vmaf.metadata

@@ -1 +0,0 @@
-c050ada8ec285c56d4d40e16f03e451787c0999e  SOURCES/vmaf-1.3.15.tar.gz

README.md

@@ -0,0 +1,3 @@
+# vmaf
+
+The vmaf package

SOURCES/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch

@@ -1,64 +0,0 @@
-From 870de42512805dcdd469ef0301476b3fc0e4bc95 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 12:32:54 +0200
-Subject: [PATCH] Use PREFIX and LIBDIR build variable instead of custom ones
-
----
- wrapper/Makefile | 29 +++++++++++++++--------------
- 1 file changed, 15 insertions(+), 14 deletions(-)
-
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index 9317515..868b13f 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -8,7 +8,8 @@ SRCDIR = $(TOP)/src
- OBJDIR = $(TOP)/obj
- FEATURESRCDIR = $(TOP)/../feature/src
- PTOOLSDIR = $(TOP)/../ptools
--INSTALL_PREFIX = /usr/local
-+PREFIX ?= /usr/local
-+LIBDIR ?= $(PREFIX)/lib
- INCLUDES += -I$(TOP)/../feature/src
- INCLUDES += -I$(TOP)/../feature/src/common
- 
-@@ -168,24 +169,24 @@ vmafossexec: $(OBJDIR)/main.o $(LIBVMAF)
- 
- .PHONY: install
- install:
--	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/lib
--	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/include
--	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/share
--	mkdir -p $(DESTDIR)$(INSTALL_PREFIX)/lib/pkgconfig
--	cp $(LIBVMAF) $(DESTDIR)$(INSTALL_PREFIX)/lib/$(LIBVMAF)
--	cp src/libvmaf.h $(DESTDIR)$(INSTALL_PREFIX)/include/
--	cp -r ../model $(DESTDIR)$(INSTALL_PREFIX)/share/
--	cp libvmaf.pc $(DESTDIR)$(INSTALL_PREFIX)/lib/pkgconfig/
-+	mkdir -p $(DESTDIR)$(LIBDIR)
-+	mkdir -p $(DESTDIR)$(PREFIX)/include
-+	mkdir -p $(DESTDIR)$(PREFIX)/share
-+	mkdir -p $(DESTDIR)$(LIBDIR)/pkgconfig
-+	cp $(LIBVMAF) $(DESTDIR)$(LIBDIR)/$(LIBVMAF)
-+	cp src/libvmaf.h $(DESTDIR)$(PREFIX)/include/
-+	cp -r ../model $(DESTDIR)$(PREFIX)/share/
-+	cp libvmaf.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
- 
- .PHONY: uninstall
- uninstall:
--	rm -f $(DESTDIR)$(INSTALL_PREFIX)/lib/$(LIBVMAF)
--	rm -f $(DESTDIR)$(INSTALL_PREFIX)/include/libvmaf.h
--	rm -fr $(DESTDIR)$(INSTALL_PREFIX)/share/model
--	rm -f $(DESTDIR)$(INSTALL_PREFIX)/lib/pkgconfig/libvmaf.pc
-+	rm -f $(DESTDIR)$(LIBDIR)/$(LIBVMAF)
-+	rm -f $(DESTDIR)$(PREFIX)/include/libvmaf.h
-+	rm -fr $(DESTDIR)$(PREFIX)/share/model
-+	rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/libvmaf.pc
- 
- testlib: $(SRCDIR)/main.cpp
--	$(CXX) -s -o $@  $(CXXFLAGS) $^ -I $(FEATURESRCDIR) -I $(FEATURESRCDIR)/common -I $(DESTDIR)$(INSTALL_PREFIX)/include -L$(DESTDIR)$(INSTALL_PREFIX)/lib -lvmaf -pthread
-+	$(CXX) -s -o $@  $(CXXFLAGS) $^ -I $(FEATURESRCDIR) -I $(FEATURESRCDIR)/common -I $(DESTDIR)$(PREFIX)/include -L$(DESTDIR)$(LIBDIR) -lvmaf -pthread
- 
- .PHONY: clean
- clean:
--- 
-2.17.2
-

SOURCES/0002-Unbundle-pugixml.patch

@@ -1,38 +0,0 @@
-From a6765396684ddd62fe660cb914e495e61a4dcab9 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 13:43:48 +0200
-Subject: [PATCH] Unbundle pugixml
-
----
- wrapper/Makefile | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index 868b13f..4a891e1 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -43,9 +43,9 @@ OBJS = \
- 	$(OBJDIR)/vmaf.o \
- 	$(OBJDIR)/darray.o \
- 	$(OBJDIR)/libvmaf.o \
--	$(OBJDIR)/pugixml.o \
- 	$(OBJDIR)/blur_array.o \
--	$(OBJDIR)/cpu_info.o
-+	$(OBJDIR)/cpu_info.o \
-+	$(NULL)
- 
- AVX_OBJS := \
- 	$(OBJDIR)/convolution_avx.o \
-@@ -158,9 +158,6 @@ $(OBJDIR)/vmaf.o: $(SRCDIR)/vmaf.cpp
- $(OBJDIR)/%.o: $(SRCDIR)/%.c
- 	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $<
- 
--$(OBJDIR)/%.o: $(SRCDIR)/pugixml/%.cpp
--	$(CXX) -c -o $@ $(CXXFLAGS) $(CPPFLAGS) $<
--
- $(LIBVMAF): $(OBJS) $(wildcard ../ptools/*.o)
- 	ar rcs $@ $^
- 
--- 
-2.17.2
-

SOURCES/0003-Drop-AVX-when-not-relevant.patch

@@ -1,84 +0,0 @@
-From bd90f8e5d7bb1d323ec35d8326915ded41cce587 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 13:44:42 +0200
-Subject: [PATCH 03/11] Drop AVX when not relevant
-
----
- feature/Makefile |  9 +++++++++
- wrapper/Makefile | 17 ++++++++++++++---
- 2 files changed, 23 insertions(+), 3 deletions(-)
-
-diff --git a/feature/Makefile b/feature/Makefile
-index 111d07c..c786a27 100644
---- a/feature/Makefile
-+++ b/feature/Makefile
-@@ -10,13 +10,22 @@ LIBVMAF = $(TOP)/../wrapper/libvmaf.a
- CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic
- # CFLAGS_COMMON = -g -O0 -fPIC -Wall -Wextra -pedantic
- 
-+UNAME    := $(shell uname -m)
- CFLAGS   := -std=c99 $(CFLAGS_COMMON) $(CFLAGS)
- CXXFLAGS := -std=c++11 $(CFLAGS_COMMON) $(CXXFLAGS)
- CPPFLAGS := $(CPPFLAGS)
- LIBS     := $(LIBS) -lm
- LDFLAGS  := $(LDFLAGS)
- 
-+ifeq ($(UNAME), x86_64)
-+	USE_AVX = 1
-+endif
-+ifeq ($(UNAME), i386)
-+	USE_AVX = 1
-+endif
-+ifeq ($(USE_AVX), 1)
- $(AVX_OBJS): EXTRA_CFLAGS := -mavx
-+endif
- 
- $(OBJDIR)/vmaf_main.o: $(SRCDIR)/vmaf_main.c
- 	$(CC) $(EXTRA_CFLAGS) -c -o $@ $(CFLAGS) $(CPPFLAGS) $<
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index 985a30f..62bde27 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -3,6 +3,7 @@ LIBVMAF = libvmaf.a
- .PHONY: all
- all: $(LIBVMAF) vmafossexec
- 
-+UNAME    := $(shell uname -m)
- TOP = $(shell pwd)
- SRCDIR = $(TOP)/src
- OBJDIR = $(TOP)/obj
-@@ -11,6 +12,18 @@ PTOOLSDIR = $(TOP)/../ptools
- PREFIX ?= /usr/local
- LIBDIR ?= $(PREFIX)/lib
- 
-+ifeq ($(UNAME), x86_64)
-+	USE_AVX = 1
-+endif
-+ifeq ($(UNAME), i386)
-+	USE_AVX = 1
-+endif
-+ifeq ($(USE_AVX), 1)
-+AVX_OBJS := \
-+	$(OBJDIR)/convolution_avx.o \
-+
-+endif
-+
- OBJS = \
- 	$(OBJDIR)/alloc.o \
- 	$(OBJDIR)/alignment.o \
-@@ -44,11 +57,9 @@ OBJS = \
- 	$(OBJDIR)/libvmaf.o \
- 	$(OBJDIR)/blur_array.o \
- 	$(OBJDIR)/cpu_info.o \
-+	$(AVX_OBJS) \
- 	$(NULL)
- 
--AVX_OBJS := \
--	$(OBJDIR)/convolution_avx.o \
--
- CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic -D MULTI_THREADING
- # CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic -D MULTI_THREADING -D PRINT_PROGRESS
- # CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic
--- 
-2.17.1
-

SOURCES/0004-Use-better-FLAGS-for-ptools.patch

@@ -1,35 +0,0 @@
-From 1f85e97f791709405d5b38981d1786727c229bc0 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 13:54:40 +0200
-Subject: [PATCH 04/11] Use better FLAGS for ptools
-
----
- ptools/Makefile.Linux | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/ptools/Makefile.Linux b/ptools/Makefile.Linux
-index 73d8241..890141b 100644
---- a/ptools/Makefile.Linux
-+++ b/ptools/Makefile.Linux
-@@ -10,7 +10,8 @@ CC = g++
- OC = ./opencontainers_1_8_4
- OCINC = $(OC)/include
- 
--CFLAGS = -Wall -Wextra -fpic -O -fno-strict-aliasing -DLINUX_ -DOC_NEW_STYLE_INCLUDES -Wno-deprecated -I$(OCINC) -pthread -D_REENTRANT
-+CFLAGS_COMMON = -Wall -Wextra -fpic -O
-+CFLAGS = $(CFLAGS_COMMON) -fno-strict-aliasing -DLINUX_ -DOC_NEW_STYLE_INCLUDES -Wno-deprecated -I$(OCINC) -pthread -D_REENTRANT
- 
- ## How to build with OCString
- ##CFLAGS = -Wall -O4 -DLINUX_ -DOC_USE_OC_STRING -DOC_USE_OC_EXCEPTIONS -DOC_ONLY_NEEDED_STL -DOC_NEW_STYLE_INCLUDES -Wno-deprecated -I$(OCINC) 
-@@ -30,7 +31,7 @@ all: midasyeller_ex midastalker_ex midastalker_ex2 httpclient_ex midasserver_ex
- 	$(CC) $(CFLAGS) -c $<
- 
- libptools.so : $(COM_OBJS)
--	$(CC) $(CCFLAGS) $(COM_OBJS) -shared -o libptools.so
-+	$(CC) $(CCFLAGS) $(COM_OBJS) $(LDFLAGS) -shared -Wl,-soname,libptools.so.0 -o libptools.so
- 
- midasserver_ex : $(COM_OBJS) midasserver_ex.o
- 	$(CC) $(CCFLAGS) $(COM_OBJS) midasserver_ex.o -pthread -o midasserver_ex
--- 
-2.17.1
-

SOURCES/0005-Switch-pugixml-include.patch

@@ -1,25 +0,0 @@
-From 80053ca29abc26ff6129ea5cb5c7e7545519b625 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 13:57:00 +0200
-Subject: [PATCH] Switch pugixml include
-
----
- wrapper/src/vmaf.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wrapper/src/vmaf.cpp b/wrapper/src/vmaf.cpp
-index fa1dce9..3e193bc 100644
---- a/wrapper/src/vmaf.cpp
-+++ b/wrapper/src/vmaf.cpp
-@@ -29,7 +29,7 @@
- 
- #include "vmaf.h"
- #include "combo.h"
--#include "pugixml/pugixml.hpp"
-+#include <pugixml.hpp>
- #include "timer.h"
- #include "jsonprint.h"
- #include "debug.h"
--- 
-2.17.2
-

SOURCES/0006-Switch-to-shared-library-for-libvmaf.patch

@@ -1,58 +0,0 @@
-From f3b0da9d64e0ad5e668abc97137635f3c5da2d8f Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 14:33:30 +0200
-Subject: [PATCH] Switch to shared library for libvmaf
-
----
- feature/Makefile   | 2 +-
- wrapper/.gitignore | 1 +
- wrapper/Makefile   | 4 ++--
- 3 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/feature/Makefile b/feature/Makefile
-index 111d07c..86ced7d 100644
---- a/feature/Makefile
-+++ b/feature/Makefile
-@@ -5,7 +5,7 @@ TOP = $(shell pwd)
- SRCDIR  = $(TOP)/src
- OBJDIR  = $(TOP)/obj
- TOOLDIR = $(TOP)/tool
--LIBVMAF = $(TOP)/../wrapper/libvmaf.a
-+LIBVMAF = $(TOP)/../wrapper/libvmaf.so
- 
- CFLAGS_COMMON = -g -O3 -fPIC -w -Wextra -pedantic
- # CFLAGS_COMMON = -g -O0 -fPIC -Wall -Wextra -pedantic
-diff --git a/wrapper/.gitignore b/wrapper/.gitignore
-index b721ec4..16e4e57 100644
---- a/wrapper/.gitignore
-+++ b/wrapper/.gitignore
-@@ -1,6 +1,7 @@
- *.o
- vmafossexec
- libvmaf.a
-+libvmaf.so*
- testlib
- .cproject
- .project
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index 4a891e1..2aeaf66 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -1,4 +1,4 @@
--LIBVMAF = libvmaf.a
-+LIBVMAF = libvmaf.so
- 
- .PHONY: all
- all: $(LIBVMAF) vmafossexec
-@@ -159,7 +159,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c
- 	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $<
- 
- $(LIBVMAF): $(OBJS) $(wildcard ../ptools/*.o)
--	ar rcs $@ $^
-+	$(CC) $(LDFLAGS) $^ -shared -Wl,-soname,libvmaf.so.0 -o $@
- 
- vmafossexec: $(OBJDIR)/main.o $(LIBVMAF)
- 	$(CXX) -s -o $@ $(LDFLAGS) $^ -pthread
--- 
-2.17.2
-

SOURCES/0007-Unbundle-libsvm.patch

@@ -1,32 +0,0 @@
-From 1b1b5db051e99bd7070fd996d46af4f88d030452 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 14:35:50 +0200
-Subject: [PATCH] Unbundle libsvm
-
----
- Makefile | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 5a13baa..d2ba5cc 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,5 @@
- TARGETS = \
- 	ptools \
--	libsvm \
- 	wrapper \
- 	feature
- 
-@@ -9,8 +8,6 @@ all:
- 		cd $${dir}; $(MAKE); cd ..; \
- 	done
- 
--	cd libsvm; $(MAKE) lib; cd ..;
--
- clean:
- 	-for dir in $(TARGETS); do \
- 		cd $${dir}; $(MAKE) clean; cd ..; \
--- 
-2.17.2
-

SOURCES/0008-Add-pugixml-LIBS.patch

@@ -1,25 +0,0 @@
-From b0fbd280173737102f1814e59452545c6d116cb1 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 14:43:21 +0200
-Subject: [PATCH] Add pugixml LIBS
-
----
- wrapper/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index 2aeaf66..ac6decc 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -159,7 +159,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c
- 	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $<
- 
- $(LIBVMAF): $(OBJS) $(wildcard ../ptools/*.o)
--	$(CC) $(LDFLAGS) $^ -shared -Wl,-soname,libvmaf.so.0 -o $@
-+	$(CC) $(LDFLAGS) $^ -shared -Wl,-soname,libvmaf.so.0 -lpugixml -pthread -o $@
- 
- vmafossexec: $(OBJDIR)/main.o $(LIBVMAF)
- 	$(CXX) -s -o $@ $(LDFLAGS) $^ -pthread
--- 
-2.17.2
-

SOURCES/0009-Avoid-x86cpudetection-code-when-not-relevant.patch

@@ -1,39 +0,0 @@
-From 02e035cfe70c8c89e7b0f7ac8e9dd0548cfcab56 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 18:00:25 +0200
-Subject: [PATCH] Avoid x86cpudetection code when not relevant
-
----
- feature/src/common/cpu.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/feature/src/common/cpu.c b/feature/src/common/cpu.c
-index 85156f8..3d48dcd 100644
---- a/feature/src/common/cpu.c
-+++ b/feature/src/common/cpu.c
-@@ -16,9 +16,10 @@
-  *
-  */
- 
--#include "cpudetect.h"
- #include "cpu.h"
- 
-+#if defined(__i386__) || defined(__x86_64)
-+#include "cpudetect.h"
- 
- enum vmaf_cpu cpu_autodetect()
- {
-@@ -31,3 +32,10 @@ enum vmaf_cpu cpu_autodetect()
-     else
-         return VMAF_CPU_NONE;
- }
-+
-+#else
-+enum vmaf_cpu cpu_autodetect()
-+{
-+    return VMAF_CPU_NONE;
-+}
-+#endif
--- 
-2.17.2
-

SOURCES/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch

@@ -1,30 +0,0 @@
-From 8b4d74a98a95aa12d58f9ebaded2c562b62111f7 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 19:16:00 +0200
-Subject: [PATCH] Fix libvmaf.pc to use Libs.private for pthread m
-
-This avoid to link to pthread and m when not needed
-Also avoid to link to a specitic libstdc++
-(as reported in https://github.com/Netflix/vmaf/issues/122)
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- wrapper/libvmaf.pc | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/wrapper/libvmaf.pc b/wrapper/libvmaf.pc
-index e48d5a8..416d327 100644
---- a/wrapper/libvmaf.pc
-+++ b/wrapper/libvmaf.pc
-@@ -10,6 +10,6 @@ URL: https://github.com/Netflix/vmaf
- Requires:
- Requires.private:
- Conflicts:
--Libs: -L${libdir} -lvmaf -lstdc++ -lpthread -lm
--Libs.private:
-+Libs: -L${libdir} -lvmaf
-+Libs.private: -lpthread -lm
- Cflags: -I${includedir}
--- 
-2.17.2
-

SOURCES/0011-Add-msse2-for-i686.patch

@@ -1,41 +0,0 @@
-From c4af3c8270c8f498601d7dd68426c4bd52583006 Mon Sep 17 00:00:00 2001
-From: Nicolas Chauvet <kwizart@gmail.com>
-Date: Sat, 7 Apr 2018 19:30:49 +0200
-Subject: [PATCH 11/11] Add -msse2 for i686
-
-With x86_64 -msse2 is implicit, but not i686
-Both asm option needs to be enabled there
-
-Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
----
- wrapper/Makefile | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/wrapper/Makefile b/wrapper/Makefile
-index ceba5dc..a38d35b 100644
---- a/wrapper/Makefile
-+++ b/wrapper/Makefile
-@@ -14,9 +14,11 @@ LIBDIR ?= $(PREFIX)/lib
- 
- ifeq ($(UNAME), x86_64)
- 	USE_AVX = 1
-+        ASM_CFLAGS = -mavx
- endif
- ifeq ($(UNAME), i386)
- 	USE_AVX = 1
-+        ASM_CFLAGS = -msse -msse2 -mavx
- endif
- ifeq ($(USE_AVX), 1)
- AVX_OBJS := \
-@@ -70,7 +72,7 @@ CXXFLAGS := -std=c++11 $(CFLAGS_COMMON) $(CXXFLAGS)
- CPPFLAGS := $(CPPFLAGS)
- LDFLAGS  := $(LDFLAGS)
- 
--$(AVX_OBJS): EXTRA_CFLAGS := -mavx
-+$(AVX_OBJS): EXTRA_CFLAGS := $(ASM_CFLAGS)
- 
- $(OBJDIR)/alloc.o: $(FEATURESRCDIR)/common/alloc.c
- 	$(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) $<
--- 
-2.17.1
-

sources

@@ -0,0 +1 @@
+SHA512 (vmaf-2.3.0.tar.gz) = 10f0af2b1e868d9780a2766c6c06451ea79f4a8cd8f6c546473382587011f9a7c8c5bf80952021980ede62e2188bcb388337c8903a906d50c739be7cdbb8f61b

vmaf.spec

@@ -1,27 +1,20 @@
 Name:           vmaf
-Version:        1.3.15
+Version:        2.3.0
 Release:        2%{?dist}
 Summary:        Video Multi-Method Assessment Fusion
 
-License:        ASL 2.0
+License:        BSD-2-Clause-Patent
 URL:            https://github.com/netflix/vmaf
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
-Patch0:         0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch
-Patch1:         0002-Unbundle-pugixml.patch
-Patch3:         0004-Use-better-FLAGS-for-ptools.patch
-Patch4:         0005-Switch-pugixml-include.patch
-Patch5:         0006-Switch-to-shared-library-for-libvmaf.patch
-Patch6:         0007-Unbundle-libsvm.patch
-Patch7:         0008-Add-pugixml-LIBS.patch
-Patch8:         0009-Avoid-x86cpudetection-code-when-not-relevant.patch
-Patch9:         0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch
 
 # This project relies on AVX
 ExclusiveArch:  x86_64
 
 BuildRequires:  gcc-c++
-BuildRequires:  libsvm-devel
+BuildRequires:  meson
-BuildRequires:  pugixml-devel
+BuildRequires:  nasm
+BuildRequires:  vim-common
+
 
 # Enforce our own build version for library
 Requires:       libvmaf%{?_isa} = %{version}-%{release}
@@ -42,6 +35,7 @@ https://github.com/Netflix/vmaf/blob/master/resource/doc/VMAF_ICIP17.pdf
 
 %package -n     libvmaf
 Summary:        Library for %{name}
+Provides:       bundled(libsvm) = 3.24
 #Some repo provides it
 Provides: %{name}-static = %{version}-%{release}
 Obsoletes: %{name}-static < %{version}-%{release}
@@ -60,76 +54,107 @@ Obsoletes: %{name}-devel < %{version}-%{release}
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
+%package        models
+Summary:        Model files for %{name}
+Requires:       libvmaf = %{version}-%{release}
+BuildArch:      noarch
+
+%description    models
+The %{name}-models package contains model files.
+These are needed for apps that can't use the builtin models.
 
 %prep
 %autosetup -p1
 # Unbundle
-rm -rf wrapper/src/pugixml
+rm -rf third_party/
-rm -rf libsvm
-
-# Tweak libvmaf.pc
-sed -i -e 's|/usr/local|%{_prefix}|g' wrapper/libvmaf.pc
-sed -i -e 's|/usr/lib|%{_libdir}|g' wrapper/libvmaf.pc
-
 
 %build
-%ifarch i686
+pushd libvmaf
-export ASM_CFLAGS="-msse -msse2 -mavx"
+%meson \
-%endif
+ -Ddefault_library=shared
-%make_build CFLAGS_COMMON="%{optflags} ${ASM_CFLAGS} -fPIC" LDFLAGS="%{__global_ldflags}" V=1
+%meson_build
-
+popd
 
 %install
-%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir}
+pushd libvmaf
-
+%meson_install
-mv %{buildroot}%{_libdir}/libvmaf.so \
+popd
-  %{buildroot}%{_libdir}/libvmaf.so.0.0.0
-ln -s libvmaf.so.0.0.0 \
-  %{buildroot}%{_libdir}/libvmaf.so.0
-ln -s libvmaf.so.0 \
-  %{buildroot}%{_libdir}/libvmaf.so
-
-# Install vmafossexec
-mkdir -p %{buildroot}%{_bindir}
-install -pm 0755 wrapper/vmafossexec \
-  %{buildroot}%{_bindir}
 
 #RPM Macros support
 mkdir -p %{buildroot}%{rpmmacrodir}
 cat > %{buildroot}%{rpmmacrodir}/macros.%{name} << EOF
 # libvmaf RPM Macros
-%libvmaf_version	%{version}
+%libvmaf_version %{version}
 EOF
 touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name}
 
+mkdir -p %{buildroot}%{_datadir}/model/
+cp -Rp model/* %{buildroot}%{_datadir}/model/
+
+%check
+pushd libvmaf
+ninja -vC %{_vpath_builddir} test
+popd
 
 %ldconfig_scriptlets -n libvmaf
 
 
 %files
-%doc FAQ.md NOTICE.md README.md
+%doc README.md
-%{_bindir}/vmafossexec
+%{_bindir}/vmaf
+
+%files models
 %{_datadir}/model/
 
 %files -n libvmaf
 %doc CHANGELOG.md
 %license LICENSE
-%{_libdir}/*.so.*
+%{_libdir}/*.so.1*
 
 %files -n libvmaf-devel
 %doc CONTRIBUTING.md
 %{rpmmacrodir}/macros.%{name}
-%{_includedir}/libvmaf.h
+%{_includedir}/libvmaf/
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libvmaf.pc
 
 
 %changelog
-* Mon Feb 26 2024 Sergey Cherevko <s.cherevko@msvsphere-os.ru> - 1.3.15-2
+* Sat Dec 11 2021 Leigh Scott <leigh123linux@gmail.com> - 2.3.0-2
-- Rebuilt for MSVSphere 8.9
+- Add models sub-package
+
+* Fri Dec 10 2021 Leigh Scott <leigh123linux@gmail.com> - 2.3.0-1
+- Update to 2.3.0
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Mar 10 2021 Leigh Scott <leigh123linux@gmail.com> - 2.1.1-1
+- Update to 2.1.1
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Thu Dec 31 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.3-1
+- Update to 1.5.3
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.5.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jun 24 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-4
+- Add upstream commit to mark ABI as C
+
+* Sat May 23 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-3
+- Fix pkconfig version
+
+* Wed Mar 04 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-2
+- Use shared for vmafossexec
+
+* Tue Mar 03 2020 Leigh Scott <leigh123linux@gmail.com> - 1.5.1-1
+- Update to 1.5.1
 
-* Fri Nov 27 2020 Richard Shaw <hobbes1069@gmail.com> - 1.3.15-2
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.15-2
-- Rebuild for pugixml 1.11.
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
 * Wed Sep 11 2019 Leigh Scott <leigh123linux@googlemail.com> - 1.3.15-1
 - Update to 1.3.15