Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package opentoonz for openSUSE:Factory checked in at 2021-04-12 15:49:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/opentoonz (Old) and /work/SRC/openSUSE:Factory/.opentoonz.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "opentoonz" Mon Apr 12 15:49:40 2021 rev:12 rq:884615 version:1.5.0 Changes: -------- --- /work/SRC/openSUSE:Factory/opentoonz/opentoonz.changes 2021-02-23 20:23:04.551797388 +0100 +++ /work/SRC/openSUSE:Factory/.opentoonz.new.2401/opentoonz.changes 2021-04-12 15:49:54.469275271 +0200 @@ -1,0 +2,66 @@ +Sun Apr 11 07:04:31 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 1.5.0 + * Ease Regulations for the Use of Animate Tool + * New - Aotz MyPaint brush set (Sketch, Ink, Fill, Clouds, Water, + Grass, Leaves, Fur, Eraser, etc.) + * Fix vector custom styles + * Fix color model pick mode + * New - Save/Reload Color Separation Colors Parameters + * New - Add snap option to control point editor tool + * New - Freehand mode in control point editor tool + * New - Convert To Vector : Align Boundary Strokes Direction Option + * New - Snap at intersection in cutter tool + * New - Bloom Iwa Fx + * New - Fractal Noise Iwa Fx + * New - Glare Iwa Fx + * New - Search bar in New Fx browser + * New - Linear color space option for Add Fx Ino + * New - Logarithmic option for Spiral fx + * New - Particle FX Preset: Flock fx + * New Segment Erase + * New Frame range for segment mode of eraser tool + * New - (Optional/Experimental) Expression Reference Manager + * New - Expression Function: Periodic Random + * New - Copy expression object address directly from UI + * New - multi arc shape in geometric tool + * Fix - Geometric tool / Type tool first point offset + * Enhance - Premultiply on Loading PNG images + * Fix - Fix copy/paste keyframe causing bad data + * New - Horizontal Level Strip option + * Fix icon rendering for HDPI + * Fix for Duplicate Window Title (Mac) + * Fix for Full Screen on Multiple Monitors (WIndows) + * New - (Optional) Toolbar location + * New - Color Keys Global Palette + * Fix - OpenGL Line Smoothing + * Updated Dwango plugins (separate download) + * Fix Batch Rendering on Mac + * Updated Output Settings Dialogue + * Fix incorrect xml in tnz file + * Fix - Scene Cast Update on Pasting + * Enhancement - Improved target area for Transform selection + * New - (Optional) Create New Style Command Button + * Fix - Fix Vector Tape Tool on Joining Points at the Same Position + * Updated Languages ( ) + * New - Initial support for Norwegian Bokmal + * New - Weblate widget + * New - Generation of translation projects now optional in cmake + * New - All New Icons (GUI Cleanup) + * New - Live update for 3DLuts via Preferences + * New - Additional UI Style Sheet customizations via Preferences + * New - Icons for all commands + * Update Default Room set + * Fix - Fix Crash When Drawing on Absent Level + * New - More shapes for Adobe Animate keyboard shortcuts + * New - Shortcut keypress length option + * New - Undo: Reset Undo when Saving Levels Preference Option +- Drop patches: + * p_handle-no-return-in-nonvoid-function.patch + * 0001-Fix-build-with-GCC-10.patch + * 0001-Fix-build-with-Qt-5.15.patch + * 0001-System-depend-code-deduplication.patch +- Rebase 0001-Fix-linker-errors-on-Linux.patch +- Update 0001-Use-the-system-mypaint-brushes.patch + +------------------------------------------------------------------- Old: ---- 0001-Fix-build-with-GCC-10.patch 0001-Fix-build-with-Qt-5.15.patch 0001-System-depend-code-deduplication.patch _service opentoonz-1.4.0.tar.xz p_handle-no-return-in-nonvoid-function.patch New: ---- opentoonz-1.5.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ opentoonz.spec ++++++ --- /var/tmp/diff_new_pack.tVEr7s/_old 2021-04-12 15:49:55.517276539 +0200 +++ /var/tmp/diff_new_pack.tVEr7s/_new 2021-04-12 15:49:55.521276544 +0200 @@ -17,26 +17,18 @@ Name: opentoonz -Version: 1.4.0 +Version: 1.5.0 Release: 0 Summary: 2D animation software -# need to review license as site indicates: "modified BSD license" License: BSD-2-Clause Group: Productivity/Graphics/Other URL: https://opentoonz.github.io/e/ -Source0: %{name}-%{version}.tar.xz +Source0: https://github.com/opentoonz/opentoonz/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz Source3: %{name}-rpmlintrc -Patch0: p_handle-no-return-in-nonvoid-function.patch # PATCH-FIX-UPSTREAM -Patch1: 0001-Fix-linker-errors-on-Linux.patch +Patch0: 0001-Fix-linker-errors-on-Linux.patch # PATCH-FIX-OPENSUSE -- Use the system mypaint brushes -Patch2: 0001-Use-the-system-mypaint-brushes.patch -# PATCH-FIX-UPSTREAM -Patch3: 0001-Fix-build-with-GCC-10.patch -# PATCH-FIX-UPSTREAM -Patch4: 0001-Fix-build-with-Qt-5.15.patch -# PATCH-FIX-UPSTREAM -Patch5: 0001-System-depend-code-deduplication.patch +Patch1: 0001-Use-the-system-mypaint-brushes.patch BuildRequires: boost-devel >= 1.55 BuildRequires: cmake BuildRequires: freeglut-devel @@ -57,6 +49,7 @@ BuildRequires: cmake(Qt5Network) BuildRequires: cmake(Qt5OpenGL) BuildRequires: cmake(Qt5PrintSupport) +BuildRequires: cmake(Qt5SerialPort) BuildRequires: cmake(Qt5Script) BuildRequires: cmake(Qt5Svg) BuildRequires: cmake(Qt5Widgets) @@ -67,7 +60,12 @@ BuildRequires: pkgconfig(libmypaint) BuildRequires: pkgconfig(libpng) BuildRequires: pkgconfig(libusb-1.0) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(lzo2) +BuildRequires: pkgconfig(mypaint-brushes-1.0) >= 1.3 +%ifarch x86_64 +BuildRequires: pkgconfig(opencv) +%endif BuildRequires: pkgconfig(sdl2) BuildRequires: pkgconfig(zlib) ExclusiveArch: i586 x86_64 @@ -90,11 +88,7 @@ # Keep thirdparty/lzo/driver, but remove library. rm -r thirdparty/lzo/2.* -# Use the mypaint brushes instead of the local copy -rm -fr stuff/library/mypaint\ brushes - %build - # TODO upstream planning to replace custom thirdparty libs with system versions cd thirdparty/tiff-* export CFLAGS="%{optflags} -fPIC" ++++++ 0001-Fix-linker-errors-on-Linux.patch ++++++ --- /var/tmp/diff_new_pack.tVEr7s/_old 2021-04-12 15:49:55.537276563 +0200 +++ /var/tmp/diff_new_pack.tVEr7s/_new 2021-04-12 15:49:55.537276563 +0200 @@ -1,4 +1,4 @@ -From 8ce3c36cc6c7b311a8f970123798e8db0dca5393 Mon Sep 17 00:00:00 2001 +From fa1de4f333f423737c916efec3d3df772a6d8577 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Mon, 13 Apr 2020 10:14:42 +0200 Subject: [PATCH] Fix linker errors on Linux. @@ -10,26 +10,26 @@ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/toonz/sources/tnzcore/CMakeLists.txt b/toonz/sources/tnzcore/CMakeLists.txt -index d637cd26..12b4d5da 100644 +index c34f3aa..b8d46d3 100644 --- a/toonz/sources/tnzcore/CMakeLists.txt +++ b/toonz/sources/tnzcore/CMakeLists.txt @@ -356,5 +356,5 @@ endif() target_link_libraries(tnzcore - Qt5::OpenGL Qt5::Network Qt5::Multimedia + Qt5::Core Qt5::OpenGL Qt5::Network Qt5::Multimedia ${GL_LIB} ${GLUT_LIB} ${QT_LIB} ${Z_LIB} ${JPEG_LIB} ${LZ4_LIB} - ${EXTRA_LIBS} + ${EXTRA_LIBS} ${CMAKE_DL_LIBS} ) diff --git a/toonz/sources/toonzqt/CMakeLists.txt b/toonz/sources/toonzqt/CMakeLists.txt -index 3c1a329e..ee6a7139 100644 +index eb8536a..efba45c 100644 --- a/toonz/sources/toonzqt/CMakeLists.txt +++ b/toonz/sources/toonzqt/CMakeLists.txt -@@ -246,4 +246,4 @@ elseif(BUILD_ENV_UNIXLIKE) +@@ -248,4 +248,4 @@ elseif(BUILD_ENV_UNIXLIKE) endif() endif() -target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::OpenGL Qt5::Svg ${EXTRA_LIBS} ${GL_LIB}) +target_link_libraries(toonzqt Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::OpenGL Qt5::Svg ${EXTRA_LIBS} ${GL_LIB} ${CMAKE_DL_LIBS}) -- -2.26.0 +2.30.2 ++++++ 0001-Use-the-system-mypaint-brushes.patch ++++++ --- /var/tmp/diff_new_pack.tVEr7s/_old 2021-04-12 15:49:55.545276572 +0200 +++ /var/tmp/diff_new_pack.tVEr7s/_new 2021-04-12 15:49:55.545276572 +0200 @@ -1,26 +1,72 @@ -From 9ed962d41dce825c60df869c96f062b3906cbc8d Mon Sep 17 00:00:00 2001 +From b149eff126a44344cd36d44d3004ba2b38e89c2e Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Mon, 13 Apr 2020 18:42:56 +0200 -Subject: [PATCH] Use the system mypaint brushes. +Subject: [PATCH] Use the system mypaint brushes if available. +CMake will check at build time whether mypaint-brushes 1.3 +is available and only install brushes not available in this release. --- - toonz/sources/toonzlib/mypaintbrushstyle.cpp | 3 +++ - 1 file changed, 3 insertions(+) + toonz/sources/CMakeLists.txt | 16 ++++++++++++++++ + toonz/sources/toonz/CMakeLists.txt | 2 ++ + toonz/sources/toonzlib/mypaintbrushstyle.cpp | 5 +++++ + 3 files changed, 23 insertions(+) +diff --git a/toonz/sources/CMakeLists.txt b/toonz/sources/CMakeLists.txt +index 7cf3d7c5..21252259 100644 +--- a/toonz/sources/CMakeLists.txt ++++ b/toonz/sources/CMakeLists.txt +@@ -480,6 +480,22 @@ elseif(BUILD_ENV_UNIXLIKE) + # Can be 'libmypaint' or 'libmypaint-1.x' + pkg_search_module(MYPAINT_LIB REQUIRED libmypaint libmypaint-1.3>=1.3) + ++ # Get the system mypaint brushes location ++ pkg_check_modules(MYPAINT_BRUSHES mypaint-brushes-1.0>=1.3) ++ ++ if(MYPAINT_BRUSHES_FOUND) ++ pkg_get_variable(MYPAINT_BRUSHES_DIR mypaint-brushes-1.0 brushesdir) ++ add_definitions(-DMYPAINT_BRUSHES_DIR="${MYPAINT_BRUSHES_DIR}") ++ # This regex is used in toonzlib/CMakeLists.txt and matches brushes ++ # installed by mypaint-brushes 1.3 ++ set(SYSTEM_MYPAINT_EXCLUDE "mypaint brushes/classic|deevad|experimental|kaerhon_v1|ramon|tanda") ++ message("**************** System mypaint brushes:" ${MYPAINT_BRUSHES_DIR}) ++ else() ++ # Set an arbitrary value so not everything gets excluded if the system ++ # brushes are not found at build time ++ set(SYSTEM_MYPAINT_EXCLUDE "_nothing_") ++ endif() ++ + if(PLATFORM EQUAL 64) + find_library(TURBOJPEG_LIB turbojpeg) + message("**************** turbojpeg lib:" ${TURBOJPEG_LIB}) +diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt +index 57407ca1..c1e456e3 100644 +--- a/toonz/sources/toonz/CMakeLists.txt ++++ b/toonz/sources/toonz/CMakeLists.txt +@@ -721,6 +721,8 @@ exec \$OPENTOONZ_BASE/bin/OpenToonz \"\$@\" + DIRECTORY + ${CMAKE_SOURCE_DIR}/../../stuff + DESTINATION share/opentoonz ++ # Only excluded when using system mypaint brushes ++ REGEX "${SYSTEM_MYPAINT_EXCLUDE}" EXCLUDE + ) + + endif() diff --git a/toonz/sources/toonzlib/mypaintbrushstyle.cpp b/toonz/sources/toonzlib/mypaintbrushstyle.cpp -index b299c106..adfb30db 100644 +index eecc7126..8a8aac4c 100644 --- a/toonz/sources/toonzlib/mypaintbrushstyle.cpp +++ b/toonz/sources/toonzlib/mypaintbrushstyle.cpp -@@ -76,6 +76,9 @@ std::string TMyPaintBrushStyle::getBrushType() { return "myb"; } +@@ -82,6 +82,11 @@ TFilePathSet TMyPaintBrushStyle::getBrushesDirs() { + for (QStringList::iterator i = genericLocations.begin(); + i != genericLocations.end(); ++i) + paths.push_back(TFilePath(*i) + "mypaint" + "brushes"); ++#ifdef MYPAINT_BRUSHES_DIR ++ // Use the system brushes if available ++ const QString systemMypaintBrushes(MYPAINT_BRUSHES_DIR); ++ paths.push_back(TFilePath(systemMypaintBrushes)); ++#endif + return paths; + } - TFilePathSet TMyPaintBrushStyle::getBrushesDirs() { - TFilePathSet paths; -+ // Load the mypaint brushes -+ const QString mypaintBrushes("/usr/share/mypaint-data/1.0/brushes"); -+ paths.push_back(TFilePath(mypaintBrushes)); - paths.push_back(m_libraryDir + "mypaint brushes"); - QStringList genericLocations = - QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); -- -2.26.0 +2.31.1
