Hello community,
here is the log from the commit of package OpenSceneGraph for
openSUSE:Leap:15.2 checked in at 2020-02-21 16:53:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/OpenSceneGraph (Old)
and /work/SRC/openSUSE:Leap:15.2/.OpenSceneGraph.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "OpenSceneGraph"
Fri Feb 21 16:53:40 2020 rev:18 rq:775322 version:3.6.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/OpenSceneGraph/OpenSceneGraph.changes
2020-01-15 14:45:54.181229210 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.OpenSceneGraph.new.26092/OpenSceneGraph.changes
2020-02-21 16:54:57.155552839 +0100
@@ -1,0 +2,93 @@
+Mon Feb 3 14:52:44 UTC 2020 - Stefan Brüns <[email protected]>
+
+- Replace wrong Requires: SDL-devel in devel package with
+ pkgconfig(sdl2).
+- Remove architecture specific _constraints, there are no significant
+ differences in real life, avoids failures for other architectures
+ not covered.
+
+-------------------------------------------------------------------
+Fri Dec 13 08:38:57 UTC 2019 - Guillaume GARDET <[email protected]>
+
+- Update _constraints for ARM
+
+-------------------------------------------------------------------
+Tue Dec 10 11:07:08 UTC 2019 - Michael Vetter <[email protected]>
+
+- bsc#1158895: Remove dependency on jasper (due to planned removal)
+ Removes JPEG2000 support.
+
+-------------------------------------------------------------------
+Mon Sep 30 14:23:23 UTC 2019 - Michel Normand <[email protected]>
+
+- Add _constraints for PowerPC to avoid linker failure
+
+-------------------------------------------------------------------
+Tue Jul 2 18:40:00 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Fix failing builds with CMake 3.14 and later
+ Add fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
+
+-------------------------------------------------------------------
+Sun Mar 24 00:01:04 UTC 2019 - Stefan Brüns <[email protected]>
+
+- Add conflicts for the legacy libOpenSceneGraph1-devel and
+ libOpenThreads1-devel packages, which install into the same location.
+
+-------------------------------------------------------------------
+Wed Oct 10 11:12:43 UTC 2018 - Ondřej Súkup <[email protected]>
+
+- update to 3.6.3
+ * big bunch of fixes for performance and compatibility
+ * fixes for crashes
+ * for details see Changelog
+
+-------------------------------------------------------------------
+Thu Jul 12 21:35:18 UTC 2018 - [email protected]
+
+- update to 3.6.2
+ * Removed deprecated xine plugin to simplify licensing
+ * big bunch of fixes for performance and compatibility
+ * for details see Changelog
+
+-------------------------------------------------------------------
+Tue May 29 08:10:16 UTC 2018 - [email protected]
+
+- update to bugfix release 3.6.1
+ * big bunch of fixes for performance and compatibility
+ * for details see Changelog
+
+-------------------------------------------------------------------
+Tue Apr 17 07:22:07 UTC 2018 - [email protected]
+
+- update to 3.6.0
+- drop 8e26ebd23ef9_Fixed_coverity_detected_defect_OOB_read.patch
+- drop 01c712e85195_Explicit_signed_char_declarations.patch
+ * OpenThreads::Affinity introduced to enable setting of processor affinity
+ on viewer and database threads
+ * osgText rewritten to improve visual quality, add signed distance field
+ support and full GLES2/3 and GL3/4 support
+ * Added VertexArrayObject support, enable full OpenGL Core Profile support
+ * Added OpenCASCADE plugin
+ * Added STEP (.stp) plugin
+ * Improvements to FBX and COLLADA loaders
+ * Improvements to gles plugin to provide better Sketchfab support
+ * Added osgemscripten example
+ * Improvements to osgAnimation
+ * NodeVisitor ValueMap for storing values that can be stored and accessed
+ across frames, such as update, event and cull traversals
+ * ShapeDrawable rewritten as an osg::Geometry to improve performance and
flexibility
+ * Added osg::MultiDrawArrays support
+ * Added osgdeferred example that illustrates how to implement deferred
rendering
+ * Added MultiDrawIndirect support
+ * Moved glDispatchCompute control out of osg::Program into a dedicated
+ osg::DispatchCompute class to improve control of compute shaders
+ * KdTree support added for PolytopeIntersector, and ability to work with
+ points, lines and polygons
+ * osgQt has been moved out to it's own dedicated osgQt github repository
+ * CMake build support for iOS bitcode builds
+ * CoverityScan testing introduced, fixes bring defect density to 0.0
+ per 1,0000 lines of code!
+
+
+-------------------------------------------------------------------
Old:
----
01c712e85195_Explicit_signed_char_declarations.patch
8e26ebd23ef9_Fixed_coverity_detected_defect_OOB_read.patch
OpenSceneGraph-3.4.1.tar.gz
New:
----
OpenSceneGraph-3.6.3.tar.gz
_constraints
fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ OpenSceneGraph.spec ++++++
--- /var/tmp/diff_new_pack.HJCD45/_old 2020-02-21 16:54:58.947556532 +0100
+++ /var/tmp/diff_new_pack.HJCD45/_new 2020-02-21 16:54:58.987556614 +0100
@@ -1,7 +1,7 @@
#
# spec file for package OpenSceneGraph
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,52 +12,46 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
-%define _osg_so_nr 131
-%define _opt_so_nr 20
-%if 0%{?suse_version} > 1320 || (0%{?suse_version} == 1315 && 0%{?is_opensuse})
+%define _osg_so_nr 158
+%define _opt_so_nr 21
+%if 0%{?is_opensuse}
%bcond_without gdal
%else
%bcond_with gdal
%endif
Name: OpenSceneGraph
-Version: 3.4.1
+Version: 3.6.3
Release: 0
Summary: 3D graphics toolkit
-# NOTE: also SUSE-wxWidgets-3.0
http://trac.openscenegraph.org/projects/osg/attachment/wiki/Legal/LICENSE.txt
-License: LGPL-2.1
+# Actually they call it OpenSceneGraph Public License, Version 0.0, which is
+# "LGPL-2.1-only AND WXwindows" (https://spdx.org/licenses/WXwindows)
+# "LGPL-2.1-only WITH WxWindows-exception-3.1" would be valid
(https://spdx.org/licenses/WxWindows-exception-3.1.html)
+# Contrary to that most sources state "GPL-2.0-only"
+# Ticket opened to clear license situation:
https://github.com/openscenegraph/OpenSceneGraph/issues/552
+License: LGPL-2.1-only WITH WxWindows-exception-3.1
Group: Productivity/Graphics/Other
-Url: http://openscenegraph.org/projects/osg
+URL: http://openscenegraph.org/projects/osg
Source0:
https://github.com/openscenegraph/%{name}/archive/%{name}-%{version}.tar.gz
Source99: %{name}-rpmlintrc
-# PATCH-FIX-UPSTREAM
8e26ebd23ef9_Fixed_coverity_detected_defect_OOB_read.patch -- Fix
out-of-bound-read, also required for the next patch to apply
-Patch0: 8e26ebd23ef9_Fixed_coverity_detected_defect_OOB_read.patch
-# PATCH-FIX-UPSTREAM 01c712e85195_Explicit_signed_char_declarations.patch --
compilation fix for e.g. ARM, PPC
-Patch1: 01c712e85195_Explicit_signed_char_declarations.patch
+# https://github.com/openscenegraph/OpenSceneGraph/issues/779
+Patch0: fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: fltk-devel
BuildRequires: freeglut-devel
-BuildRequires: freetype2-devel
BuildRequires: gcc-c++
BuildRequires: giflib-devel
-BuildRequires: libSDL-devel
-BuildRequires: libSDL2-devel
-BuildRequires: libjasper-devel
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
-BuildRequires: libtiff-devel
-BuildRequires: openal-soft-devel
BuildRequires: pkgconfig
BuildRequires: unzip
BuildRequires: update-desktop-files
BuildRequires: wxWidgets-devel
-BuildRequires: pkgconfig(Qt5OpenGL)
-BuildRequires: pkgconfig(Qt5WebKitWidgets)
-BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(gstreamer-1.0)
BuildRequires: pkgconfig(gstreamer-app-1.0)
BuildRequires: pkgconfig(gstreamer-audio-1.0)
@@ -68,8 +62,11 @@
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(gtkglext-1.0)
BuildRequires: pkgconfig(librsvg-2.0) >= 2.35
+BuildRequires: pkgconfig(libtiff-4)
BuildRequires: pkgconfig(libxml-2.0)
+BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(poppler-glib)
+BuildRequires: pkgconfig(sdl2)
BuildRequires: pkgconfig(xrandr)
%if %{with gdal}
BuildRequires: pkgconfig(gdal)
@@ -86,11 +83,9 @@
%package -n libOpenSceneGraph%{_osg_so_nr}
Summary: Shared libraries for OpenSceneGraph
-Group: System/Libraries
-%if "%{_osg_so_nr}" == "130"
# try to cover up past mistakes
+Group: System/Libraries
Obsoletes: libOpenSceneGraph100
-%endif
%description -n libOpenSceneGraph%{_osg_so_nr}
The OpenSceneGraph is a graphics toolkit for the development of
@@ -104,8 +99,21 @@
%package -n libOpenSceneGraph-devel
Summary: OpenSceneGraph development files
Group: Development/Libraries/C and C++
+Requires: curl-devel
+Requires: freeglut-devel
+Requires: giflib-devel
Requires: libOpenSceneGraph%{_osg_so_nr} = %{version}
Requires: libOpenThreads-devel = %{version}
+Requires: libjpeg-devel
+Requires: libpng-devel
+Requires: pkgconfig(freetype2)
+Requires: pkgconfig(librsvg-2.0)
+Requires: pkgconfig(libtiff-4)
+Requires: pkgconfig(openal)
+Requires: pkgconfig(poppler-glib)
+Requires: pkgconfig(sdl2)
+Requires: pkgconfig(xrandr)
+Conflicts: libOpenSceneGraph1-devel
%description -n libOpenSceneGraph-devel
The OpenSceneGraph is a graphics toolkit for the development of
@@ -134,6 +142,7 @@
Summary: OpenSceneGraph development files
Group: Development/Libraries/C and C++
Requires: libOpenThreads%{_opt_so_nr} = %{version}
+Conflicts: libOpenThreads1-devel
%description -n libOpenThreads-devel
The OpenSceneGraph is a graphics toolkit for the development of
@@ -174,11 +183,10 @@
%prep
%setup -q -n %{name}-%{name}-%{version}
%patch0 -p1
-%patch1 -p1
-for file in *.txt ChangeLog; do
+for file in *.md *.txt ChangeLog; do
sed -i "s/\r//g" "$file"
done
-chmod 644 *.txt ChangeLog
+chmod 644 *.md *.txt ChangeLog
%build
%cmake \
@@ -189,8 +197,7 @@
-DBUILD_OSG_APPLICATIONS=ON \
-DCMAKE_BUILD_TYPE=Release \
-DDYNAMIC_OPENSCENEGRAPH=ON \
- -DDYNAMIC_OPENTHREADS=ON \
- -DDESIRED_QT_VERSION=5
+ -DDYNAMIC_OPENTHREADS=ON
make %{?_smp_mflags}
%install
@@ -206,7 +213,8 @@
%postun -n libOpenThreads%{_opt_so_nr} -p /sbin/ldconfig
%files
-%doc AUTHORS.txt LICENSE.txt NEWS.txt README.txt ChangeLog
+%license LICENSE.txt
+%doc AUTHORS.txt NEWS.txt README.md ChangeLog
%{_bindir}/osg2cpp
%{_bindir}/osgarchive
%{_bindir}/osgconv
@@ -214,6 +222,7 @@
%{_bindir}/osgversion
%{_bindir}/osgviewer
%{_bindir}/present3D
+%{_bindir}/osgshaderpipeline
%files plugins
%{_libdir}/osgPlugins-%{version}/
@@ -236,7 +245,6 @@
%{_libdir}/libosgViewer.so.*
%{_libdir}/libosgWidget.so.*
%{_libdir}/libosgPresentation.so.*
-%{_libdir}/libosgQt.so.*
%files -n libOpenSceneGraph-devel
%{_includedir}/osg/
@@ -255,7 +263,6 @@
%{_includedir}/osgViewer/
%{_includedir}/osgVolume/
%{_includedir}/osgWidget/
-%{_includedir}/osgQt/
%{_includedir}/osgPresentation/
%{_libdir}/libosg.so
%{_libdir}/libosgAnimation.so
@@ -274,7 +281,6 @@
%{_libdir}/libosgVolume.so
%{_libdir}/libosgWidget.so
%{_libdir}/libosgPresentation.so
-%{_libdir}/libosgQt.so
%{_libdir}/pkgconfig/openscenegraph.pc
%{_libdir}/pkgconfig/openscenegraph-osg*.pc
++++++ OpenSceneGraph-3.4.1.tar.gz -> OpenSceneGraph-3.6.3.tar.gz ++++++
++++ 229511 lines of diff (skipped)
++++++ _constraints ++++++
<constraints>
<hardware>
<disk>
<size unit="G">6</size>
</disk>
<memory>
<size unit="M">4500</size>
</memory>
</hardware>
</constraints>
++++++ fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch ++++++
>From f21f269302d8796fa794b6231cb116cc51eb92ab Mon Sep 17 00:00:00 2001
From: StefanBruens <[email protected]>
Date: Tue, 2 Jul 2019 20:37:02 +0200
Subject: [PATCH] Fix wxWidgets COMPONENTS specification, deprecated usage
broken with CMake 3.14
Current FindWxWidgets.cmake allows to specify OPTIONAL components, unfortunately
this broke the (deprecated) use of wxWidgets_USE_LIBS.
Fixes: #779
---
CMakeLists.txt | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 567f0fb7b48..427e0393a3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -789,9 +789,7 @@ IF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
FIND_PACKAGE(FLTK)
FIND_PACKAGE(FOX)
-
- SET(wxWidgets_USE_LIBS base core gl net)
- FIND_PACKAGE(wxWidgets)
+ FIND_PACKAGE(wxWidgets COMPONENTS base core gl net)
ENDIF(BUILD_OSG_EXAMPLES AND NOT ANDROID)
