Index: head/multimedia/x265/Makefile
===================================================================
--- head/multimedia/x265/Makefile	(revision 476479)
+++ head/multimedia/x265/Makefile	(revision 476480)
@@ -1,52 +1,53 @@
 # Created by: adamw
 # $FreeBSD$
 
 PORTNAME=	x265
 PORTVERSION=	2.8
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	https://downloads.videolan.org/pub/videolan/x265/ \
 		https://mirror.leaseweb.com/videolan/x265/ \
 		http://downloads.videolan.org/pub/videolan/x265/ \
 		http://mirror.leaseweb.com/videolan/x265/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 PATCH_SITES=	http://hg.videolan.org/${PORTNAME}/raw-rev/
 PATCHFILES=	450421921079:-p2
 
 MAINTAINER=	mi@aldan.algebra.com
 COMMENT=	H.265/High Efficiency Video Coding (HEVC) format
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC:H}/COPYING
 
-BUILD_DEPENDS=	yasm:devel/yasm
+BUILD_DEPENDS=	nasm:devel/nasm
 
 USES=		cmake compiler:c++14-lang pathfix
 
 OPTIONS_DEFINE=		DEBUG OPTIMIZED_FLAGS
 OPTIONS_DEFINE_amd64=	HI10P HI12P
 
 DEBUG_PREVENTS=		OPTIMIZED_FLAGS
 DEBUG_PREVENTS_MSG=	Optimizations are incompatible with debugging code
 DEBUG_VARS_OFF=		CFLAGS+=-DNDEBUG CPPFLAGS+=-DNDEBUG 
 HI10P_CMAKE_BOOL=	HIGH_BIT_DEPTH
 HI12P_CMAKE_BOOL=	MAIN12
 HI12P_IMPLIES=		HI10P
 OPTIMIZED_FLAGS_VARS=	CFLAGS+=-O3 CXXFLAGS+=-O3
 
 DEBUG_DESC=	Enable debugging
 HI10P_DESC=	Enable HI10P Support (64-bit only)
 HI12P_DESC=	Enable HI12P Support (64-bit only)
 OPTIMIZED_FLAGS_DESC=	Enable O3 optimization
 
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DENABLE_PIC=on -DPLATFORM_LIBS=md -DENABLE_TESTS=on
 CFLAGS_mips=	-DNO_ATOMICS # cannot use lang/gcc
 CFLAGS_mips64=	-DNO_ATOMICS # cannot use lang/gcc
 EXTRACT_AFTER_ARGS+=	--exclude "md5*" --exclude compat
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}/source
 
 do-test:
 	${WRKSRC}/test/TestBench
 
 .include <bsd.port.mk>
Index: head/multimedia/x265/files/patch-disable-avx-for-clang
===================================================================
--- head/multimedia/x265/files/patch-disable-avx-for-clang	(revision 476479)
+++ head/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: head/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
Index: head/multimedia/x265/files/patch-bug-422
===================================================================
--- head/multimedia/x265/files/patch-bug-422	(nonexistent)
+++ head/multimedia/x265/files/patch-bug-422	(revision 476480)
@@ -0,0 +1,13 @@
+See:
+
+	https://bitbucket.org/multicoreware/x265/issues/422
+
+--- common/pixel.cpp	2018-05-21 08:33:10 UTC
++++ common/pixel.cpp	2018-08-05 21:57:26 UTC
+@@ -923,5 +923,5 @@
+ {
+     for (int i = 0; i < count; i++)
+-        dst[i] = (uint16_t)(src[i] * 256.0);
++        dst[i] = (int16_t)(src[i] * 256.0);
+ }
+ 

Property changes on: head/multimedia/x265/files/patch-bug-422
___________________________________________________________________
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