haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-04 22:18:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

x265: bump versions.

Browse Source
This commit is contained in:
Jerome Duval
2015-10-12 21:43:52 +00:00
parent f563ee7a97
commit e210a454ba
4 changed files with 24 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
media-libs/x265/patches/x265-1.8_hg.patchset → media-libs/x265/patches/x265-1.8.patchset
View File

55
media-libs/x265/patches/x265-1.7.patchset → media-libs/x265/patches/x265-1.9_hg.patchset
View File

@@ -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 <timothygu99@gmail.com>
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 <timothygu99@gmail.com>
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 <timothygu99@gmail.com>
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 <timothygu99@gmail.com>
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