From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A1F591382C5 for ; Mon, 7 Jun 2021 17:26:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F0761E08A8; Mon, 7 Jun 2021 17:26:12 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AB825E08A8 for ; Mon, 7 Jun 2021 17:26:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B1F15335D97 for ; Mon, 7 Jun 2021 17:26:10 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD8837A6 for ; Mon, 7 Jun 2021 17:26:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1623086742.3533aee04be15a96cc9c0f783e3e94a9c217b430.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/opencolorio/files/, media-libs/opencolorio/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch media-libs/opencolorio/opencolorio-1.1.1.ebuild X-VCS-Directories: media-libs/opencolorio/files/ media-libs/opencolorio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3533aee04be15a96cc9c0f783e3e94a9c217b430 X-VCS-Branch: master Date: Mon, 7 Jun 2021 17:26:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1bd228cf-7aaf-42f2-89f0-86bedb8b151a X-Archives-Hash: e438101ec76c420dd0e75b82131b0b49 commit: 3533aee04be15a96cc9c0f783e3e94a9c217b430 Author: Bernd Waibel posteo net> AuthorDate: Sun Jun 6 18:55:46 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Jun 7 17:25:42 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3533aee0 media-libs/opencolorio: respect python sitedir Pass certain variables to cmake and add a patch to respect the python site-packages dir. Closes: https://bugs.gentoo.org/794604 Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/21143 Signed-off-by: Sam James gentoo.org> ...ecific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch | 38 ++++++++++++++++++++++ media-libs/opencolorio/opencolorio-1.1.1.ebuild | 8 +++++ 2 files changed, 46 insertions(+) diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch new file mode 100644 index 00000000000..0f0fb4e649d --- /dev/null +++ b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch @@ -0,0 +1,38 @@ +From 80c08e5bee5bd9fc37a6aeff4b7b7bb8edb3c831 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sun, 6 Jun 2021 20:42:48 +0200 +Subject: [PATCH] [Gentoo specific]OCIOMacros.cmake: remove LIB_SUFFIX + +We don't use LIB_SUFFIX for python's site-packages dir, so remove it +from the PYTHON_VARIANT_PATH to ensure, python modules are installed +to the correct location. + +Signed-off-by: Bernd Waibel +--- + share/cmake/OCIOMacros.cmake | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/share/cmake/OCIOMacros.cmake b/share/cmake/OCIOMacros.cmake +index b9fb239..0ce9e62 100644 +--- a/share/cmake/OCIOMacros.cmake ++++ b/share/cmake/OCIOMacros.cmake +@@ -241,14 +241,14 @@ MACRO(OCIOFindPython) + if(WIN32) + set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/${PYTHON_UCS}/site-packages") + else() +- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages") ++ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages") + endif() + else() + # Ignore UCS value and install into lib/python2.6/site-packages dir + if(WIN32) + set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/site-packages") + else() +- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages") ++ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/site-packages") + endif() + endif() + +-- +2.31.1 + diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild index 8d00c38a853..8fb845a03b7 100644 --- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild +++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild @@ -54,6 +54,7 @@ PATCHES=( "${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch" "${FILESDIR}/${P}-fix-self-assign-clang.patch" "${FILESDIR}/${P}-no-werror.patch" + "${FILESDIR}/${P}-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch" ) pkg_setup() { @@ -90,6 +91,13 @@ src_configure() { -DOCIO_BUILD_TESTS=$(usex test) ) + if use python; then + mycmakeargs+=( + -DPYTHON=${PYTHON} + -DPYTHON_LIBRARY=$(python_get_library_path) + ) + fi + use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken cmake_src_configure }