diff options
Diffstat (limited to 'media-libs/x265')
19 files changed, 992 insertions, 1034 deletions
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest index 28249212eef4..c27eb2713e67 100644 --- a/media-libs/x265/Manifest +++ b/media-libs/x265/Manifest @@ -1,7 +1 @@ -DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714 -DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3 -DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba -DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a -DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d -DIST x265_3.2.1.tar.gz 1426255 BLAKE2B 4184cfa290b36f497c5f3a5e3b597bf44e52dd20ba6af21c665d98709c9b984122a339d93aae572756a94549c0c1a293ee195c6c1d34902d298664ecf016f896 SHA512 5cb29b9d4475c1f686f6e31e47ccddde3db1639d5dcf9c058513389a9fdeb35a83b14e30e59498a76dec74bb0b410b6d8f5b1b45d18927be9811bb6a40d8d568 -DIST x265_3.2.tar.gz 1425689 BLAKE2B 58da4aa52381ec89b0aea1dc896fef92d9ec9fc781fd279acd0a338cd872f52482c81c558dde749c1205dbc13341a9851c381d01e2f312f5e2b4712d2242b7d3 SHA512 08c779026fe4c03797efef9d6a898b16c308355311e167c81b976345eb78039725a31294c77a60b76b4ef648d8720e16b2d6524e7108755531a5375231f5313e +DIST x265_3.5.tar.gz 1537044 BLAKE2B 4fe15b762eda08a4379f69df622bef603fed784a237381d5c95876412020c113d053af829fa1eb66468462a6edc0de32dc597b1a98a63e9aa0250a47f4e76d05 SHA512 230e683239c3e262096ba96246c6f67229a1625d163f86647a411733bb1cf349685858aee3017bce818bb6992448d0abaa9241615a5b620561ce47ecb164f997 diff --git a/media-libs/x265/files/arm-r1.patch b/media-libs/x265/files/arm-r1.patch new file mode 100644 index 000000000000..69aa3036eff3 --- /dev/null +++ b/media-libs/x265/files/arm-r1.patch @@ -0,0 +1,68 @@ +More aliases for ARM. +Do not force CFLAGS for ARM. + +--- 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) + set(X86_ALIASES x86 i386 i686 x86_64 amd64) +-set(ARM_ALIASES armv6l armv7l aarch64) ++set(ARM_ALIASES armv6l armv6l armv7l armv7a aarch64) + list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) + list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) + set(POWER_ALIASES ppc64 ppc64le) +@@ -239,11 +239,7 @@ if(GCC) + endif() + endif() + if(ARM AND CROSS_COMPILE_ARM) +- if(ARM64) +- set(ARM_ARGS -fPIC) +- else() +- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) +- endif() ++ set(ARM_ARGS -fPIC) + message(STATUS "cross compile arm") + elseif(ARM) + if(ARM64) +@@ -252,10 +248,10 @@ if(GCC) + else() + find_package(Neon) + if(CPU_HAS_NEON) +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) ++ set(ARM_ARGS -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + 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/files/arm.patch b/media-libs/x265/files/arm.patch deleted file mode 100644 index 69edcdecfb91..000000000000 --- a/media-libs/x265/files/arm.patch +++ /dev/null @@ -1,34 +0,0 @@ -More aliases for ARM. -Do not force CFLAGS for ARM. - -Index: source/CMakeLists.txt -=================================================================== ---- source.orig/CMakeLists.txt -+++ source/CMakeLists.txt -@@ -41,7 +41,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_ - # System architecture detection - string(TOLOWER "${CMAKE_SYSTEM_PROCESSOR}" SYSPROC) - set(X86_ALIASES x86 i386 i686 x86_64 amd64) --set(ARM_ALIASES armv6l armv7l) -+set(ARM_ALIASES armv6l armv6j armv7l armv7a) - list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) - list(FIND ARM_ALIASES "${SYSPROC}" ARMMATCH) - set(POWER_ALIASES ppc64 ppc64le) -@@ -208,15 +208,11 @@ if(GCC) - endif() - endif() - endif() -- if(ARM AND CROSS_COMPILE_ARM) -- set(ARM_ARGS -march=armv6 -mfloat-abi=soft -mfpu=vfp -marm -fPIC) -- elseif(ARM) -+ if(ARM) - find_package(Neon) - if(CPU_HAS_NEON) -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=neon -marm -fPIC) -+ set(ARM_ARGS -mfpu=neon) - add_definitions(-DHAVE_NEON) -- else() -- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) - endif() - endif() - add_definitions(${ARM_ARGS}) diff --git a/media-libs/x265/files/non_x86.patch b/media-libs/x265/files/non_x86.patch deleted file mode 100644 index 3c7e389329a7..000000000000 --- a/media-libs/x265/files/non_x86.patch +++ /dev/null @@ -1,20 +0,0 @@ -# HG changeset patch -# User Jayashree <jayashree.c@multicorewareinc.com> -# Date 1527224165 -19800 -# Fri May 25 10:26:05 2018 +0530 -# Node ID 4504219210793536d921ee4e0b3058698c630bf4 -# Parent cc2c5e46f3c87d27e3602af30b06ba6a0fbe2704 -Fix build error on on ppc64le - -diff -r cc2c5e46f3c8 -r 450421921079 source/common/param.cpp ---- a/source/common/param.cpp Mon May 21 18:42:29 2018 +0530 -+++ b/source/common/param.cpp Fri May 25 10:26:05 2018 +0530 -@@ -633,7 +633,7 @@ - if (bValueWasNull) - p->cpuid = atobool(value); - else -- p->cpuid = parseCpuName(value, bError); -+ p->cpuid = parseCpuName(value, bError, false); - #endif - } - OPT("fps") diff --git a/media-libs/x265/files/test-ns.patch b/media-libs/x265/files/test-ns.patch new file mode 100644 index 000000000000..898751a7ae2d --- /dev/null +++ b/media-libs/x265/files/test-ns.patch @@ -0,0 +1,295 @@ +Namespace functions for multi-bitdepth builds so that libraries are self-contained. + +Index: source/common/param.h +=================================================================== +--- source.orig/common/param.h ++++ source/common/param.h +@@ -53,6 +53,18 @@ int x265_param_default_preset(x265_param + int x265_param_apply_profile(x265_param *, const char *profile); + int x265_param_parse(x265_param *p, const char *name, const char *value); + int x265_zone_param_parse(x265_param* p, const char* name, const char* value); ++void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis); ++void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis); ++void x265_picture_free(x265_picture *); ++x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile); ++void x265_zone_free(x265_param *param); ++FILE* x265_csvlog_open(const x265_param *); ++void x265_csvlog_frame(const x265_param *, const x265_picture *); ++void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv); ++void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth); ++int x265_encoder_reconfig(x265_encoder *, x265_param *); ++x265_picture *x265_picture_alloc(void); ++void x265_picture_init(x265_param *param, x265_picture *pic); + #define PARAM_NS X265_NS + #endif + } +Index: source/encoder/api.cpp +=================================================================== +--- source.orig/encoder/api.cpp ++++ source/encoder/api.cpp +@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_par + if (p->rc.zoneCount || p->rc.zonefileCount) + { + int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount; +- param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); +- latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); +- zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); + } + + x265_copy_params(param, p); +@@ -216,7 +216,7 @@ x265_encoder *x265_encoder_open(x265_par + /* Try to open CSV file handle */ + if (encoder->m_param->csvfn) + { +- encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param); ++ encoder->m_param->csvfpt = PARAM_NS::x265_csvlog_open(encoder->m_param); + if (!encoder->m_param->csvfpt) + { + x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV log file <%s>, aborting\n", encoder->m_param->csvfn); +@@ -321,7 +321,7 @@ int x265_encoder_reconfig(x265_encoder* + if (encoder->m_latestParam->rc.zoneCount || encoder->m_latestParam->rc.zonefileCount) + { + int zoneCount = encoder->m_latestParam->rc.zonefileCount ? encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount; +- save.rc.zones = x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount); ++ save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount); + } + x265_copy_params(&save, encoder->m_latestParam); + int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in); +@@ -604,7 +604,7 @@ fail: + *pi_nal = 0; + + if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart) +- x265_csvlog_frame(encoder->m_param, pic_out); ++ PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out); + + if (numEncoded < 0) + encoder->m_aborted = true; +@@ -637,7 +637,7 @@ void x265_vmaf_encoder_log(x265_encoder* + encoder->fetchStats(&stats, sizeof(stats)); + int padx = encoder->m_sps.conformanceWindow.rightOffset; + int pady = encoder->m_sps.conformanceWindow.bottomOffset; +- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); ++ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); + } + } + #endif +@@ -651,7 +651,7 @@ void x265_encoder_log(x265_encoder* enc, + encoder->fetchStats(&stats, sizeof(stats)); + int padx = encoder->m_sps.conformanceWindow.rightOffset; + int pady = encoder->m_sps.conformanceWindow.bottomOffset; +- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); ++ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); + } + } + +@@ -872,7 +872,7 @@ void x265_alloc_analysis_data(x265_param + return; + + fail: +- x265_free_analysis_data(param, analysis); ++ PARAM_NS::x265_free_analysis_data(param, analysis); + } + + void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis) +Index: source/encoder/encoder.cpp +=================================================================== +--- source.orig/encoder/encoder.cpp ++++ source/encoder/encoder.cpp +@@ -186,8 +186,8 @@ void Encoder::create() + { + m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication)); + m_dupBuffer[i]->dupPic = NULL; +- m_dupBuffer[i]->dupPic = x265_picture_alloc(); +- x265_picture_init(p, m_dupBuffer[i]->dupPic); ++ m_dupBuffer[i]->dupPic = PARAM_NS::x265_picture_alloc(); ++ PARAM_NS::x265_picture_init(p, m_dupBuffer[i]->dupPic); + m_dupBuffer[i]->dupPlane = NULL; + m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize); + m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane; +@@ -756,7 +756,7 @@ int Encoder::setAnalysisData(x265_analys + curFrame->m_analysisData = (*analysis_data); + curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU; + curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, &curFrame->m_analysisData); ++ PARAM_NS::x265_alloc_analysis_data(m_param, &curFrame->m_analysisData); + if (m_param->maxCUSize == 16) + { + if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I) +@@ -860,7 +860,7 @@ void Encoder::destroy() + for (uint32_t i = 0; i < DUP_BUFFER; i++) + { + X265_FREE(m_dupBuffer[i]->dupPlane); +- x265_picture_free(m_dupBuffer[i]->dupPic); ++ PARAM_NS::x265_picture_free(m_dupBuffer[i]->dupPic); + X265_FREE(m_dupBuffer[i]); + } + +@@ -1592,7 +1592,7 @@ int Encoder::encode(const x265_picture* + if (m_exportedPic) + { + if (!m_param->bUseAnalysisFile && m_param->analysisSave) +- x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); + ATOMIC_DEC(&m_exportedPic->m_countRefEncoders); + m_exportedPic = NULL; + m_dpb->recycleUnreferenced(); +@@ -1968,7 +1968,7 @@ int Encoder::encode(const x265_picture* + + /* Free up inputPic->analysisData since it has already been used */ + if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE)) +- x265_free_analysis_data(m_param, &outFrame->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData); + + if (pic_out) + { +@@ -2046,7 +2046,7 @@ int Encoder::encode(const x265_picture* + writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData); + pic_out->analysisData.saveParam = pic_out->analysisData.saveParam; + if (m_param->bUseAnalysisFile) +- x265_free_analysis_data(m_param, &pic_out->analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData); + } + } + if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)) +@@ -2061,7 +2061,7 @@ int Encoder::encode(const x265_picture* + writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData); + } + if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion) +- x265_free_analysis_data(m_param, &outFrame->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData); + if (m_param->internalCsp == X265_CSP_I400) + { + if (slice->m_sliceType == P_SLICE) +@@ -2199,7 +2199,7 @@ int Encoder::encode(const x265_picture* + uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize; + frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU; + frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData); ++ PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData); + frameEnc->m_analysisData.poc = frameEnc->m_poc; + if (m_param->rc.bStatRead) + readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType); +@@ -2210,7 +2210,7 @@ int Encoder::encode(const x265_picture* + for (int i = 0; i < m_param->rc.zonefileCount; i++) + { + if (m_param->rc.zones[i].startFrame == frameEnc->m_poc) +- x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam); ++ PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam); + } + } + +@@ -2353,7 +2353,7 @@ int Encoder::encode(const x265_picture* + analysis->numCUsInFrame = numCUsInFrame; + analysis->numCuInHeight = heightInCU; + analysis->numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + } + /* determine references, setup RPS, etc */ + m_dpb->prepareEncode(frameEnc); +@@ -4264,7 +4264,7 @@ void Encoder::readAnalysisFile(x265_anal + else if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -4300,7 +4300,7 @@ void Encoder::readAnalysisFile(x265_anal + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + } +@@ -4334,7 +4334,7 @@ void Encoder::readAnalysisFile(x265_anal + if (m_param->scaleFactor) + analysis->numPartitions *= factor; + /* Memory is allocated for inter and intra analysis data based on the slicetype */ +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + + if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL) + { +@@ -4587,7 +4587,7 @@ void Encoder::readAnalysisFile(x265_anal + else if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -4624,7 +4624,7 @@ void Encoder::readAnalysisFile(x265_anal + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + } +@@ -4655,7 +4655,7 @@ void Encoder::readAnalysisFile(x265_anal + analysis->numCuInHeight = cuLoc.heightInCU; + + /* Memory is allocated for inter and intra analysis data based on the slicetype */ +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + + if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL) + { +@@ -5257,7 +5257,7 @@ void Encoder::readAnalysisFile(x265_anal + if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \ +- x265_alloc_analysis_data(m_param, analysis); \ ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); \ + m_aborted = true; \ + return; \ + }\ +@@ -5271,7 +5271,7 @@ void Encoder::readAnalysisFile(x265_anal + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + /* Now arrived at the right frame, read the record */ +@@ -5378,7 +5378,7 @@ void Encoder::writeAnalysisFile(x265_ana + if (fwrite(val, size, writeSize, fileOffset) < writeSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -5600,7 +5600,7 @@ void Encoder::writeAnalysisFileRefine(x2 + if (fwrite(val, size, writeSize, fileOffset) < writeSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \ +- x265_free_analysis_data(m_param, analysis); \ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); \ + m_aborted = true; \ + return; \ + }\ +Index: source/common/param.cpp +=================================================================== +--- source.orig/common/param.cpp ++++ source/common/param.cpp +@@ -102,7 +102,7 @@ x265_param *x265_param_alloc() + + void x265_param_free(x265_param* p) + { +- x265_zone_free(p); ++ PARAM_NS::x265_zone_free(p); + #ifdef SVT_HEVC + x265_free(p->svtHevcParam); + #endif diff --git a/media-libs/x265/files/tests.patch b/media-libs/x265/files/tests.patch new file mode 100644 index 000000000000..6c85829ee22d --- /dev/null +++ b/media-libs/x265/files/tests.patch @@ -0,0 +1,16 @@ +Tests run against static library (upstream build system): +We build main as both shared & static, main10 & 12 are static only and linked into main. +All need PLATFORM_LIBS, so instruct cmake to also link them. + +Index: source/CMakeLists.txt +=================================================================== +--- source.orig/CMakeLists.txt ++++ source/CMakeLists.txt +@@ -578,6 +578,7 @@ endif() + if(SVTHEVC_FOUND) + target_link_libraries(x265-static ${SVT_HEVC_LIBRARY}) + endif() ++target_link_libraries(x265-static ${PLATFORM_LIBS}) + install(TARGETS x265-static + LIBRARY DESTINATION ${LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${LIB_INSTALL_DIR}) diff --git a/media-libs/x265/files/x265-2.9-detect512.patch b/media-libs/x265/files/x265-2.9-detect512.patch deleted file mode 100644 index 8437ed09b884..000000000000 --- a/media-libs/x265/files/x265-2.9-detect512.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/source/common/cpu.cpp -+++ b/source/common/cpu.cpp -@@ -110,6 +110,11 @@ - { "", 0 }, - }; - -+bool detect512() -+{ -+ return(enable512); -+} -+ - #if X265_ARCH_X86 - - extern "C" { -@@ -123,10 +128,6 @@ - #pragma warning(disable: 4309) // truncation of constant value - #endif - --bool detect512() --{ -- return(enable512); --} - uint32_t cpu_detect(bool benableavx512 ) - { - diff --git a/media-libs/x265/files/ppc64.patch b/media-libs/x265/files/x265-3.3-ppc64.patch index f453c0de0a57..8e739e3fab1b 100644 --- a/media-libs/x265/files/ppc64.patch +++ b/media-libs/x265/files/x265-3.3-ppc64.patch @@ -2,8 +2,8 @@ More complete ppc64 matches. Index: x265_2.2/source/CMakeLists.txt =================================================================== ---- x265_2.2.orig/source/CMakeLists.txt -+++ x265_2.2/source/CMakeLists.txt +--- old/CMakeLists.txt ++++ new/CMakeLists.txt @@ -44,7 +44,7 @@ set(X86_ALIASES x86 i386 i686 x86_64 amd set(ARM_ALIASES armv6l armv6j armv7l armv7a) list(FIND X86_ALIASES "${SYSPROC}" X86MATCH) diff --git a/media-libs/x265/files/x265-9999-arm.patch b/media-libs/x265/files/x265-9999-arm.patch new file mode 100644 index 000000000000..218d92a0ab41 --- /dev/null +++ b/media-libs/x265/files/x265-9999-arm.patch @@ -0,0 +1,64 @@ +From 85ee373b0d1f03e7600366eae64a767e07298688 Mon Sep 17 00:00:00 2001 +From: Sam James <sam@gentoo.org> +Date: Wed, 1 Dec 2021 15:42:38 +0000 +Subject: [PATCH] Respect CFLAGS for arm* + +--- + CMakeLists.txt | 6 +++--- + dynamicHDR10/CMakeLists.txt | 8 ++++---- + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 9580413..737bf14 100755 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -249,14 +249,14 @@ if(GCC) + endif() + if(ARM AND CROSS_COMPILE_ARM) + message(STATUS "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 -mfpu=neon -fPIC) + add_definitions(-DHAVE_NEON) + else() +- set(ARM_ARGS -mcpu=native -mfloat-abi=hard -mfpu=vfp -marm) ++ set(ARM_ARGS -fPIC) + endif() + endif() + if(ARM64 OR CROSS_COMPILE_ARM64) +diff --git a/dynamicHDR10/CMakeLists.txt b/dynamicHDR10/CMakeLists.txt +index 22fb79d..3639281 100644 +--- 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 -mfpu=neon -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() +-- +2.34.1 + diff --git a/media-libs/x265/files/x265-9999-test-ns.patch b/media-libs/x265/files/x265-9999-test-ns.patch new file mode 100644 index 000000000000..ed3de18ae83e --- /dev/null +++ b/media-libs/x265/files/x265-9999-test-ns.patch @@ -0,0 +1,286 @@ +Namespace functions for multi-bitdepth builds so that libraries are self-contained. +--- a/common/param.cpp ++++ b/common/param.cpp +@@ -102,7 +102,7 @@ x265_param *x265_param_alloc() + + void x265_param_free(x265_param* p) + { +- x265_zone_free(p); ++ PARAM_NS::x265_zone_free(p); + #ifdef SVT_HEVC + x265_free(p->svtHevcParam); + #endif +--- a/common/param.h ++++ b/common/param.h +@@ -55,6 +55,18 @@ int x265_param_apply_profile(x265_param *, const char *profile); + int x265_param_parse(x265_param *p, const char *name, const char *value); + int x265_scenecut_aware_qp_param_parse(x265_param* p, const char* name, const char* value); + int x265_zone_param_parse(x265_param* p, const char* name, const char* value); ++void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis); ++void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis); ++void x265_picture_free(x265_picture *); ++x265_zone *x265_zone_alloc(int zoneCount, int isZoneFile); ++void x265_zone_free(x265_param *param); ++FILE* x265_csvlog_open(const x265_param *); ++void x265_csvlog_frame(const x265_param *, const x265_picture *); ++void x265_csvlog_encode(const x265_param*, const x265_stats *, int padx, int pady, int argc, char** argv); ++void x265_dither_image(x265_picture *, int picWidth, int picHeight, int16_t *errorBuf, int bitDepth); ++int x265_encoder_reconfig(x265_encoder *, x265_param *); ++x265_picture *x265_picture_alloc(void); ++void x265_picture_init(x265_param *param, x265_picture *pic); + #define PARAM_NS X265_NS + #endif + } +--- a/encoder/api.cpp ++++ b/encoder/api.cpp +@@ -106,9 +106,9 @@ x265_encoder *x265_encoder_open(x265_param *p) + if (p->rc.zoneCount || p->rc.zonefileCount) + { + int zoneCount = p->rc.zonefileCount ? p->rc.zonefileCount : p->rc.zoneCount; +- param->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); +- latestParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); +- zoneParam->rc.zones = x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ param->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ latestParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); ++ zoneParam->rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!p->rc.zonefileCount); + } + + x265_copy_params(param, p); +@@ -214,7 +214,7 @@ x265_encoder *x265_encoder_open(x265_param *p) + /* Try to open CSV file handle */ + if (encoder->m_param->csvfn) + { +- encoder->m_param->csvfpt = x265_csvlog_open(encoder->m_param); ++ encoder->m_param->csvfpt = PARAM_NS::x265_csvlog_open(encoder->m_param); + if (!encoder->m_param->csvfpt) + { + x265_log(encoder->m_param, X265_LOG_ERROR, "Unable to open CSV log file <%s>, aborting\n", encoder->m_param->csvfn); +@@ -319,7 +319,7 @@ int x265_encoder_reconfig(x265_encoder* enc, x265_param* param_in) + if (encoder->m_latestParam->rc.zoneCount || encoder->m_latestParam->rc.zonefileCount) + { + int zoneCount = encoder->m_latestParam->rc.zonefileCount ? encoder->m_latestParam->rc.zonefileCount : encoder->m_latestParam->rc.zoneCount; +- save.rc.zones = x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount); ++ save.rc.zones = PARAM_NS::x265_zone_alloc(zoneCount, !!encoder->m_latestParam->rc.zonefileCount); + } + x265_copy_params(&save, encoder->m_latestParam); + int ret = encoder->reconfigureParam(encoder->m_latestParam, param_in); +@@ -602,7 +602,7 @@ fail: + *pi_nal = 0; + + if (numEncoded && encoder->m_param->csvLogLevel && encoder->m_outputCount >= encoder->m_latestParam->chunkStart) +- x265_csvlog_frame(encoder->m_param, pic_out); ++ PARAM_NS::x265_csvlog_frame(encoder->m_param, pic_out); + + if (numEncoded < 0) + encoder->m_aborted = true; +@@ -643,7 +643,7 @@ void x265_vmaf_encoder_log(x265_encoder* enc, int argc, char **argv, x265_param + encoder->fetchStats(&stats, sizeof(stats)); + int padx = encoder->m_sps.conformanceWindow.rightOffset; + int pady = encoder->m_sps.conformanceWindow.bottomOffset; +- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); ++ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); + } + } + #endif +@@ -657,7 +657,7 @@ void x265_encoder_log(x265_encoder* enc, int argc, char **argv) + encoder->fetchStats(&stats, sizeof(stats)); + int padx = encoder->m_sps.conformanceWindow.rightOffset; + int pady = encoder->m_sps.conformanceWindow.bottomOffset; +- x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); ++ PARAM_NS::x265_csvlog_encode(encoder->m_param, &stats, padx, pady, argc, argv); + } + } + +@@ -878,7 +878,7 @@ void x265_alloc_analysis_data(x265_param *param, x265_analysis_data* analysis) + return; + + fail: +- x265_free_analysis_data(param, analysis); ++ PARAM_NS::x265_free_analysis_data(param, analysis); + } + + void x265_free_analysis_data(x265_param *param, x265_analysis_data* analysis) +--- a/encoder/encoder.cpp ++++ b/encoder/encoder.cpp +@@ -216,8 +216,8 @@ void Encoder::create() + { + m_dupBuffer[i] = (AdaptiveFrameDuplication*)x265_malloc(sizeof(AdaptiveFrameDuplication)); + m_dupBuffer[i]->dupPic = NULL; +- m_dupBuffer[i]->dupPic = x265_picture_alloc(); +- x265_picture_init(p, m_dupBuffer[i]->dupPic); ++ m_dupBuffer[i]->dupPic = PARAM_NS::x265_picture_alloc(); ++ PARAM_NS::x265_picture_init(p, m_dupBuffer[i]->dupPic); + m_dupBuffer[i]->dupPlane = NULL; + m_dupBuffer[i]->dupPlane = X265_MALLOC(char, framesize); + m_dupBuffer[i]->dupPic->planes[0] = m_dupBuffer[i]->dupPlane; +@@ -768,7 +768,7 @@ int Encoder::setAnalysisData(x265_analysis_data *analysis_data, int poc, uint32_ + curFrame->m_analysisData = (*analysis_data); + curFrame->m_analysisData.numCUsInFrame = widthInCU * heightInCU; + curFrame->m_analysisData.numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, &curFrame->m_analysisData); ++ PARAM_NS::x265_alloc_analysis_data(m_param, &curFrame->m_analysisData); + if (m_param->maxCUSize == 16) + { + if (analysis_data->sliceType == X265_TYPE_IDR || analysis_data->sliceType == X265_TYPE_I) +@@ -872,7 +872,7 @@ void Encoder::destroy() + for (uint32_t i = 0; i < DUP_BUFFER; i++) + { + X265_FREE(m_dupBuffer[i]->dupPlane); +- x265_picture_free(m_dupBuffer[i]->dupPic); ++ PARAM_NS::x265_picture_free(m_dupBuffer[i]->dupPic); + X265_FREE(m_dupBuffer[i]); + } + +@@ -1478,7 +1478,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + if (m_exportedPic) + { + if (!m_param->bUseAnalysisFile && m_param->analysisSave) +- x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &m_exportedPic->m_analysisData); + + ATOMIC_DEC(&m_exportedPic->m_countRefEncoders); + +@@ -1892,7 +1892,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + + /* Free up inputPic->analysisData since it has already been used */ + if ((m_param->analysisLoad && !m_param->analysisSave) || ((m_param->bAnalysisType == AVC_INFO) && slice->m_sliceType != I_SLICE)) +- x265_free_analysis_data(m_param, &outFrame->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData); + + if (pic_out) + { +@@ -1971,7 +1971,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + writeAnalysisFile(&pic_out->analysisData, *outFrame->m_encData); + pic_out->analysisData.saveParam = pic_out->analysisData.saveParam; + if (m_param->bUseAnalysisFile) +- x265_free_analysis_data(m_param, &pic_out->analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &pic_out->analysisData); + } + } + if (m_param->rc.bStatWrite && (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion)) +@@ -1986,7 +1986,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + writeAnalysisFileRefine(&outFrame->m_analysisData, *outFrame->m_encData); + } + if (m_param->analysisMultiPassRefine || m_param->analysisMultiPassDistortion) +- x265_free_analysis_data(m_param, &outFrame->m_analysisData); ++ PARAM_NS::x265_free_analysis_data(m_param, &outFrame->m_analysisData); + if (m_param->internalCsp == X265_CSP_I400) + { + if (slice->m_sliceType == P_SLICE) +@@ -2153,7 +2153,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + uint32_t heightInCU = (m_param->sourceHeight + m_param->maxCUSize - 1) >> m_param->maxLog2CUSize; + frameEnc->m_analysisData.numCUsInFrame = widthInCU * heightInCU; + frameEnc->m_analysisData.numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData); ++ PARAM_NS::x265_alloc_analysis_data(m_param, &frameEnc->m_analysisData); + frameEnc->m_analysisData.poc = frameEnc->m_poc; + if (m_param->rc.bStatRead) + readAnalysisFile(&frameEnc->m_analysisData, frameEnc->m_poc, frameEnc->m_lowres.sliceType); +@@ -2164,7 +2164,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + for (int i = 0; i < m_param->rc.zonefileCount; i++) + { + if (m_param->rc.zones[i].startFrame == frameEnc->m_poc) +- x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam); ++ PARAM_NS::x265_encoder_reconfig(this, m_param->rc.zones[i].zoneParam); + } + } + +@@ -2307,7 +2307,7 @@ int Encoder::encode(const x265_picture* pic_in, x265_picture* pic_out) + analysis->numCUsInFrame = numCUsInFrame; + analysis->numCuInHeight = heightInCU; + analysis->numPartitions = m_param->num4x4Partitions; +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + } + if (m_param->bEnableTemporalSubLayers > 2) + { +@@ -4434,7 +4434,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + else if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -4470,7 +4470,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + } +@@ -4504,7 +4504,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + if (m_param->scaleFactor) + analysis->numPartitions *= factor; + /* Memory is allocated for inter and intra analysis data based on the slicetype */ +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + + if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL) + { +@@ -4757,7 +4757,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + else if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -4794,7 +4794,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + } +@@ -4825,7 +4825,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, const x + analysis->numCuInHeight = cuLoc.heightInCU; + + /* Memory is allocated for inter and intra analysis data based on the slicetype */ +- x265_alloc_analysis_data(m_param, analysis); ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); + + if (m_param->ctuDistortionRefine == CTU_DISTORTION_INTERNAL) + { +@@ -5440,7 +5440,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli + if (fread(val, size, readSize, fileOffset) != readSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error reading analysis 2 pass data\n"); \ +- x265_alloc_analysis_data(m_param, analysis); \ ++ PARAM_NS::x265_alloc_analysis_data(m_param, analysis); \ + m_aborted = true; \ + return; \ + }\ +@@ -5454,7 +5454,7 @@ void Encoder::readAnalysisFile(x265_analysis_data* analysis, int curPoc, int sli + if (poc != curPoc || feof(m_analysisFileIn)) + { + x265_log(NULL, X265_LOG_WARNING, "Error reading analysis 2 pass data: Cannot find POC %d\n", curPoc); +- x265_free_analysis_data(m_param, analysis); ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); + return; + } + /* Now arrived at the right frame, read the record */ +@@ -5561,7 +5561,7 @@ void Encoder::writeAnalysisFile(x265_analysis_data* analysis, FrameData &curEncD + if (fwrite(val, size, writeSize, fileOffset) < writeSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error writing analysis data\n");\ +- x265_free_analysis_data(m_param, analysis);\ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis);\ + m_aborted = true;\ + return;\ + }\ +@@ -5783,7 +5783,7 @@ void Encoder::writeAnalysisFileRefine(x265_analysis_data* analysis, FrameData &c + if (fwrite(val, size, writeSize, fileOffset) < writeSize)\ + {\ + x265_log(NULL, X265_LOG_ERROR, "Error writing analysis 2 pass data\n"); \ +- x265_free_analysis_data(m_param, analysis); \ ++ PARAM_NS::x265_free_analysis_data(m_param, analysis); \ + m_aborted = true; \ + return; \ + }\ diff --git a/media-libs/x265/metadata.xml b/media-libs/x265/metadata.xml index 22a07293b836..af1229eaf0d8 100644 --- a/media-libs/x265/metadata.xml +++ b/media-libs/x265/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="project"> <email>media-video@gentoo.org</email> @@ -9,9 +9,8 @@ <flag name="12bit">Add support for producing 12bits HEVC.</flag> <flag name="numa">Build with support for NUMA nodes.</flag> <flag name="pic">Disable optimized assembly code that is not PIC friendly</flag> - <flag name="power8">Enable support for Power 8 assembly optimizations.</flag> </use> <upstream> - <remote-id type="bitbucket">multicoreware/x265</remote-id> + <remote-id type="bitbucket">multicoreware/x265_git</remote-id> </upstream> </pkgmetadata> diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild deleted file mode 100644 index 71303686d68a..000000000000 --- a/media-libs/x265/x265-3.1.2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic - -if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" -else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/176" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -PATCHES=( - "${FILESDIR}/arm.patch" - "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" -) - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source - else - unpack ${A} - export S="$(echo "${WORKDIR}/${PN}_"*"/source")" - fi -} - -# By default, the library and the encoder is configured for only one output bit -# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC -# files with a different bit depth, which is annoying. However, upstream -# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all -# that together so that the resulting library can produce all three of them -# instead of only one. -# The API requires the bit depth parameter, so that libx265 can then chose which -# variant of the encoder to use. -# To achieve this, we have to build one (static) library for each non-main -# variant, and link it into the main library. -# Upstream documents using the 8bit variant as main library, hence we do not -# allow disabling it: "main" *MUST* come last in the following list. - -x265_get_variants() { - local variants="" - use 12bit && variants+="main12 " - use 10bit && variants+="main10 " - variants+="main" - echo "${variants}" -} - -x265_variant_src_configure() { - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - - local mycmakeargs=( "${myabicmakeargs[@]}" ) - case "${MULTIBUILD_VARIANT}" in - "main12") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - -DMAIN12=ON - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main10") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main") - if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then - local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) - unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" - for v in "${myvariants[@]}" ; do - ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die - liblist+="libx265_${v}.a;" - done - mycmakeargs+=( - -DEXTRA_LIB="${liblist}" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=$(usex 10bit) - -DLINKED_12BIT=$(usex 12bit) - ) - fi - ;; - *) - die "Unknown variant: ${MULTIBUILD_VARIANT}";; - esac - cmake-utils_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) - $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") - -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." - fi - - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_configure -} - -multilib_src_compile() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile -} - -x265_variant_src_test() { - if [ -x "${BUILD_DIR}/test/TestBench" ] ; then - "${BUILD_DIR}/test/TestBench" || die - else - einfo "Unit tests check only assembly." - einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" - einfo "Skipping tests." - fi -} - -multilib_src_test() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_test -} - -multilib_src_install() { - # Install only "main" variant since the others are already linked into it. - local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install -} - -multilib_src_install_all() { - dodoc -r "${S}/../doc/"* -} diff --git a/media-libs/x265/x265-3.1.ebuild b/media-libs/x265/x265-3.1.ebuild deleted file mode 100644 index 71303686d68a..000000000000 --- a/media-libs/x265/x265-3.1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic - -if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" -else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/176" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -PATCHES=( - "${FILESDIR}/arm.patch" - "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" -) - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source - else - unpack ${A} - export S="$(echo "${WORKDIR}/${PN}_"*"/source")" - fi -} - -# By default, the library and the encoder is configured for only one output bit -# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC -# files with a different bit depth, which is annoying. However, upstream -# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all -# that together so that the resulting library can produce all three of them -# instead of only one. -# The API requires the bit depth parameter, so that libx265 can then chose which -# variant of the encoder to use. -# To achieve this, we have to build one (static) library for each non-main -# variant, and link it into the main library. -# Upstream documents using the 8bit variant as main library, hence we do not -# allow disabling it: "main" *MUST* come last in the following list. - -x265_get_variants() { - local variants="" - use 12bit && variants+="main12 " - use 10bit && variants+="main10 " - variants+="main" - echo "${variants}" -} - -x265_variant_src_configure() { - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - - local mycmakeargs=( "${myabicmakeargs[@]}" ) - case "${MULTIBUILD_VARIANT}" in - "main12") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - -DMAIN12=ON - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main10") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main") - if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then - local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) - unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" - for v in "${myvariants[@]}" ; do - ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die - liblist+="libx265_${v}.a;" - done - mycmakeargs+=( - -DEXTRA_LIB="${liblist}" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=$(usex 10bit) - -DLINKED_12BIT=$(usex 12bit) - ) - fi - ;; - *) - die "Unknown variant: ${MULTIBUILD_VARIANT}";; - esac - cmake-utils_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) - $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") - -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." - fi - - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_configure -} - -multilib_src_compile() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile -} - -x265_variant_src_test() { - if [ -x "${BUILD_DIR}/test/TestBench" ] ; then - "${BUILD_DIR}/test/TestBench" || die - else - einfo "Unit tests check only assembly." - einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" - einfo "Skipping tests." - fi -} - -multilib_src_test() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_test -} - -multilib_src_install() { - # Install only "main" variant since the others are already linked into it. - local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install -} - -multilib_src_install_all() { - dodoc -r "${S}/../doc/"* -} diff --git a/media-libs/x265/x265-3.2.1.ebuild b/media-libs/x265/x265-3.2.1.ebuild deleted file mode 100644 index a7c7ebc8e962..000000000000 --- a/media-libs/x265/x265-3.2.1.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic - -if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" -else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/179" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -PATCHES=( - "${FILESDIR}/arm.patch" - "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" -) - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source - else - unpack ${A} - export S="$(echo "${WORKDIR}/${PN}_"*"/source")" - fi -} - -# By default, the library and the encoder is configured for only one output bit -# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC -# files with a different bit depth, which is annoying. However, upstream -# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all -# that together so that the resulting library can produce all three of them -# instead of only one. -# The API requires the bit depth parameter, so that libx265 can then chose which -# variant of the encoder to use. -# To achieve this, we have to build one (static) library for each non-main -# variant, and link it into the main library. -# Upstream documents using the 8bit variant as main library, hence we do not -# allow disabling it: "main" *MUST* come last in the following list. - -x265_get_variants() { - local variants="" - use 12bit && variants+="main12 " - use 10bit && variants+="main10 " - variants+="main" - echo "${variants}" -} - -x265_variant_src_configure() { - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - - local mycmakeargs=( "${myabicmakeargs[@]}" ) - case "${MULTIBUILD_VARIANT}" in - "main12") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - -DMAIN12=ON - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main10") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main") - if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then - local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) - unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" - for v in "${myvariants[@]}" ; do - ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die - liblist+="libx265_${v}.a;" - done - mycmakeargs+=( - -DEXTRA_LIB="${liblist}" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=$(usex 10bit) - -DLINKED_12BIT=$(usex 12bit) - ) - fi - ;; - *) - die "Unknown variant: ${MULTIBUILD_VARIANT}";; - esac - cmake-utils_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) - $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") - -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." - fi - - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_configure -} - -multilib_src_compile() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile -} - -x265_variant_src_test() { - if [ -x "${BUILD_DIR}/test/TestBench" ] ; then - "${BUILD_DIR}/test/TestBench" || die - else - einfo "Unit tests check only assembly." - einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" - einfo "Skipping tests." - fi -} - -multilib_src_test() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_test -} - -multilib_src_install() { - # Install only "main" variant since the others are already linked into it. - local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install -} - -multilib_src_install_all() { - dodoc -r "${S}/../doc/"* -} diff --git a/media-libs/x265/x265-3.2.ebuild b/media-libs/x265/x265-3.2.ebuild deleted file mode 100644 index b1d719a14b6c..000000000000 --- a/media-libs/x265/x265-3.2.ebuild +++ /dev/null @@ -1,196 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic - -if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" -else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" -fi - -DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" - -LICENSE="GPL-2" -# subslot = libx265 soname -SLOT="0/179" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" -RESTRICT="!test? ( test )" - -ASM_DEPEND=">=dev-lang/yasm-1.2.0" -RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} - abi_x86_32? ( ${ASM_DEPEND} ) - abi_x86_64? ( ${ASM_DEPEND} )" - -PATCHES=( - "${FILESDIR}/arm.patch" - "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" -) - -src_unpack() { - if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source - else - unpack ${A} - export S="$(echo "${WORKDIR}/${PN}_"*"/source")" - fi -} - -# By default, the library and the encoder is configured for only one output bit -# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC -# files with a different bit depth, which is annoying. However, upstream -# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all -# that together so that the resulting library can produce all three of them -# instead of only one. -# The API requires the bit depth parameter, so that libx265 can then chose which -# variant of the encoder to use. -# To achieve this, we have to build one (static) library for each non-main -# variant, and link it into the main library. -# Upstream documents using the 8bit variant as main library, hence we do not -# allow disabling it: "main" *MUST* come last in the following list. - -x265_get_variants() { - local variants="" - use 12bit && variants+="main12 " - use 10bit && variants+="main10 " - variants+="main" - echo "${variants}" -} - -x265_variant_src_configure() { - mkdir -p "${BUILD_DIR}" || die - pushd "${BUILD_DIR}" >/dev/null || die - - local mycmakeargs=( "${myabicmakeargs[@]}" ) - case "${MULTIBUILD_VARIANT}" in - "main12") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - -DMAIN12=ON - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main10") - mycmakeargs+=( - -DHIGH_BIT_DEPTH=ON - -DEXPORT_C_API=OFF - -DENABLE_SHARED=OFF - -DENABLE_CLI=OFF - ) - if [[ ${ABI} = x86 ]] ; then - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = arm ]] ; then - # 589674 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) - fi - ;; - "main") - if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then - local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) - unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" - for v in "${myvariants[@]}" ; do - ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die - liblist+="libx265_${v}.a;" - done - mycmakeargs+=( - -DEXTRA_LIB="${liblist}" - -DEXTRA_LINK_FLAGS=-L. - -DLINKED_10BIT=$(usex 10bit) - -DLINKED_12BIT=$(usex 12bit) - ) - fi - ;; - *) - die "Unknown variant: ${MULTIBUILD_VARIANT}";; - esac - cmake-utils_src_configure - popd >/dev/null || die -} - -multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC - local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) - $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") - -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) - -DLIB_INSTALL_DIR="$(get_libdir)" - ) - - if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi - elif [[ ${ABI} = x32 ]] ; then - # bug #510890 - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." - fi - - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_configure -} - -multilib_src_compile() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile -} - -x265_variant_src_test() { - if [ -x "${BUILD_DIR}/test/TestBench" ] ; then - "${BUILD_DIR}/test/TestBench" || die - else - einfo "Unit tests check only assembly." - einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}" - einfo "Skipping tests." - fi -} - -multilib_src_test() { - local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant x265_variant_src_test -} - -multilib_src_install() { - # Install only "main" variant since the others are already linked into it. - local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install -} - -multilib_src_install_all() { - dodoc -r "${S}/../doc/"* -} diff --git a/media-libs/x265/x265-2.8.ebuild b/media-libs/x265/x265-3.5-r2.ebuild index f4bb545314bb..3fa4d5cb933f 100644 --- a/media-libs/x265/x265-2.8.ebuild +++ b/media-libs/x265/x265-3.5-r2.ebuild @@ -1,45 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic +inherit cmake multilib-minimal multibuild if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/" + S=${WORKDIR}/${P}/source else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="amd64 arm ~arm64 hppa ~ia64 ppc ppc64 x86" + SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" +HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/160" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" +SLOT="0/199" +IUSE="+10bit +12bit cpu_flags_arm_neon cpu_flags_ppc_vsx2 numa pic test" RESTRICT="!test? ( test )" -ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +ASM_DEPEND=">=dev-lang/nasm-2.13" +BDEPEND=" abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/arm.patch" + "${FILESDIR}/arm-r1.patch" "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" - "${FILESDIR}/non_x86.patch" + "${FILESDIR}/x265-3.3-ppc64.patch" + "${FILESDIR}/tests.patch" + "${FILESDIR}/test-ns.patch" ) src_unpack() { if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source + git-r3_src_unpack else unpack ${A} export S="$(echo "${WORKDIR}/${PN}_"*"/source")" @@ -71,6 +72,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -84,13 +87,16 @@ x265_variant_src_configure() { if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 12bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main10") @@ -99,24 +105,28 @@ 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 ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 10bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" + local liblist="" v= for v in "${myvariants[@]}" ; do ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die liblist+="libx265_${v}.a;" @@ -127,24 +137,32 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + # upstream uses mix of altivec + power8 vectors + # it's impossible to enable altivec without CPU_POWER8 + # and it does not work on ppc32 + # so we toggle both variables together + mycmakeargs+=( + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) + fi fi ;; *) die "Unknown variant: ${MULTIBUILD_VARIANT}";; esac - cmake-utils_src_configure + cmake_src_configure popd >/dev/null || die } multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) + -DENABLE_TESTS=$(usex test ON OFF) $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) + -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) @@ -168,7 +186,7 @@ multilib_src_configure() { multilib_src_compile() { local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile + multibuild_foreach_variant cmake_src_compile } x265_variant_src_test() { @@ -189,9 +207,14 @@ multilib_src_test() { multilib_src_install() { # Install only "main" variant since the others are already linked into it. local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install + multibuild_foreach_variant cmake_src_install } multilib_src_install_all() { dodoc -r "${S}/../doc/"* + + # we don't install *.a files for all variants, + # so just delete these files instead of pretending + # real USE=static-libs support + find "${ED}" -name "*.a" -delete || die } diff --git a/media-libs/x265/x265-2.9.ebuild b/media-libs/x265/x265-3.5-r3.ebuild index 5f28b491babf..f3d6c8cbd76a 100644 --- a/media-libs/x265/x265-2.9.ebuild +++ b/media-libs/x265/x265-3.5-r3.ebuild @@ -1,45 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic +inherit cmake flag-o-matic multilib-minimal multibuild if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/" + S=${WORKDIR}/${P}/source else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" + SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz" + KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" +HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/165" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" +SLOT="0/199" +IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test" RESTRICT="!test? ( test )" -ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +ASM_DEPEND=">=dev-lang/nasm-2.13" +BDEPEND=" abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/arm.patch" + "${FILESDIR}/arm-r1.patch" "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" - "${FILESDIR}"/${PN}-2.9-detect512.patch + "${FILESDIR}/x265-3.3-ppc64.patch" + "${FILESDIR}/tests.patch" + "${FILESDIR}/test-ns.patch" ) src_unpack() { if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source + git-r3_src_unpack else unpack ${A} export S="$(echo "${WORKDIR}/${PN}_"*"/source")" @@ -71,6 +72,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -84,13 +87,16 @@ x265_variant_src_configure() { if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 12bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main10") @@ -99,24 +105,28 @@ 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 ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 10bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" + local liblist="" v= for v in "${myvariants[@]}" ; do ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die liblist+="libx265_${v}.a;" @@ -127,39 +137,49 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + # upstream uses mix of altivec + power8 vectors + # it's impossible to enable altivec without CPU_POWER8 + # and it does not work on ppc32 + # so we toggle both variables together + mycmakeargs+=( + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) + fi fi ;; *) die "Unknown variant: ${MULTIBUILD_VARIANT}";; esac - cmake-utils_src_configure + cmake_src_configure popd >/dev/null || die } multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC + # -Werror=odr + # https://bugs.gentoo.org/875854 + # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto + filter-lto + local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) + -DENABLE_TESTS=$(usex test ON OFF) $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) + -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) + # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi + # Bug #528202, bug #913412 + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = x32 ]] ; then # bug #510890 myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) @@ -168,7 +188,7 @@ multilib_src_configure() { multilib_src_compile() { local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile + multibuild_foreach_variant cmake_src_compile } x265_variant_src_test() { @@ -189,9 +209,14 @@ multilib_src_test() { multilib_src_install() { # Install only "main" variant since the others are already linked into it. local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install + multibuild_foreach_variant cmake_src_install } multilib_src_install_all() { dodoc -r "${S}/../doc/"* + + # we don't install *.a files for all variants, + # so just delete these files instead of pretending + # real USE=static-libs support + find "${ED}" -name "*.a" -delete || die } diff --git a/media-libs/x265/x265-3.0.ebuild b/media-libs/x265/x265-3.5-r4.ebuild index 2d1942d399d2..11fbb36fc212 100644 --- a/media-libs/x265/x265-3.0.ebuild +++ b/media-libs/x265/x265-3.5-r4.ebuild @@ -1,44 +1,46 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic +inherit cmake flag-o-matic multilib-minimal multibuild if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/" + S=${WORKDIR}/${P}/source else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" + SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" +HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/169" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" +SLOT="0/199" +IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test" RESTRICT="!test? ( test )" -ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +ASM_DEPEND=">=dev-lang/nasm-2.13" +BDEPEND=" abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/arm.patch" + "${FILESDIR}/arm-r1.patch" "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" + "${FILESDIR}/x265-3.3-ppc64.patch" + "${FILESDIR}/tests.patch" + "${FILESDIR}/test-ns.patch" ) src_unpack() { if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source + git-r3_src_unpack else unpack ${A} export S="$(echo "${WORKDIR}/${PN}_"*"/source")" @@ -70,6 +72,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -83,13 +87,16 @@ x265_variant_src_configure() { if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 12bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main10") @@ -98,24 +105,28 @@ 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 ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 10bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" + local liblist="" v= for v in "${myvariants[@]}" ; do ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die liblist+="libx265_${v}.a;" @@ -126,39 +137,49 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + # upstream uses mix of altivec + power8 vectors + # it's impossible to enable altivec without CPU_POWER8 + # and it does not work on ppc32 + # so we toggle both variables together + mycmakeargs+=( + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) + fi fi ;; *) die "Unknown variant: ${MULTIBUILD_VARIANT}";; esac - cmake-utils_src_configure + cmake_src_configure popd >/dev/null || die } multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC + # -Werror=odr + # https://bugs.gentoo.org/875854 + # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto + filter-lto + local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) + -DENABLE_TESTS=$(usex test ON OFF) $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) + -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) + # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi + # Bug #528202, bug #913412 + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = x32 ]] ; then # bug #510890 myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) @@ -167,7 +188,7 @@ multilib_src_configure() { multilib_src_compile() { local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile + multibuild_foreach_variant cmake_src_compile } x265_variant_src_test() { @@ -188,9 +209,14 @@ multilib_src_test() { multilib_src_install() { # Install only "main" variant since the others are already linked into it. local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install + multibuild_foreach_variant cmake_src_install } multilib_src_install_all() { dodoc -r "${S}/../doc/"* + + # we don't install *.a files for all variants, + # so just delete these files instead of pretending + # real USE=static-libs support + find "${ED}" -name "*.a" -delete || die } diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild index aaf2a4fe9a00..8be9f4a93e84 100644 --- a/media-libs/x265/x265-9999.ebuild +++ b/media-libs/x265/x265-9999.ebuild @@ -1,44 +1,45 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=8 -inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic +inherit cmake flag-o-matic multilib-minimal multibuild if [[ ${PV} = 9999* ]]; then - inherit mercurial - EHG_REPO_URI="https://bitbucket.org/multicoreware/x265" + inherit git-r3 + EGIT_REPO_URI="https://bitbucket.org/multicoreware/x265_git/" + S=${WORKDIR}/${P}/source else - SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" + SRC_URI="https://bitbucket.org/multicoreware/x265_git/downloads/${PN}_${PV}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~x86" fi DESCRIPTION="Library for encoding video streams into the H.265/HEVC format" -HOMEPAGE="http://x265.org/" +HOMEPAGE="http://x265.org/ https://bitbucket.org/multicoreware/x265_git/" LICENSE="GPL-2" # subslot = libx265 soname -SLOT="0/184" -IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test" +SLOT="0/208" +IUSE="+10bit +12bit cpu_flags_ppc_vsx2 numa test" RESTRICT="!test? ( test )" -ASM_DEPEND=">=dev-lang/yasm-1.2.0" RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )" -DEPEND="${RDEPEND} +DEPEND="${RDEPEND}" +ASM_DEPEND=">=dev-lang/nasm-2.13" +BDEPEND=" abi_x86_32? ( ${ASM_DEPEND} ) abi_x86_64? ( ${ASM_DEPEND} )" PATCHES=( - "${FILESDIR}/arm.patch" + "${FILESDIR}/${PN}-9999-arm.patch" "${FILESDIR}/neon.patch" - "${FILESDIR}/ppc64.patch" + "${FILESDIR}/tests.patch" + "${FILESDIR}/${PN}-9999-test-ns.patch" ) src_unpack() { if [[ ${PV} = 9999* ]]; then - mercurial_src_unpack - # Can't set it at global scope due to mercurial.eclass limitations... - export S=${WORKDIR}/${P}/source + git-r3_src_unpack else unpack ${A} export S="$(echo "${WORKDIR}/${PN}_"*"/source")" @@ -70,6 +71,8 @@ x265_variant_src_configure() { mkdir -p "${BUILD_DIR}" || die pushd "${BUILD_DIR}" >/dev/null || die + einfo "Configuring variant: ${MULTIBUILD_VARIANT} for ABI: ${ABI}" + local mycmakeargs=( "${myabicmakeargs[@]}" ) case "${MULTIBUILD_VARIANT}" in "main12") @@ -83,13 +86,16 @@ x265_variant_src_configure() { if [[ ${ABI} = x86 ]] ; then mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 12bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main10") @@ -98,24 +104,28 @@ 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 ) fi - if [[ ${ABI} = arm ]] ; then + if [[ ${ABI} = arm* ]] ; then # 589674 mycmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi - if [[ ${ABI} = ppc64 ]] ; then - # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5 - mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF ) + # disable altivec for 10bit build #607802#c5 + if [[ ${ABI} = ppc* ]] ; then + mycmakeargs+=( + -DENABLE_ALTIVEC=OFF + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) fi ;; "main") if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then local myvariants=( "${MULTIBUILD_VARIANTS[@]}" ) unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1] - local liblist="" + local liblist="" v= for v in "${myvariants[@]}" ; do ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die liblist+="libx265_${v}.a;" @@ -126,39 +136,49 @@ x265_variant_src_configure() { -DLINKED_10BIT=$(usex 10bit) -DLINKED_12BIT=$(usex 12bit) ) + if [[ ${ABI} = ppc* ]] ; then + # upstream uses mix of altivec + power8 vectors + # it's impossible to enable altivec without CPU_POWER8 + # and it does not work on ppc32 + # so we toggle both variables together + mycmakeargs+=( + -DCPU_POWER8=$(usex cpu_flags_ppc_vsx2 ON OFF) + -DENABLE_ALTIVEC=$(usex cpu_flags_ppc_vsx2 ON OFF) + ) + fi fi ;; *) die "Unknown variant: ${MULTIBUILD_VARIANT}";; esac - cmake-utils_src_configure + cmake_src_configure popd >/dev/null || die } multilib_src_configure() { - append-cflags -fPIC - append-cxxflags -fPIC + # -Werror=odr + # https://bugs.gentoo.org/875854 + # https://bitbucket.org/multicoreware/x265_git/issues/937/build-fails-with-lto + filter-lto + local myabicmakeargs=( - $(cmake-utils_use_enable test TESTS) + -DENABLE_TESTS=$(usex test ON OFF) $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF") + -DENABLE_PIC=ON -DENABLE_LIBNUMA=$(usex numa ON OFF) - -DCPU_POWER8=$(usex power8 ON OFF) - -DENABLE_ALTIVEC=$(usex power8 ON OFF) + -DGIT_ARCHETYPE=1 #814116 -DLIB_INSTALL_DIR="$(get_libdir)" ) + # Unfortunately, the asm for x86/x32/arm isn't PIC-safe. if [[ ${ABI} = x86 ]] ; then - # Bug #528202 - if use pic ; then - ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it." - myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) - fi + # Bug #528202, bug #913412 + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = x32 ]] ; then # bug #510890 myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) elif [[ ${ABI} = arm ]] ; then - myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) ) - use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it." + myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF ) fi local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) @@ -167,7 +187,7 @@ multilib_src_configure() { multilib_src_compile() { local MULTIBUILD_VARIANTS=( $(x265_get_variants) ) - multibuild_foreach_variant cmake-utils_src_compile + multibuild_foreach_variant cmake_src_compile } x265_variant_src_test() { @@ -188,9 +208,14 @@ multilib_src_test() { multilib_src_install() { # Install only "main" variant since the others are already linked into it. local MULTIBUILD_VARIANTS=( "main" ) - multibuild_foreach_variant cmake-utils_src_install + multibuild_foreach_variant cmake_src_install } multilib_src_install_all() { dodoc -r "${S}/../doc/"* + + # we don't install *.a files for all variants, + # so just delete these files instead of pretending + # real USE=static-libs support + find "${ED}" -name "*.a" -delete || die } |