Re: UPDATE: svt-av1 0.8.5

On Sat, Nov 14, 2020 at 10:14:42PM -0500, Brad Smith wrote:
> Here is an update to svt-av1 0.8.5.
>
> ## [0.8.5] - 2020-09-04
> Relicensing notice
> - Change the outbound license from BSD+Patent to the AOM license / patent
>
> Encoder
> - Added tpl support to adaptively change lambda and quantization parameters within the frame
> - Added multi staged hme support
> - Quality speed trade-offs tuned to VOD use cases
> - Added first level non-optimized support for 2pass VBR and CRF
> - Added combined cli two pass support with options for stats being written to a memory buffer and a specified file
> - Added non square partitioning optimizations
> - Improved lambda generation
>
> Build and Testing
> - Bug fixes
> - Improve CI
> - Improve Unit Test Coverage
> - Address C vs asm mismatches
> - Fix static analysis warnings / errors
> - Add address sanitizer
> - Fix symbol conflicts with libaom and libvpx when staticly lined to ffmpeg

Here is an updated diff fixing some issues including having the shared libs
properly linked with libm / libpthread.


Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- Makefile 2 Jul 2020 08:15:38 -0000 1.4
+++ Makefile 18 Nov 2020 05:46:32 -0000
@@ -6,12 +6,12 @@ COMMENT= scalable AV1 encoder/decoder

GH_ACCOUNT= OpenVisualCloud
GH_PROJECT= SVT-AV1
-GH_TAGNAME= v0.8.4
+GH_TAGNAME= v0.8.5
PKGNAME= ${DISTNAME:L}
CATEGORIES= multimedia

-SHARED_LIBS= SvtAv1Dec 1.0 \
- SvtAv1Enc 1.0
+SHARED_LIBS= SvtAv1Dec 2.0 \
+ SvtAv1Enc 2.0

HOMEPAGE= https://github.com/OpenVisualCloud/SVT-AV1

Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo 2 Jul 2020 08:15:38 -0000 1.4
+++ distinfo 18 Nov 2020 05:46:32 -0000
@@ -1,2 +1,2 @@
-SHA256 (SVT-AV1-0.8.4.tar.gz) = mFCZTGznhZl1iFH5KVBbLDVBrwJ4tqEyfNQQTrcq8Uo=
-SIZE (SVT-AV1-0.8.4.tar.gz) = 6291815
+SHA256 (SVT-AV1-0.8.5.tar.gz) = jOlDWeqUUHRcF8EtTMBU1F9rJJjmPi66paUnO7Nvb5U=
+SIZE (SVT-AV1-0.8.5.tar.gz) = 6319601
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-CMakeLists_txt 18 Nov 2020 05:46:32 -0000
@@ -0,0 +1,36 @@
+$OpenBSD$
+
+- cmake: Link against pthread on Linux.
+- cmake: Enable Position Indepent Code the cmake way.
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -110,12 +110,13 @@ if(UNIX)
+ endif()
+ endif()
+
++# Always build with -fPIC
++set(CMAKE_POSITION_INDEPENDENT_CODE ON)
++
+ set(flags_to_test
+ -Wextra
+ -Wformat
+- -Wformat-security
+- -fPIE
+- -fPIC)
++ -Wformat-security)
+ if(MSVC)
+ list(INSERT flags_to_test 0 /W3)
+ list(APPEND flags_to_test /MP)
+@@ -229,6 +230,10 @@ macro(ASM_COMPILE_TO_TARGET target)
+ endforeach()
+ endif()
+ endmacro()
++
++# Find out if we have threading available
++set(CMAKE_THREAD_PREFER_PTHREADS ON)
++find_package(Threads)
+
+ # Add Subdirectories
+ add_subdirectory(Source/Lib/Common)
Index: patches/patch-Source_Lib_Decoder_CMakeLists_txt
===================================================================
RCS file: patches/patch-Source_Lib_Decoder_CMakeLists_txt
diff -N patches/patch-Source_Lib_Decoder_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_Lib_Decoder_CMakeLists_txt 18 Nov 2020 05:46:32 -0000
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+- cmake: Fix detection of libm.
+- cmake: Link against pthread on Linux.
+
+Index: Source/Lib/Decoder/CMakeLists.txt
+--- Source/Lib/Decoder/CMakeLists.txt.orig
++++ Source/Lib/Decoder/CMakeLists.txt
+@@ -18,10 +18,11 @@ set(DEC_VERSION ${DEC_VERSION_MAJOR}.${DEC_VERSION_MIN
+
+ if(UNIX)
+ if(NOT APPLE)
+- find_library(M_LIB name m)
++ find_library(M_LIB NAMES m)
+ if(M_LIB)
+ list(APPEND PLATFORM_LIBS m)
+ endif()
++ list(APPEND PLATFORM_LIBS Threads::Threads)
+ endif()
+ set(LIBS_PRIVATE "-lpthread -lm")
+ endif()
Index: patches/patch-Source_Lib_Encoder_CMakeLists_txt
===================================================================
RCS file: patches/patch-Source_Lib_Encoder_CMakeLists_txt
diff -N patches/patch-Source_Lib_Encoder_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-Source_Lib_Encoder_CMakeLists_txt 18 Nov 2020 05:46:32 -0000
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+- cmake: Fix detection of libm.
+- cmake: Link against pthread on Linux.
+
+Index: Source/Lib/Encoder/CMakeLists.txt
+--- Source/Lib/Encoder/CMakeLists.txt.orig
++++ Source/Lib/Encoder/CMakeLists.txt
+@@ -19,11 +19,12 @@ set(ENC_VERSION ${ENC_VERSION_MAJOR}.${ENC_VERSION_MIN
+
+ if(UNIX)
+ if(NOT APPLE)
+- find_library(M_LIB name m)
++ find_library(M_LIB NAMES m)
+ if(M_LIB)
+ list(APPEND PLATFORM_LIBS m)
+ endif()
+ endif()
++ list(APPEND PLATFORM_LIBS Threads::Threads)
+ set(LIBS_PRIVATE "-lpthread -lm")
+ endif()
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/svt-av1/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 18 Jun 2020 10:30:51 -0000 1.1.1.1
+++ pkg/PLIST 18 Nov 2020 05:46:32 -0000
@@ -2,6 +2,7 @@
@bin bin/SvtAv1DecApp
@bin bin/SvtAv1EncApp
include/svt-av1/
+include/svt-av1/EbDebugMacros.h
include/svt-av1/EbSvtAv1.h
include/svt-av1/EbSvtAv1Dec.h
include/svt-av1/EbSvtAv1Enc.h