x265, bump version (#2738)

This commit is contained in:
Schrijvers Luc
2018-07-26 01:22:21 +02:00
committed by waddlesplash
parent 4b7788d06e
commit c46e72ad9e
2 changed files with 22 additions and 30 deletions

View File

@@ -1,14 +1,11 @@
From b2a16767983618709903e175f6f3d94a36e35832 Mon Sep 17 00:00:00 2001
From 88e599ade80fb1265161cc641cd455b812a26e9e Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 28 Dec 2014 07:11:55 +0000
Subject: Check if threading library needs to be linked separately
---
source/CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index acdeb7b..0e8d824 100644
index 0168cc5..5ff33da 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -79,7 +79,8 @@ else()
@@ -22,23 +19,20 @@ index acdeb7b..0e8d824 100644
if(LIBRT)
list(APPEND PLATFORM_LIBS rt)
--
2.12.2
2.16.4
From 3649a1e872b18b9e5b2562e12d581d43be916e6a Mon Sep 17 00:00:00 2001
From b2dfc2079cb74721efa72f078a0b112437e3a504 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 28 Dec 2014 07:13:56 +0000
Subject: Add an option to adjust headers installation path
---
source/CMakeLists.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 0e8d824..ed3c9a8 100644
index 5ff33da..1febc33 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -332,6 +332,7 @@ endif()
@@ -352,6 +352,7 @@ endif()
# Build options
set(LIB_INSTALL_DIR lib CACHE STRING "Install location of libraries")
set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables")
@@ -46,31 +40,28 @@ index 0e8d824..ed3c9a8 100644
set(EXTRA_LIB "" CACHE STRING "Extra libraries to link against")
set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags")
if(EXTRA_LINK_FLAGS)
@@ -525,7 +526,8 @@ endif()
install(TARGETS x265-static
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
@@ -554,7 +555,8 @@ if(ENABLE_HDR10_PLUS)
LIBRARY DESTINATION ${LIB_INSTALL_DIR}
ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
endif()
-install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h" DESTINATION include)
+install(FILES x265.h "${PROJECT_BINARY_DIR}/x265_config.h"
+ DESTINATION "${INCLUDE_INSTALL_DIR}")
if(CMAKE_RC_COMPILER)
# The resource compiler does not need CFLAGS or macro defines. It
if(WIN32)
if(MSVC_IDE)
install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
--
2.12.2
2.16.4
From 524b178975d953535acb23fcc9f240b3c5742ce0 Mon Sep 17 00:00:00 2001
From 2bb590b7c67f44b70b2d4d496043f37bf79d24c4 Mon Sep 17 00:00:00 2001
From: Timothy Gu <timothygu99@gmail.com>
Date: Sun, 28 Dec 2014 07:14:34 +0000
Subject: Add Haiku version of adjusting thread priority
---
source/common/threadpool.cpp | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp
index f6509b7..b031a8e 100644
index f359d80..55679dd 100644
--- a/source/common/threadpool.cpp
+++ b/source/common/threadpool.cpp
@@ -57,6 +57,10 @@
@@ -97,4 +88,5 @@ index f6509b7..b031a8e 100644
#endif
--
2.12.2
2.16.4

View File

@@ -5,11 +5,11 @@ and ITU-T H.265). HEVC is a direct successor to the earlier H.264/MPEG-4 AVC \
video compression standard, aiming to achieve the same video quality at half \
the bit rate. x265 is a free software project implementing that standard."
HOMEPAGE="http://x265.org/"
COPYRIGHT="2013-2017 x265 Project"
COPYRIGHT="2013-2018 x265 Project"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://bitbucket.org/multicoreware/x265/downloads/x265_$portVersion.tar.gz"
CHECKSUM_SHA256="9c2aa718d78f6fecdd783f08ab83b98d3169e5f670404da4c16439306907d729"
CHECKSUM_SHA256="6e59f9afc0c2b87a46f98e33b5159d56ffb3558a49d8e3d79cb7fdc6b7aaa863"
SOURCE_DIR="x265_$portVersion"
PATCHES="x265-$portVersion.patchset"
@@ -19,7 +19,7 @@ SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86"
PROVIDES="
x265$secondaryArchSuffix = $portVersion
cmd:x265 = $portVersion
lib:libx265$secondaryArchSuffix = 89
lib:libx265$secondaryArchSuffix = 160
"
REQUIRES="
haiku$secondaryArchSuffix
@@ -27,7 +27,7 @@ REQUIRES="
PROVIDES_devel="
x265${secondaryArchSuffix}_devel = $portVersion
devel:libx265$secondaryArchSuffix = 89
devel:libx265$secondaryArchSuffix = 160
"
REQUIRES_devel="
x265$secondaryArchSuffix == $portVersion base