On Fri, Feb 08, 2019 at 05:56:33PM +0100, Klemens Nanni wrote:
> On Sun, Jan 27, 2019 at 01:23:15PM -0500, Brad Smith wrote:
> > Here is an update to x265 3.0.
> Tests pass on amd64, but on sparc64 the entire test directory is missing:
Looking at the CMake files TestBench is only built on archs having assembly
code. So just amd64/i386/arm and possibly powerpc.
> $ make test
> ===> Regression tests for x265-3.0
> /tmp/pobj/x265-3.0/build-sparc64/test/TestBench
> /tmp/pobj/x265-3.0/build-sparc64/test/TestBench: not found
> *** Error 1 in . (Makefile:52 'do-test')
> *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2826
> '/tmp/pobj/x265-3.0/build-sparc64/.test_done')
> *** Error 1 in /usr/ports/multimedia/x265
> (/usr/ports/infrastructure/mk/bsd.port.mk:2465 'test')
>
> > Index: Makefile
> > ===================================================================
> > RCS file: /home/cvs/ports/multimedia/x265/Makefile,v
> > retrieving revision 1.39
> > diff -u -p -u -p -r1.39 Makefile
> > --- Makefile 5 Nov 2018 07:58:37 -0000 1.39
> > +++ Makefile 26 Jan 2019 04:27:12 -0000
> > @@ -2,14 +2,13 @@
> >
> > COMMENT= free H.265/HEVC encoder
> >
> > -VER= 2.9
> > +VER= 3.0
> > DISTNAME= x265_${VER}
> > PKGNAME= x265-${VER}
> > -REVISION= 1
> > CATEGORIES= multimedia
> > -MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/
> > +MASTER_SITES= http://bitbucket.org/multicoreware/x265/downloads/
> Why this fallback, TLS works fine.
Woops. Didn't mean to change the URL like that for commit. I was having some
issues
downloading the dist file but I think it was on the BitBucket side. It's
working fine
for me now.
> > Index: patches/patch-source_common_quant_cpp
> > ===================================================================
> > RCS file: patches/patch-source_common_quant_cpp
> > diff -N patches/patch-source_common_quant_cpp
> > --- patches/patch-source_common_quant_cpp 5 Nov 2018 07:58:37 -0000
> > 1.3
> > +++ /dev/null 1 Jan 1970 00:00:00 -0000
> > @@ -1,47 +0,0 @@
> > -$OpenBSD: patch-source_common_quant_cpp,v 1.3 2018/11/05 07:58:37
> > ajacoutot Exp $
> > -
> > -Fix the build on !X86 archs.
> Builds fine on sparc64.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/multimedia/x265/Makefile,v
retrieving revision 1.39
diff -u -p -u -p -r1.39 Makefile
--- Makefile 5 Nov 2018 07:58:37 -0000 1.39
+++ Makefile 8 Feb 2019 17:54:19 -0000
@@ -2,14 +2,13 @@
COMMENT= free H.265/HEVC encoder
-VER= 2.9
+VER= 3.0
DISTNAME= x265_${VER}
PKGNAME= x265-${VER}
-REVISION= 1
CATEGORIES= multimedia
MASTER_SITES= https://bitbucket.org/multicoreware/x265/downloads/
-SHARED_LIBS= x265 16.0
+SHARED_LIBS= x265 17.0
HOMEPAGE= http://x265.org/
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/multimedia/x265/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo 17 Oct 2018 08:32:21 -0000 1.18
+++ distinfo 26 Jan 2019 04:26:31 -0000
@@ -1,2 +1,2 @@
-SHA256 (x265_2.9.tar.gz) = 665ofISjn1S5lUF8UqL93mWk4ufrrFcw0lFHEwS5ECQ=
-SIZE (x265_2.9.tar.gz) = 1385848
+SHA256 (x265_3.0.tar.gz) = xbn8JgyrvEqBVhpEj0zpytchgnK0AR/qvDprdRsvBmI=
+SIZE (x265_3.0.tar.gz) = 1398519
Index: patches/patch-source_common_quant_cpp
===================================================================
RCS file: patches/patch-source_common_quant_cpp
diff -N patches/patch-source_common_quant_cpp
--- patches/patch-source_common_quant_cpp 5 Nov 2018 07:58:37 -0000
1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,47 +0,0 @@
-$OpenBSD: patch-source_common_quant_cpp,v 1.3 2018/11/05 07:58:37 ajacoutot
Exp $
-
-Fix the build on !X86 archs.
-
-Index: source/common/quant.cpp
---- source/common/quant.cpp.orig
-+++ source/common/quant.cpp
-@@ -723,6 +723,7 @@ uint32_t Quant::rdoQuant(const CUData& cu, int16_t* ds
- X265_CHECK(coeffNum[cgScanPos] == 0, "count of coeff failure\n");
- 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);
-@@ -731,6 +732,10 @@ uint32_t Quant::rdoQuant(const CUData& cu, int16_t* ds
- primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff,
costUncoded, &totalUncodedCost, &totalRdCost,blkPos);
- primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff,
m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale,
blkPos);
- }
-+#else
-+ primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff,
costUncoded, &totalUncodedCost, &totalRdCost, blkPos);
-+ primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff,
m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale,
blkPos);
-+#endif
- }
- }
- else
-@@ -805,8 +810,8 @@ uint32_t Quant::rdoQuant(const CUData& cu, int16_t* ds
- uint32_t blkPos = codeParams.scan[scanPosBase];
- 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
-@@ -814,6 +819,10 @@ uint32_t Quant::rdoQuant(const CUData& cu, int16_t* ds
- primitives.cu[log2TrSize -
2].psyRdoQuant_1p(m_resiDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost,
blkPos);
- primitives.cu[log2TrSize -
2].psyRdoQuant_2p(m_resiDctCoeff, m_fencDctCoeff, costUncoded,
&totalUncodedCost, &totalRdCost, &psyScale, blkPos);
- }
-+#else
-+ primitives.cu[log2TrSize - 2].psyRdoQuant_1p(m_resiDctCoeff,
costUncoded, &totalUncodedCost, &totalRdCost, blkPos);
-+ primitives.cu[log2TrSize - 2].psyRdoQuant_2p(m_resiDctCoeff,
m_fencDctCoeff, costUncoded, &totalUncodedCost, &totalRdCost, &psyScale,
blkPos);
-+#endif
- blkPos = codeParams.scan[scanPosBase];
- for (int y = 0; y < MLS_CG_SIZE; y++)
- {
