pool/darktable
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 873201 from graphics:darktable

Browse Source 
Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/873201
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/darktable?expand=0&rev=94
This commit is contained in:
Dominique Leuenberger 2021-02-18 19:40:38 +00:00 committed by Git OBS Bridge
commit ee5ad9f03e
4 changed files with 46 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
darktable.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
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>
- Use pkgconfig BuildRequires for more libraries
-------------------------------------------------------------------
Thu Feb 4 14:29:34 UTC 2021 - Andreas Schneider <asn@cryptomilk.org>

2
darktable.dsc
View File

@ -4,7 +4,7 @@ Section: graphics
Priority: optional
Binary: darktable darktable-tools-basecurve darktable-tools-noise
Architecture: any-amd64 any-arm64
Version: 3.4.0-1.1
Version: 3.4.1-1.1
Homepage: http://www.darktable.org/
Build-Depends: cmake,
debhelper (>= 10),

38
darktable.spec
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
@ -136,11 +154,19 @@ BuildRequires: xz
# libraries deps
BuildRequires: cups-devel
BuildRequires: libjpeg-devel
BuildRequires: libtiff-devel
BuildRequires: libxml2-devel
BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libxml-2.0)
#
BuildRequires: lua-devel >= 5.3
%if 0%{?suse_version} >= 1550
BuildRequires: pkgconfig(lua5.3)
%else
BuildRequires: pkgconfig(lua)
%endif
%if 0%{?fedora_version} == 31
BuildRequires: pugixml-devel
%else
BuildRequires: pkgconfig(pugixml)
%endif
#
BuildRequires: pkgconfig
BuildRequires: pkgconfig(GraphicsMagick)
@ -260,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 \\\
@ -292,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
@ -308,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

4
debian.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:696642826afeba7a6c73b91dbcc8277538ecd3ef85ea8a6a0c9e32c3f743dc0f
size 21076
oid sha256:40f32369346ca50f12e8bd5bfe55cf7c626dcd3417a6b65e53739fd8337e800b
size 21088