Re: git: 645419c8e465 - main - multimedia/x265: upgrade to 3.5. Finally...
Date: Fri, 15 Dec 2023 23:43:36 UTC
16.12.2023 00:14, Mikhail Teterin пишет:
> The branch main has been updated by mi:
>
> URL: https://cgit.FreeBSD.org/ports/commit/?id=645419c8e46533e7e9953a432fa02dc7c140b63c
>
> commit 645419c8e46533e7e9953a432fa02dc7c140b63c
> Author: Mikhail Teterin <mi@FreeBSD.org>
> AuthorDate: 2023-12-15 21:12:58 +0000
> Commit: Mikhail Teterin <mi@FreeBSD.org>
> CommitDate: 2023-12-15 21:12:58 +0000
>
> multimedia/x265: upgrade to 3.5. Finally...
>
> PR: 274526
> Submitted by: takefu
> Release Notes:
> https://x265.readthedocs.io/en/master/releasenotes.html#version-3-5
> ---
> multimedia/x265/Makefile | 16 +-
> multimedia/x265/distinfo | 8 +-
> multimedia/x265/files/patch-md5 | 51 ++++++
> multimedia/x265/files/patch-source_CMakeLists.txt | 12 +-
> .../files/patch-source_cmake_Findsvthevc.cmake | 8 +-
> .../x265/files/patch-source_common_version.cpp | 11 +-
> multimedia/x265/files/patch-source_encoder_api.cpp | 19 +-
> multimedia/x265/files/patch-source_x265.h | 8 +-
> multimedia/x265/files/patch-warnings | 201 +++++++++++++++++++++
> multimedia/x265/pkg-plist | 2 +-
> 10 files changed, 296 insertions(+), 40 deletions(-)
>
> diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
> index 59275b34e4bc..a6e5db162104 100644
> --- a/multimedia/x265/Makefile
> +++ b/multimedia/x265/Makefile
> @@ -1,9 +1,11 @@
> PORTNAME= x265
> -PORTVERSION= 3.4
> -PORTREVISION= 3
> +PORTVERSION= 3.5
> CATEGORIES= multimedia
> MASTER_SITES= https://bitbucket.org/multicoreware/x265_git/get/${BB_TAG}.tar.gz?meow=/
>
> +PATCH_SITES= https://bitbucket.org/multicoreware/x265_git/commits/8f18e3ad32684eee95e885e718655f93951128c3/raw/
> +PATCHFILES+= x265-asm-warnings.patch:-p1
> +
> MAINTAINER= mi@aldan.algebra.com
> COMMENT= H.265/High Efficiency Video Coding (HEVC) format
> WWW= https://www.x265.org/
> @@ -13,9 +15,9 @@ LICENSE_FILE= ${WRKSRC:H}/COPYING
>
> USES= cmake compiler:c++14-lang cpe pathfix dos2unix
>
> -CPE_VENDOR= multicorewareinc
> +CPE_VENDOR= multicorewareinc
>
> -BB_TAG= 25b2c07035ff # Top of the Release_3.4 branch at this time
> +BB_TAG= Release_${DISTVERSION}
>
> OPTIONS_DEFINE= DEBUG OPTIMIZED_FLAGS VMAF
> OPTIONS_DEFAULT= OPTIMIZED_FLAGS HI8P HI10P HI12P
> @@ -30,7 +32,7 @@ OPTIONS_DEFAULT_powerpc64le= ASM
> OPTIONS_MULTI= PixelWidth
> OPTIONS_MULTI_PixelWidth=HI8P HI10P HI12P
>
> -DOS2UNIX_FILES= abrEncApp.cpp
> +DOS2UNIX_FILES= common/scaler.cpp
> DEBUG_PREVENTS= OPTIMIZED_FLAGS
> DEBUG_PREVENTS_MSG= Optimizations are incompatible with debugging code
> DEBUG_CMAKE_ON= -DCMAKE_ASM_NASM_FLAGS:STRING="-g -O0"
> @@ -41,7 +43,7 @@ SVTHEVC_CMAKE_ON= -DSVT_HEVC_INCLUDE_DIR:PATH="${LOCALBASE}/include/svt-hevc"
> 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"
> +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)
> @@ -54,7 +56,7 @@ VMAF_DESC= Per frame and aggregate VMAF score
> USE_LDCONFIG= yes
> CMAKE_ARGS= -DENABLE_TESTS=on -DENABLE_HDR10_PLUS:BOOL=true
> LDFLAGS_i386= -Wl,-znotext
> -EXTRACT_AFTER_ARGS+= --exclude compat --strip-components=1
> +EXTRACT_AFTER_ARGS+= --exclude compat --exclude md5\.* --strip-components=1
> PATCH_WRKSRC= ${WRKSRC:H}
> WRKSRC= ${WRKDIR}/source
>
> …
>
> diff --git a/multimedia/x265/pkg-plist b/multimedia/x265/pkg-plist
> index 36d6f89c2fd5..33c170ed4109 100644
> --- a/multimedia/x265/pkg-plist
> +++ b/multimedia/x265/pkg-plist
> @@ -6,5 +6,5 @@ lib/libhdr10plus.a
> lib/libhdr10plus.so
> lib/libx265.a
> lib/libx265.so
> -lib/libx265.so.192
> +lib/libx265.so.200
> libdata/pkgconfig/x265.pc
Hi!
pkg-static: Unable to access file
/tmp/work/usr/ports/multimedia/x265/work/stage/usr/local/lib/libx265.so:No
such file or directory
pkg-static: Unable to access file
/tmp/work/usr/ports/multimedia/x265/work/stage/usr/local/lib/libx265.so.200:No
such file or directory
pkg-static: Unable to access file
/tmp/work/usr/ports/multimedia/x265/work/stage/usr/local/libdata/pkgconfig/x265.pc:No
such file or directory
Options :
ASM : on
DEBUG : off
HI10P : on
HI12P : on
HI8P : on
OPTIMIZED_FLAGS: on
SVTHEVC : on
VMAF : off
# find /tmp/work/usr/ports/multimedia/x265/work/ -name '*.pc'
# find /tmp/work/usr/ports/multimedia/x265/work/ -name 'libx265.so*'
/tmp/work/usr/ports/multimedia/x265/work/12bit/libx265.so.200
/tmp/work/usr/ports/multimedia/x265/work/12bit/libx265.so
/tmp/work/usr/ports/multimedia/x265/work/10bit/libx265.so.200
/tmp/work/usr/ports/multimedia/x265/work/10bit/libx265.so
/tmp/work/usr/ports/multimedia/x265/work/.build/libx265.so.200
/tmp/work/usr/ports/multimedia/x265/work/.build/libx265.so
13.2-p8 amd64.
> -lib/libx265.so.192
> +lib/libx265.so.200
And look like consumers need bump.
--
Best regards,
Vladimir Druzenko