Attachment 216585 Details for Bug 247035 – Updated diff, with VMAF-build fixed

[patch] Updated diff, with VMAF-build fixed

x265.patch (text/plain), 13.90 KB, created by Mikhail Teterin on 2020-07-19 21:59:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikhail Teterin

Created: 2020-07-19 21:59:18 UTC

Size: 13.90 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 542595)
>+++ Makefile	(working copy)
>@@ -2,14 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	x265
>-PORTVERSION=	3.2.1
>-PORTREVISION=	3
>+PORTVERSION=	3.4
> CATEGORIES=	multimedia
>-MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/ \
>-		https://downloads.videolan.org/pub/videolan/x265/ \
>-		https://mirror.leaseweb.com/videolan/x265/ \
>-		http://downloads.videolan.org/pub/videolan/x265/ \
>-		http://mirror.leaseweb.com/videolan/x265/
>+MASTER_SITES=	https://bitbucket.org/multicoreware/x265/downloads/
> DISTNAME=	${PORTNAME}_${PORTVERSION}
> 
> MAINTAINER=	mi@aldan.algebra.com
>@@ -18,19 +13,19 @@
> LICENSE=	GPLv2+
> LICENSE_FILE=	${WRKSRC:H}/COPYING
> 
>-BUILD_DEPENDS=	${BUILD_DEPENDS_${ARCH}}
>-BUILD_DEPENDS_amd64=	nasm:devel/nasm
>-BUILD_DEPENDS_i386=	nasm:devel/nasm
>+USES=		cmake compiler:c++14-lang pathfix dos2unix
> 
>-USES=		cmake compiler:c++14-lang pathfix
>-
> OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS VMAF
> OPTIONS_DEFAULT=	OPTIMIZED_FLAGS HI8P HI10P HI12P
>-OPTIONS_DEFINE_amd64=	SVTHEVC
>+OPTIONS_DEFINE_aarch64=	ASM
>+OPTIONS_DEFINE_amd64=	ASM SVTHEVC
>+OPTIONS_DEFINE_i386=	ASM
>+OPTIONS_DEFAULT_amd64=	ASM
> 
> OPTIONS_MULTI=		PixelWidth
> OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P
> 
>+DOS2UNIX_FILES=		abrEncApp.cpp
> DEBUG_PREVENTS=		OPTIMIZED_FLAGS
> DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
> DEBUG_VARS_OFF=		CFLAGS+=-DNDEBUG
>@@ -42,6 +37,7 @@
> VMAF_LIB_DEPENDS=	libvmaf.so:multimedia/vmaf
> VMAF_USES=		localbase:ldflags
> VMAF_CMAKE_BOOL=	ENABLE_LIBVMAF
>+VMAF_CMAKE_ON=	-DVMAF_INCLUDE_DIR:PATH="${LOCALBASE}/include/libvmaf"
> 
> DEBUG_DESC=	Enable debugging
> HI8P_DESC=	Enable 8-bit pixel-width (you, probably, want this)
>@@ -51,7 +47,6 @@
> SVTHEVC_DESC=	HEVC encoding via SVT-HEVC
> VMAF_DESC=	Per frame and aggregate VMAF score
> 
>-OPTIONS_SUB=	yes
> USE_LDCONFIG=	yes
> CMAKE_ARGS=	-DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
> LDFLAGS_i386=	-Wl,-znotext
>@@ -61,6 +56,17 @@
> 
> .include <bsd.port.options.mk>
> 
>+.if ${ARCH} == aarch64 && ${PORT_OPTIONS:MASM}
>+BUILD_DEPENDS=	as:devel/binutils
>+USE_GCC=	yes
>+ASM_PREVENTS=	HI10P HI12P
>+ASM_PREVENTS_MSG=	Currently HI10P and HI12P doesn't build with assembly
>+.endif
>+
>+.if ${ARCH} != aarch64 && ${PORT_OPTIONS:MASM}
>+BUILD_DEPENDS=	nasm:devel/nasm
>+.endif
>+
> DEFAULT_DEPTH=	${PORT_OPTIONS:MHI*P:O:ts/:T}
> OTHER_DEPTHS=	${PORT_OPTIONS:MHI*P:N${DEFAULT_DEPTH}}
> 
>@@ -69,7 +75,7 @@
> .endif
> 
> .if "${DEFAULT_DEPTH}" != "HI8P"
>-CMAKE_ARGS+=   -DHIGH_BIT_DEPTH:BOOL=true
>+CMAKE_ARGS+=	-DHIGH_BIT_DEPTH:BOOL=true
> .endif
> 
> CMAKE_OTHER_ARGS=${CMAKE_ARGS:C/.*-D_END_CUSTOM_OPTIONS=1 +//W}
>@@ -81,7 +87,7 @@
> .for b in ${OTHER_DEPTHS:C/HI([0-9]+)P/\1/}
> EXTRA_LINK_FLAGS+=-L${WRKSRC:H}/$bbit
> 
>-.if ${ARCH} == i386 && $b != 8 || ! ${BUILD_DEPENDS:Mnasm*}
>+.if ${ARCH} == i386 && $b != 8 || ! ${PORT_OPTIONS:MASM}
> ASSEMBLY=false
> .else
> ASSEMBLY=true
>@@ -95,7 +101,7 @@
> 		-DMAIN$b:BOOL=true -DENABLE_ASSEMBLY:BOOL=${ASSEMBLY} \
> 		-DEXPORT_C_API:BOOL=false -DENABLE_CLI=false
> 	${SETENV} ${MAKE_ENV} ${MAKE_CMD} -C ${WRKSRC:H}/$bbit ${MAKE_ARGS}
>-	${LN} ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a
>+	${LN} -f ${WRKSRC:H}/$bbit/libx265.a ${WRKSRC:H}/$bbit/libx265_$bbit.a
> 	${ECHO_MSG} "---> Built the $b-bit library ---"
> .endfor
> 
>@@ -107,10 +113,11 @@
> 
> CMAKE_ARGS+=	-DENABLE_SHARED:BOOL=true
> 
>-.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" || ! ${BUILD_DEPENDS:Mnasm*}
>+.if ${ARCH} == i386 && ${DEFAULT_DEPTH} != "HI8P" || ! ${PORT_OPTIONS:MASM}
> CMAKE_ARGS+=	-DENABLE_ASSEMBLY:BOOL=false
> .else
> CMAKE_ARGS+=	-DENABLE_ASSEMBLY:BOOL=true
>+
> do-test:
> 	${WRKDIR}/.build/test/TestBench
> .endif
>Index: distinfo
>===================================================================
>--- distinfo	(revision 542595)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1572350105
>-SHA256 (x265_3.2.1.tar.gz) = fb9badcf92364fd3567f8b5aa0e5e952aeea7a39a2b864387cec31e3b58cbbcc
>-SIZE (x265_3.2.1.tar.gz) = 1426255
>+TIMESTAMP = 1591425294
>+SHA256 (x265_3.4.tar.gz) = c2047f23a6b729e5c70280d23223cb61b57bfe4ad4e8f1471eeee2a61d148672
>+SIZE (x265_3.4.tar.gz) = 1469365
>Index: files/patch-source_CMakeLists.txt
>===================================================================
>--- files/patch-source_CMakeLists.txt	(revision 542595)
>+++ files/patch-source_CMakeLists.txt	(working copy)
>@@ -1,14 +1,11 @@
>-===> Checking for items in STAGEDIR missing from pkg-plist
>-Error: Orphaned: bin/libSvtHevcEnc.so
>-Error: Orphaned: include/EbApi.h
>-Error: Orphaned: include/EbErrorCodes.h
>-Error: Orphaned: include/EbTime.h
>-
>-libx265.so.179: undefined reference to `compute_vmaf'
>-
>---- source/CMakeLists.txt.orig	2019-01-23 09:47:18 UTC
>+--- source/CMakeLists.txt.orig	2020-06-06 08:18:40 UTC
> +++ source/CMakeLists.txt
>-@@ -570,13 +570,6 @@ if(ENABLE_HDR10_PLUS)
>+@@ -122,3 +122,4 @@
>+     if(ENABLE_LIBVMAF)
>+         add_definitions(-DENABLE_LIBVMAF)
>++        include_directories(${VMAF_INCLUDE_DIR})
>+     endif()
>+@@ -592,12 +592,6 @@ if(ENABLE_HDR10_PLUS)
>          ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
>  endif()
>  
>@@ -15,20 +12,21 @@
> -if(SVTHEVC_FOUND)
> -    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbApi.h" DESTINATION include)
> -    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbErrorCodes.h" DESTINATION include)
>--    install(FILES "${SVT_HEVC_INCLUDE_DIR}/EbTime.h" DESTINATION include)
>--    install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${BIN_INSTALL_DIR})
>+-    install(FILES "${SVT_HEVC_LIBRARY}" DESTINATION ${LIB_INSTALL_DIR})
> -endif()
> -
>  install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
>  if((WIN32 AND ENABLE_CLI) OR (WIN32 AND ENABLE_SHARED))
>      if(MSVC_IDE)
>-@@ -627,6 +620,9 @@ if(ENABLE_SHARED)
>-     endif()
>+@@ -649,7 +643,10 @@ if(ENABLE_SHARED)
>      if(EXTRA_LIB)
>          target_link_libraries(x265-shared ${EXTRA_LIB})
>+     endif()
>+-	 target_link_libraries(x265-shared ${PLATFORM_LIBS})
>++    if(ENABLE_LIBVMAF)
>++	target_link_libraries(x265-shared ${VMAF})
> +    endif()
>-+    if(ENABLE_LIBVMAF)
>-+        target_link_libraries(x265-shared ${VMAF})
>-     endif()
>- 	 target_link_libraries(x265-shared ${PLATFORM_LIBS})
>++	target_link_libraries(x265-shared ${PLATFORM_LIBS})
>      if(SVTHEVC_FOUND)
>+         target_link_libraries(x265-shared ${SVT_HEVC_LIBRARY})
>+     endif(SVTHEVC_FOUND)
>Index: files/patch-source_abrEncApp.cpp
>===================================================================
>--- files/patch-source_abrEncApp.cpp	(nonexistent)
>+++ files/patch-source_abrEncApp.cpp	(working copy)
>@@ -0,0 +1,9 @@
>+--- source/abrEncApp.cpp	2020-05-29 13:39:35.000000000 -0400
>++++ source/abrEncApp.cpp	2020-07-19 17:37:32.365958000 -0400
>+@@ -815,5 +815,5 @@
>+             if (m_param->csvfn && !b_ctrl_c)
>+ #if ENABLE_LIBVMAF
>+-                api->vmaf_encoder_log(m_encoder, m_cliopt.argCount, m_cliopt.argString, m_cliopt.param, vmafdata);
>++                api->vmaf_encoder_log(m_encoder, m_cliopt.argCnt, m_cliopt.argString, m_cliopt.param, vmafdata);
>+ #else
>+                 api->encoder_log(m_encoder, m_cliopt.argCnt, m_cliopt.argString);
>
>Property changes on: files/patch-source_abrEncApp.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_cmake_Findsvthevc.cmake
>===================================================================
>--- files/patch-source_cmake_Findsvthevc.cmake	(nonexistent)
>+++ files/patch-source_cmake_Findsvthevc.cmake	(working copy)
>@@ -0,0 +1,11 @@
>+--- source/cmake/Findsvthevc.cmake.orig	2020-06-06 07:11:33 UTC
>++++ source/cmake/Findsvthevc.cmake
>+@@ -38,7 +38,7 @@ if(SVT_HEVC_INCLUDE_DIR)
>+         string(REGEX MATCH "SVT_VERSION_PATCHLEVEL  \$([0-9]*)\$" _ ${version})
>+         set(SVT_VERSION_PATCHLEVEL ${CMAKE_MATCH_1})
>+ 
>+-        if(NOT ${SVT_VERSION_MAJOR} EQUAL "1" OR NOT ${SVT_VERSION_MINOR} EQUAL "4" OR NOT ${SVT_VERSION_PATCHLEVEL} EQUAL "1")
>++        if(NOT ${SVT_VERSION_MAJOR} EQUAL "1" OR NOT ${SVT_VERSION_MINOR} EQUAL "4" OR NOT ${SVT_VERSION_PATCHLEVEL} GREATER_EQUAL "1")
>+             message (SEND_ERROR "-- Found SVT-HEVC Lib Version: ${SVT_VERSION_MAJOR}.${SVT_VERSION_MINOR}.${SVT_VERSION_PATCHLEVEL} which doesn't match the required version: ${SVT_VERSION_MAJOR_REQUIRED}.${SVT_VERSION_MINOR_REQUIRED}.${SVT_VERSION_PATCHLEVEL_REQUIRED}; Aborting configure  ")
>+         else()
>+             message(STATUS "-- Found SVT-HEVC Lib Version: ${SVT_VERSION_MAJOR}.${SVT_VERSION_MINOR}.${SVT_VERSION_PATCHLEVEL}")
>
>Property changes on: files/patch-source_cmake_Findsvthevc.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_common_version.cpp
>===================================================================
>--- files/patch-source_common_version.cpp	(nonexistent)
>+++ files/patch-source_common_version.cpp	(working copy)
>@@ -0,0 +1,20 @@
>+--- source/common/version.cpp.orig	2020-05-29 17:39:35 UTC
>++++ source/common/version.cpp
>+@@ -63,6 +63,8 @@
>+ #define ONOS    "[Linux]"
>+ #elif __OpenBSD__
>+ #define ONOS    "[OpenBSD]"
>++#elif __FreeBSD__
>++#define ONOS	"[FreeBSD]"
>+ #elif  __CYGWIN__
>+ #define ONOS    "[Cygwin]"
>+ #elif __APPLE__
>+@@ -71,7 +73,7 @@
>+ #define ONOS    "[Unk-OS]"
>+ #endif
>+ 
>+-#if X86_64
>++#if defined(X86_64) || X265_ARCH_ARM64
>+ #define BITS    "[64 bit]"
>+ #else
>+ #define BITS    "[32 bit]"
>
>Property changes on: files/patch-source_common_version.cpp
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_dynamicHDR10_CMakeLists.txt
>===================================================================
>--- files/patch-source_dynamicHDR10_CMakeLists.txt	(nonexistent)
>+++ files/patch-source_dynamicHDR10_CMakeLists.txt	(working copy)
>@@ -0,0 +1,28 @@
>+--- source/dynamicHDR10/CMakeLists.txt.orig	2020-06-06 13:37:44 UTC
>++++ source/dynamicHDR10/CMakeLists.txt
>+@@ -42,18 +42,6 @@ if(GCC)
>+             endif()
>+         endif()
>+     endif()
>+-    if(ARM AND CROSS_COMPILE_ARM)
>+-        set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC)
>+-    elseif(ARM)
>+-        find_package(Neon)
>+-        if(CPU_HAS_NEON)
>+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC)
>+-            add_definitions(-DHAVE_NEON)
>+-        else()
>+-            set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm)
>+-        endif()
>+-    endif()
>+-    add_definitions(${ARM_ARGS})
>+     if(FPROFILE_GENERATE)
>+         if(INTEL_CXX)
>+             add_definitions(-prof-gen -prof-dir="${CMAKE_CURRENT_BINARY_DIR}")
>+@@ -150,4 +138,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location
>+ option(ENABLE_SHARED "Build shared library" OFF)
>+ 
>+ install(FILES hdr10plus.h DESTINATION include)
>+-endif()
>+\ No newline at end of file
>++endif()
>
>Property changes on: files/patch-source_dynamicHDR10_CMakeLists.txt
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-source_encoder_api.cpp
>===================================================================
>--- files/patch-source_encoder_api.cpp	(revision 542595)
>+++ files/patch-source_encoder_api.cpp	(nonexistent)
>@@ -1,17 +0,0 @@
>-Chase https://github.com/Netflix/vmaf/commit/82a86e040371
>-
>-source/encoder/api.cpp:36:10: fatal error: 'libvmaf.h' file not found
>-#include "libvmaf.h"
>-         ^~~~~~~~~~~
>-
>---- source/encoder/api.cpp.orig	2019-10-29 11:55:05 UTC
>-+++ source/encoder/api.cpp
>-@@ -33,7 +33,7 @@
>- #include "svt.h"
>- 
>- #if ENABLE_LIBVMAF
>--#include "libvmaf.h"
>-+#include "libvmaf/libvmaf.h"
>- #endif
>- 
>- /* multilib namespace reflectors */
>
>Property changes on: files/patch-source_encoder_api.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-source_encoder_svt.h
>===================================================================
>--- files/patch-source_encoder_svt.h	(revision 542595)
>+++ files/patch-source_encoder_svt.h	(nonexistent)
>@@ -1,18 +0,0 @@
>-https://bitbucket.org/multicoreware/x265/issues/509/x265-fails-to-build-with-current-svt-hevc
>-
>-In file included from source/encoder/analysis.cpp:35:
>-In file included from source/encoder/encoder.h:34:
>-source/encoder/svt.h:32:10: fatal error: 'EbTime.h' file not found
>-#include "EbTime.h"
>-         ^~~~~~~~~~
>-
>---- source/encoder/svt.h.orig	2019-07-31 04:59:54 UTC
>-+++ source/encoder/svt.h
>-@@ -29,7 +29,6 @@
>- 
>- #include "EbApi.h"
>- #include "EbErrorCodes.h"
>--#include "EbTime.h"
>- 
>- namespace X265_NS {
>- 
>
>Property changes on: files/patch-source_encoder_svt.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 542595)
>+++ pkg-plist	(working copy)
>@@ -6,5 +6,5 @@
> lib/libhdr10plus.so
> lib/libx265.a
> lib/libx265.so
>-lib/libx265.so.179
>+lib/libx265.so.192
> libdata/pkgconfig/x265.pc

Actions: View | Diff

Attachments on bug 247035: 215300 | 216585