multimedia/svt-av1: update to 0.8.7

Changes:	https://gitlab.com/AOMediaCodec/SVT-AV1/-/releases/v0.8.7
Reported by:	Repology

8 files changed, 49 insertions, 44 deletions

diff --git a/graphics/libavif/Makefile b/graphics/libavif/Makefile
index e7b60d7c7fb9..361147b78dbb 100644
--- a/graphics/libavif/Makefile
+++ b/graphics/libavif/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	libavif
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.9.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 6e6f5891b3f0..e97b4e8aa7e9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	4.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio net
 MASTER_SITES=	https://ffmpeg.org/releases/
diff --git a/multimedia/gstreamer1-plugins-svt-av1/Makefile b/multimedia/gstreamer1-plugins-svt-av1/Makefile
index 18f5451ee83a..41e60d31fe0b 100644
--- a/multimedia/gstreamer1-plugins-svt-av1/Makefile
+++ b/multimedia/gstreamer1-plugins-svt-av1/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.6
+DISTVERSION=	0.8.7
 CATEGORIES=	multimedia
 PKGNAMEPREFIX=	gstreamer1-plugins-
 
@@ -18,7 +18,7 @@ USE_GNOME=	glib20
 USE_GSTREAMER1=	yes
 GL_ACCOUNT=	AOMediaCodec
 GL_PROJECT=	SVT-AV1
-GL_COMMIT=	a5ec26c0f0bd6e872a0b2bb340b4a777f4847020
+GL_COMMIT=	3971c982311d49f9355dc8dccdcf8d21b70fa624
 WRKSRC_SUBDIR=	gstreamer-plugin
 PLIST_FILES=	lib/gstreamer-1.0/libgstsvtav1enc.so
 
diff --git a/multimedia/gstreamer1-plugins-svt-av1/distinfo b/multimedia/gstreamer1-plugins-svt-av1/distinfo
index 219a54ca1e81..5b0ba5eac19d 100644
--- a/multimedia/gstreamer1-plugins-svt-av1/distinfo
+++ b/multimedia/gstreamer1-plugins-svt-av1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617891582
-SHA256 (AOMediaCodec-SVT-AV1-a5ec26c0f0bd6e872a0b2bb340b4a777f4847020_GL0.tar.gz) = bbb7fd76c8357ec89caf39839b8ede7c3e029694dd5fd36443bee8b2966f6332
-SIZE (AOMediaCodec-SVT-AV1-a5ec26c0f0bd6e872a0b2bb340b4a777f4847020_GL0.tar.gz) = 6421205
+TIMESTAMP = 1620464700
+SHA256 (AOMediaCodec-SVT-AV1-3971c982311d49f9355dc8dccdcf8d21b70fa624_GL0.tar.gz) = 5bb4e655e40beda6556897caa8f22e3be478a361e5000ffa0f015e1c32778893
+SIZE (AOMediaCodec-SVT-AV1-3971c982311d49f9355dc8dccdcf8d21b70fa624_GL0.tar.gz) = 6401397
diff --git a/multimedia/svt-av1/Makefile b/multimedia/svt-av1/Makefile
index db88377a3f17..4ad09200eb40 100644
--- a/multimedia/svt-av1/Makefile
+++ b/multimedia/svt-av1/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	svt-av1
 DISTVERSIONPREFIX=	v
-DISTVERSION=	0.8.6
-PORTREVISION=	1
+DISTVERSION=	0.8.7
 CATEGORIES=	multimedia
 
 MAINTAINER=	jbeich@FreeBSD.org
@@ -21,7 +20,7 @@ USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 GL_ACCOUNT=	AOMediaCodec
 GL_PROJECT=	SVT-AV1
-GL_COMMIT=	a5ec26c0f0bd6e872a0b2bb340b4a777f4847020
+GL_COMMIT=	3971c982311d49f9355dc8dccdcf8d21b70fa624
 CMAKE_ON=	ENABLE_NASM
 CMAKE_OFF=	NATIVE
 
diff --git a/multimedia/svt-av1/distinfo b/multimedia/svt-av1/distinfo
index 219a54ca1e81..5b0ba5eac19d 100644
--- a/multimedia/svt-av1/distinfo
+++ b/multimedia/svt-av1/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1617891582
-SHA256 (AOMediaCodec-SVT-AV1-a5ec26c0f0bd6e872a0b2bb340b4a777f4847020_GL0.tar.gz) = bbb7fd76c8357ec89caf39839b8ede7c3e029694dd5fd36443bee8b2966f6332
-SIZE (AOMediaCodec-SVT-AV1-a5ec26c0f0bd6e872a0b2bb340b4a777f4847020_GL0.tar.gz) = 6421205
+TIMESTAMP = 1620464700
+SHA256 (AOMediaCodec-SVT-AV1-3971c982311d49f9355dc8dccdcf8d21b70fa624_GL0.tar.gz) = 5bb4e655e40beda6556897caa8f22e3be478a361e5000ffa0f015e1c32778893
+SIZE (AOMediaCodec-SVT-AV1-3971c982311d49f9355dc8dccdcf8d21b70fa624_GL0.tar.gz) = 6401397
diff --git a/multimedia/svt-av1/files/patch-revert b/multimedia/svt-av1/files/patch-revert
index 4dc1cde196cb..a12b5df35443 100644
--- a/multimedia/svt-av1/files/patch-revert
+++ b/multimedia/svt-av1/files/patch-revert
@@ -1,14 +1,16 @@
 Revert https://gitlab.com/AOMediaCodec/SVT-AV1/-/commit/fedc119668a4
 due to https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1613
 
---- CMakeLists.txt.orig	2020-11-29 07:10:56 UTC
+--- CMakeLists.txt.orig	2021-05-08 09:05:00 UTC
 +++ CMakeLists.txt
-@@ -276,6 +276,5 @@ if(BUILD_TESTING)
- endif()
+@@ -389,8 +389,4 @@ endif()
  
  add_subdirectory(third_party/fastfeat)
--add_subdirectory(third_party/cpuinfo)
  
+-if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
+-    add_subdirectory(third_party/cpuinfo)
+-endif()
+-
  install(DIRECTORY ${PROJECT_SOURCE_DIR}/Source/API/ DESTINATION "${CMAKE_INSTALL_FULL_INCLUDEDIR}/svt-av1" FILES_MATCHING PATTERN "*.h")
 --- Source/Lib/Common/Codec/CMakeLists.txt.orig	2020-11-29 07:10:56 UTC
 +++ Source/Lib/Common/Codec/CMakeLists.txt
@@ -31,23 +33,24 @@ due to https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1613
  endif ()
  file(GLOB all_files
      "*.h"
---- Source/Lib/Common/Codec/common_dsp_rtcd.c.orig	2020-11-29 07:10:56 UTC
+--- Source/Lib/Common/Codec/common_dsp_rtcd.c.orig	2021-05-08 09:05:00 UTC
 +++ Source/Lib/Common/Codec/common_dsp_rtcd.c
-@@ -17,9 +17,6 @@
+@@ -17,11 +17,6 @@
  #include "EbPackUnPack_C.h"
  #include "EbAvcStyleMcp.h"
  
+-#ifdef ARCH_X86_64
 -// for get_cpu_flags
 -#include "cpuinfo.h"
+-#endif
 -
  /*
   * DSP deprecated flags
   */
-@@ -69,31 +66,121 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, co
- /**************************************
+@@ -72,30 +67,120 @@ int64_t svt_av1_block_error_c(const TranLow *coeff, co
   * Instruction Set Support
   **************************************/
-+#ifdef ARCH_X86_64
+ #ifdef ARCH_X86_64
 +// Helper Functions
 +static INLINE void run_cpuid(int eax, int ecx, int* abcd) {
 +#ifdef _WIN32
@@ -71,7 +74,7 @@ due to https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1613
 +    abcd[3] = edx;
 +#endif
 +}
- 
++
 +static INLINE int32_t check_xcr0_ymm() {
 +    uint32_t xcr0;
 +#ifdef _WIN32
@@ -183,38 +186,39 @@ due to https://gitlab.com/AOMediaCodec/SVT-AV1/-/issues/1613
      return flags;
  }
  
-@@ -105,6 +192,7 @@ CPU_FLAGS get_cpu_flags_to_use() {
+@@ -107,7 +192,7 @@ CPU_FLAGS get_cpu_flags_to_use() {
  #endif
      return flags;
  }
+-#endif /*ARCH_X86_64*/
 +#endif
  
  #ifdef ARCH_X86_64
- #ifndef NON_AVX512_SUPPORT
---- Source/Lib/Decoder/CMakeLists.txt.orig	2020-11-29 07:10:56 UTC
+ #if EN_AVX512_SUPPORT
+--- Source/Lib/Decoder/CMakeLists.txt.orig	2021-05-08 09:05:00 UTC
 +++ Source/Lib/Decoder/CMakeLists.txt
-@@ -98,8 +98,7 @@ endif()
- set_target_properties(SvtAv1Dec PROPERTIES VERSION ${DEC_VERSION})
- set_target_properties(SvtAv1Dec PROPERTIES SOVERSION ${DEC_VERSION_MAJOR})
+@@ -100,9 +100,6 @@ set_target_properties(SvtAv1Dec PROPERTIES SOVERSION $
+ set_target_properties(SvtAv1Dec PROPERTIES C_VISIBILITY_PRESET hidden)
  add_dependencies(SvtAv1Dec EbVersionHeaderGen)
--target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS})
--target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public)
-+target_link_libraries(SvtAv1Dec ${PLATFORM_LIBS})
- install(TARGETS SvtAv1Dec DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ target_link_libraries(SvtAv1Dec PUBLIC ${PLATFORM_LIBS})
+-if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
+-    target_link_libraries(SvtAv1Dec PRIVATE cpuinfo_public)
+-endif()
  
- configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Dec.pc @ONLY)
---- Source/Lib/Encoder/CMakeLists.txt.orig	2020-11-29 07:10:56 UTC
+ set(DEC_PKG_CONFIG_EXTRA_CFLAGS "")
+ if (BUILD_SHARED_LIBS)
+--- Source/Lib/Encoder/CMakeLists.txt.orig	2021-05-08 09:05:00 UTC
 +++ Source/Lib/Encoder/CMakeLists.txt
-@@ -129,8 +129,7 @@ endif()
- 
- set_target_properties(SvtAv1Enc PROPERTIES VERSION ${ENC_VERSION})
+@@ -131,9 +131,6 @@ set_target_properties(SvtAv1Enc PROPERTIES VERSION ${E
  set_target_properties(SvtAv1Enc PROPERTIES SOVERSION ${ENC_VERSION_MAJOR})
--target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS})
--target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public)
-+target_link_libraries(SvtAv1Enc ${PLATFORM_LIBS})
- install(TARGETS SvtAv1Enc DESTINATION "${CMAKE_INSTALL_LIBDIR}")
+ set_target_properties(SvtAv1Enc PROPERTIES C_VISIBILITY_PRESET hidden)
+ target_link_libraries(SvtAv1Enc PUBLIC ${PLATFORM_LIBS})
+-if(NOT COMPILE_C_ONLY AND HAVE_X86_PLATFORM)
+-    target_link_libraries(SvtAv1Enc PRIVATE cpuinfo_public)
+-endif()
  
- configure_file(pkg-config.pc.in ${CMAKE_BINARY_DIR}/SvtAv1Enc.pc @ONLY)
+ set(ENC_PKG_CONFIG_EXTRA_CFLAGS "")
+ if (BUILD_SHARED_LIBS)
 --- test/CMakeLists.txt.orig	2020-11-29 07:10:56 UTC
 +++ test/CMakeLists.txt
 @@ -86,7 +86,6 @@ set(lib_list
diff --git a/multimedia/svt-av1/pkg-plist b/multimedia/svt-av1/pkg-plist
index fe2a46c15562..8aebb676ab6a 100644
--- a/multimedia/svt-av1/pkg-plist
+++ b/multimedia/svt-av1/pkg-plist
@@ -7,11 +7,12 @@ include/svt-av1/EbSvtAv1Enc.h
 include/svt-av1/EbSvtAv1ErrorCodes.h
 include/svt-av1/EbSvtAv1ExtFrameBuf.h
 include/svt-av1/EbSvtAv1Formats.h
+include/svt-av1/EbSvtAv1Metadata.h
 lib/libSvtAv1Dec.so
 lib/libSvtAv1Dec.so.0
-lib/libSvtAv1Dec.so.0.8.6
+lib/libSvtAv1Dec.so.0.8.7
 lib/libSvtAv1Enc.so
 lib/libSvtAv1Enc.so.0
-lib/libSvtAv1Enc.so.0.8.6
+lib/libSvtAv1Enc.so.0.8.7
 libdata/pkgconfig/SvtAv1Dec.pc
 libdata/pkgconfig/SvtAv1Enc.pc