diff options
author | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2021-10-08 23:06:07 +0100 |
commit | e23a08d0c97a0cc415aaa165da840b056f93c997 (patch) | |
tree | 4c5f7db60483518201fef36f8cc0712789a08db2 /media-libs/x265 | |
parent | 391b5b359a346aff490103da7dddc85047f83830 (diff) |
gentoo resync : 08.10.2021
Diffstat (limited to 'media-libs/x265')
-rw-r--r-- | media-libs/x265/Manifest | 6 | ||||
-rw-r--r-- | media-libs/x265/files/arm-r1.patch | 34 | ||||
-rw-r--r-- | media-libs/x265/x265-3.5-r2.ebuild (renamed from media-libs/x265/x265-3.5-r1.ebuild) | 1 | ||||
-rw-r--r-- | media-libs/x265/x265-9999.ebuild | 1 |
4 files changed, 35 insertions, 7 deletions
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index c3437dcff8c8..57609943e42e 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -1,4 +1,4 @@ -AUX arm-r1.patch 1448 BLAKE2B 1cb6b7282436c23565833eef725f74f6a0780911b54a84f3b552f936288496f429a057410cd57fb0214741b0f6b307ad3bd546872a628fe33cf2e036bb625113 SHA512 43d646200d2df2b041d9c2100559ea84f3a45a974624bd4b174eb4804201f4291a3d4e9915e16d81d781bb8ad49c6d4e61f438f470480362418e4e6e758ff1b5 +AUX arm-r1.patch 2252 BLAKE2B 86ea85441e4023cf415f57ea6b909e3a9d6c3cc4f35c1e402d4a84632f533e37b3ba8bea07af4cde0218c20c684d59cb4632de1cf73d6f2cc843e048c7a424a9 SHA512 387e8fd56fbc4d56765c0bcad2f5c5a1b43c4d3db51f81d010e0926932a58b16dcaae614e191efdfb0afedcf6ae5981966e8a94258fb0b22e85e003a1cea15ec AUX neon.patch 677 BLAKE2B 805177f9d3d3f703699adad93b0ca655065b9d093ecc3776600fa4eb3c565962beac47ebbeb35dcdf6fa3d0d19c734310b4032bcda62aeeea8ddc99debe901f1 SHA512 69e3d7c6d987ccbbaa7111eb8efc1e02c1e02096936a0eedfbe7e9e1c1377bed0f50f7b09aec0768e8de31251b8e3d2191aab56f19259c0e4aeda9684ab55bc6 AUX test-ns.patch 14677 BLAKE2B fa48d03bca5d72b7b3eac7f6ac98c93bde12ec845f9eecdde2c4ed5ed4ac6688d74ea75e11f00d4f901967f81cd80f138eaae662bd6cc1f67948121c3c0b2e34 SHA512 c6d2752027e42403704c68948256c52a237f8b83ee97d4b8e21cc13654964342ed061e5f048984fb649e9980f4899a64931ec97d6dfa1b786db6346134b04281 AUX tests.patch 650 BLAKE2B 21759b11966e12df1a72a1ed00935ff781ad8b912e734de65cf0872cf92400aef71d4aebbe067dd1059a1d445cd9819cef4dc4b1c7df63ca7b8e97b8e578045e SHA512 a4a3b69fa86e6910ff4f963b9667c8deaea4ff88f3396e8e426e61d036b12cbf550bff7867657da1ba98417f1ccae88db1887b94ea6271604060e01fb8698d79 @@ -6,7 +6,7 @@ AUX x265-3.3-ppc64.patch 590 BLAKE2B bbc6f18b8f192424450d2860e33ea6dbba14b46876f DIST x265_3.4.tar.gz 1469365 BLAKE2B 1021d9d62779d0cecddea56496b4e46bd8ccfd91fdf292efe412dc82b3c974095a5f9bd095057aa08e77b164555adc594549dea6aef7fbc0c025ae7295df721e SHA512 576b18711935e7da8433b2170d24ed159eb12ff1a18399360afa1b2132db33b463145c65ed918f667528ee954bbdfb5c69e5480f1c1df801515cefc592f3206e DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997 EBUILD x265-3.4.ebuild 6377 BLAKE2B 8cc509d9a0d7c8d4b0ed2226f3eae682035f725648d0c43b3083c6db50ae8afb3351855f38204a55bd1b5dd8fec3d6f6e11c5f12a0b3533f051e16983cef10f2 SHA512 d634f733615b5c2abbb3ced26c867e18a997172869e7991066d9f7ca18486f2140ee8195edd2f3584a3479f5a556ddb7e4e428d5a2bf963b56c9fde993853843 -EBUILD x265-3.5-r1.ebuild 6323 BLAKE2B 44ca896e96db19607d459260f0d08b21127a16110f30ddccf022880c285b81046915f0b21fc6a3e6b3565fb05ae582ec2589e95e4053af4aa278c2a70034bb06 SHA512 dcb576be87c85b898be29daa033381803675ff39424374340954a4e7cd04918c16c15667e43966d9efb1f9809792e5917f00fa1c1f749f6192b44f85a3c02bb7 +EBUILD x265-3.5-r2.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d EBUILD x265-3.5.ebuild 6295 BLAKE2B a27b1827080b93140f8a8548633a62682a68aca0b9bb9311306ed2d22dd012020e4ed39882a7d0025f1b31c253d769abedc620fb5889417d8bd44222494377a6 SHA512 4438c74042c8eaa5c9a153344fb28a1ac99b7f07b4d3db763db3904eba10774097c2b56a4892f67ac89ea82b6ab28f12ac84c6d532416e4cda8a5ca1e46dcf85 -EBUILD x265-9999.ebuild 6323 BLAKE2B 44ca896e96db19607d459260f0d08b21127a16110f30ddccf022880c285b81046915f0b21fc6a3e6b3565fb05ae582ec2589e95e4053af4aa278c2a70034bb06 SHA512 dcb576be87c85b898be29daa033381803675ff39424374340954a4e7cd04918c16c15667e43966d9efb1f9809792e5917f00fa1c1f749f6192b44f85a3c02bb7 +EBUILD x265-9999.ebuild 6350 BLAKE2B 0b952a0dc4f51ad94c34ce61afd4a89c4d581157016680ef2825b729e94f28dbeb4273052ac37dcc3ad66479b6369e771c6d678e63197e79ff132731a120080e SHA512 13821133cc698549521bc92cbe5644176db63a43c79b2f91ccdb373f5eec0b6384624ce50498978031e973c5eab3cb98a4ed814ed5651ff0f63b1839057eab5d MISC metadata.xml 622 BLAKE2B 337e399c3be2dfc52c2f422a76ae80faad2424d221e074041e06cc0a10403bea1aca3975ae6afaf9bb4b50cc5069db8413928e8697458014c6f96d1856421f79 SHA512 be4f7c57f732fa836cda726da9426a0e4bdac2a681a4be3bb157e7cf7b8f517e3002653d9ee7a58ba81601d34fb6168680453bbdaa10389b65945f7b4d1a492c diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch index 8a8102dd2580..69aa3036eff3 100644 --- a/media-libs/x265/files/arm-r1.patch +++ b/media-libs/x265/files/arm-r1.patch @@ -1,10 +1,8 @@ More aliases for ARM. Do not force CFLAGS for ARM. -Index: source/CMakeLists.txt -=================================================================== ---- source.orig/CMakeLists.txt -+++ source/CMakeLists.txt +--- a/CMakeLists.txt ++++ b/CMakeLists.txt @@ -40,7 +40,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ # System architecture detection string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) @@ -40,3 +38,31 @@ Index: source/CMakeLists.txt endif() endif() endif() +--- a/dynamicHDR10/CMakeLists.txt ++++ b/dynamicHDR10/CMakeLists.txt +@@ -43,14 +43,14 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) ++ set(ARM_ARGS -fPIC) + elseif(ARM) + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + add_definitions(${ARM_ARGS}) +@@ -150,4 +150,4 @@ set(BIN_INSTALL_DIR bin CACHE STRING "Install location of executables") + option(ENABLE_SHARED "Build shared library" OFF) + + install(FILES hdr10plus.h DESTINATION include) +-endif() +\ No newline at end of file ++endif() + diff --git a/media-libs/x265/x265-3.5-r1.ebuild b/media-libs/x265/x265-3.5-r2.ebuild index 3e0116c5da00..58018488f52c 100644 --- a/media-libs/x265/x265-3.5-r1.ebuild +++ b/media-libs/x265/x265-3.5-r2.ebuild @@ -105,6 +105,7 @@ x265_variant_src_configure() { -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF + -DENABLE_HDR10_PLUS=ON ) if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index 3e0116c5da00..58018488f52c 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -105,6 +105,7 @@ x265_variant_src_configure() { -DEXPORT_C_API=OFF -DENABLE_SHARED=OFF -DENABLE_CLI=OFF + -DENABLE_HDR10_PLUS=ON ) if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) |