Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package meshlab for openSUSE:Factory checked
in at 2025-05-12 16:51:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/meshlab (Old)
and /work/SRC/openSUSE:Factory/.meshlab.new.30101 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meshlab"
Mon May 12 16:51:41 2025 rev:4 rq:1276773 version:2023.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/meshlab/meshlab.changes 2025-03-12
20:15:29.955990875 +0100
+++ /work/SRC/openSUSE:Factory/.meshlab.new.30101/meshlab.changes
2025-05-12 16:55:28.209253840 +0200
@@ -1,0 +2,13 @@
+Sun May 11 23:22:03 UTC 2025 - Stefan Brüns <stefan.bru...@rwth-aachen.de>
+
+- Update to version 2023.12
+ * This version brings several bugfixes, and new plugins:
+ + filter_cubization
+ + filter_developability
+ + filter_embree
+ + filter_mesh_alpha_wrap
+- Drop upstream patches:
+ * 0001-Set-correct-RPATH-for-libraries-and-executable.patch
+ * gcc13-fix.patch
+
+-------------------------------------------------------------------
Old:
----
0001-Set-correct-RPATH-for-libraries-and-executable.patch
gcc13-fix.patch
meshlab-2022.02.tar.gz
vcglib-2022.02.tar.gz
New:
----
meshlab-2023.12.tar.gz
vcglib-2023.12.tar.gz
BETA DEBUG BEGIN:
Old:- Drop upstream patches:
* 0001-Set-correct-RPATH-for-libraries-and-executable.patch
* gcc13-fix.patch
Old: * 0001-Set-correct-RPATH-for-libraries-and-executable.patch
* gcc13-fix.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ meshlab.spec ++++++
--- /var/tmp/diff_new_pack.yYeBeg/_old 2025-05-12 16:55:29.181294074 +0200
+++ /var/tmp/diff_new_pack.yYeBeg/_new 2025-05-12 16:55:29.185294239 +0200
@@ -22,27 +22,31 @@
%bcond_with gmp
%endif
+# Optional dependencies not yet used or available
+# - embree
+# - glTF
+# - libe57Format
+# - libigl
+# - u3d
+
%define glew_version %(rpm -q --queryformat='%%{version}' glew-devel | sed -nr
's/([0-9.]+).*/\\1/p')
Name: meshlab
-Version: 2022.02
+Version: 2023.12
Release: 0
Summary: System for the processing and editing of unstructured 3D
triangular meshes
License: BSD-3-Clause AND GPL-2.0-or-later
Group: Productivity/Graphics/3D Editors
URL: https://www.meshlab.net/
Source0:
https://github.com/cnr-isti-vclab/meshlab/archive/refs/tags/MeshLab-%{version}.tar.gz#/meshlab-%{version}.tar.gz
-# Probably belongs in its own package, but nothing else depends on it
+# Belongs in its own package, but meshlab requires a complete source tree --
https://github.com/cnr-isti-vclab/vcglib/issues/230
Source1:
https://github.com/cnr-isti-vclab/vcglib/archive/refs/tags/%{version}.tar.gz#/vcglib-%{version}.tar.gz
# PATCH-FIX-OPENSUSE -- adjust plugin and shader search path
Patch1: 0001-Use-same-paths-for-shader-plugin-lookup-as-used-for-.patch
# PATCH-FIX-OPENSUSE -- https://github.com/cnr-isti-vclab/vcglib/issues/210
Patch2: 0001-Remove-unused-return-value-in-unused-function.patch
# PATCH-FIX-OPENSUSE
-Patch3: 0001-Set-correct-RPATH-for-libraries-and-executable.patch
-# PATCH-FIX-OPENSUSE
Patch4: 0001-Allow-usage-of-system-provided-levmar.patch
-Patch5: gcc13-fix.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
@@ -95,22 +99,24 @@
%autopatch -p1
# Remove bundled library sources, since we use the packaged libraries
-rm -r src/external/{glew*,levmar*,lib3ds*,muparser*,qhull*,xerces*}/*
+rm -r src/external/glew*/*
+
+# Change defaults for MESHLAB_ALLOW_DOWNLOAD_*
+sed -i '/option/ s|\(MESHLAB_ALLOW_DOWNLOAD.*\) ON|\1 OFF|'
src/external/*.cmake
+grep -E 'option.*MESHLAB_ALLOW_DOWNLOAD.*' src/external/*.cmake
# set plugin and shader search path
sed -i 's|PLUGIN_DIR|QString("%{_libdir}/meshlab/plugins")|g'
src/common/globals.cpp
sed -i 's|SHADER_DIR|QString("%{_datadir}/meshlab/shaders")|g'
src/common/globals.cpp
%build
-pushd src
-%cmake -DALLOW_SYSTEM_GLEW:BOOL=ON -DGLEW_VERSION=%{glew_version}
+%cmake \
+ -DGLEW_VERSION=%{glew_version} \
+ %{nil}
%cmake_build
-popd
%install
-pushd src
%cmake_install
-popd
for i in 16 48 64 128 512 ; do
install -D -m 644 src/meshlab/images/eye${i}.png \
@@ -121,15 +127,11 @@
sed -i -e 's/Exec=.*/Exec=env QT_QPA_PLATFORM=xcb meshlab/'
%{buildroot}%{_datadir}/applications/meshlab.desktop
desktop-file-validate %{buildroot}%{_datadir}/applications/meshlab.desktop
-# Remove leftover libIFX*.so --
https://github.com/cnr-isti-vclab/meshlab/issues/1353
-rm %{buildroot}%{_libdir}/meshlab/libIFX*.so
-
install -D -m 0644 -t %{buildroot}%{_mandir}/man1/ docs/man/*.1
%fdupes %{buildroot}%{_datadir}
%post -p /sbin/ldconfig
-
%postun -p /sbin/ldconfig
%files
@@ -140,8 +142,8 @@
%doc README.md
%doc docs/privacy.txt
%license LICENSE.txt
-%license distrib/shaders/3Dlabs-license.txt
-%license distrib/shaders/LightworkDesign-license.txt
+%license resources/shaders/3Dlabs-license.txt
+%license resources/shaders/LightworkDesign-license.txt
%{_datadir}/icons/hicolor/*/apps/meshlab.*
%{_datadir}/applications/meshlab.desktop
++++++ 0001-Allow-usage-of-system-provided-levmar.patch ++++++
--- /var/tmp/diff_new_pack.yYeBeg/_old 2025-05-12 16:55:29.225295895 +0200
+++ /var/tmp/diff_new_pack.yYeBeg/_new 2025-05-12 16:55:29.225295895 +0200
@@ -1,4 +1,4 @@
-From d011885857365284874a14a9cb14a454eb72b157 Mon Sep 17 00:00:00 2001
+From 13e113de553d5a7de71bbd77687ee5dd2d8b5759 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@rwth-aachen.de>
Date: Sun, 22 Jan 2023 07:07:41 +0100
Subject: [PATCH] Allow usage of system provided levmar
@@ -7,28 +7,24 @@
src/external/levmar.cmake | 22 ++++++++++++++++++-
.../edit_mutualcorrs/levmarmethods.h | 2 +-
src/meshlabplugins/edit_mutualcorrs/solver.h | 2 +-
- .../param_collapse.h | 2 +-
- .../parametrizator.h | 1 -
.../filter_mutualglobal/levmarmethods.h | 2 +-
.../filter_mutualglobal/solver.h | 2 +-
.../filter_mutualinfo/levmarmethods.h | 2 +-
src/meshlabplugins/filter_mutualinfo/solver.h | 2 +-
- 9 files changed, 28 insertions(+), 9 deletions(-)
+ 7 files changed, 27 insertions(+), 7 deletions(-)
diff --git a/src/external/levmar.cmake b/src/external/levmar.cmake
-index 63ed77e..50e066a 100644
+index 96d76bf..155165b 100644
--- a/src/external/levmar.cmake
+++ b/src/external/levmar.cmake
-@@ -3,10 +3,30 @@
+@@ -3,8 +3,28 @@
# SPDX-License-Identifier: BSL-1.0
- option(ALLOW_BUNDLED_LEVMAR "Allow use of bundled levmar source" ON)
-+option(ALLOW_SYSTEM_LEVMAR "Allow use of system-provided levmar" ON)
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR "Allow download and use of levmar
source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LEVMAR "Allow use of system-provided levmar" ON)
- set(LEVMAR_DIR ${CMAKE_CURRENT_LIST_DIR}/levmar-2.3)
-
--if(ALLOW_BUNDLED_LEVMAR AND EXISTS "${LEVMAR_DIR}/lm.h")
-+if (ALLOW_SYSTEM_LEVMAR)
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
++if (MESHLAB_ALLOW_SYSTEM_LEVMAR)
+ find_library(LEVMAR_LIBRARY NAMES levmar)
+ find_path(LEVMAR_INCLUDE_DIR NAMES levmar.h PATH_SUFFIXES levmar)
+
@@ -47,114 +43,89 @@
+ add_library(external-levmar INTERFACE)
+ target_link_libraries(external-levmar INTERFACE levmar::levmar)
+
-+elseif(ALLOW_BUNDLED_LEVMAR AND EXISTS "${LEVMAR_DIR}/lm.h")
- message(STATUS "- levmar - using bundled source")
- add_library(
- external-levmar STATIC
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
+ set(LEVMAR_VERSION "2.6.1")
+
+ set(LEVMAR_DIR
"${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/levmar-${LEVMAR_VERSION}")
diff --git a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
-index 7801493..c1a15c8 100644
+index 77f257b..c1a15c8 100644
--- a/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
+++ b/src/meshlabplugins/edit_mutualcorrs/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
#include <list>
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
struct LevmarCorrelation {
diff --git a/src/meshlabplugins/edit_mutualcorrs/solver.h
b/src/meshlabplugins/edit_mutualcorrs/solver.h
-index 7ee965a..7d93079 100644
+index fc15e51..7d93079 100644
--- a/src/meshlabplugins/edit_mutualcorrs/solver.h
+++ b/src/meshlabplugins/edit_mutualcorrs/solver.h
@@ -5,7 +5,7 @@
#include "alignset.h"
#include "parameters.h"
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
#include <iostream>
#include <fstream>
-diff --git a/src/meshlabplugins/filter_isoparametrization/param_collapse.h
b/src/meshlabplugins/filter_isoparametrization/param_collapse.h
-index 98060e9..363b2ff 100644
---- a/src/meshlabplugins/filter_isoparametrization/param_collapse.h
-+++ b/src/meshlabplugins/filter_isoparametrization/param_collapse.h
-@@ -14,7 +14,7 @@
-
- #include <local_parametrization.h>
- #include <mesh_operators.h>
--#include <lm.h>
-+#include <levmar.h>
- #include <uv_grid.h>
-
- #include "opt_patch.h"
-diff --git a/src/meshlabplugins/filter_isoparametrization/parametrizator.h
b/src/meshlabplugins/filter_isoparametrization/parametrizator.h
-index 74b03db..c548a31 100644
---- a/src/meshlabplugins/filter_isoparametrization/parametrizator.h
-+++ b/src/meshlabplugins/filter_isoparametrization/parametrizator.h
-@@ -32,7 +32,6 @@
- #include <vcg/space/color4.h>
- #include <dual_coord_optimization.h>
- #include <float.h>
--#include <lm.h>
- #ifndef _MESHLAB
- #include <wrap/io_trimesh/export_ply.h>
- #endif
diff --git a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
-index decb063..a35d185 100644
+index 73e2e7a..a35d185 100644
--- a/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
+++ b/src/meshlabplugins/filter_mutualglobal/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
#include <list>
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
struct LevmarCorrelation {
diff --git a/src/meshlabplugins/filter_mutualglobal/solver.h
b/src/meshlabplugins/filter_mutualglobal/solver.h
-index c7008ec..9e2e497 100644
+index db7cc5f..9e2e497 100644
--- a/src/meshlabplugins/filter_mutualglobal/solver.h
+++ b/src/meshlabplugins/filter_mutualglobal/solver.h
@@ -5,7 +5,7 @@
#include "alignset.h"
#include "parameters.h"
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
#include <iostream>
#include <fstream>
diff --git a/src/meshlabplugins/filter_mutualinfo/levmarmethods.h
b/src/meshlabplugins/filter_mutualinfo/levmarmethods.h
-index decb063..a35d185 100644
+index 73e2e7a..a35d185 100644
--- a/src/meshlabplugins/filter_mutualinfo/levmarmethods.h
+++ b/src/meshlabplugins/filter_mutualinfo/levmarmethods.h
@@ -12,7 +12,7 @@ sufficient to get a calibrated shot.<br>
#include <list>
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
struct LevmarCorrelation {
diff --git a/src/meshlabplugins/filter_mutualinfo/solver.h
b/src/meshlabplugins/filter_mutualinfo/solver.h
-index c7008ec..9e2e497 100644
+index db7cc5f..9e2e497 100644
--- a/src/meshlabplugins/filter_mutualinfo/solver.h
+++ b/src/meshlabplugins/filter_mutualinfo/solver.h
@@ -5,7 +5,7 @@
#include "alignset.h"
#include "parameters.h"
--#include "lm.h"
+-#include "levmar.h"
+#include <levmar.h>
#include <iostream>
#include <fstream>
--
-2.39.0
+2.49.0
++++++ meshlab-2022.02.tar.gz -> meshlab-2023.12.tar.gz ++++++
/work/SRC/openSUSE:Factory/meshlab/meshlab-2022.02.tar.gz
/work/SRC/openSUSE:Factory/.meshlab.new.30101/meshlab-2023.12.tar.gz differ:
char 12, line 1
++++++ vcglib-2022.02.tar.gz -> vcglib-2023.12.tar.gz ++++++
/work/SRC/openSUSE:Factory/meshlab/vcglib-2022.02.tar.gz
/work/SRC/openSUSE:Factory/.meshlab.new.30101/vcglib-2023.12.tar.gz differ:
char 13, line 1
