diff --git a/multimedia/vvdec/Makefile b/multimedia/vvdec/Makefile index 95cffdec078e..70ccf7c6f332 100644 --- a/multimedia/vvdec/Makefile +++ b/multimedia/vvdec/Makefile @@ -1,24 +1,24 @@ PORTNAME= vvdec DISTVERSIONPREFIX= v -DISTVERSION= 1.1.2 +DISTVERSION= 1.3.0 CATEGORIES= multimedia python MAINTAINER= yuri@FreeBSD.org COMMENT= Versatile Video Coding (VVC) decoder LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= uses explicit SSE instructions without any way to turn them off, can be removed once this bug is fixed: https://github.com/fraunhoferhhi/vvdec/issues/9; also is for 64-bit systems USES= cmake compiler:c++14-lang USE_LDCONFIG= yes USE_GITHUB= yes GH_ACCOUNT= fraunhoferhhi CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= FREEBSD_VVDEC_ENABLE_X86_SIMD .include diff --git a/multimedia/vvdec/distinfo b/multimedia/vvdec/distinfo index 08051110444e..b72bd27c1f2d 100644 --- a/multimedia/vvdec/distinfo +++ b/multimedia/vvdec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1625849697 -SHA256 (fraunhoferhhi-vvdec-v1.1.2_GH0.tar.gz) = 2301d115f904b6ecac5802f2ba2382799540bdb0821966ae008250ff9999ed37 -SIZE (fraunhoferhhi-vvdec-v1.1.2_GH0.tar.gz) = 634466 +TIMESTAMP = 1641229748 +SHA256 (fraunhoferhhi-vvdec-v1.3.0_GH0.tar.gz) = 1b0782ae5d35fbd8e7af563f1d42cbcf13a5acc300bcb6ab6d310ca442b726e6 +SIZE (fraunhoferhhi-vvdec-v1.3.0_GH0.tar.gz) = 649229 diff --git a/multimedia/vvdec/files/patch-CMakeLists.txt b/multimedia/vvdec/files/patch-CMakeLists.txt index d647b4ee6806..329be4c5cb2c 100644 --- a/multimedia/vvdec/files/patch-CMakeLists.txt +++ b/multimedia/vvdec/files/patch-CMakeLists.txt @@ -1,20 +1,20 @@ ---- CMakeLists.txt.orig 2021-03-12 15:55:41 UTC +--- CMakeLists.txt.orig 2021-12-17 13:50:15 UTC +++ CMakeLists.txt -@@ -12,7 +12,7 @@ endif() - # project name - project( vvdec VERSION 1.0.0.0 ) +@@ -17,7 +17,7 @@ if( PROJECT_VERSION_RC) + set( PROJECT_VERSION "${PROJECT_VERSION}-rc${PROJECT_VERSION_RC}" ) + endif() --set( VVDEC_ENABLE_X86_SIMD TRUE ) -+set( VVDEC_ENABLE_X86_SIMD ${FREEBSD_VVDEC_ENABLE_X86_SIMD} ) - set( VVDEC_ENABLE_ARM_SIMD FALSE ) +-set( VVDEC_ENABLE_X86_SIMD TRUE CACHE BOOL "enable x86 intrinsics" ) ++set( VVDEC_ENABLE_X86_SIMD ${FREEBSD_VVDEC_ENABLE_X86_SIMD} CACHE BOOL "enable x86 intrinsics" ) + set( VVDEC_ENABLE_ARM_SIMD FALSE CACHE BOOL "enable arm intrinsics" ) if( APPLE ) -@@ -37,7 +37,7 @@ endif() +@@ -42,7 +42,7 @@ endif() # enable sse4.1 build for all source files for gcc and clang if( VVDEC_ENABLE_X86_SIMD ) if( UNIX OR MINGW ) - add_compile_options( "-msse4.1" ) + add_compile_options( ${FREEBSD_SIMD_CFLAGS} ) endif() set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DTARGET_SIMD_X86" ) diff --git a/multimedia/vvdec/files/patch-source_Lib_vvdec_CMakeLists.txt b/multimedia/vvdec/files/patch-source_Lib_vvdec_CMakeLists.txt index 2b5d0fc5aa44..cbaeeb742f93 100644 --- a/multimedia/vvdec/files/patch-source_Lib_vvdec_CMakeLists.txt +++ b/multimedia/vvdec/files/patch-source_Lib_vvdec_CMakeLists.txt @@ -1,18 +1,18 @@ ---- source/Lib/vvdec/CMakeLists.txt.orig 2021-03-12 15:55:41 UTC +--- source/Lib/vvdec/CMakeLists.txt.orig 2021-12-17 13:50:15 UTC +++ source/Lib/vvdec/CMakeLists.txt -@@ -79,10 +79,11 @@ if( VVDEC_ENABLE_X86_SIMD ) - set_property( SOURCE ${AVX_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "/arch:AVX" ) - set_property( SOURCE ${AVX2_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "/arch:AVX2" ) - elseif( UNIX OR MINGW ) +@@ -88,10 +88,11 @@ if( VVDEC_ENABLE_X86_SIMD ) + if( NOT VVDEC_TARGET_WASM ) + set_property( SOURCE ${X86_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-mxsave" ) + endif() - set_property( SOURCE ${SSE41_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-msse4.1" ) - set_property( SOURCE ${SSE42_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-msse4.2" ) - set_property( SOURCE ${AVX_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-mavx" ) - set_property( SOURCE ${AVX2_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-mavx2" ) + #set_property( SOURCE ${SSE41_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-msse4.1" ) + #set_property( SOURCE ${SSE42_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-msse4.2" ) + #set_property( SOURCE ${AVX_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-mavx" ) + #set_property( SOURCE ${AVX2_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS "-mavx2" ) + set_property( SOURCE ${AVX2_SRC_FILES} APPEND PROPERTY COMPILE_FLAGS ${FREEBSD_SIMD_CFLAGS} ) endif() endif()