Appending /home/jer/git/gentoo to PORTDIR_OVERLAY... Forcing test. >>> Creating Manifest for /home/jer/git/gentoo/media-libs/libaom >>> Unpacking source... * Fetching https://aomedia.googlesource.com/aom ... git fetch https://aomedia.googlesource.com/aom +HEAD:refs/git-r3/HEAD remote: Counting objects: 1101, done remote: Finding sources: 100% (21/21) remote: Total 21 (delta 0), reused 19 (delta 0) Unpacking objects: 100% (21/21), done. From https://aomedia.googlesource.com/aom f14613eb2..598d11fdc -> refs/git-r3/HEAD git symbolic-ref refs/git-r3/media-libs/libaom/0/__main__ refs/git-r3/HEAD * Checking out https://aomedia.googlesource.com/aom to /home/jer/portage/media-libs/libaom-9999/work/libaom-9999 ... git checkout --quiet refs/git-r3/HEAD GIT update --> repository: https://aomedia.googlesource.com/aom updating from commit: f14613eb246a78d298c237dc87923d9042480351 to commit: 598d11fdceedaf362033cc24323d602117540ee7 av1/av1_dx_iface.c | 4 ++-- av1/common/onyxc_int.h | 8 ++++++-- av1/common/x86/cfl_ssse3.c | 82 +++++++++++++++++++++++++++++++++++++++++++--------------------------------------- 3 files changed, 51 insertions(+), 43 deletions(-) >>> Source unpacked in /home/jer/portage/media-libs/libaom-9999/work >>> Preparing source in /home/jer/portage/media-libs/libaom-9999/work/libaom-9999 ... * Applying libdirpc.patch ... 1 out of 2 hunks FAILED -- saving rejects to file build/cmake/pkg_config.cmake.rej [ !! ] * ERROR: media-libs/libaom-9999::gentoo failed (prepare phase): * patch -p1 failed with /home/jer/portage/media-libs/libaom-9999/files/libdirpc.patch * * Call stack: * ebuild.sh, line 124: Called src_prepare * environment, line 4063: Called cmake-utils_src_prepare * environment, line 1130: Called default_src_prepare * phase-functions.sh, line 923: Called __eapi6_src_prepare * environment, line 272: Called eapply '/home/jer/portage/media-libs/libaom-9999/files/libdirpc.patch' '/home/jer/portage/media-libs/libaom-9999/files/pthread_lib.patch' * environment, line 1350: Called _eapply_patch '/home/jer/portage/media-libs/libaom-9999/files/libdirpc.patch' * environment, line 1288: Called __helpers_die 'patch -p1 failed with /home/jer/portage/media-libs/libaom-9999/files/libdirpc.patch' * isolated-functions.sh, line 121: Called die * The specific snippet of code: * die "$@" * * If you need support, post the output of `emerge --info '=media-libs/libaom-9999::gentoo'`, * the complete build log and the output of `emerge -pqv '=media-libs/libaom-9999::gentoo'`. * The complete build log is located at '/aches/gentoo/emergelogs/wim/media-libs:libaom-9999:20180430-175049.log'. * For convenience, a symlink to the build log is located at '/home/jer/portage/media-libs/libaom-9999/temp/build.log'. * The ebuild environment file is located at '/home/jer/portage/media-libs/libaom-9999/temp/environment'. * Working directory: '/home/jer/portage/media-libs/libaom-9999/work/libaom-9999' * S: '/home/jer/portage/media-libs/libaom-9999/work/libaom-9999'
Created attachment 532300 [details, diff] libdirpc.patch
Created attachment 532302 [details, diff] pthread_lib.patch
Just some spacing changed in the source files. Adjusted the patches to apply again.
(In reply to Markus from comment #3) > Just some spacing changed in the source files. Adjusted the patches to apply > again. There were changes upstream again. Please whether the patches need to be adapted or deleted. https://aomedia.googlesource.com/aom/+/6791ad16ab772f9aa61062e18ea23928af465322%5E%21/ https://aomedia.googlesource.com/aom/+/7599afa575a20b6eb7889620499b7e49e0f093c0%5E%21/ https://aomedia.googlesource.com/aom/+log/refs/heads/master
ffmpeg-9999 now requires libaom>=1.0, which lead me to this bug. I copied the libaom-9999.ebuild to a local repo and commented out the PATCHES line. It built successfully, as did ffmpeg-999. It found and linked the libaom-av1 codec successfully. The two patch files seem to be concerned with fixing up the lib suffix, so whether they are safe to delete I cannot say. libaom installed itself in /usr/lib64, but pkg-config shows -L/usr/lib , so perhaps some changes are still needed there. I'm running ~amd64 on 17.0/desktop profile, so still have symlinked /lib, /usr/lib.
The bug has been closed via the following commit(s): https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8f01c6fb2a8d5a29eddde87cb2e09e1d66df333 commit b8f01c6fb2a8d5a29eddde87cb2e09e1d66df333 Author: Alexis Ballier <aballier@gentoo.org> AuthorDate: 2018-06-28 14:40:39 +0000 Commit: Alexis Ballier <aballier@gentoo.org> CommitDate: 2018-06-28 17:23:01 +0000 media-libs/libaom: update patches for live ebuild Closes: https://bugs.gentoo.org/654430 Package-Manager: Portage-2.3.41, Repoman-2.3.9 media-libs/libaom/files/libdirpc2.patch | 48 ++++++++++++++++++++++++++++++ media-libs/libaom/files/pthread_lib2.patch | 14 +++++++++ media-libs/libaom/libaom-9999.ebuild | 2 +- 3 files changed, 63 insertions(+), 1 deletion(-)
