From 5c81ea554686aabce851c0a892dd006257a5642766218e9718b435ab9098a1dc Mon Sep 17 00:00:00 2001 From: Marcus Rueckert Date: Sat, 6 Feb 2021 16:01:42 +0000 Subject: [PATCH 1/6] also bump debian files OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=17 --- darktable.dsc | 2 +- debian.tar.xz | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/darktable.dsc b/darktable.dsc index 1835d67..b66200f 100644 --- a/darktable.dsc +++ b/darktable.dsc @@ -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), diff --git a/debian.tar.xz b/debian.tar.xz index 060f520..a6d879f 100644 --- a/debian.tar.xz +++ b/debian.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:696642826afeba7a6c73b91dbcc8277538ecd3ef85ea8a6a0c9e32c3f743dc0f -size 21076 +oid sha256:40f32369346ca50f12e8bd5bfe55cf7c626dcd3417a6b65e53739fd8337e800b +size 21088 From 27659555beabac6b78185e024c9608c7c27cf61ea81fa831ef0a8f30aa0bd8e3 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 8 Feb 2021 07:55:15 +0000 Subject: [PATCH 2/6] Use pkgconfig BuildRequires for more libraries OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=19 --- darktable.changes | 5 +++++ darktable.spec | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/darktable.changes b/darktable.changes index 7aea92d..44d24a2 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Feb 8 06:41:57 UTC 2021 - Andreas Schneider + +- Use pkgconfig BuildRequires for more libraries + ------------------------------------------------------------------- Thu Feb 4 14:29:34 UTC 2021 - Andreas Schneider diff --git a/darktable.spec b/darktable.spec index dabcc42..e1b7c93 100644 --- a/darktable.spec +++ b/darktable.spec @@ -136,11 +136,11 @@ 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 -BuildRequires: pugixml-devel +BuildRequires: pkgconfig(lua) +BuildRequires: pkgconfig(pugixml) # BuildRequires: pkgconfig BuildRequires: pkgconfig(GraphicsMagick) From ef06bfdce653d65c8820167890125b08718d3c4eabe2f8f28e7fcd24d2799134 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 8 Feb 2021 08:29:25 +0000 Subject: [PATCH 3/6] Fix pugixml on Fedora 31 OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=20 --- darktable.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/darktable.spec b/darktable.spec index e1b7c93..9f24d66 100644 --- a/darktable.spec +++ b/darktable.spec @@ -140,7 +140,11 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) # BuildRequires: pkgconfig(lua) +%if 0%{?fedora_version} == 31 +BuildRequires: pugixml-devel +%else BuildRequires: pkgconfig(pugixml) +%endif # BuildRequires: pkgconfig BuildRequires: pkgconfig(GraphicsMagick) From 6306008a0098b2ece7f7db3c1d06ec36ab839419fa926102df109caa3a09ccd2 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 8 Feb 2021 08:52:15 +0000 Subject: [PATCH 4/6] Pick lua53-devel on Tumbleweed OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=21 --- darktable.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/darktable.spec b/darktable.spec index 9f24d66..458f106 100644 --- a/darktable.spec +++ b/darktable.spec @@ -139,7 +139,11 @@ BuildRequires: libjpeg-devel BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) # +%if 0%{?opensuse_version} >= 1550 +BuildRequires: lua53-devel +%else BuildRequires: pkgconfig(lua) +%endif %if 0%{?fedora_version} == 31 BuildRequires: pugixml-devel %else From 2d452bf2b266303e8a3502cf5af68ce8e5fc9a6be3a1fb8a6c42d44df7214b22 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 8 Feb 2021 09:07:56 +0000 Subject: [PATCH 5/6] Fix suse version check OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=22 --- darktable.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/darktable.spec b/darktable.spec index 458f106..be34a2c 100644 --- a/darktable.spec +++ b/darktable.spec @@ -139,8 +139,8 @@ BuildRequires: libjpeg-devel BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) # -%if 0%{?opensuse_version} >= 1550 -BuildRequires: lua53-devel +%if 0%{?suse_version} >= 1550 +BuildRequires: pkgconfig(lua5.3) %else BuildRequires: pkgconfig(lua) %endif From 29092a228dca7cab1debc542df8dd3494a5acc81f29f071c6f0b4f4f5368452b Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Wed, 10 Feb 2021 17:06:03 +0000 Subject: [PATCH 6/6] Build with internal lua on Fedora 33 and newer OBS-URL: https://build.opensuse.org/package/show/graphics:darktable/darktable?expand=0&rev=23 --- darktable.changes | 5 +++++ darktable.spec | 24 ++++++++++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/darktable.changes b/darktable.changes index 44d24a2..6131763 100644 --- a/darktable.changes +++ b/darktable.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 10 17:05:34 UTC 2021 - Andreas Schneider + +- Build with internal lua on Fedora 33 and newer + ------------------------------------------------------------------- Mon Feb 8 06:41:57 UTC 2021 - Andreas Schneider diff --git a/darktable.spec b/darktable.spec index be34a2c..75e56f2 100644 --- a/darktable.spec +++ b/darktable.spec @@ -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