Build with internal lua on Fedora 33 and newer

OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=23
This commit is contained in:
Andreas Schneider 2021-02-10 17:06:03 +00:00 committed by Git OBS Bridge
parent 2d452bf2b2
commit 29092a228d
2 changed files with 27 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 10 17:05:34 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>
- Build with internal lua on Fedora 33 and newer
-------------------------------------------------------------------
Mon Feb 8 06:41:57 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>

View File

@ -18,6 +18,24 @@
%bcond_with clang
%if 0%{?fedora_version} >= 33
%bcond_without use_intree_lua
%else
%bcond_with use_intree_lua
%endif
%if %{with use_intree_lua}
%define _dont_use_intree_lua OFF
%else
%define _dont_use_intree_lua ON
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 33
%bcond_without cmake_macros
%else
%bcond_with cmake_macros
%endif
%if 0%{?suse_version} || 0%{?fedora_version} >= 33
%bcond_without cmake_macros
%else
@ -268,7 +286,9 @@ rm -rf src/external/CL src/external/OpenCL
sed -i -e 's, \"external/CL/\*\.h\" , ,' src/CMakeLists.txt
# Remove bundled lua
%if %{without use_intree_lua}
rm -rf src/external/lua/
%endif
%build
%global cmake_options \\\
@ -300,7 +320,7 @@ export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print
#suse branch
%cmake \
-DCLANG_OPENCL_INCLUDE_DIR=${_OPENCL_INCLUDE_DIR} \
-DDONT_USE_INTERNAL_LUA=ON \
-DDONT_USE_INTERNAL_LUA=%{_dont_use_intree_lua} \
%ifarch aarch64
-DTESTBUILD_OPENCL_PROGRAMS=OFF \
%endif
@ -316,7 +336,7 @@ export _OPENCL_INCLUDE_DIR=$(clang -print-search-dirs | awk -F= '/^libra/ {print
mkdir %{_target_platform}
pushd %{_target_platform}
%cmake \
-DDONT_USE_INTERNAL_LUA=ON \
-DDONT_USE_INTERNAL_LUA=%{_dont_use_intree_lua} \
%ifarch aarch64
-DTESTBUILD_OPENCL_PROGRAMS=OFF \
%endif