From e210a454ba77b818d3562dd5e4aa26d60f1653f4 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Mon, 12 Oct 2015 21:43:52 +0000 Subject: [PATCH] x265: bump versions. --- ...x265-1.8_hg.patchset => x265-1.8.patchset} | 0 ...x265-1.7.patchset => x265-1.9_hg.patchset} | 55 +++++-------------- .../x265/{x265-1.7.recipe => x265-1.8.recipe} | 10 ++-- ...{x265-1.8_hg.recipe => x265-1.9_hg.recipe} | 8 +-- 4 files changed, 24 insertions(+), 49 deletions(-) rename media-libs/x265/patches/{x265-1.8_hg.patchset => x265-1.8.patchset} (100%) rename media-libs/x265/patches/{x265-1.7.patchset => x265-1.9_hg.patchset} (65%) rename media-libs/x265/{x265-1.7.recipe => x265-1.8.recipe} (87%) rename media-libs/x265/{x265-1.8_hg.recipe => x265-1.9_hg.recipe} (89%) diff --git a/media-libs/x265/patches/x265-1.8_hg.patchset b/media-libs/x265/patches/x265-1.8.patchset similarity index 100% rename from media-libs/x265/patches/x265-1.8_hg.patchset rename to media-libs/x265/patches/x265-1.8.patchset diff --git a/media-libs/x265/patches/x265-1.7.patchset b/media-libs/x265/patches/x265-1.9_hg.patchset similarity index 65% rename from media-libs/x265/patches/x265-1.7.patchset rename to media-libs/x265/patches/x265-1.9_hg.patchset index 806597513..202241b23 100644 --- a/media-libs/x265/patches/x265-1.7.patchset +++ b/media-libs/x265/patches/x265-1.9_hg.patchset @@ -1,14 +1,14 @@ -From d5ce784d118acd2cf0d434268ebeb75a03b04e6f Mon Sep 17 00:00:00 2001 +From b2a16767983618709903e175f6f3d94a36e35832 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 07:11:55 +0000 Subject: Check if threading library needs to be linked separately diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index 9cc5913..eced637 100644 +index 353003e..6fd2cbe 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -60,7 +60,8 @@ else() +@@ -66,7 +66,8 @@ else() endif() if(UNIX) @@ -19,28 +19,28 @@ index 9cc5913..eced637 100644 if(LIBRT) list(APPEND PLATFORM_LIBS rt) -- -1.8.3.4 +2.2.2 -From c9f6f61516949019b8d9dde31fbdc05d8e67dbb4 Mon Sep 17 00:00:00 2001 +From 3649a1e872b18b9e5b2562e12d581d43be916e6a Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 07:13:56 +0000 Subject: Add an option to adjust headers installation path diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt -index eced637..8ff52f9 100644 +index 6fd2cbe..bd6fbdb 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt -@@ -271,6 +271,7 @@ endif() +@@ -277,6 +277,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") +set(INCLUDE_INSTALL_DIR include CACHE STRING "Install location of headers") - - if(X64) - # NOTE: We only officially support 16bit-per-pixel compiles of x265 -@@ -379,7 +380,8 @@ endif() + set(EXTRA_LIB "" CACHE STRING "Extra libraries to link against") + set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags") + if(EXTRA_LINK_FLAGS) +@@ -419,7 +420,8 @@ endif() install(TARGETS x265-static LIBRARY DESTINATION ${LIB_INSTALL_DIR} ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) @@ -51,17 +51,17 @@ index eced637..8ff52f9 100644 if(CMAKE_RC_COMPILER) # The resource compiler does not need CFLAGS or macro defines. It -- -1.8.3.4 +2.2.2 -From dd3065dea7a357f642c0bbb961ecfc9eec2ad184 Mon Sep 17 00:00:00 2001 +From 524b178975d953535acb23fcc9f240b3c5742ce0 Mon Sep 17 00:00:00 2001 From: Timothy Gu Date: Sun, 28 Dec 2014 07:14:34 +0000 Subject: Add Haiku version of adjusting thread priority diff --git a/source/common/threadpool.cpp b/source/common/threadpool.cpp -index 9c28470..7663d4a 100644 +index 6cb815f..a4b138d 100644 --- a/source/common/threadpool.cpp +++ b/source/common/threadpool.cpp @@ -52,6 +52,9 @@ @@ -87,29 +87,4 @@ index 9c28470..7663d4a 100644 #endif -- -1.8.3.4 - - -From 07c68c91ceaa9ef67ed1c83498e2dae54a0e8c15 Mon Sep 17 00:00:00 2001 -From: Timothy Gu -Date: Mon, 29 Dec 2014 04:43:42 +0000 -Subject: checkasm-a: Explicitly use PLT relocation for libc symbols - -Fixes linking with PIC (default for all compilation) on Haiku. - -diff --git a/source/test/checkasm-a.asm b/source/test/checkasm-a.asm -index f7b9837..d0d622a 100644 ---- a/source/test/checkasm-a.asm -+++ b/source/test/checkasm-a.asm -@@ -153,7 +153,7 @@ cglobal checkasm_call, 2,15,16,max_args*8+8 - jz .ok - mov r9, rax - lea r0, [error_message] -- call puts -+ call puts wrt ..plt - mov r1, [rsp+max_args*8] - mov dword [r1], 0 - mov rax, r9 --- -1.8.3.4 - +2.2.2 diff --git a/media-libs/x265/x265-1.7.recipe b/media-libs/x265/x265-1.8.recipe similarity index 87% rename from media-libs/x265/x265-1.7.recipe rename to media-libs/x265/x265-1.8.recipe index 2b620aa02..fd9a9fb7d 100644 --- a/media-libs/x265/x265-1.7.recipe +++ b/media-libs/x265/x265-1.8.recipe @@ -7,20 +7,20 @@ the bit rate. x265 is a free software project implementing that standard." HOMEPAGE="http://x265.org/" LICENSE="GNU GPL v2" -COPYRIGHT="2013-2014 x265 Project" +COPYRIGHT="2013-2015 x265 Project" SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/$portVersion.tar.bz2" -CHECKSUM_SHA256="133dd4d7121116e75c1664e2295d61c36dee7569718a714f37caefc5a1a521db" +CHECKSUM_SHA256="3d36472d9b41cdf04ae92eede1f1da2198432d0ebc2c29ec2da36d8bddaafb7e" REVISION="1" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 x86" # BitBucket sucks -SOURCE_DIR='multicoreware-x265-8425278def1e' +SOURCE_DIR='multicoreware-x265-e27327f5da35' PROVIDES=" x265$secondaryArchSuffix = $portVersion cmd:x265 = $portVersion - lib:libx265$secondaryArchSuffix = 43 + lib:libx265$secondaryArchSuffix = 68 " REQUIRES=" @@ -69,7 +69,7 @@ INSTALL() PROVIDES_devel=" x265${secondaryArchSuffix}_devel = $portVersion - devel:libx265$secondaryArchSuffix = 43 + devel:libx265$secondaryArchSuffix = 68 " REQUIRES_devel=" x265$secondaryArchSuffix == $portVersion base diff --git a/media-libs/x265/x265-1.8_hg.recipe b/media-libs/x265/x265-1.9_hg.recipe similarity index 89% rename from media-libs/x265/x265-1.8_hg.recipe rename to media-libs/x265/x265-1.9_hg.recipe index f4596a2d4..fb82d4fc1 100644 --- a/media-libs/x265/x265-1.8_hg.recipe +++ b/media-libs/x265/x265-1.9_hg.recipe @@ -9,18 +9,18 @@ HOMEPAGE="http://x265.org/" LICENSE="GNU GPL v2" COPYRIGHT="2013-2014 x265 Project" SOURCE_URI="https://bitbucket.org/multicoreware/x265/get/tip.tar.bz2" -CHECKSUM_SHA256="287dd96f772efbd63cf25a8bdf99abdfc4d8a48f025f51f36a4378c7347182e7" +CHECKSUM_SHA256="705b48f799851b4012a496fd8596c6c2abb9cd6f3c2ec36d0f458865aae5c4c8" REVISION="1" ARCHITECTURES="!x86_gcc2 ?x86 ?x86_64" SECONDARY_ARCHITECTURES="!x86_gcc2 ?x86" # BitBucket sucks -SOURCE_DIR='multicoreware-x265-4781e6cef251' +SOURCE_DIR="multicoreware-x265-b6156a08b1de" PROVIDES=" x265$secondaryArchSuffix = $portVersion cmd:x265 = $portVersion - lib:libx265$secondaryArchSuffix = 68 + lib:libx265$secondaryArchSuffix = 75 " REQUIRES=" @@ -69,7 +69,7 @@ INSTALL() PROVIDES_devel=" x265${secondaryArchSuffix}_devel = $portVersion - devel:libx265$secondaryArchSuffix = 68 + devel:libx265$secondaryArchSuffix = 75 " REQUIRES_devel=" x265$secondaryArchSuffix == $portVersion base