CVS commit: pkgsrc/multimedia/x265

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/multimedia/x265
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Fri, 5 Apr 2024 09:22:33 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Apr  5 09:22:33 UTC 2024

Modified Files:
        pkgsrc/multimedia/x265: Makefile PLIST distinfo
        pkgsrc/multimedia/x265/patches: patch-CMakeLists.txt
            patch-common_cpu.cpp patch-common_cpu.h patch-common_quant.cpp
            patch-common_version.cpp patch-encoder_analysis.cpp
            patch-encoder_encoder.cpp

Log Message:
x265: updated to 3.6

Version 3.6
===========

Release date - 4th April, 2024.

New feature
-----------
1. Segment based Ratecontrol (SBRC) feature
2. Motion-Compensated Spatio-Temporal Filtering
3. Scene-cut aware qp - BBAQ (Bidirectional Boundary Aware Quantization)
4. Histogram-Based Scene Change Detection
5. Film-Grain characteristics as a SEI message to support Film Grain Synthesis(FGS)
6. Add temporal layer implementation(Hierarchical B-frame implementation)

Enhancements to existing features
---------------------------------
1. Added Dolby Vision 8.4 Profile Support

API changes
-----------
1. Add Segment based Ratecontrol(SBRC) feature: "--[no-]sbrc".
2. Add command line parameter for mcstf feature: "--[no-]mctf".
3. Add command line parameters for the scene cut aware qp feature: "--scenecut-aware-qp" and "--masking-strength".
4. Add command line parameters for Histogram-Based Scene Change Detection: "--hist-scenecut".
5. Add film grain characteristics as a SEI message to the bitstream: "--film-grain <filename>"
6. cli: add new option --cra-nal (Force nal type to CRA to all frames expect for the first frame, works only with keyint 1)

Optimizations
---------------------
ARM64 NEON optimizations:- Several time-consuming C functions have been optimized for the targeted platform - aarch64. The overall performance increased by around 20%.
SVE/SVE2 optimizations

Bug fixes
---------
1. Linux bug to utilize all the cores
2. Crash with hist-scenecut build when source resolution is not multiple of minCuSize
3. 32bit and 64bit builds generation for ARM
4. bugs in zonefile feature (Reflect Zonefile Parameters inside Lookahead, extra IDR issue, Avg I Slice QP value issue etc..)
5. Add x86 ASM implementation for subsampling luma
6. Fix for abrladder segfault with load reuse level 1
7. Reorder miniGOP based on temporal layer hierarchy and add support for more B frame
8. Add MacOS aarch64 build support
9. Fix boundary condition issue for Gaussian filter


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/multimedia/x265/Makefile \
    pkgsrc/multimedia/x265/distinfo
cvs rdiff -u -r1.26 -r1.27 pkgsrc/multimedia/x265/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt \
    pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp \
    pkgsrc/multimedia/x265/patches/patch-common_quant.cpp
cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/x265/patches/patch-common_cpu.h \
    pkgsrc/multimedia/x265/patches/patch-common_version.cpp \
    pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp
cvs rdiff -u -r1.3 -r1.4 \
    pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/x265/Makefile
diff -u pkgsrc/multimedia/x265/Makefile:1.37 pkgsrc/multimedia/x265/Makefile:1.38
--- pkgsrc/multimedia/x265/Makefile:1.37        Fri Jan 26 03:16:46 2024
+++ pkgsrc/multimedia/x265/Makefile     Fri Apr  5 09:22:33 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2024/01/26 03:16:46 riastradh Exp $
+# $NetBSD: Makefile,v 1.38 2024/04/05 09:22:33 adam Exp $
 
-DISTNAME=      x265_3.5
+DISTNAME=      x265_3.6
 PKGNAME=       ${DISTNAME:S/_/-/}
 CATEGORIES=    multimedia
 MASTER_SITES=  https://bitbucket.org/multicoreware/x265_git/downloads/
@@ -10,9 +10,9 @@ HOMEPAGE=     http://www.x265.org/
 COMMENT=       High Efficiency Video Coding (HEVC)
 LICENSE=       gnu-gpl-v2
 
-WRKSRC=                ${WRKDIR}/${DISTNAME}/source
+WRKSRC=                ${WRKDIR}/source
 
-USE_LANGUAGES=         c c++
+USE_LANGUAGES= c c++
 
 CMAKE_ARGS+=   -DENABLE_PIC=ON
 # Set version here instead of relying on git; see patch-CMakeLists.txt
@@ -23,7 +23,7 @@ CMAKE_ARGS+=  -DX265_LATEST_TAG=${PKGVERS
 
 .include "../../mk/bsd.prefs.mk"
 .if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "i386"
-.  if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && ${MACHINE_ARCH} == "i386" 
+.  if (${OPSYS} == "NetBSD" || ${OPSYS} == "FreeBSD") && ${MACHINE_ARCH} == "i386"
 # Avoid text relocations
 CMAKE_ARGS+=   -DENABLE_ASSEMBLY=OFF
 .  else
@@ -32,10 +32,10 @@ TOOL_DEPENDS+=      nasm>=2.13.0:../../devel/
 .endif
 
 .if ${USE_CROSS_COMPILE:tl} == "yes"
-CMAKE_ARGS+=           -DCMAKE_SYSTEM:STRING=${OPSYS:Q}-${OS_VERSION:Q}
-CMAKE_ARGS+=           -DCMAKE_SYSTEM_NAME:STRING=${OPSYS:Q}
-CMAKE_ARGS+=           -DCMAKE_SYSTEM_VERSION:STRING=${OS_VERSION:Q}
-CMAKE_ARGS+=           -DCMAKE_SYSTEM_PROCESSOR:STRING=${MACHINE_ARCH:Q}
+CMAKE_ARGS+=   -DCMAKE_SYSTEM:STRING=${OPSYS}-${OS_VERSION}
+CMAKE_ARGS+=   -DCMAKE_SYSTEM_NAME:STRING=${OPSYS}
+CMAKE_ARGS+=   -DCMAKE_SYSTEM_VERSION:STRING=${OS_VERSION}
+CMAKE_ARGS+=   -DCMAKE_SYSTEM_PROCESSOR:STRING=${MACHINE_ARCH}
 .endif
 
 .include "../../devel/cmake/build.mk"
Index: pkgsrc/multimedia/x265/distinfo
diff -u pkgsrc/multimedia/x265/distinfo:1.37 pkgsrc/multimedia/x265/distinfo:1.38
--- pkgsrc/multimedia/x265/distinfo:1.37        Tue Oct 26 11:01:19 2021
+++ pkgsrc/multimedia/x265/distinfo     Fri Apr  5 09:22:33 2024
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.37 2021/10/26 11:01:19 nia Exp $
+$NetBSD: distinfo,v 1.38 2024/04/05 09:22:33 adam Exp $
 
-BLAKE2s (x265_3.5.tar.gz) = 916116fa1a478057206e28142294ac79427111334a80468f147d6193af9366cc
-SHA512 (x265_3.5.tar.gz) = 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997
-Size (x265_3.5.tar.gz) = 1537044 bytes
-SHA1 (patch-CMakeLists.txt) = 60cc9452ae7aed5687fb95a75ad8b3aee3bf3624
-SHA1 (patch-common_cpu.cpp) = 86dd8d4a3f9cf51312cd93695beace4c4becb8c6
-SHA1 (patch-common_cpu.h) = 33e3bb9bc9cb60735aa09efa185c474ebd3e6af5
-SHA1 (patch-common_quant.cpp) = 810ba9af4ec6a767af18fe59a10feb0bca626777
-SHA1 (patch-common_version.cpp) = a1120089986e757395fa1d85b77e75d85acbc24f
-SHA1 (patch-encoder_analysis.cpp) = 28b23506e7ffbb3e019eb2ae9f749054cc865c9f
-SHA1 (patch-encoder_encoder.cpp) = 907db18c8e9afd51684ed886da70c23ac3d3652a
+BLAKE2s (x265_3.6.tar.gz) = 9389825cc213ed0859e57fccf8382822501ad9cca2805502b80e502e059b2a06
+SHA512 (x265_3.6.tar.gz) = b3e00e18b410c2994699ae8b47ade8fa7011d48ae883bbd7e48a9b6a3e936cfe9298b1e72248dee243fcf0f361312c6a77daffd83fa066cc0c82179995012f74
+Size (x265_3.6.tar.gz) = 1668556 bytes
+SHA1 (patch-CMakeLists.txt) = 5b355d9d2d3c58b1455f19516ed9ee45618aff1d
+SHA1 (patch-common_cpu.cpp) = 9dbe83e44ab09d877d6a517dacdebfd206c7ec95
+SHA1 (patch-common_cpu.h) = 0bc594b87b26ed06827e56b6d1515b756f07504e
+SHA1 (patch-common_quant.cpp) = 2b2edfe6a167808854bb89582b81ce5bd338675d
+SHA1 (patch-common_version.cpp) = 0a157bbc23a2f41e735bdc984b148652ff55186c
+SHA1 (patch-encoder_analysis.cpp) = addc4174bd9bf1d0c5f7645414b2571d7a5a3053
+SHA1 (patch-encoder_encoder.cpp) = f81e0cd1030e6e3b57258feebfde1a6e309d9671

Index: pkgsrc/multimedia/x265/PLIST
diff -u pkgsrc/multimedia/x265/PLIST:1.26 pkgsrc/multimedia/x265/PLIST:1.27
--- pkgsrc/multimedia/x265/PLIST:1.26   Sat Apr 10 08:36:03 2021
+++ pkgsrc/multimedia/x265/PLIST        Fri Apr  5 09:22:33 2024
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.26 2021/04/10 08:36:03 adam Exp $
+@comment $NetBSD: PLIST,v 1.27 2024/04/05 09:22:33 adam Exp $
 bin/x265
 include/x265.h
 include/x265_config.h
 lib/libx265.a
 lib/libx265.so
-lib/libx265.so.199
+lib/libx265.so.209
 lib/pkgconfig/x265.pc

Index: pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt
diff -u pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.2 pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.3
--- pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt:1.2     Sat Apr 10 08:36:03 2021
+++ pkgsrc/multimedia/x265/patches/patch-CMakeLists.txt Fri Apr  5 09:22:33 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-CMakeLists.txt,v 1.2 2021/04/10 08:36:03 adam Exp $
+$NetBSD: patch-CMakeLists.txt,v 1.3 2024/04/05 09:22:33 adam Exp $
 
 Get X265_VERSION and X265_LATEST_TAG from outside.
 
@@ -9,26 +9,26 @@ Solaris ld: Passing "-Wa,--noexecstack" 
             requesting a non executable stack. I don't know if Solaris ld
             is complying or just ignoring it.
 
---- CMakeLists.txt.orig        2021-03-16 12:53:00.000000000 +0000
+--- CMakeLists.txt.orig        2024-04-04 09:39:50.000000000 +0000
 +++ CMakeLists.txt
-@@ -485,7 +485,6 @@ if(POWER)
-     endif()
- endif()
- 
--include(Version) # determine X265_VERSION and X265_LATEST_TAG
- include_directories(. common encoder "${PROJECT_BINARY_DIR}")
- 
- option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
-@@ -665,7 +664,11 @@ if(ENABLE_SHARED)
-         elseif(CYGWIN)
-             # Cygwin is not officially supported or tested. MinGW with msys is recommended.
-         else()
--            list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
-+            if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
-+                list(APPEND LINKER_OPTIONS "-mimpure-text -Wa,--noexecstack")
-+            else()
-+                list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
-+            endif()
-         endif()
-     endif()
-     set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
+@@ -523,7 +523,6 @@ if(POWER)
+     endif()
+ endif()
+ 
+-include(Version) # determine X265_VERSION and X265_LATEST_TAG
+ include_directories(. common encoder "${PROJECT_BINARY_DIR}")
+ 
+ option(ENABLE_PPA "Enable PPA profiling instrumentation" OFF)
+@@ -745,7 +744,11 @@ if(ENABLE_SHARED)
+         elseif(CYGWIN)
+             # Cygwin is not officially supported or tested. MinGW with msys is recommended.
+         else()
+-            list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++            if(${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
++                list(APPEND LINKER_OPTIONS "-mimpure-text -Wa,--noexecstack")
++            else()
++                list(APPEND LINKER_OPTIONS "-Wl,-Bsymbolic,-znoexecstack")
++            endif()
+         endif()
+     endif()
+     set_target_properties(x265-shared PROPERTIES SOVERSION ${X265_BUILD})
Index: pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.2 pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.3
--- pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp:1.2     Fri Jan 25 09:01:13 2019
+++ pkgsrc/multimedia/x265/patches/patch-common_cpu.cpp Fri Apr  5 09:22:33 2024
@@ -1,26 +1,26 @@
-$NetBSD: patch-common_cpu.cpp,v 1.2 2019/01/25 09:01:13 adam Exp $
+$NetBSD: patch-common_cpu.cpp,v 1.3 2024/04/05 09:22:33 adam Exp $
 
 Retire detect512, make enable512 a global.
 
---- common/cpu.cpp.orig        2019-01-23 09:47:18.000000000 +0000
+--- common/cpu.cpp.orig        2024-04-04 09:39:50.000000000 +0000
 +++ common/cpu.cpp
-@@ -58,7 +58,7 @@ static void sigill_handler(int sig)
- #endif // if X265_ARCH_ARM
- 
- namespace X265_NS {
--static bool enable512 = false;
+@@ -62,7 +62,7 @@ static void sigill_handler(int sig)
+ #endif // if X265_ARCH_ARM
+ 
+ namespace X265_NS {
+-static bool enable512 = false;
 +bool enable512 = false;
- const cpu_name_t cpu_names[] =
- {
- #if X265_ARCH_X86
-@@ -123,10 +123,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr);
- #pragma warning(disable: 4309) // truncation of constant value
- #endif
- 
--bool detect512()
--{
--    return(enable512);
--}
- 
- uint32_t cpu_detect(bool benableavx512 )
- {
+ const cpu_name_t cpu_names[] =
+ {
+ #if X265_ARCH_X86
+@@ -135,10 +135,6 @@ uint64_t PFX(cpu_xgetbv)(int xcr);
+ #pragma warning(disable: 4309) // truncation of constant value
+ #endif
+ 
+-bool detect512()
+-{
+-    return(enable512);
+-}
+ 
+ uint32_t cpu_detect(bool benableavx512 )
+ {
Index: pkgsrc/multimedia/x265/patches/patch-common_quant.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.2 pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.3
--- pkgsrc/multimedia/x265/patches/patch-common_quant.cpp:1.2   Fri Jan 25 09:01:13 2019
+++ pkgsrc/multimedia/x265/patches/patch-common_quant.cpp       Fri Apr  5 09:22:33 2024
@@ -1,22 +1,22 @@
-$NetBSD: patch-common_quant.cpp,v 1.2 2019/01/25 09:01:13 adam Exp $
+$NetBSD: patch-common_quant.cpp,v 1.3 2024/04/05 09:22:33 adam Exp $
 
 Use enable512 as a global, not through detect512
 
---- common/quant.cpp.orig      2019-01-23 09:47:18.000000000 +0000
+--- common/quant.cpp.orig      2024-04-05 09:11:03.482354127 +0000
 +++ common/quant.cpp
-@@ -724,7 +724,6 @@ uint32_t Quant::rdoQuant(const CUData& c
-             uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
-             uint32_t blkPos      = codeParams.scan[scanPosBase];
- #if X265_ARCH_X86
--            bool enable512 = detect512();
-             if (enable512)
-                 primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
-             else
-@@ -811,7 +810,6 @@ uint32_t Quant::rdoQuant(const CUData& c
-             if (usePsyMask)
-             {
- #if X265_ARCH_X86
--                bool enable512 = detect512();
-                 if (enable512)
-                     primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
-                 else
+@@ -708,7 +708,6 @@ uint32_t Quant::rdoQuant(const CUData& c
+             uint32_t scanPosBase = (cgScanPos << MLS_CG_SIZE);
+             uint32_t blkPos      = codeParams.scan[scanPosBase];
+ #if X265_ARCH_X86
+-            bool enable512 = detect512();
+             if (enable512)
+                 primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+             else
+@@ -795,7 +794,6 @@ uint32_t Quant::rdoQuant(const CUData& c
+             if (usePsyMask)
+             {
+ #if X265_ARCH_X86
+-                bool enable512 = detect512();
+                 if (enable512)
+                     primitives.cu[log2TrSize - 2].psyRdoQuant(m_resiDctCoeff, m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale, blkPos);
+                 else

Index: pkgsrc/multimedia/x265/patches/patch-common_cpu.h
diff -u pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.1 pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.2
--- pkgsrc/multimedia/x265/patches/patch-common_cpu.h:1.1       Tue Dec 11 17:55:56 2018
+++ pkgsrc/multimedia/x265/patches/patch-common_cpu.h   Fri Apr  5 09:22:33 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-common_cpu.h,v 1.1 2018/12/11 17:55:56 jklos Exp $
+$NetBSD: patch-common_cpu.h,v 1.2 2024/04/05 09:22:33 adam Exp $
 
 Retire detect512, use enable512 as a global
 
---- common/cpu.h.orig  2018-10-05 12:14:40.000000000 +0000
+--- common/cpu.h.orig  2024-04-05 09:13:16.246340956 +0000
 +++ common/cpu.h
 @@ -50,7 +50,7 @@ extern "C" void PFX(safe_intel_cpu_indic
- 
- namespace X265_NS {
- uint32_t cpu_detect(bool);
--bool detect512();
+ 
+ namespace X265_NS {
+ uint32_t cpu_detect(bool);
+-bool detect512();
 +extern bool enable512;
- 
- struct cpu_name_t
- {
+ 
+ struct cpu_name_t
+ {
Index: pkgsrc/multimedia/x265/patches/patch-common_version.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.1 pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.2
--- pkgsrc/multimedia/x265/patches/patch-common_version.cpp:1.1 Sat Apr 10 08:36:03 2021
+++ pkgsrc/multimedia/x265/patches/patch-common_version.cpp     Fri Apr  5 09:22:33 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-common_version.cpp,v 1.1 2021/04/10 08:36:03 adam Exp $
+$NetBSD: patch-common_version.cpp,v 1.2 2024/04/05 09:22:33 adam Exp $
 
 Recognise NetBSD.
 
---- common/version.cpp.orig    2021-04-10 08:24:32.907512619 +0000
+--- common/version.cpp.orig    2024-04-05 09:11:41.485595483 +0000
 +++ common/version.cpp
 @@ -61,6 +61,8 @@
- #define ONOS    "[Windows]"
- #elif  __linux
- #define ONOS    "[Linux]"
+ #define ONOS    "[Windows]"
+ #elif  __linux
+ #define ONOS    "[Linux]"
 +#elif __NetBSD__
 +#define ONOS    "[NetBSD]"
- #elif __OpenBSD__
- #define ONOS    "[OpenBSD]"
- #elif  __CYGWIN__
+ #elif __OpenBSD__
+ #define ONOS    "[OpenBSD]"
+ #elif  __CYGWIN__
Index: pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.1 pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.2
--- pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp:1.1       Wed Sep 18 10:04:51 2019
+++ pkgsrc/multimedia/x265/patches/patch-encoder_analysis.cpp   Fri Apr  5 09:22:33 2024
@@ -1,15 +1,15 @@
-$NetBSD: patch-encoder_analysis.cpp,v 1.1 2019/09/18 10:04:51 jperkin Exp $
+$NetBSD: patch-encoder_analysis.cpp,v 1.2 2024/04/05 09:22:33 adam Exp $
 
 Ensure std::log() is used.
 
---- encoder/analysis.cpp.orig  2019-07-08 11:10:19.000000000 +0000
+--- encoder/analysis.cpp.orig  2024-04-04 09:39:50.000000000 +0000
 +++ encoder/analysis.cpp
-@@ -3702,7 +3702,7 @@ void Analysis::normFactor(const pixel* s
- 
-     // 2. Calculate ac component
-     uint64_t z_k = 0;
--    int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
+@@ -3739,7 +3739,7 @@ void Analysis::normFactor(const pixel* s
+ 
+     // 2. Calculate ac component
+     uint64_t z_k = 0;
+-    int block = (int)(((log(blockSize) / log(2)) - 2) + 0.5);
 +    int block = (int)(((std::log(blockSize) / std::log(2)) - 2) + 0.5);
-     primitives.cu[block].normFact(src, blockSize, shift, &z_k);
- 
-     // Remove the DC part
+     primitives.cu[block].normFact(src, blockSize, shift, &z_k);
+ 
+     // Remove the DC part

Index: pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp
diff -u pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.3 pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.4
--- pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp:1.3        Fri May 25 14:42:07 2018
+++ pkgsrc/multimedia/x265/patches/patch-encoder_encoder.cpp    Fri Apr  5 09:22:33 2024
@@ -1,14 +1,14 @@
-$NetBSD: patch-encoder_encoder.cpp,v 1.3 2018/05/25 14:42:07 jperkin Exp $
+$NetBSD: patch-encoder_encoder.cpp,v 1.4 2024/04/05 09:22:33 adam Exp $
 
 Fix error: call of overloaded 'pow(int, int)' is ambiguous
 
---- encoder/encoder.cpp.orig   2018-05-21 08:33:10.000000000 +0000
+--- encoder/encoder.cpp.orig   2024-04-04 09:39:50.000000000 +0000
 +++ encoder/encoder.cpp
-@@ -55,6 +55,7 @@ const char g_sliceTypeToChar[] = {'B', '
- static const char* defaultAnalysisFileName = "x265_analysis.dat";
- 
- using namespace X265_NS;
+@@ -118,6 +118,7 @@ VideoSignalTypePresets vstPresets[] =
+ static const char* defaultAnalysisFileName = "x265_analysis.dat";
+ 
+ using namespace X265_NS;
 +using std::pow;
- 
- Encoder::Encoder()
- {
+ 
+ Encoder::Encoder()
+ {

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/www/apache24
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/www/apache24
Indexes:

Home | Main Index | Thread Index | Old Index