From 4d114d07470511f1b2320673ffd251d42055bfee Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 5 Nov 2018 19:37:23 +0100 Subject: [PATCH 1/6] Initial import --- .gitignore | 1 + sources | 1 + vmaf.spec | 138 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 140 insertions(+) create mode 100644 .gitignore create mode 100644 sources create mode 100644 vmaf.spec diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8cb8ad8 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +vmaf-*.tar.gz diff --git a/sources b/sources new file mode 100644 index 0000000..c76c7df --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (vmaf-a654f6f.tar.gz) = 37984568db2d86c996567f3d2b57bd93e5dfce1adf5233e2cf0c1f6a099e3b704c8b31ff20c8115f87d4d7d40bedaad198a033d3acd4b40b4710a9d7a64cd987 diff --git a/vmaf.spec b/vmaf.spec new file mode 100644 index 0000000..3329a07 --- /dev/null +++ b/vmaf.spec @@ -0,0 +1,138 @@ +%global commit0 a654f6f7f5998aedf2d6e2f6b3a9eece9753c3fb +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global commitdate0 20180914 + +Name: vmaf +Version: 1.3.9 +Release: 1.%{commitdate0}git%{shortcommit0}%{?dist} +Summary: Video Multi-Method Assessment Fusion + +License: ASL 2.0 +URL: https://github.com/netflix/vmaf/ +Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +Patch0: 0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch +Patch1: 0002-Unbundle-pugixml.patch +Patch2: 0003-Drop-AVX-when-not-relevant.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 +Patch10: 0011-Add-msse2-for-i686.patch + +# This project relies on AVX +ExclusiveArch: x86_64 + +BuildRequires: gcc-c++ +BuildRequires: libsvm-devel +BuildRequires: pugixml-devel + +# Enforce our own build version for library +Requires: libvmaf%{?_isa} = %{version}-%{release} +# Upstream only provides a static library +# Packages using libvmaf must Requires this: +#%%{?libvmaf_version:Requires: libvmaf%%{?_isa} = %%{libvmaf_version}} + + +%description +VMAF is a perceptual video quality assessment algorithm developed by +Netflix. VMAF Development Kit (VDK) is a software package that contains +the VMAF algorithm implementation, as well as a set of tools that allows +a user to train and test a custom VMAF model. For an overview, read this +tech blog post, or this slide deck. + +https://github.com/Netflix/vmaf/blob/master/resource/doc/VMAF_ICIP17.pdf + + +%package -n libvmaf +Summary: Library for %{name} +#Some repo provides it +Provides: %{name}-static = %{version}-%{release} +Obsoletes: %{name}-static < %{version}-%{release} + +%description -n libvmaf +Library for %{name}. + +%package -n libvmaf-devel +Summary: Development files for %{name} +Requires: libvmaf%{?_isa} = %{version}-%{release} +#Some repo provides it +Provides: %{name}-devel = %{version}-%{release} +Obsoletes: %{name}-devel < %{version}-%{release} + +%description -n libvmaf-devel +The %{name}-devel package contains libraries and header files for +developing applications that use %{name}. + + +%prep +%autosetup -p1 -n %{name}-%{commit0} +# Unbundle +rm -rf wrapper/src/pugixml +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 +export ASM_CFLAGS="-msse -msse2 -mavx" +%endif +%make_build CFLAGS_COMMON="%{optflags} ${ASM_CFLAGS} -fPIC" LDFLAGS="%{__global_ldflags}" V=1 + + +%install +%make_install PREFIX=%{_prefix} LIBDIR=%{_libdir} + +mv %{buildroot}%{_libdir}/libvmaf.so \ + %{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} +EOF +touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} + + +%ldconfig_scriptlets -n libvmaf + + +%files +%doc FAQ.md NOTICE.md README.md +%{_bindir}/vmafossexec +%{_datadir}/model/ + +%files -n libvmaf +%doc CHANGELOG.md +%license LICENSE +%{_libdir}/*.so.* + +%files -n libvmaf-devel +%doc CONTRIBUTING.md +%{rpmmacrodir}/macros.%{name} +%{_includedir}/libvmaf.h +%{_libdir}/*.so +%{_libdir}/pkgconfig/libvmaf.pc + + +%changelog +* Fri Sep 21 2018 Nicolas Chauvet - 1.3.9-0.20180914gita654f6f +- Update to 1.3.9 up to 20180914 + +* Sat Apr 07 2018 Nicolas Chauvet - 1.3.3-1.20180407git510e257 +- Initial spec file From 78868b3cb583aba6e87eaf94e0d56e4f62a89eed Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Mon, 5 Nov 2018 20:07:35 +0100 Subject: [PATCH 2/6] Add patches --- ...IBDIR-build-variable-instead-of-cust.patch | 65 ++++++++++++++ 0002-Unbundle-pugixml.patch | 38 +++++++++ 0003-Drop-AVX-when-not-relevant.patch | 84 +++++++++++++++++++ 0004-Use-better-FLAGS-for-ptools.patch | 35 ++++++++ 0005-Switch-pugixml-include.patch | 26 ++++++ ...Switch-to-shared-library-for-libvmaf.patch | 58 +++++++++++++ 0007-Unbundle-libsvm.patch | 32 +++++++ 0008-Add-pugixml-LIBS.patch | 25 ++++++ ...6cpudetection-code-when-not-relevant.patch | 39 +++++++++ ...pc-to-use-Libs.private-for-pthread-m.patch | 30 +++++++ 0011-Add-msse2-for-i686.patch | 41 +++++++++ 11 files changed, 473 insertions(+) create mode 100644 0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch create mode 100644 0002-Unbundle-pugixml.patch create mode 100644 0003-Drop-AVX-when-not-relevant.patch create mode 100644 0004-Use-better-FLAGS-for-ptools.patch create mode 100644 0005-Switch-pugixml-include.patch create mode 100644 0006-Switch-to-shared-library-for-libvmaf.patch create mode 100644 0007-Unbundle-libsvm.patch create mode 100644 0008-Add-pugixml-LIBS.patch create mode 100644 0009-Avoid-x86cpudetection-code-when-not-relevant.patch create mode 100644 0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch create mode 100644 0011-Add-msse2-for-i686.patch diff --git a/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch b/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch new file mode 100644 index 0000000..2fef1ba --- /dev/null +++ b/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch @@ -0,0 +1,65 @@ +From 14f859ed0ee63774c3aa86cb31ae0d2b8f4941fd Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 12:32:54 +0200 +Subject: [PATCH 01/11] 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 8658e83..6b02083 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 + + OBJS = \ + $(OBJDIR)/alloc.o \ +@@ -170,24 +171,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.1 + diff --git a/0002-Unbundle-pugixml.patch b/0002-Unbundle-pugixml.patch new file mode 100644 index 0000000..c4af166 --- /dev/null +++ b/0002-Unbundle-pugixml.patch @@ -0,0 +1,38 @@ +From 524c2dea1569cef1aaeb26c2afd9a64e11c06254 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 13:43:48 +0200 +Subject: [PATCH 02/11] Unbundle pugixml + +--- + wrapper/Makefile | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/wrapper/Makefile b/wrapper/Makefile +index 6b02083..985a30f 100644 +--- a/wrapper/Makefile ++++ b/wrapper/Makefile +@@ -42,9 +42,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 \ +@@ -160,9 +160,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.1 + diff --git a/0003-Drop-AVX-when-not-relevant.patch b/0003-Drop-AVX-when-not-relevant.patch new file mode 100644 index 0000000..5d68f52 --- /dev/null +++ b/0003-Drop-AVX-when-not-relevant.patch @@ -0,0 +1,84 @@ +From bd90f8e5d7bb1d323ec35d8326915ded41cce587 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +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 + diff --git a/0004-Use-better-FLAGS-for-ptools.patch b/0004-Use-better-FLAGS-for-ptools.patch new file mode 100644 index 0000000..3f45ac5 --- /dev/null +++ b/0004-Use-better-FLAGS-for-ptools.patch @@ -0,0 +1,35 @@ +From 1f85e97f791709405d5b38981d1786727c229bc0 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +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 + diff --git a/0005-Switch-pugixml-include.patch b/0005-Switch-pugixml-include.patch new file mode 100644 index 0000000..aae4b9d --- /dev/null +++ b/0005-Switch-pugixml-include.patch @@ -0,0 +1,26 @@ +From 6b8189523f590e0ec8bd67b15c58377d27fe63f7 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 13:57:00 +0200 +Subject: [PATCH 05/11] Switch pugixml include + +--- + wrapper/src/vmaf.cpp | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wrapper/src/vmaf.cpp b/wrapper/src/vmaf.cpp +index bed3502..a776931 100644 +--- a/wrapper/src/vmaf.cpp ++++ b/wrapper/src/vmaf.cpp +@@ -28,7 +28,8 @@ + + #include "vmaf.h" + #include "combo.h" +-#include "pugixml/pugixml.hpp" ++#include "svm.h" ++#include + #include "timer.h" + #include "jsonprint.h" + #include "debug.h" +-- +2.17.1 + diff --git a/0006-Switch-to-shared-library-for-libvmaf.patch b/0006-Switch-to-shared-library-for-libvmaf.patch new file mode 100644 index 0000000..aee0af3 --- /dev/null +++ b/0006-Switch-to-shared-library-for-libvmaf.patch @@ -0,0 +1,58 @@ +From 26c58a87b63742412f8845318dbd27585a734ed1 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 14:33:30 +0200 +Subject: [PATCH 06/11] 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 c786a27..127faed 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 62bde27..8644c49 100644 +--- a/wrapper/Makefile ++++ b/wrapper/Makefile +@@ -1,4 +1,4 @@ +-LIBVMAF = libvmaf.a ++LIBVMAF = libvmaf.so + + .PHONY: all + all: $(LIBVMAF) vmafossexec +@@ -172,7 +172,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.1 + diff --git a/0007-Unbundle-libsvm.patch b/0007-Unbundle-libsvm.patch new file mode 100644 index 0000000..c152918 --- /dev/null +++ b/0007-Unbundle-libsvm.patch @@ -0,0 +1,32 @@ +From ee9ed1dfd1a41a30bf9c6a5e11cf0ae4f70a37ed Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 14:35:50 +0200 +Subject: [PATCH 07/11] 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.1 + diff --git a/0008-Add-pugixml-LIBS.patch b/0008-Add-pugixml-LIBS.patch new file mode 100644 index 0000000..07ecb1f --- /dev/null +++ b/0008-Add-pugixml-LIBS.patch @@ -0,0 +1,25 @@ +From d3d9937d72928f8c98feb196caeccdde9bafa63e Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 14:43:21 +0200 +Subject: [PATCH 08/11] Add pugixml LIBS + +--- + wrapper/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wrapper/Makefile b/wrapper/Makefile +index 8644c49..ceba5dc 100644 +--- a/wrapper/Makefile ++++ b/wrapper/Makefile +@@ -172,7 +172,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.1 + diff --git a/0009-Avoid-x86cpudetection-code-when-not-relevant.patch b/0009-Avoid-x86cpudetection-code-when-not-relevant.patch new file mode 100644 index 0000000..0a85ec8 --- /dev/null +++ b/0009-Avoid-x86cpudetection-code-when-not-relevant.patch @@ -0,0 +1,39 @@ +From 48f15b192920c283285276c01cf71331314d66a2 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 18:00:25 +0200 +Subject: [PATCH 09/11] 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 4befea2..165488a 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.1 + diff --git a/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch b/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch new file mode 100644 index 0000000..dfa992c --- /dev/null +++ b/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch @@ -0,0 +1,30 @@ +From 0a484f7a0af68364ce98d6b9a7f1389c08163a35 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +Date: Sat, 7 Apr 2018 19:16:00 +0200 +Subject: [PATCH 10/11] 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 +--- + wrapper/libvmaf.pc | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/wrapper/libvmaf.pc b/wrapper/libvmaf.pc +index 5d524f4..d025135 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.1 + diff --git a/0011-Add-msse2-for-i686.patch b/0011-Add-msse2-for-i686.patch new file mode 100644 index 0000000..e34b259 --- /dev/null +++ b/0011-Add-msse2-for-i686.patch @@ -0,0 +1,41 @@ +From c4af3c8270c8f498601d7dd68426c4bd52583006 Mon Sep 17 00:00:00 2001 +From: Nicolas Chauvet +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 +--- + 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 + From 7a3a7146ac69b3e4d84d87f6e14466a9c20a1590 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 3 Feb 2019 11:23:19 +0000 Subject: [PATCH 3/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmaf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmaf.spec b/vmaf.spec index 3329a07..93a0470 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -4,7 +4,7 @@ Name: vmaf Version: 1.3.9 -Release: 1.%{commitdate0}git%{shortcommit0}%{?dist} +Release: 2.%{commitdate0}git%{shortcommit0}%{?dist} Summary: Video Multi-Method Assessment Fusion License: ASL 2.0 @@ -131,6 +131,9 @@ touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} %changelog +* Sun Feb 03 2019 Fedora Release Engineering - 1.3.9-2.20180914gita654f6f +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Fri Sep 21 2018 Nicolas Chauvet - 1.3.9-0.20180914gita654f6f - Update to 1.3.9 up to 20180914 From 5a040ff0a72f8dd4847d57d6b18b7bb32f7bdf59 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 6 Apr 2019 19:17:38 +0200 Subject: [PATCH 4/6] Update to 1.3.14 --- ...nd-LIBDIR-build-variable-instead-of-cust.patch | 15 +++++++-------- 0002-Unbundle-pugixml.patch | 12 ++++++------ 0005-Switch-pugixml-include.patch | 15 +++++++-------- 0006-Switch-to-shared-library-for-libvmaf.patch | 12 ++++++------ 0007-Unbundle-libsvm.patch | 6 +++--- 0008-Add-pugixml-LIBS.patch | 10 +++++----- ...d-x86cpudetection-code-when-not-relevant.patch | 8 ++++---- ...maf.pc-to-use-Libs.private-for-pthread-m.patch | 8 ++++---- sources | 2 +- vmaf.spec | 14 ++++++++------ 10 files changed, 51 insertions(+), 51 deletions(-) diff --git a/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch b/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch index 2fef1ba..f55eba3 100644 --- a/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch +++ b/0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch @@ -1,15 +1,14 @@ -From 14f859ed0ee63774c3aa86cb31ae0d2b8f4941fd Mon Sep 17 00:00:00 2001 +From 870de42512805dcdd469ef0301476b3fc0e4bc95 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 12:32:54 +0200 -Subject: [PATCH 01/11] Use PREFIX and LIBDIR build variable instead of custom - ones +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 8658e83..6b02083 100644 +index 9317515..868b13f 100644 --- a/wrapper/Makefile +++ b/wrapper/Makefile @@ -8,7 +8,8 @@ SRCDIR = $(TOP)/src @@ -19,10 +18,10 @@ index 8658e83..6b02083 100644 -INSTALL_PREFIX = /usr/local +PREFIX ?= /usr/local +LIBDIR ?= $(PREFIX)/lib + INCLUDES += -I$(TOP)/../feature/src + INCLUDES += -I$(TOP)/../feature/src/common - OBJS = \ - $(OBJDIR)/alloc.o \ -@@ -170,24 +171,24 @@ vmafossexec: $(OBJDIR)/main.o $(LIBVMAF) +@@ -168,24 +169,24 @@ vmafossexec: $(OBJDIR)/main.o $(LIBVMAF) .PHONY: install install: @@ -61,5 +60,5 @@ index 8658e83..6b02083 100644 .PHONY: clean clean: -- -2.17.1 +2.17.2 diff --git a/0002-Unbundle-pugixml.patch b/0002-Unbundle-pugixml.patch index c4af166..fd43ec2 100644 --- a/0002-Unbundle-pugixml.patch +++ b/0002-Unbundle-pugixml.patch @@ -1,17 +1,17 @@ -From 524c2dea1569cef1aaeb26c2afd9a64e11c06254 Mon Sep 17 00:00:00 2001 +From a6765396684ddd62fe660cb914e495e61a4dcab9 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 13:43:48 +0200 -Subject: [PATCH 02/11] Unbundle pugixml +Subject: [PATCH] Unbundle pugixml --- wrapper/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/wrapper/Makefile b/wrapper/Makefile -index 6b02083..985a30f 100644 +index 868b13f..4a891e1 100644 --- a/wrapper/Makefile +++ b/wrapper/Makefile -@@ -42,9 +42,9 @@ OBJS = \ +@@ -43,9 +43,9 @@ OBJS = \ $(OBJDIR)/vmaf.o \ $(OBJDIR)/darray.o \ $(OBJDIR)/libvmaf.o \ @@ -23,7 +23,7 @@ index 6b02083..985a30f 100644 AVX_OBJS := \ $(OBJDIR)/convolution_avx.o \ -@@ -160,9 +160,6 @@ $(OBJDIR)/vmaf.o: $(SRCDIR)/vmaf.cpp +@@ -158,9 +158,6 @@ $(OBJDIR)/vmaf.o: $(SRCDIR)/vmaf.cpp $(OBJDIR)/%.o: $(SRCDIR)/%.c $(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $< @@ -34,5 +34,5 @@ index 6b02083..985a30f 100644 ar rcs $@ $^ -- -2.17.1 +2.17.2 diff --git a/0005-Switch-pugixml-include.patch b/0005-Switch-pugixml-include.patch index aae4b9d..0eb5708 100644 --- a/0005-Switch-pugixml-include.patch +++ b/0005-Switch-pugixml-include.patch @@ -1,26 +1,25 @@ -From 6b8189523f590e0ec8bd67b15c58377d27fe63f7 Mon Sep 17 00:00:00 2001 +From 80053ca29abc26ff6129ea5cb5c7e7545519b625 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 13:57:00 +0200 -Subject: [PATCH 05/11] Switch pugixml include +Subject: [PATCH] Switch pugixml include --- - wrapper/src/vmaf.cpp | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + 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 bed3502..a776931 100644 +index fa1dce9..3e193bc 100644 --- a/wrapper/src/vmaf.cpp +++ b/wrapper/src/vmaf.cpp -@@ -28,7 +28,8 @@ +@@ -29,7 +29,7 @@ #include "vmaf.h" #include "combo.h" -#include "pugixml/pugixml.hpp" -+#include "svm.h" +#include #include "timer.h" #include "jsonprint.h" #include "debug.h" -- -2.17.1 +2.17.2 diff --git a/0006-Switch-to-shared-library-for-libvmaf.patch b/0006-Switch-to-shared-library-for-libvmaf.patch index aee0af3..08a3293 100644 --- a/0006-Switch-to-shared-library-for-libvmaf.patch +++ b/0006-Switch-to-shared-library-for-libvmaf.patch @@ -1,7 +1,7 @@ -From 26c58a87b63742412f8845318dbd27585a734ed1 Mon Sep 17 00:00:00 2001 +From f3b0da9d64e0ad5e668abc97137635f3c5da2d8f Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 14:33:30 +0200 -Subject: [PATCH 06/11] Switch to shared library for libvmaf +Subject: [PATCH] Switch to shared library for libvmaf --- feature/Makefile | 2 +- @@ -10,7 +10,7 @@ Subject: [PATCH 06/11] Switch to shared library for libvmaf 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/feature/Makefile b/feature/Makefile -index c786a27..127faed 100644 +index 111d07c..86ced7d 100644 --- a/feature/Makefile +++ b/feature/Makefile @@ -5,7 +5,7 @@ TOP = $(shell pwd) @@ -35,7 +35,7 @@ index b721ec4..16e4e57 100644 .cproject .project diff --git a/wrapper/Makefile b/wrapper/Makefile -index 62bde27..8644c49 100644 +index 4a891e1..2aeaf66 100644 --- a/wrapper/Makefile +++ b/wrapper/Makefile @@ -1,4 +1,4 @@ @@ -44,7 +44,7 @@ index 62bde27..8644c49 100644 .PHONY: all all: $(LIBVMAF) vmafossexec -@@ -172,7 +172,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c +@@ -159,7 +159,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c $(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $< $(LIBVMAF): $(OBJS) $(wildcard ../ptools/*.o) @@ -54,5 +54,5 @@ index 62bde27..8644c49 100644 vmafossexec: $(OBJDIR)/main.o $(LIBVMAF) $(CXX) -s -o $@ $(LDFLAGS) $^ -pthread -- -2.17.1 +2.17.2 diff --git a/0007-Unbundle-libsvm.patch b/0007-Unbundle-libsvm.patch index c152918..c69f535 100644 --- a/0007-Unbundle-libsvm.patch +++ b/0007-Unbundle-libsvm.patch @@ -1,7 +1,7 @@ -From ee9ed1dfd1a41a30bf9c6a5e11cf0ae4f70a37ed Mon Sep 17 00:00:00 2001 +From 1b1b5db051e99bd7070fd996d46af4f88d030452 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 14:35:50 +0200 -Subject: [PATCH 07/11] Unbundle libsvm +Subject: [PATCH] Unbundle libsvm --- Makefile | 3 --- @@ -28,5 +28,5 @@ index 5a13baa..d2ba5cc 100644 -for dir in $(TARGETS); do \ cd $${dir}; $(MAKE) clean; cd ..; \ -- -2.17.1 +2.17.2 diff --git a/0008-Add-pugixml-LIBS.patch b/0008-Add-pugixml-LIBS.patch index 07ecb1f..30cb36e 100644 --- a/0008-Add-pugixml-LIBS.patch +++ b/0008-Add-pugixml-LIBS.patch @@ -1,17 +1,17 @@ -From d3d9937d72928f8c98feb196caeccdde9bafa63e Mon Sep 17 00:00:00 2001 +From b0fbd280173737102f1814e59452545c6d116cb1 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 14:43:21 +0200 -Subject: [PATCH 08/11] Add pugixml LIBS +Subject: [PATCH] Add pugixml LIBS --- wrapper/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrapper/Makefile b/wrapper/Makefile -index 8644c49..ceba5dc 100644 +index 2aeaf66..ac6decc 100644 --- a/wrapper/Makefile +++ b/wrapper/Makefile -@@ -172,7 +172,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c +@@ -159,7 +159,7 @@ $(OBJDIR)/%.o: $(SRCDIR)/%.c $(CC) -c -o $@ $(CFLAGS) $(CPPFLAGS) -I $(FEATURESRCDIR) $< $(LIBVMAF): $(OBJS) $(wildcard ../ptools/*.o) @@ -21,5 +21,5 @@ index 8644c49..ceba5dc 100644 vmafossexec: $(OBJDIR)/main.o $(LIBVMAF) $(CXX) -s -o $@ $(LDFLAGS) $^ -pthread -- -2.17.1 +2.17.2 diff --git a/0009-Avoid-x86cpudetection-code-when-not-relevant.patch b/0009-Avoid-x86cpudetection-code-when-not-relevant.patch index 0a85ec8..95e336d 100644 --- a/0009-Avoid-x86cpudetection-code-when-not-relevant.patch +++ b/0009-Avoid-x86cpudetection-code-when-not-relevant.patch @@ -1,14 +1,14 @@ -From 48f15b192920c283285276c01cf71331314d66a2 Mon Sep 17 00:00:00 2001 +From 02e035cfe70c8c89e7b0f7ac8e9dd0548cfcab56 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 18:00:25 +0200 -Subject: [PATCH 09/11] Avoid x86cpudetection code when not relevant +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 4befea2..165488a 100644 +index 85156f8..3d48dcd 100644 --- a/feature/src/common/cpu.c +++ b/feature/src/common/cpu.c @@ -16,9 +16,10 @@ @@ -35,5 +35,5 @@ index 4befea2..165488a 100644 +} +#endif -- -2.17.1 +2.17.2 diff --git a/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch b/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch index dfa992c..44ecab3 100644 --- a/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch +++ b/0010-Fix-libvmaf.pc-to-use-Libs.private-for-pthread-m.patch @@ -1,7 +1,7 @@ -From 0a484f7a0af68364ce98d6b9a7f1389c08163a35 Mon Sep 17 00:00:00 2001 +From 8b4d74a98a95aa12d58f9ebaded2c562b62111f7 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Sat, 7 Apr 2018 19:16:00 +0200 -Subject: [PATCH 10/11] Fix libvmaf.pc to use Libs.private for pthread m +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++ @@ -13,7 +13,7 @@ Signed-off-by: Nicolas Chauvet 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wrapper/libvmaf.pc b/wrapper/libvmaf.pc -index 5d524f4..d025135 100644 +index e48d5a8..416d327 100644 --- a/wrapper/libvmaf.pc +++ b/wrapper/libvmaf.pc @@ -10,6 +10,6 @@ URL: https://github.com/Netflix/vmaf @@ -26,5 +26,5 @@ index 5d524f4..d025135 100644 +Libs.private: -lpthread -lm Cflags: -I${includedir} -- -2.17.1 +2.17.2 diff --git a/sources b/sources index c76c7df..020cb26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vmaf-a654f6f.tar.gz) = 37984568db2d86c996567f3d2b57bd93e5dfce1adf5233e2cf0c1f6a099e3b704c8b31ff20c8115f87d4d7d40bedaad198a033d3acd4b40b4710a9d7a64cd987 +SHA512 (vmaf-8f41503.tar.gz) = 596b96d320a77da39b43b14c385866294ed3be09e3474f940f4bf768ad7e78478446ac42edd0547582839c914ddaf61b33cff493c4eae87b480bd1e0fa12ef7a diff --git a/vmaf.spec b/vmaf.spec index 93a0470..c466e6d 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -1,10 +1,10 @@ -%global commit0 a654f6f7f5998aedf2d6e2f6b3a9eece9753c3fb +%global commit0 8f41503605e6e55b34945e49cba864697e1ca683 %global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commitdate0 20180914 +%global commitdate0 20190403 Name: vmaf -Version: 1.3.9 -Release: 2.%{commitdate0}git%{shortcommit0}%{?dist} +Version: 1.3.14 +Release: 1.%{commitdate0}git%{shortcommit0}%{?dist} Summary: Video Multi-Method Assessment Fusion License: ASL 2.0 @@ -12,7 +12,6 @@ URL: https://github.com/netflix/vmaf/ Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz Patch0: 0001-Use-PREFIX-and-LIBDIR-build-variable-instead-of-cust.patch Patch1: 0002-Unbundle-pugixml.patch -Patch2: 0003-Drop-AVX-when-not-relevant.patch Patch3: 0004-Use-better-FLAGS-for-ptools.patch Patch4: 0005-Switch-pugixml-include.patch Patch5: 0006-Switch-to-shared-library-for-libvmaf.patch @@ -20,7 +19,6 @@ 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 -Patch10: 0011-Add-msse2-for-i686.patch # This project relies on AVX ExclusiveArch: x86_64 @@ -131,6 +129,10 @@ touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} %changelog +* Sat Apr 06 2019 Nicolas Chauvet - 1.3.14-1.20190403git8f415036 +- Update to 1.13.4 +- Rebase patches + * Sun Feb 03 2019 Fedora Release Engineering - 1.3.9-2.20180914gita654f6f - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From 745e4eed35c3171dc29e82920c0b0790202be84d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 03:06:29 +0000 Subject: [PATCH 5/6] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- vmaf.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vmaf.spec b/vmaf.spec index c466e6d..7998a17 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -4,7 +4,7 @@ Name: vmaf Version: 1.3.14 -Release: 1.%{commitdate0}git%{shortcommit0}%{?dist} +Release: 2.%{commitdate0}git%{shortcommit0}%{?dist} Summary: Video Multi-Method Assessment Fusion License: ASL 2.0 @@ -129,6 +129,9 @@ touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 1.3.14-2.20190403git8f41503 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Sat Apr 06 2019 Nicolas Chauvet - 1.3.14-1.20190403git8f415036 - Update to 1.13.4 - Rebase patches From 92451d408d7caba79efffd9a75bb5e956e73e553 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Wed, 11 Sep 2019 09:25:49 +0100 Subject: [PATCH 6/6] Update to 1.3.15 --- sources | 2 +- vmaf.spec | 19 +++++++++---------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/sources b/sources index 020cb26..e1d2544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vmaf-8f41503.tar.gz) = 596b96d320a77da39b43b14c385866294ed3be09e3474f940f4bf768ad7e78478446ac42edd0547582839c914ddaf61b33cff493c4eae87b480bd1e0fa12ef7a +SHA512 (vmaf-1.3.15.tar.gz) = 48dd07e7cf0bca0133739d788e0dab016304cb3b33c72db5a2bc55a55768c3efac6b85c413e8471bfa362bf6ce3bd20994bf996af9cf09c37f2be977791c08c6 diff --git a/vmaf.spec b/vmaf.spec index 7998a17..22d4aa2 100644 --- a/vmaf.spec +++ b/vmaf.spec @@ -1,15 +1,11 @@ -%global commit0 8f41503605e6e55b34945e49cba864697e1ca683 -%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) -%global commitdate0 20190403 - Name: vmaf -Version: 1.3.14 -Release: 2.%{commitdate0}git%{shortcommit0}%{?dist} +Version: 1.3.15 +Release: 1%{?dist} Summary: Video Multi-Method Assessment Fusion License: ASL 2.0 -URL: https://github.com/netflix/vmaf/ -Source0: %{url}/archive/%{commit0}/%{name}-%{shortcommit0}.tar.gz +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 @@ -66,7 +62,7 @@ developing applications that use %{name}. %prep -%autosetup -p1 -n %{name}-%{commit0} +%autosetup -p1 # Unbundle rm -rf wrapper/src/pugixml rm -rf libsvm @@ -129,11 +125,14 @@ touch -r LICENSE %{buildroot}%{rpmmacrodir}/macros.%{name} %changelog +* Wed Sep 11 2019 Leigh Scott - 1.3.15-1 +- Update to 1.3.15 + * Sat Jul 27 2019 Fedora Release Engineering - 1.3.14-2.20190403git8f41503 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Sat Apr 06 2019 Nicolas Chauvet - 1.3.14-1.20190403git8f415036 -- Update to 1.13.4 +- Update to 1.3.14 - Rebase patches * Sun Feb 03 2019 Fedora Release Engineering - 1.3.9-2.20180914gita654f6f