Created attachment 899830 [details] emerge --info x265 [ebuild R *] media-libs/x265-9999:0/208::gentoo USE="10bit 12bit -numa -test" ABI_X86="32 (64) (-x32)" 0 KiB * Package: media-libs/x265-9999:0/208 * Repository: gentoo * Maintainer: media-video@gentoo.org * USE: 10bit 12bit abi_x86_32 abi_x86_64 amd64 elibc_glibc kernel_linux * FEATURES: ccache network-sandbox preserve-libs sandbox userpriv usersandbox >>> Unpacking source... * Repository id: multicoreware_x265_git.git * To override fetched repository properties, use: * EGIT_OVERRIDE_REPO_MULTICOREWARE_X265_GIT * EGIT_OVERRIDE_BRANCH_MULTICOREWARE_X265_GIT * EGIT_OVERRIDE_COMMIT_MULTICOREWARE_X265_GIT * EGIT_OVERRIDE_COMMIT_DATE_MULTICOREWARE_X265_GIT * * Fetching https://bitbucket.org/multicoreware/x265_git/ ... git fetch https://bitbucket.org/multicoreware/x265_git/ +HEAD:refs/git-r3/HEAD remote: Enumerating objects: 473, done. remote: Counting objects: 100% (473/473), done. remote: Compressing objects: 100% (105/105), done. remote: Total 410 (delta 376), reused 337 (delta 305), pack-reused 0 (from 0) Receiving objects: 100% (410/410), 112.97 KiB | 781.00 KiB/s, done. Resolving deltas: 100% (376/376), completed with 62 local objects. From https://bitbucket.org/multicoreware/x265_git ad1a30a8a..1cb70f6b4 HEAD -> refs/git-r3/HEAD git symbolic-ref refs/git-r3/media-libs/x265/0/__main__ refs/git-r3/HEAD * Checking out https://bitbucket.org/multicoreware/x265_git/ to /var/tmp/portage/media-libs/x265-9999/work/x265-9999 ... git checkout --quiet refs/git-r3/HEAD GIT update --> repository: https://bitbucket.org/multicoreware/x265_git/ updating from commit: ad1a30a8a69d5bbc0096da7aafc9da21c599cb01 to commit: 1cb70f6b44247a069163ab79c213620bfc3b1bf6 doc/reST/cli.rst | 57 +++++++ source/CMakeLists.txt | 17 +- source/abrEncApp.cpp | 424 ++++++++++++++++++++++++++++++------------------- source/abrEncApp.h | 7 +- source/common/cudata.cpp | 497 +++++++++++++++++++++++++++++++++++++++++++++++++++++---- source/common/cudata.h | 30 +++- source/common/deblock.cpp | 4 +- source/common/frame.cpp | 88 ++++++++--- source/common/frame.h | 12 +- source/common/framedata.h | 2 +- source/common/lowpassdct.cpp | 6 +- source/common/param.cpp | 93 ++++++++++- source/common/piclist.cpp | 126 ++++++++++++++- source/common/piclist.h | 17 +- source/common/picyuv.cpp | 160 ++++++++++++++----- source/common/picyuv.h | 2 +- source/common/predict.cpp | 58 +++++-- source/common/slice.cpp | 158 ++++++++++++++++++- source/common/slice.h | 63 +++++++- source/common/wavefront.cpp | 7 +- source/common/wavefront.h | 6 +- source/encoder/analysis.cpp | 508 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- source/encoder/analysis.h | 25 ++- source/encoder/api.cpp | 28 ++-- source/encoder/dpb.cpp | 167 ++++++++++++++++---- source/encoder/dpb.h | 12 +- source/encoder/encoder.cpp | 1697 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------- source/encoder/encoder.h | 18 +-- source/encoder/entropy.cpp | 520 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- source/encoder/entropy.h | 12 +- source/encoder/frameencoder.cpp | 402 ++++++++++++++++++++++++---------------------- source/encoder/frameencoder.h | 57 +++---- source/encoder/framefilter.cpp | 36 ++--- source/encoder/framefilter.h | 4 +- source/encoder/level.cpp | 151 +++++++++++++++--- source/encoder/motion.cpp | 8 + source/encoder/motion.h | 2 +- source/encoder/nal.cpp | 4 +- source/encoder/nal.h | 2 +- source/encoder/ratecontrol.cpp | 4 +- source/encoder/sao.cpp | 10 +- source/encoder/search.cpp | 2161 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------- source/encoder/search.h | 31 +++- source/encoder/sei.cpp | 4 +- source/encoder/sei.h | 224 +++++++++++++++++++++++++- source/encoder/slicetype.cpp | 6 +- source/encoder/weightPrediction.cpp | 8 +- source/input/input.cpp | 6 +- source/input/input.h | 2 +- source/input/y4m.cpp | 12 +- source/input/y4m.h | 4 +- source/input/yuv.cpp | 22 ++- source/input/yuv.h | 4 +- source/x265.h | 74 ++++++++- source/x265cli.cpp | 344 ++++++++++++++++++++++++++++++++-------- source/x265cli.h | 30 +++- 56 files changed, 6721 insertions(+), 1712 deletions(-) >>> Source unpacked in /var/tmp/portage/media-libs/x265-9999/work >>> Preparing source in /var/tmp/portage/media-libs/x265-9999/work/x265-9999/source ... * Source directory (CMAKE_USE_DIR): "/var/tmp/portage/media-libs/x265-9999/work/x265-9999/source" * Build directory (BUILD_DIR): "/var/tmp/portage/media-libs/x265-9999/work/x265-9999/source_build" * Applying x265-9999-arm.patch ... [ ok ] * Applying neon.patch ... [ ok ] * Applying tests.patch ... [ ok ] * Applying x265-9999-test-ns.patch ... patching file common/param.cpp patching file common/param.h patching file encoder/api.cpp Hunk #4 FAILED at 602. Hunk #5 succeeded at 646 (offset 3 lines). Hunk #6 FAILED at 657. Hunk #7 succeeded at 884 (offset 6 lines). 2 out of 7 hunks FAILED -- saving rejects to file encoder/api.cpp.rej patching file encoder/encoder.cpp Hunk #1 succeeded at 217 (offset 1 line). Hunk #2 succeeded at 774 (offset 6 lines). Hunk #3 succeeded at 881 (offset 9 lines). Hunk #4 FAILED at 1478. Hunk #5 FAILED at 1892. Hunk #6 FAILED at 1971. Hunk #7 FAILED at 1986. Hunk #8 FAILED at 2153. Hunk #9 FAILED at 2164. Hunk #10 succeeded at 2408 (offset 101 lines). Hunk #11 succeeded at 4711 (offset 277 lines). Hunk #12 succeeded at 4747 (offset 277 lines). Hunk #13 succeeded at 4781 (offset 277 lines). Hunk #14 succeeded at 5034 (offset 277 lines). Hunk #15 succeeded at 5071 (offset 277 lines). Hunk #16 succeeded at 5102 (offset 277 lines). Hunk #17 succeeded at 5717 (offset 277 lines). Hunk #18 succeeded at 5731 (offset 277 lines). Hunk #19 succeeded at 5838 (offset 277 lines). Hunk #20 succeeded at 6060 (offset 277 lines). 6 out of 20 hunks FAILED -- saving rejects to file encoder/encoder.cpp.rej [ !! ] * ERROR: media-libs/x265-9999::gentoo failed (prepare phase): * patch -p1 failed with /var/tmp/portage/media-libs/x265-9999/files/x265-9999-test-ns.patch * * Call stack: * ebuild.sh, line 136: Called src_prepare * environment, line 3149: Called cmake_src_prepare * environment, line 1235: Called default_src_prepare * phase-functions.sh, line 949: Called __eapi8_src_prepare * environment, line 355: Called eapply '--' '/var/tmp/portage/media-libs/x265-9999/files/x265-9999-arm.patch' '/var/tmp/portage/media-libs/x265-9999/files/neon.patch' '/var/tmp/portage/media-libs/x265-9999/files/tests.patch' '/var/tmp/portage/media-libs/x265-9999/files/x265-9999-test-ns.patch' * environment, line 1392: Called _eapply_patch '/var/tmp/portage/media-libs/x265-9999/files/x265-9999-test-ns.patch' * environment, line 1330: Called __helpers_die 'patch -p1 failed with /var/tmp/portage/media-libs/x265-9999/files/x265-9999-test-ns.patch' * isolated-functions.sh, line 112: Called die * The specific snippet of code: * die "$@"
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86fff0790dd62c7e91afbfecbf52ed9300a83e19 commit 86fff0790dd62c7e91afbfecbf52ed9300a83e19 Author: Paul Zander <negril.nx+gentoo@gmail.com> AuthorDate: 2024-08-23 16:43:10 +0000 Commit: Sam James <sam@gentoo.org> CommitDate: 2024-08-25 15:43:06 +0000 media-libs/x265: add 3.5-r5, ebuild cleanup Clean up cruft and duplicate code. Split up patches so we can re-use them. Silently disable tests on x86, x32 and arm32. They never worked, have no deps and were failing before because the options was not visible. Closes: https://bugs.gentoo.org/728748 Closes: https://bugs.gentoo.org/937416 Closes: https://bugs.gentoo.org/937750 Closes: https://bugs.gentoo.org/937753 Signed-off-by: Paul Zander <negril.nx+gentoo@gmail.com> Signed-off-by: Sam James <sam@gentoo.org> media-libs/x265/files/test-ns.patch | 55 +++--- media-libs/x265/files/x265-3.5-r5-cpp-std.patch | 23 +++ media-libs/x265/files/x265-3.5-r5-gcc15.patch | 29 ++++ media-libs/x265/files/x265-3.5-r5-test-ns_2.patch | 11 ++ media-libs/x265/files/x265-9999-test-ns.patch | 157 +++++++++-------- media-libs/x265/metadata.xml | 1 - media-libs/x265/x265-3.5-r3.ebuild | 1 + media-libs/x265/x265-3.5-r4.ebuild | 1 + media-libs/x265/x265-3.5-r5.ebuild | 195 ++++++++++++++++++++++ media-libs/x265/x265-9999.ebuild | 195 ++++++++++------------ 10 files changed, 452 insertions(+), 216 deletions(-)
