[gentoo-commits] repo/gentoo:master commit in: media-libs/x265/

[Ionen Wolkens]

commit:     d41450c586971bf48a4a8cdf04e057b7af77066d
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 25 03:24:56 2021 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Sep 25 03:41:02 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d41450c5

media-libs/x265: quickfix for missing lib and .pc if no git(1)

-DGIT_ARCHETYPE is not a real option but something the Version.cmake
would hard set(...) and overwrite, however if dev-vcs/git is not
found it skips that entirely.

i.e. if GIT_FOUND then use .git if found, else use .txt version.

Setting this tells it to use the latter if missing, if found then
doing so does nothing given cmake will overwrite it.

If no version/tag, the source/CMakeLists.txt acts on this comment:

    "# shared library is not installed if a tag is not found"

Closes: https://bugs.gentoo.org/812398
Closes: https://bugs.gentoo.org/814116
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 media-libs/x265/{x265-9999.ebuild => x265-3.5-r1.ebuild} | 1 +
 media-libs/x265/x265-9999.ebuild                         | 1 +
 2 files changed, 2 insertions(+)

diff --git a/media-libs/x265/x265-9999.ebuild 
b/media-libs/x265/x265-3.5-r1.ebuild
similarity index 99%
copy from media-libs/x265/x265-9999.ebuild
copy to media-libs/x265/x265-3.5-r1.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-3.5-r1.ebuild
@@ -161,6 +161,7 @@ multilib_src_configure() {
                $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
                -DENABLE_PIC=ON
                -DENABLE_LIBNUMA=$(usex numa ON OFF)
+               -DGIT_ARCHETYPE=1 #814116
                -DLIB_INSTALL_DIR="$(get_libdir)"
        )
 

diff --git a/media-libs/x265/x265-9999.ebuild b/media-libs/x265/x265-9999.ebuild
index e956de4eab0..3e0116c5da0 100644
--- a/media-libs/x265/x265-9999.ebuild
+++ b/media-libs/x265/x265-9999.ebuild
@@ -161,6 +161,7 @@ multilib_src_configure() {
                $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
                -DENABLE_PIC=ON
                -DENABLE_LIBNUMA=$(usex numa ON OFF)
+               -DGIT_ARCHETYPE=1 #814116
                -DLIB_INSTALL_DIR="$(get_libdir)"
        )