diff --git a/0001-Fix-typo-in-the-.pc.in-files-that-botched-the-versio.patch b/0001-Fix-typo-in-the-.pc.in-files-that-botched-the-versio.patch deleted file mode 100644 index 88b18b0..0000000 --- a/0001-Fix-typo-in-the-.pc.in-files-that-botched-the-versio.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 38413a86dc8782048089077a07b2347bf430dc02 Mon Sep 17 00:00:00 2001 -From: Larry Gritz -Date: Sat, 9 May 2020 12:48:09 -0700 -Subject: [PATCH] Fix typo in the .pc.in files that botched the version (#1168) - -Signed-off-by: Larry Gritz ---- - src/build-scripts/oslcomp.pc.in | 2 +- - src/build-scripts/oslexec.pc.in | 2 +- - src/build-scripts/oslquery.pc.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/build-scripts/oslcomp.pc.in b/src/build-scripts/oslcomp.pc.in -index 00244fd1..63cf7a9f 100644 ---- a/src/build-scripts/oslcomp.pc.in -+++ b/src/build-scripts/oslcomp.pc.in -@@ -6,6 +6,6 @@ includedir=${prefix}/include - Name: oslcomp - Description: oslcomp Compile OSL shaders from source - URL: https://github.com/imageworks/OpenShadingLanguage --Version: @PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_PATCH@ -+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@ - Libs: -L${libdir} -loslcomp - Cflags: -I${includedir} -diff --git a/src/build-scripts/oslexec.pc.in b/src/build-scripts/oslexec.pc.in -index e29cf9a1..1ad264c2 100644 ---- a/src/build-scripts/oslexec.pc.in -+++ b/src/build-scripts/oslexec.pc.in -@@ -6,6 +6,6 @@ includedir=${prefix}/include - Name: oslexec - Description: oslexec Execute compiled OSL shaders - URL: https://github.com/imageworks/OpenShadingLanguage --Version: @PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_PATCH@ -+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@ - Libs: -L${libdir} -loslexec - Cflags: -I${includedir} -diff --git a/src/build-scripts/oslquery.pc.in b/src/build-scripts/oslquery.pc.in -index 060cd4c0..4da229b2 100644 ---- a/src/build-scripts/oslquery.pc.in -+++ b/src/build-scripts/oslquery.pc.in -@@ -6,6 +6,6 @@ includedir=${prefix}/include - Name: oslquery - Description: oslquery Query parameters of OSL compiled shaders - URL: https://github.com/imageworks/OpenShadingLanguage --Version: @PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_PATCH@ -+Version: @PROJECT_VERSION_MAJOR@.@PROJECT_VERSION_MINOR@.@PROJECT_VERSION_PATCH@ - Libs: -L${libdir} -loslquery - Cflags: -I${includedir} --- -2.26.2 - diff --git a/0001-LLVM-10-odds-and-ends-1135.patch b/0001-LLVM-10-odds-and-ends-1135.patch deleted file mode 100644 index d307bd0..0000000 --- a/0001-LLVM-10-odds-and-ends-1135.patch +++ /dev/null @@ -1,94 +0,0 @@ -From 2683cfdc41e66f7681c68a6f1b85e0a26fb00a86 Mon Sep 17 00:00:00 2001 -From: Larry Gritz -Date: Tue, 31 Mar 2020 08:21:01 -0700 -Subject: [PATCH] LLVM 10 odds and ends (#1135) - -* Use llvm 10 in some CI tests - -* build_llvm: New download location for llvm 10 - -* Build time check that LLVM 10+ requires C++ >= 14 ---- - .github/workflows/workflow.yml | 22 ++++++++++++++++++++-- - src/build-scripts/build_llvm.bash | 7 ++++++- - src/cmake/externalpackages.cmake | 5 ++++- - 3 files changed, 30 insertions(+), 4 deletions(-) - -diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml -index b331fca9..4ef8a2ee 100644 ---- a/.github/workflows/workflow.yml -+++ b/.github/workflows/workflow.yml -@@ -111,8 +111,26 @@ jobs: - source src/build-scripts/gh-installdeps.bash - source src/build-scripts/ci-build-and-test.bash - -+ linux-2021ish-gcc8-llvm9: -+ name: "Linux gcc8, C++17, llvm10, oiio master, avx2, exr2.4" -+ runs-on: ubuntu-18.04 -+ steps: -+ - uses: actions/checkout@v1 -+ - name: all -+ env: -+ CXX: g++-8 -+ CMAKE_CXX_STANDARD: 17 -+ LLVM_VERSION: 10.0.0 -+ USE_SIMD: avx2,f16c -+ OPENEXR_VERSION: 2.4.0 -+ OPENIMAGEIO_BRANCH: master -+ run: | -+ source src/build-scripts/ci-startup.bash -+ source src/build-scripts/gh-installdeps.bash -+ source src/build-scripts/ci-build-and-test.bash -+ - linux-bleeding: -- name: "Linux bleeding edge: gcc8, C++17, llvm9, oiio master, avx2, exr2.4" -+ name: "Linux bleeding edge: gcc8, C++17, llvm10, oiio master, avx2, exr2.4" - runs-on: ubuntu-18.04 - steps: - - uses: actions/checkout@v1 -@@ -121,7 +139,7 @@ jobs: - CXX: g++-8 - USE_CPP: 17 - CMAKE_CXX_STANDARD: 17 -- LLVM_VERSION: 9.0.0 -+ LLVM_VERSION: 10.0.0 - USE_SIMD: avx2,f16c - OPENEXR_VERSION: 2.4.0 - OPENIMAGEIO_BRANCH: master -diff --git a/src/build-scripts/build_llvm.bash b/src/build-scripts/build_llvm.bash -index b0fdf591..3b25b64e 100755 ---- a/src/build-scripts/build_llvm.bash -+++ b/src/build-scripts/build_llvm.bash -@@ -24,7 +24,12 @@ if [[ `uname` == "Linux" ]] ; then - LLVMTAR=clang+llvm-${LLVM_VERSION}-x86_64-linux-gnu-${LLVM_DISTRO_NAME}.tar.xz - fi - echo LLVMTAR = $LLVMTAR -- curl --location http://releases.llvm.org/${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR -+ if [ "$LLVM_VERSION" == "10.0.0" ] ; then -+ # new -+ curl --location https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR -+ else -+ curl --location http://releases.llvm.org/${LLVM_VERSION}/${LLVMTAR} -o $LLVMTAR -+ fi - ls -l $LLVMTAR - tar xf $LLVMTAR - rm -f $LLVMTAR -diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake -index 5afb9664..62f9b7fd 100644 ---- a/src/cmake/externalpackages.cmake -+++ b/src/cmake/externalpackages.cmake -@@ -223,7 +223,10 @@ add_definitions (-DOSL_LLVM_FULL_VERSION="${LLVM_VERSION}") - if (LLVM_NAMESPACE) - add_definitions ("-DLLVM_NAMESPACE=${LLVM_NAMESPACE}") - endif () -- -+if (LLVM_VERSION VERSION_GREATER_EQUAL 10.0.0 AND -+ CMAKE_CXX_STANDARD VERSION_LESS 14) -+ message (FATAL_ERROR "LLVM 10+ requires C++14 or higher.") -+endif () - - checked_find_package (partio) - --- -2.16.4 - diff --git a/0001-Some-SPI-build-fixes-for-finding-the-right-llvm.patch b/0001-Some-SPI-build-fixes-for-finding-the-right-llvm.patch deleted file mode 100644 index 06bb1dc..0000000 --- a/0001-Some-SPI-build-fixes-for-finding-the-right-llvm.patch +++ /dev/null @@ -1,133 +0,0 @@ -From ca90dc60c0f6473ff99fa0b396af4d434862bc1b Mon Sep 17 00:00:00 2001 -From: Larry Gritz -Date: Mon, 30 Mar 2020 21:05:24 -0700 -Subject: [PATCH] Some SPI build fixes for finding the right llvm - ---- - site/spi/Makefile-bits | 63 ++++++++++++++++++++++++++++++++------------------ - 1 file changed, 41 insertions(+), 22 deletions(-) - -diff --git a/site/spi/Makefile-bits b/site/spi/Makefile-bits -index 4b148191..15eeca0e 100644 ---- a/site/spi/Makefile-bits -+++ b/site/spi/Makefile-bits -@@ -66,11 +66,13 @@ endif - ifeq (${SP_OS}, rhel7) - # Rhel7 (current) - platform := rhel7 -- SPI_COMPILER_PLATFORM ?= gcc-4.8 -- ifeq (${SPI_COMPILER_PLATFORM},gcc-6.3) -- SPCOMP2_COMPILER ?= gcc63 -- else -+ SPI_COMPILER_PLATFORM ?= gcc-6.3 -+ ifeq (${SPI_COMPILER_PLATFORM},gcc-4.8) - SPCOMP2_COMPILER ?= gcc48m64 -+ CMAKE_CXX_STANDARD ?= 11 -+ else -+ SPCOMP2_COMPILER ?= gcc63 -+ CMAKE_CXX_STANDARD ?= 14 - endif - SP_PLATFORM ?= linux - SP_PROC ?= x86_64 -@@ -100,7 +102,6 @@ SPCOMP2_ROOT ?= /shots/spi/home/lib/SpComp2 - - ## Rhel7 (current) - ifeq (${SP_OS}, rhel7) -- CMAKE_CXX_STANDARD ?= 11 - USE_SIMD ?= sse4.1,aes - CMAKE ?= cmake - USE_NINJA ?= 1 -@@ -128,23 +129,22 @@ ifeq (${SP_OS}, rhel7) - LLVM_DIRECTORY ?= /shots/spi/home/lib/arnold/rhel7/llvm_8.0.0 - ifeq (${COMPILER},clang6) - LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_6.0.1 -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" -+ MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \ -+ -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ - else ifeq (${COMPILER},clang7) - LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_7.0.1 -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" -+ MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \ -+ -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ - else ifeq (${COMPILER},clang8) - LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_8.0.0 -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" -+ MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \ -+ -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ - else ifeq (${COMPILER},clang9) -- LLVM_DIRECTORY := /shots/spi/home/software/packages/llvm/9.0.0/${SPI_COMPILER_PLATFORM} -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" -+ LLVM_DIRECTORY := /shots/spi/home/software/packages/llvm/9.0.1-1/${SPI_COMPILER_PLATFORM} -+ MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \ -+ -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ - else ifeq (${COMPILER},clang) - MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" - else ifeq (${COMPILER}, gcc6) - MY_CMAKE_FLAGS += \ - -DCMAKE_C_COMPILER=/opt/rh/devtoolset-6/root/usr/bin/gcc \ -@@ -156,9 +156,11 @@ ifeq (${SP_OS}, rhel7) - MY_CMAKE_FLAGS += \ - -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang \ - -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++ -- MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" \ -- -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" \ -- -DTOOLCHAIN_FLAGS="--gcc-toolchain=/usr" -+ endif -+ ifeq (${SPI_COMPILER_PLATFORM},gcc-4.8) -+ MY_CMAKE_FLAGS += -DCMAKE_C_FLAGS="--gcc-toolchain=/usr" \ -+ -DCMAKE_CXX_FLAGS="--gcc-toolchain=/usr" \ -+ -DTOOLCHAIN_FLAGS="--gcc-toolchain=/usr" - endif - - MY_CMAKE_FLAGS += -@@ -292,6 +294,7 @@ ifeq (${SP_OS}, rhel7) - - ## Generic OSX machines (including LG's laptop) - else ifeq (${platform}, macosx) -+ CMAKE_CXX_STANDARD ?= 14 - USE_SIMD ?= sse4.2 - MY_CMAKE_FLAGS += -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 - MY_CMAKE_FLAGS += -DCMAKE_INSTALL_NAME_DIR="${working_dir}/dist/${platform}${variant}/lib" -@@ -317,14 +320,30 @@ else ifeq (${platform}, macosx) - MY_CMAKE_FLAGS += \ - -DCMAKE_C_COMPILER=gcc-8 -DCMAKE_CXX_COMPILER=g++-8 - USE_LIBCPLUSPLUS := 0 -+ else ifeq (${COMPILER}, gcc9) -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=gcc-9 -DCMAKE_CXX_COMPILER=g++-9 -+ USE_LIBCPLUSPLUS := 0 - else ifeq (${COMPILER},clang6) -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@6/6.0.1_1/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm@6/6.0.1_1/bin/clang++ -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@6/6.0.1_2/bin/clang \ -+ -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm@6/6.0.1_2/bin/clang++ - else ifeq (${COMPILER},clang7) -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@7/7.0.1/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm@7/7.0.1/bin/clang++ -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@7/7.0.1_1/bin/clang \ -+ -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm@7/7.0.1_1/bin/clang++ - else ifeq (${COMPILER},clang8) -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm/8.0.1/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm/8.0.1/bin/clang++ -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@8/8.0.1_1/bin/clang \ -+ -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm/8.0.1/bin/clang++ - else ifeq (${COMPILER},clang9) -- MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm/9.0.0/bin/clang -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm/9.0.0/bin/clang++ -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm@9/9.0.1/bin/clang \ -+ -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm@9/9.0.1/bin/clang++ -+ else ifeq (${COMPILER},clang10) -+ MY_CMAKE_FLAGS += \ -+ -DCMAKE_C_COMPILER=/usr/local/Cellar/llvm/10.0.0/bin/clang \ -+ -DCMAKE_CXX_COMPILER=/usr/local/Cellar/llvm/10.0.0/bin/clang++ - else ifeq (${COMPILER},clang) - MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ - else ifeq (${COMPILER},gcc) --- -2.16.4 - diff --git a/0001-Use-single-shared-clang-cpp-library-starting-with-LL.patch b/0001-Use-single-shared-clang-cpp-library-starting-with-LL.patch deleted file mode 100644 index b91ce4c..0000000 --- a/0001-Use-single-shared-clang-cpp-library-starting-with-LL.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 891061d02a71ce1a5aad6807063b69f8e38e174a Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Stefan=20Br=C3=BCns?= -Date: Wed, 13 May 2020 20:23:49 +0200 -Subject: [PATCH] Use single shared clang-cpp library starting with LLVM 9 - -Since 9.0 LLVM defaults to building a single clang-cpp library for -non-developer builds. - -As this is just the default, and some distributions enable it only with -LLVM 10 (e.g. Fedora), make the clang-cpp search dependent on the build -mode. ---- - src/cmake/modules/FindLLVM.cmake | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/src/cmake/modules/FindLLVM.cmake b/src/cmake/modules/FindLLVM.cmake -index 8b17ad8e..21a87f38 100644 ---- a/src/cmake/modules/FindLLVM.cmake -+++ b/src/cmake/modules/FindLLVM.cmake -@@ -79,6 +79,18 @@ if (NOT LLVM_LIBRARY) - set (LLVM_LIBRARY "${LLVM_LIBRARIES}") - endif () - -+execute_process (COMMAND ${LLVM_CONFIG} --shared-mode -+ OUTPUT_VARIABLE LLVM_SHARED_MODE -+ OUTPUT_STRIP_TRAILING_WHITESPACE) -+if (LLVM_VERSION VERSION_GREATER_EQUAL 9.0 AND (LLVM_SHARED_MODE STREQUAL "shared")) -+ find_library ( _CLANG_CPP_LIBRARY -+ NAMES "clang-cpp" -+ PATHS ${LLVM_LIB_DIR}) -+ if (_CLANG_CPP_LIBRARY) -+ list (APPEND CLANG_LIBRARIES ${_CLANG_CPP_LIBRARY}) -+ endif () -+endif () -+ - foreach (COMPONENT clangFrontend clangDriver clangSerialization - clangParse clangSema clangAnalysis clangAST clangBasic - clangEdit clangLex) --- -2.26.2 - diff --git a/legalcode.txt b/CC-BY-3.0.txt similarity index 100% rename from legalcode.txt rename to CC-BY-3.0.txt diff --git a/OpenShadingLanguage-Release-1.11.4.1.tar.gz b/OpenShadingLanguage-Release-1.11.4.1.tar.gz deleted file mode 100644 index 8b2e6c1..0000000 --- a/OpenShadingLanguage-Release-1.11.4.1.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8d8f2a1544f537f5ff3fc033195e023546c51dadd700849ed5aaaf0cf5fb24dd -size 15083497 diff --git a/OpenShadingLanguage-Release-1.11.6.0.tar.gz b/OpenShadingLanguage-Release-1.11.6.0.tar.gz new file mode 100644 index 0000000..a47f19b --- /dev/null +++ b/OpenShadingLanguage-Release-1.11.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:36d942fea5ef64ad2ecc421e7d2e1191fae5af4ce1e81f7937bfe759d6788259 +size 14109747 diff --git a/OpenShadingLanguage.changes b/OpenShadingLanguage.changes index 8c336f8..4673585 100644 --- a/OpenShadingLanguage.changes +++ b/OpenShadingLanguage.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Jul 5 17:41:36 UTC 2020 - Stefan Brüns + +- Update to v1.11.6.0, see included CHANGES.md or + https://github.com/imageworks/OpenShadingLanguage/blob/Release-1.11.6.0-dev/CHANGES.md +- Drop obsolete patches: + + 0001-Fix-typo-in-the-.pc.in-files-that-botched-the-versio.patch + + 0001-LLVM-10-odds-and-ends-1135.patch + + 0001-Some-SPI-build-fixes-for-finding-the-right-llvm.patch + + 0001-Use-single-shared-clang-cpp-library-starting-with-LL.patch +- Renamed legalcode.txt to CC-BY-3.0.txt + ------------------------------------------------------------------- Wed May 13 19:11:41 UTC 2020 - Stefan Brüns diff --git a/OpenShadingLanguage.spec b/OpenShadingLanguage.spec index 34f8fd5..c0e9fbf 100644 --- a/OpenShadingLanguage.spec +++ b/OpenShadingLanguage.spec @@ -23,22 +23,14 @@ %define oiio_major_minor_ver %(rpm -q --queryformat='%%{version}' OpenImageIO-devel | cut -d . -f 1-2) Name: OpenShadingLanguage -Version: 1.11.4.1 +Version: 1.11.6.0 Release: 0 Summary: A language for programmable shading License: BSD-3-Clause Group: Productivity/Graphics/Other URL: https://github.com/imageworks/OpenShadingLanguage Source0: https://github.com/imageworks/OpenShadingLanguage/archive/Release-%{version}-dev.tar.gz#/%{name}-Release-%{version}.tar.gz -Source1: https://creativecommons.org/licenses/by/3.0/legalcode.txt -# PATCH-FIX-UPSTREAM -Patch0: 0001-LLVM-10-odds-and-ends-1135.patch -# PATCH-FIX-UPSTREAM -Patch1: 0001-Some-SPI-build-fixes-for-finding-the-right-llvm.patch -# PATCH-FIX-UPSTREAM -Patch2: 0001-Fix-typo-in-the-.pc.in-files-that-botched-the-versio.patch -# PATCH-FIX-UPSTREAM - https://github.com/imageworks/OpenShadingLanguage/pull/1171 -Patch3: 0001-Use-single-shared-clang-cpp-library-starting-with-LL.patch +Source1: https://creativecommons.org/licenses/by/3.0/legalcode.txt#/CC-BY-3.0.txt BuildRequires: OpenEXR-devel BuildRequires: bison BuildRequires: clang-devel >= 7 @@ -198,13 +190,13 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-Release-%{version}-dev -%autopatch -p1 find . -iname CMakeLists.txt -exec sed "-i" "-e s/COMMAND python/COMMAND python3/" "{}" \; %build %cmake \ -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \ -DOSL_SHADER_INSTALL_DIR:PATH=%{_datadir}/%{name}/shaders/ \ + -DOSL_BUILD_MATERIALX:BOOL=ON \ -DCMAKE_CXX_STANDARD:STRING=14 %cmake_build @@ -240,7 +232,7 @@ find %{buildroot} -name CHANGES.md -print -delete %{_bindir}/* %files doc -%license legalcode.txt +%license CC-BY-3.0.txt %doc %{_docdir}/%{name}/ %files MaterialX-shaders-source