Update to x265-3.3.

from Brad (maintainer)
This commit is contained in:
ajacoutot 2020-02-24 18:41:19 +00:00
parent 8d1fff4c46
commit 6df54e3970
4 changed files with 8 additions and 40 deletions

View File

@ -1,15 +1,14 @@
# $OpenBSD: Makefile,v 1.45 2019/12/20 13:18:35 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.46 2020/02/24 18:41:19 ajacoutot Exp $
COMMENT= free H.265/HEVC encoder
VER= 3.2.1
VER= 3.3
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
REVISION= 0
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/
SHARED_LIBS= x265 20.0
SHARED_LIBS= x265 21.0
HOMEPAGE= http://x265.org/
@ -24,6 +23,7 @@ WRKSRC= ${WRKDIST}/source
MODULES= devel/cmake
# XXX requires __sync builtins
COMPILER= base-clang ports-gcc
.if ${MACHINE_ARCH} == "amd64"
@ -34,16 +34,6 @@ CONFIGURE_ARGS+=-DCMAKE_ASM_YASM_FLAGS_DEBUG="-g dwarf2" \
-DENABLE_PIC=On \
-DENABLE_TESTS=On
.if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "arm" || \
${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "mips64" || \
${MACHINE_ARCH} == "mips64el" || ${MACHINE_ARCH} == "powerpc" || \
${MACHINE_ARCH} == "sparc64"
CONFIGURE_ARGS+=-DNO_ATOMICS=Off
.else
CONFIGURE_ARGS+=-DNO_ATOMICS=On
.endif
.if ${MACHINE_ARCH} == "i386"
CONFIGURE_ARGS+=-DENABLE_ASSEMBLY=Off
.endif

View File

@ -1,2 +1,2 @@
SHA256 (x265_3.2.1.tar.gz) = +5utz5I2T9NWf4taoOXpUq7qejmiuGQ4fOwx47WMu8w=
SIZE (x265_3.2.1.tar.gz) = 1426255
SHA256 (x265_3.3.tar.gz) = 8m4UjtH037M/0es/9eYOCAeNGyAX6IvLsEWz+1gwC5w=
SIZE (x265_3.3.tar.gz) = 1438685

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-source_encoder_analysis_cpp,v 1.1 2019/12/20 13:18:35 ajacoutot Exp $
limit-tu: Fix bug in loading co-located CU's TU depth.
Index: source/encoder/analysis.cpp
--- source/encoder/analysis.cpp.orig
+++ source/encoder/analysis.cpp
@@ -375,12 +375,12 @@ int32_t Analysis::loadTUDepth(CUGeom cuGeom, CUData pa
CUData* neighbourCU;
uint8_t count = 0;
int32_t maxTUDepth = -1;
- neighbourCU = m_slice->m_refFrameList[0][0]->m_encData->m_picCTU;
+ neighbourCU = &m_slice->m_refFrameList[0][0]->m_encData->m_picCTU[parentCTU.m_cuAddr];
predDepth += neighbourCU->m_refTuDepth[cuGeom.geomRecurId];
count++;
if (m_slice->isInterB())
{
- neighbourCU = m_slice->m_refFrameList[1][0]->m_encData->m_picCTU;
+ neighbourCU = &m_slice->m_refFrameList[1][0]->m_encData->m_picCTU[parentCTU.m_cuAddr];
predDepth += neighbourCU->m_refTuDepth[cuGeom.geomRecurId];
count++;
}

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2014/09/04 05:37:41 brad Exp $
@comment $OpenBSD: PLIST,v 1.2 2020/02/24 18:41:19 ajacoutot Exp $
@bin bin/x265
include/x265.h
include/x265_config.h
lib/libx265.a
@static-lib lib/libx265.a
@lib lib/libx265.so.${LIBx265_VERSION}
lib/pkgconfig/x265.pc