From bfecc50e99836de4e3b3902bab94b714ea98fcd7 Mon Sep 17 00:00:00 2001
From: brad <brad@openbsd.org>
Date: Sun, 2 Nov 2014 11:36:48 +0000
Subject: [PATCH] Update to x265 1.4.

ok sthen@
---
 multimedia/x265/Makefile                      | 12 ++++++------
 multimedia/x265/distinfo                      |  4 ++--
 .../x265/patches/patch-source_CMakeLists_txt  | 19 -------------------
 .../patches/patch-source_common_version_cpp   | 15 ---------------
 4 files changed, 8 insertions(+), 42 deletions(-)
 delete mode 100644 multimedia/x265/patches/patch-source_CMakeLists_txt
 delete mode 100644 multimedia/x265/patches/patch-source_common_version_cpp

diff --git a/multimedia/x265/Makefile b/multimedia/x265/Makefile
index 75dfb7be50b..f42703e87c4 100644
--- a/multimedia/x265/Makefile
+++ b/multimedia/x265/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.4 2014/10/09 02:23:10 brad Exp $
+# $OpenBSD: Makefile,v 1.5 2014/11/02 11:36:48 brad Exp $
 
 COMMENT=	free H.265/HEVC encoder
 BROKEN-hppa =		undefined reference to `__sync_val_compare_and_swap_8'
@@ -6,13 +6,14 @@ BROKEN-mips64 =		undefined reference to `__sync_val_compare_and_swap_8'
 BROKEN-mips64el =	undefined reference to `__sync_val_compare_and_swap_8'
 BROKEN-powerpc =	undefined reference to `__sync_val_compare_and_swap_8'
 
-DISTNAME=	1.3
-PKGNAME=	x265-${DISTNAME}
+VER=		1.4
+DISTNAME=	x265-${VER}
+DISTFILES=	${DISTNAME}{${VER}}${EXTRACT_SUFX}
 CATEGORIES=	multimedia
 MASTER_SITES=	https://bitbucket.org/multicoreware/x265/get/
 EXTRACT_SUFX=	.tar.bz2
 
-SHARED_LIBS=	x265	0.0
+SHARED_LIBS=	x265	1.0
 
 HOMEPAGE=	http://x265.org/
 
@@ -24,8 +25,7 @@ PERMIT_PACKAGE_FTP=	Yes
 
 WANTLIB=	c m pthread stdc++
 
-DIST_SUBDIR=	x265
-WRKDIST=	${WRKDIR}/multicoreware-x265-c1e4fc0162c1
+WRKDIST=	${WRKDIR}/multicoreware-x265-5e604833c5aa
 WRKSRC=		${WRKDIST}/source
 
 MODULES=	devel/cmake \
diff --git a/multimedia/x265/distinfo b/multimedia/x265/distinfo
index 1851accaceb..105be2d030a 100644
--- a/multimedia/x265/distinfo
+++ b/multimedia/x265/distinfo
@@ -1,2 +1,2 @@
-SHA256 (x265/1.3.tar.bz2) = OAcJCpm8NRiU1Y6wN9tPFIey26NInrLDirQ91rfJsJ0=
-SIZE (x265/1.3.tar.bz2) = 562401
+SHA256 (x265-1.4.tar.bz2) = 6BjKzWqWPUmBPb5sBBiIMRojfalYluYEtMkbLd+sg6U=
+SIZE (x265-1.4.tar.bz2) = 561381
diff --git a/multimedia/x265/patches/patch-source_CMakeLists_txt b/multimedia/x265/patches/patch-source_CMakeLists_txt
deleted file mode 100644
index 7bdd8abad40..00000000000
--- a/multimedia/x265/patches/patch-source_CMakeLists_txt
+++ /dev/null
@@ -1,19 +0,0 @@
-$OpenBSD: patch-source_CMakeLists_txt,v 1.2 2014/09/05 15:29:41 brad Exp $
-
-https://bitbucket.org/multicoreware/x265/commits/139d6b2a1b19
-
---- source/CMakeLists.txt.orig	Thu Aug 21 17:49:02 2014
-+++ source/CMakeLists.txt	Thu Sep  4 13:07:00 2014
-@@ -55,9 +55,10 @@ endif()
- 
- if(UNIX)
-     SET(PLATFORM_LIBS pthread)
--    if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-+    find_library(LIBRT rt)
-+    if(LIBRT)
-         SET(PLATFORM_LIBS ${PLATFORM_LIBS} rt)
--    endif(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-+    endif()
- endif(UNIX)
- 
- # Compiler detection
diff --git a/multimedia/x265/patches/patch-source_common_version_cpp b/multimedia/x265/patches/patch-source_common_version_cpp
deleted file mode 100644
index 1ee460c0e02..00000000000
--- a/multimedia/x265/patches/patch-source_common_version_cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-$OpenBSD: patch-source_common_version_cpp,v 1.2 2014/09/05 15:29:41 brad Exp $
-
-https://bitbucket.org/multicoreware/x265/commits/821c2eef4d52
-
---- source/common/version.cpp.orig	Thu Aug 21 17:49:02 2014
-+++ source/common/version.cpp	Sun Aug 31 12:44:20 2014
-@@ -63,6 +63,8 @@
- #define NVM_ONOS        "[Cygwin]"
- #elif __APPLE__
- #define NVM_ONOS        "[Mac OS X]"
-+#elif __OpenBSD__
-+#define NVM_ONOS        "[OpenBSD]"
- #else
- #define NVM_ONOS "[Unk-OS]"
- #endif