View | Details | Raw Unified | Return to bug 229788
Collapse All | Expand All

(-)multimedia/x265/Makefile (+6 lines)
Lines 46-51 CFLAGS_mips64= -DNO_ATOMICS # cannot use lang/gcc Link Here
46 
EXTRACT_AFTER_ARGS+=	--exclude "md5*" --exclude compat
 46 
EXTRACT_AFTER_ARGS+=	--exclude "md5*" --exclude compat
47 
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
 47 
WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
48 

          48
          

        

            

              
              
              49
              
.include <bsd.port.pre.mk>

            

            

              50
              

            

            

              51
              
.if ${ARCH} == i386

            

            

              52
              
LLD_UNSAFE=	yes

            

            

              53
              
.endif

            

            

              54
              

            

        

          49
          
do-test:

          55
          
do-test:

        

        

          50
          
	${WRKSRC}/test/TestBench

          56
          
	${WRKSRC}/test/TestBench

        

        

          51
          

          57
          

        



(-)multimedia/x265/files/patch-common_pixel.cpp
      (+11 lines)




  

    
      
            Line 0
          
      
      
        Link Here
      
    
  

            

              
              
              1
              
--- common/pixel.cpp.orig	2018-05-21 08:33:10 UTC

            

            

              2
              
+++ common/pixel.cpp

            

            

              3
              
@@ -922,7 +922,7 @@ static void estimateCUPropagateCost(int* dst, const ui

            

            

              4
              
 static void cuTreeFix8Pack(uint16_t *dst, double *src, int count)

            

            

              5
              
 {

            

            

              6
              
     for (int i = 0; i < count; i++)

            

            

              7
              
-        dst[i] = (uint16_t)(src[i] * 256.0);

            

            

              8
              
+        dst[i] = (uint16_t)(int16_t)(src[i] * 256.0);

            

            

              9
              
 }

            

            

              10
              
 

            

            

              11
              
 static void cuTreeFix8Unpack(double *dst, uint16_t *src, int count)

            



(-)multimedia/x265/files/patch-disable-avx-for-clang
      (-13 lines)




  

    
      
            Lines 1-13
          
      
      
        Link Here
      
    
  

            

              1
              
See:

              
              
            

            

              2
              

            

            

              3
              
	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229788

            

            

              4
              
	https://bitbucket.org/multicoreware/x265/issues/422/when-using-clang-with-avx-enabled

            

            

              5
              

            

            

              6
              
--- CMakeLists.txt	2018-05-21 04:33:10.000000000 -0400

            

            

              7
              
+++ CMakeLists.txt	2018-07-17 12:51:05.820330000 -0400

            

            

              8
              
@@ -133,4 +133,5 @@

            

            

              9
              
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")

            

            

              10
              
     set(CLANG 1)

            

            

              11
              
+    add_definitions("-mno-avx")

            

            

              12
              
 endif()

            

            

              13
              
 if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")

            






  

  Return to bug 229788