Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package darktable for openSUSE:Factory checked in at 2022-01-15 20:05:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/darktable (Old) and /work/SRC/openSUSE:Factory/.darktable.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "darktable" Sat Jan 15 20:05:22 2022 rev:97 rq:946655 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/darktable/darktable.changes 2021-09-20 23:34:18.907259705 +0200 +++ /work/SRC/openSUSE:Factory/.darktable.new.1892/darktable.changes 2022-01-15 20:05:41.353781896 +0100 @@ -1,0 +2,31 @@ +Sat Jan 8 15:46:14 UTC 2022 - Marcus Rueckert <[email protected]> + +- Fix the previous change: + bcond_* is hard + +------------------------------------------------------------------- +Mon Jan 3 07:38:51 UTC 2022 - Andreas Schneider <[email protected]> + +- Build with intree lua for openSUSE Leap versions + +------------------------------------------------------------------- +Fri Dec 31 23:23:43 UTC 2021 - Marcus Rueckert <[email protected]> + +- add SDL2 BR + +------------------------------------------------------------------- +Fri Dec 24 21:47:56 UTC 2021 - Andreas Schneider <[email protected]> + +- Add https://github.com/darktable-org/darktable/pull/10678.patch + to fix build on aarch64 + +------------------------------------------------------------------- +Fri Dec 24 17:10:20 UTC 2021 - Andreas Schneider <[email protected]> + +- Update to version 3.8.0 + https://www.darktable.org/2021/12/darktable-3.8.0-released/ + https://www.darktable.org/2021/12/darktable-3-8/ +- drop the darktable-docs package with the pdf docs + get them from https://www.darktable.org/resources/ + +------------------------------------------------------------------- Old: ---- darktable-3.6.1.tar.xz darktable-3.6.1.tar.xz.asc darktable-lua-api.pdf darktable_user_manual.pdf New: ---- 10678.patch darktable-3.8.0.tar.xz darktable-3.8.0.tar.xz.asc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ darktable.spec ++++++ --- /var/tmp/diff_new_pack.9ZOO8k/_old 2022-01-15 20:05:42.169782533 +0100 +++ /var/tmp/diff_new_pack.9ZOO8k/_new 2022-01-15 20:05:42.173782535 +0100 @@ -1,7 +1,7 @@ # # spec file for package darktable # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,10 +18,10 @@ %bcond_with clang -%if 0%{?fedora_version} >= 33 -%bcond_without use_intree_lua -%else +%if 0%{?fedora_version} >= 33 || 0%{?suse_version} >= 1590 %bcond_with use_intree_lua +%else +%bcond_without use_intree_lua %endif %if %{with use_intree_lua} @@ -99,11 +99,11 @@ %endif %if 0%{?suse_version} && 0%{?suse_version} < 1550 -%define force_gcc_version 7 +%global force_gcc_version 7 %endif Name: darktable -Version: 3.6.1 +Version: 3.8.0 Release: 0 %define pkg_name darktable %define pkg_version %{version} @@ -112,15 +112,12 @@ Source1: https://github.com/darktable-org/darktable/releases/download/release-%{version}/%{pkg_name}-%{version}.tar.xz.asc Source2: %{pkg_name}-rpmlintrc # -Source10: https://darktable-org.github.io/dtdocs/darktable_user_manual.pdf -# This is not online yet? -Source14: darktable-lua-api.pdf -# Source97: darktable.dsc Source98: debian.tar.xz Source99: README.openSUSE # Patch0: darktable-old-glib.patch +Patch1: https://github.com/darktable-org/darktable/pull/10678.patch # ExclusiveArch: x86_64 aarch64 ppc64le # build time tools @@ -155,7 +152,7 @@ BuildRequires: pkgconfig(libxml-2.0) # %if 0%{?suse_version} >= 1550 -BuildRequires: pkgconfig(lua5.3) +BuildRequires: pkgconfig(lua5.4) %else BuildRequires: pkgconfig(lua) %endif @@ -193,6 +190,7 @@ BuildRequires: pkgconfig(osmgpsmap-1.0) %endif BuildRequires: pkgconfig(pango) +BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(sqlite3) %if %{with opencl} BuildRequires: opencl-headers @@ -208,6 +206,7 @@ %if %{with avif} BuildRequires: libavif-devel %endif +BuildRequires: portmidi-devel # for the sake of simplicity we do not enforce the version here # the package is small enough that installing it doesnt hurt @@ -224,6 +223,7 @@ Summary: A virtual Lighttable and Darkroom License: GPL-3.0-or-later Group: Productivity/Graphics/Viewers +Obsoletes: darktable-docs < %{version}-%{release} %description darktable is a virtual lighttable and darkroom for photographers: it manages @@ -260,18 +260,6 @@ This package provides the noise profiling tools to add support for new cameras. -%package doc -Summary: Documentation for Darktable -Group: Documentation/Other -BuildArch: noarch - -%description doc -darktable is a virtual lighttable and darkroom for photographers: it manages -digital negatives in a database and can show them through a zoomable -lighttable. It also enables developing raw images and enhance them. - -This package provides the user manual in PDF format. - %prep %autosetup -p1 -n %{pkg_name}-%{version} @@ -281,8 +269,8 @@ 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} +# Remove bundled lua rm -rf src/external/lua/ %endif @@ -358,8 +346,6 @@ %find_lang darktable -cp -av %{SOURCE10} %{SOURCE14} \ - %{buildroot}%{_defaultdocdir}/%{pkg_name} rm %{buildroot}%{_defaultdocdir}/%{pkg_name}/LICENSE %fdupes %{buildroot}/%{_prefix} @@ -382,7 +368,6 @@ %files -f darktable.lang %doc %{_defaultdocdir}/%{pkg_name} %license LICENSE -%exclude %{_defaultdocdir}/%{pkg_name}/*.pdf %exclude %{_defaultdocdir}/%{pkg_name}/README.tools.basecurve.md %{_bindir}/darktable %if %{with opencl} @@ -419,7 +404,4 @@ %{_libexecdir}/darktable/tools/profiling-shot.xmp %{_libexecdir}/darktable/tools/subr.sh -%files doc -%{_defaultdocdir}/%{pkg_name}/*.pdf - %changelog ++++++ 10678.patch ++++++ >From 8c89be79f64883e4551db5aa51726b21a62a07e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hubert=20Figui=C3=A8re?= <[email protected]> Date: Fri, 24 Dec 2021 15:42:17 -0500 Subject: [PATCH] __DT_CLONE_TARGETS__ was undefined on aarch64 - it's probably broken on armv7 too and other non intel arch --- src/common/darktable.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/common/darktable.h b/src/common/darktable.h index b841bf2bc15..aad6169f8b6 100644 --- a/src/common/darktable.h +++ b/src/common/darktable.h @@ -133,6 +133,8 @@ typedef unsigned int u_int; # elif defined(__PPC64__) /* __PPC64__ is the only macro tested for in is_supported_platform.h, other macros would fail there anyway. */ #define __DT_CLONE_TARGETS__ __attribute__((target_clones("default","cpu=power9"))) +# else +#define __DT_CLONE_TARGETS__ # endif #else #define __DT_CLONE_TARGETS__ ++++++ darktable-3.6.1.tar.xz -> darktable-3.8.0.tar.xz ++++++ ++++ 666021 lines of diff (skipped) ++++++ darktable.dsc ++++++ --- /var/tmp/diff_new_pack.9ZOO8k/_old 2022-01-15 20:05:44.133784063 +0100 +++ /var/tmp/diff_new_pack.9ZOO8k/_new 2022-01-15 20:05:44.137784066 +0100 @@ -4,8 +4,9 @@ Priority: optional Binary: darktable darktable-tools-basecurve darktable-tools-noise Architecture: any-amd64 any-arm64 -Version: 3.6.0-1.1 +Version: 3.8.0-1.1 Homepage: http://www.darktable.org/ +# libavif-dev (>= 0.8.2), Build-Depends: cmake, debhelper (>= 10), intltool, @@ -18,21 +19,27 @@ libexiv2-dev, libflickcurl-dev, libglib2.0-dev, + clang (>= 10), + libclang-dev (>= 10), + llvm-dev (>= 10), libgmic-dev, libgphoto2-dev, libgraphicsmagick1-dev, libgtk-3-dev (>= 3.22), + libheif-dev, libjpeg-dev, libjson-glib-dev, liblcms2-dev, liblensfun-dev, - liblua5.3-dev, + liblua5.4-dev | liblua5.3-dev, libopenexr-dev, libopenjp2-7-dev, libosmgpsmap-1.0-dev, libpng-dev, + libportmidi-dev, libpugixml-dev, librsvg2-dev, + libsdl2-dev, libsecret-1-dev, libsoup2.4-dev, libsqlite3-dev, ++++++ debian.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/changelog new/debian/changelog --- old/debian/changelog 2021-09-10 23:57:06.021559698 +0200 +++ new/debian/changelog 2021-12-24 22:50:22.539549451 +0100 @@ -1,3 +1,16 @@ +darktable (3.8.0-1.2) experimental; urgency=medium + * Add BuildDepends for lua5.4-dev with a fallback to 5.3. + The fallback only makes it possible to build on old and new distros at the + same time. For the old distros allow using the intree lua. + + -- Andreas Schneider <[email protected]> Fri, 24 Dec 2021 21:49:00 -0000 +darktable (3.8.0-1.1) experimental; urgency=medium + + * Update to version 3.8.0 + https://www.darktable.org/2021/12/darktable-3.8.0-released/ + https://www.darktable.org/2021/12/darktable-3-8/ + + -- Andreas Schneider <[email protected]> Fri, 24 Dec 2021 15:52:00 -0000 darktable (3.6.1-1.1) experimental; urgency=medium * Update to version 3.6.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/clean new/debian/clean --- old/debian/clean 2017-12-24 14:52:45.000000000 +0100 +++ new/debian/clean 2021-12-24 23:44:06.475831184 +0100 @@ -1,4 +1,3 @@ doc/usermanual/profiled_final.fo doc/usermanual/profiled_final.xml doc/usermanual/usermanual.pdf -src/external/lua/ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/control new/debian/control --- old/debian/control 2021-01-15 13:56:46.874013033 +0100 +++ new/debian/control 2021-12-26 19:36:29.639148116 +0100 @@ -3,6 +3,7 @@ Priority: optional Maintainer: Debian PhotoTools Maintainers <[email protected]> Uploaders: David Bremner <[email protected]> +# libavif-dev (>= 0.8.2), Build-Depends: cmake, debhelper (>= 10), intltool, @@ -15,21 +16,27 @@ libexiv2-dev, libflickcurl-dev, libglib2.0-dev, + clang (>= 10), + libclang-dev (>= 10), + llvm-dev (>= 10), libgmic-dev, libgphoto2-dev, libgraphicsmagick1-dev, libgtk-3-dev (>= 3.22), + libheif-dev, libjpeg-dev, libjson-glib-dev, liblcms2-dev, liblensfun-dev, - liblua5.3-dev, + liblua5.4-dev | liblua5.3-dev, libopenexr-dev, libopenjp2-7-dev, libosmgpsmap-1.0-dev, libpng-dev, + libportmidi-dev, libpugixml-dev, librsvg2-dev, + libsdl2-dev, libsecret-1-dev, libsoup2.4-dev, libsqlite3-dev, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/darktable.install new/debian/darktable.install --- old/debian/darktable.install 2021-07-01 09:23:27.676974711 +0200 +++ new/debian/darktable.install 2021-12-24 17:56:49.738399118 +0100 @@ -24,7 +24,6 @@ /usr/share/doc/darktable/LICENSE* /usr/share/doc/darktable/README.md /usr/share/doc/darktable/TRANSLATORS.md* -/usr/share/doc/darktable/darktablerc.html /usr/share/locale/*/LC_MESSAGES/darktable.mo /usr/share/darktable/darktable.bash /usr/share/bash-completion/completions/darktable.bash /usr/share/darktable/luarc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/debian/rules new/debian/rules --- old/debian/rules 2020-01-19 23:09:33.757191351 +0100 +++ new/debian/rules 2021-12-24 22:34:09.510963485 +0100 @@ -30,7 +30,7 @@ ln -s /usr/share/doc/darktable debian/darktable-tools-noise/usr/share/doc/darktable-tools-noise override_dh_auto_configure: src/version_gen.c - dh_auto_configure -- -DCMAKE_INSTALL_DATAROOTDIR="share" -DCMAKE_INSTALL_LIBEXECDIR="lib" -DCMAKE_INSTALL_DOCDIR="share/doc/darktable" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_BUILD_TYPE=Release -DBINARY_PACKAGE_BUILD=1 -DRAWSPEED_ENABLE_LTO=OFF -DUSE_OPENCL=ON -DBUILD_NOISE_TOOLS=ON -DBUILD_CURVE_TOOLS=ON + dh_auto_configure -- -DCMAKE_INSTALL_DATAROOTDIR="share" -DCMAKE_INSTALL_LIBEXECDIR="lib" -DCMAKE_INSTALL_DOCDIR="share/doc/darktable" -DCMAKE_SKIP_RPATH=OFF -DCMAKE_BUILD_TYPE=Release -DBINARY_PACKAGE_BUILD=1 -DRAWSPEED_ENABLE_LTO=OFF -DUSE_OPENCL=ON -DBUILD_NOISE_TOOLS=ON -DBUILD_CURVE_TOOLS=ON -DDONT_USE_INTERNAL_LUA=Off describe-current-version: git describe --tags upstream | sed 's,^release-,,;s,-,+,;s,-,~,;'
