mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-08-05 12:38:09 -07:00
media-libs/osl: Remove old (LLVM 8)
Signed-off-by: Michał Górny <mgorny@gentoo.org>
This commit is contained in:
Michał Górny
@@ -1,2 +1 @@
|
||||
DIST osl-1.10.10.tar.gz 13549066 BLAKE2B d91360d4cde0e8f70e01aa5cbf14bd6dc30be47ba96d4f2206adb75ef8f14af6af43b00f025cbf9b9c03cfcf117380ee9bb0a93129c314b249151cd97135757b SHA512 10371d9aefa786fefbae15cb9c71d7360bd903a36734840f7d0a960a615d48096b7170596bd934d10579b33d8f8398fc0e00471a10cd517c1a4a601169b2ca13
|
||||
DIST osl-1.10.5.tar.gz 13543151 BLAKE2B 3c67834d9ab6d4d725ecde622c402707593b9aaf25f1e94f9ed6b004c28fa9b7b90cfd0d320cb2898f77f8883ac14a71310abaf63a5b06704565c5a3bdea09b4 SHA512 d704b623836edca4c3fe9c18f33b8d76f4625036228fc977732c600e23e16da4cb4bf311607019b251d734b63a184bde0f7726f144ecd5bcd7866938d95bfdff
|
||||
|
||||
@@ -1,76 +0,0 @@
|
||||
From 9efdcfafcdfbb7666171b6016b725183a71fceb0 Mon Sep 17 00:00:00 2001
|
||||
From: Bernd Waibel <waebbl@gmail.com>
|
||||
Date: Tue, 25 Jun 2019 19:44:14 +0200
|
||||
Subject: [PATCH] src/cmake/modules/FindOpenEXR.cmake: patch to find openexr
|
||||
|
||||
This upstream patch (see
|
||||
https://github.com/imageworks/OpenShadingLanguage/pull/1022/files)
|
||||
uses pkg-config variables to get the correct versions for openexr
|
||||
on multilib installations.
|
||||
|
||||
Signed-off-by: Bernd Waibel <waebbl@gmail.com>
|
||||
---
|
||||
src/cmake/modules/FindOpenEXR.cmake | 20 +++++++++++++++-----
|
||||
1 file changed, 15 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/src/cmake/modules/FindOpenEXR.cmake b/src/cmake/modules/FindOpenEXR.cmake
|
||||
index 6c6b39c..4a9de4b 100644
|
||||
--- a/src/cmake/modules/FindOpenEXR.cmake
|
||||
+++ b/src/cmake/modules/FindOpenEXR.cmake
|
||||
@@ -25,8 +25,12 @@ endif ()
|
||||
# Attempt to find OpenEXR with pkgconfig
|
||||
find_package(PkgConfig)
|
||||
if (PKG_CONFIG_FOUND)
|
||||
- pkg_check_modules(_ILMBASE QUIET IlmBase>=2.0.0)
|
||||
- pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
|
||||
+ if (NOT ILMBASE_ROOT_DIR)
|
||||
+ pkg_check_modules(_ILMBASE QUIET QUIET IlmBase>=2.0.0)
|
||||
+ endif()
|
||||
+ if (NOT OPENEXR_ROOT_DIR)
|
||||
+ pkg_check_modules(_OPENEXR QUIET OpenEXR>=2.0.0)
|
||||
+ endif()
|
||||
endif (PKG_CONFIG_FOUND)
|
||||
|
||||
# List of likely places to find the headers -- note priority override of
|
||||
@@ -60,7 +64,11 @@ find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h
|
||||
find_path (OPENEXR_INCLUDE_PATH OpenEXR/OpenEXRConfig.h)
|
||||
|
||||
# Try to figure out version number
|
||||
-if (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
|
||||
+if (DEFINED _OPENEXR_VERSION AND NOT "${_OPENEXR_VERSION}" STREQUAL "")
|
||||
+ set (OPENEXR_VERSION "${_OPENEXR_VERSION}")
|
||||
+ string (REGEX REPLACE "([0-9]+)\\.[0-9\\.]+" "\\1" OPENEXR_VERSION_MAJOR "${_OPENEXR_VERSION}")
|
||||
+ string (REGEX REPLACE "[0-9]+\\.([0-9]+)(\\.[0-9]+)?" "\\1" OPENEXR_VERSION_MINOR "${_OPENEXR_VERSION}")
|
||||
+elseif (EXISTS "${OPENEXR_INCLUDE_PATH}/OpenEXR/ImfMultiPartInputFile.h")
|
||||
# Must be at least 2.0
|
||||
file(STRINGS "${OPENEXR_INCLUDE_PATH}/OpenEXR/OpenEXRConfig.h" TMP REGEX "^#define OPENEXR_VERSION_STRING .*$")
|
||||
string (REGEX MATCHALL "[0-9]+[.0-9]+" OPENEXR_VERSION ${TMP})
|
||||
@@ -93,6 +101,8 @@ set (GENERIC_LIBRARY_PATHS
|
||||
/opt/local/lib
|
||||
$ENV{PROGRAM_FILES}/OpenEXR/lib/static )
|
||||
|
||||
+# message (STATUS "Generic lib paths: ${GENERIC_LIBRARY_PATHS}")
|
||||
+
|
||||
# Handle request for static libs by altering CMAKE_FIND_LIBRARY_SUFFIXES.
|
||||
# We will restore it at the end of this file.
|
||||
set (_openexr_orig_suffixes ${CMAKE_FIND_LIBRARY_SUFFIXES})
|
||||
@@ -114,14 +124,14 @@ foreach (COMPONENT ${_openexr_components})
|
||||
# First try with the version embedded
|
||||
set (FULL_COMPONENT_NAME ${COMPONENT}-${OPENEXR_VERSION_MAJOR}_${OPENEXR_VERSION_MINOR})
|
||||
find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
|
||||
- PATHS ${OPENEXR_LIBRARY_DIR}
|
||||
+ PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
|
||||
${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
|
||||
# Again, with no directory restrictions
|
||||
find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
|
||||
# Try again without the version
|
||||
set (FULL_COMPONENT_NAME ${COMPONENT})
|
||||
find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME}
|
||||
- PATHS ${OPENEXR_LIBRARY_DIR}
|
||||
+ PATHS ${OPENEXR_LIBRARY_DIR} $ENV{OPENEXR_LIBRARY_DIR}
|
||||
${GENERIC_LIBRARY_PATHS} NO_DEFAULT_PATH)
|
||||
# One more time, with no restrictions
|
||||
find_library (OPENEXR_${UPPERCOMPONENT}_LIBRARY ${FULL_COMPONENT_NAME})
|
||||
--
|
||||
2.22.0
|
||||
|
||||
@@ -1,88 +0,0 @@
|
||||
# Copyright 1999-2020 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit cmake llvm toolchain-funcs
|
||||
|
||||
# check this on updates
|
||||
LLVM_MAX_SLOT=8
|
||||
|
||||
DESCRIPTION="Advanced shading language for production GI renderers"
|
||||
HOMEPAGE="http://opensource.imageworks.com/?p=osl"
|
||||
SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~x86"
|
||||
|
||||
X86_CPU_FEATURES=(
|
||||
sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
|
||||
avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
|
||||
)
|
||||
CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
|
||||
|
||||
IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
|
||||
|
||||
# >=clang-3.4 is needed, but at least llvm:5 if both are installed
|
||||
RDEPEND="
|
||||
>=dev-libs/boost-1.62:=
|
||||
dev-libs/pugixml
|
||||
>=media-libs/openexr-2.2.0:=
|
||||
>=media-libs/openimageio-1.8.5
|
||||
>=sys-devel/clang-5:=
|
||||
<sys-devel/clang-9:=
|
||||
sys-libs/zlib:=
|
||||
partio? ( media-libs/partio )
|
||||
qt5? (
|
||||
dev-qt/qtcore:5
|
||||
dev-qt/qtgui:5
|
||||
dev-qt/qtwidgets:5
|
||||
)
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}"
|
||||
BDEPEND="
|
||||
sys-devel/bison
|
||||
sys-devel/flex
|
||||
virtual/pkgconfig
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${P}-upstream-patch-to-find-openexr-version.patch"
|
||||
"${FILESDIR}/${P}-fix-install-shaders.patch"
|
||||
)
|
||||
|
||||
# Restricting tests as Make file handles them differently
|
||||
RESTRICT="test"
|
||||
|
||||
S="${WORKDIR}/OpenShadingLanguage-Release-${PV}"
|
||||
|
||||
llvm_check_deps() {
|
||||
has_version -r "sys-devel/clang:${LLVM_SLOT}"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local cpufeature
|
||||
local mysimd=()
|
||||
for cpufeature in "${CPU_FEATURES[@]}"; do
|
||||
use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
|
||||
done
|
||||
|
||||
# If no CPU SIMDs were used, completely disable them
|
||||
[[ -z ${mysimd} ]] && mysimd=("0")
|
||||
|
||||
local gcc=$(tc-getCC)
|
||||
# LLVM needs CPP11. Do not disable.
|
||||
local mycmakeargs=(
|
||||
-DENABLERTTI=OFF
|
||||
-DINSTALL_DOCS=$(usex doc)
|
||||
-DLLVM_STATIC=ON
|
||||
-DOSL_BUILD_TESTS=$(usex test)
|
||||
-DSTOP_ON_WARNING=OFF
|
||||
-DUSE_PARTIO=$(usex partio)
|
||||
-DUSE_QT=$(usex qt5)
|
||||
-DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
|
||||
)
|
||||
|
||||
cmake_src_configure
|
||||
}
|
||||
Reference in New Issue
Block a user