mirror of
https://github.com/yann64/haikuports.git
synced 2026-03-19 01:46:00 +01:00
x265, revbump, fixes for debug package/cmake > 4 (#12846)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -1,4 +1,4 @@
|
||||
From e258ac00b93ebaaab0a185fb546b132ac49ef07e Mon Sep 17 00:00:00 2001
|
||||
From 6baed88724df3ea6e31b9ff23510d3b256b97fa0 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
|
||||
@@ -19,10 +19,10 @@ index a407271..ab67056 100755
|
||||
if(LIBRT)
|
||||
list(APPEND PLATFORM_LIBS rt)
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From ffe5ed29a6dccd02ce124f868a03f7868c735361 Mon Sep 17 00:00:00 2001
|
||||
From fc9237a853febebe9a91de41bfd910f79ed7d7c5 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
|
||||
@@ -41,10 +41,10 @@ index ab67056..790829d 100755
|
||||
set(EXTRA_LINK_FLAGS "" CACHE STRING "Extra link flags")
|
||||
if(EXTRA_LINK_FLAGS)
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From 555165a153df3969e55903d6c9a3c568662341eb Mon Sep 17 00:00:00 2001
|
||||
From 628228d8c2f8ec3129e170c821599905139d594f 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
|
||||
@@ -65,10 +65,10 @@ index 790829d..c4ca46e 100755
|
||||
if(MSVC_IDE)
|
||||
install(FILES "${PROJECT_BINARY_DIR}/Debug/x265.pdb" DESTINATION ${BIN_INSTALL_DIR} CONFIGURATIONS Debug)
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From d431805269baccde5d0ec7be699eb2e9cf68df31 Mon Sep 17 00:00:00 2001
|
||||
From 573fe3a9b9551744149dd55f57ac0929905823a5 Mon Sep 17 00:00:00 2001
|
||||
From: Jerome Duval <jerome.duval@gmail.com>
|
||||
Date: Fri, 25 Oct 2019 21:18:33 +0200
|
||||
Subject: avoid using nice.
|
||||
@@ -89,10 +89,10 @@ index 2db7a14..0df90c8 100644
|
||||
|
||||
m_pool.setCurrentThreadAffinity();
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From 6c724ef1432bcd50ab7b1a6ff884044b8a775943 Mon Sep 17 00:00:00 2001
|
||||
From 29df0ee3347a056620107018349832905f65111c Mon Sep 17 00:00:00 2001
|
||||
From: Elio Blanca <eblanca76@users.sourceforge.net>
|
||||
Date: Mon, 28 Feb 2022 23:29:47 +0000
|
||||
Subject: fix detection of cpu cores
|
||||
@@ -112,10 +112,10 @@ index 0df90c8..52b3435 100644
|
||||
#elif MACOS && __MACH__
|
||||
int nm[2];
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From c6b64f98234f09e905c685ed20971772ec5c549f Mon Sep 17 00:00:00 2001
|
||||
From d7d46409057b52fd5f61f8ed11a67675a6abcadd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
|
||||
Date: Tue, 15 Mar 2022 21:59:51 +0100
|
||||
Subject: Add Haiku to the known OS list
|
||||
@@ -135,5 +135,37 @@ index 42a6b1d..9a626f4 100644
|
||||
#define ONOS "[Unk-OS]"
|
||||
#endif
|
||||
--
|
||||
2.30.2
|
||||
2.50.1
|
||||
|
||||
|
||||
From 38d40114b91787002813715a397e4967eda3e6ea Mon Sep 17 00:00:00 2001
|
||||
From: Luc Schrijvers <begasus@gmail.com>
|
||||
Date: Fri, 29 Aug 2025 10:48:51 +0200
|
||||
Subject: Fix building with cmake > 4
|
||||
|
||||
|
||||
diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
|
||||
old mode 100755
|
||||
new mode 100644
|
||||
index c4ca46e..832296c
|
||||
--- a/source/CMakeLists.txt
|
||||
+++ b/source/CMakeLists.txt
|
||||
@@ -7,13 +7,13 @@ if(NOT CMAKE_BUILD_TYPE)
|
||||
endif()
|
||||
message(STATUS "cmake version ${CMAKE_VERSION}")
|
||||
if(POLICY CMP0025)
|
||||
- cmake_policy(SET CMP0025 OLD) # report Apple's Clang as just Clang
|
||||
+ cmake_policy(SET CMP0025 NEW) # report Apple's Clang as just Clang
|
||||
endif()
|
||||
if(POLICY CMP0042)
|
||||
cmake_policy(SET CMP0042 NEW) # MACOSX_RPATH
|
||||
endif()
|
||||
if(POLICY CMP0054)
|
||||
- cmake_policy(SET CMP0054 OLD) # Only interpret if() arguments as variables or keywords when unquoted
|
||||
+ cmake_policy(SET CMP0054 NEW) # Only interpret if() arguments as variables or keywords when unquoted
|
||||
endif()
|
||||
|
||||
project (x265)
|
||||
--
|
||||
2.50.1
|
||||
|
||||
|
||||
@@ -7,10 +7,9 @@ the bit rate. x265 is a free software project implementing that standard."
|
||||
HOMEPAGE="http://x265.org/"
|
||||
COPYRIGHT="2013-2023 x265 Project"
|
||||
LICENSE="GNU GPL v2"
|
||||
REVISION="5"
|
||||
REVISION="6"
|
||||
SOURCE_URI="https://bitbucket.org/multicoreware/x265_git/downloads/x265_$portVersion.tar.gz"
|
||||
CHECKSUM_SHA256="e70a3335cacacbba0b3a20ec6fecd6783932288ebc8163ad74bcc9606477cae8"
|
||||
# BitBucket sucks
|
||||
SOURCE_DIR="x265_$portVersion"
|
||||
PATCHES="x265-$portVersion.patchset"
|
||||
|
||||
@@ -90,14 +89,16 @@ BUILD()
|
||||
cmake \
|
||||
-S. \
|
||||
-B build/12bit \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
||||
-DGIT_ARCHETYPE=1 \
|
||||
-DHIGH_BIT_DEPTH=ON \
|
||||
-DEXPORT_C_API=OFF \
|
||||
-DENABLE_SHARED=OFF \
|
||||
-DENABLE_CLI=OFF \
|
||||
-DMAIN12=ON \
|
||||
-DENABLE_ASSEMBLY=$enableAsmHdr
|
||||
-DENABLE_ASSEMBLY=$enableAsmHdr \
|
||||
-Wno-dev
|
||||
make $jobArgs -C build/12bit
|
||||
cp ./build/12bit/libx265.a ./libx265_12b.a
|
||||
|
||||
@@ -106,14 +107,16 @@ BUILD()
|
||||
cmake \
|
||||
-S. \
|
||||
-B build/10bit \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
||||
-DGIT_ARCHETYPE=1 \
|
||||
-DHIGH_BIT_DEPTH=ON \
|
||||
-DEXPORT_C_API=OFF \
|
||||
-DENABLE_SHARED=OFF \
|
||||
-DENABLE_CLI=OFF \
|
||||
-DENABLE_HDR10_PLUS=ON \
|
||||
-DENABLE_ASSEMBLY=$enableAsmHdr
|
||||
-DENABLE_ASSEMBLY=$enableAsmHdr \
|
||||
-Wno-dev
|
||||
make $jobArgs -C build/10bit
|
||||
cp ./build/10bit/libx265.a ./libx265_10b.a
|
||||
cp ./build/10bit/libhdr10plus.a ./libhdr10plus.a
|
||||
@@ -121,7 +124,8 @@ BUILD()
|
||||
#8 bit #################
|
||||
echo "Configuring variant: 8 bit"
|
||||
cmake \
|
||||
-DCMAKE_BUILD_TYPE=Release \
|
||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||
-DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
|
||||
-DGIT_ARCHETYPE=1 \
|
||||
-DENABLE_SHARED=ON \
|
||||
-DEXTRA_LIB="libx265_12b.a;libx265_10b.a;libhdr10plus.a" \
|
||||
@@ -131,7 +135,8 @@ BUILD()
|
||||
-DCMAKE_INSTALL_PREFIX:PATH=$prefix \
|
||||
-DLIB_INSTALL_DIR:PATH=$relativeLibDir \
|
||||
-DBIN_INSTALL_DIR:PATH=bin \
|
||||
-DINCLUDE_INSTALL_DIR:PATH=$relativeIncludeDir
|
||||
-DINCLUDE_INSTALL_DIR:PATH=$relativeIncludeDir \
|
||||
-Wno-dev
|
||||
make $jobArgs
|
||||
}
|
||||
|
||||
@@ -142,7 +147,7 @@ INSTALL()
|
||||
|
||||
rm -f $libDir/libx265.a
|
||||
|
||||
prepareInstalledDevelLibs libx265
|
||||
prepareInstalledDevelLib libx265
|
||||
fixPkgconfig
|
||||
|
||||
# bin package
|
||||
|
||||
Reference in New Issue
Block a user