Index: multimedia/x265/Makefile
===================================================================
--- multimedia/x265/Makefile	(revision 475161)
+++ multimedia/x265/Makefile	(working copy)
@@ -46,6 +46,12 @@ CFLAGS_mips64=	-DNO_ATOMICS # cannot use lang/gcc
 EXTRACT_AFTER_ARGS+=	--exclude "md5*" --exclude compat
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
 
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == i386
+LLD_UNSAFE=	yes
+.endif
+
 do-test:
 	${WRKSRC}/test/TestBench
 
Index: multimedia/x265/files/patch-common_pixel.cpp
===================================================================
--- multimedia/x265/files/patch-common_pixel.cpp	(nonexistent)
+++ multimedia/x265/files/patch-common_pixel.cpp	(working copy)
@@ -0,0 +1,11 @@
+--- common/pixel.cpp.orig	2018-05-21 08:33:10 UTC
++++ common/pixel.cpp
+@@ -922,7 +922,7 @@ static void estimateCUPropagateCost(int* dst, const ui
+ static void cuTreeFix8Pack(uint16_t *dst, double *src, int count)
+ {
+     for (int i = 0; i < count; i++)
+-        dst[i] = (uint16_t)(src[i] * 256.0);
++        dst[i] = (uint16_t)(int16_t)(src[i] * 256.0);
+ }
+ 
+ static void cuTreeFix8Unpack(double *dst, uint16_t *src, int count)

Property changes on: multimedia/x265/files/patch-common_pixel.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: multimedia/x265/files/patch-disable-avx-for-clang
===================================================================
--- multimedia/x265/files/patch-disable-avx-for-clang	(revision 475161)
+++ multimedia/x265/files/patch-disable-avx-for-clang	(nonexistent)
@@ -1,13 +0,0 @@
-See:
-
-	https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=229788
-	https://bitbucket.org/multicoreware/x265/issues/422/when-using-clang-with-avx-enabled
-
---- CMakeLists.txt	2018-05-21 04:33:10.000000000 -0400
-+++ CMakeLists.txt	2018-07-17 12:51:05.820330000 -0400
-@@ -133,4 +133,5 @@
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-     set(CLANG 1)
-+    add_definitions("-mno-avx")
- endif()
- if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Intel")

Property changes on: multimedia/x265/files/patch-disable-avx-for-clang
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property