commit OpenSceneGraph34 for openSUSE:Factory
Hello community, here is the log from the commit of package OpenSceneGraph34 for openSUSE:Factory checked in at 2020-10-07 14:17:25 Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old) and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4249 (New) Package is "OpenSceneGraph34" Wed Oct 7 14:17:25 2020 rev:6 rq:839675 version:3.4.1 Changes: --- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes 2020-02-05 19:41:42.419267837 +0100 +++ /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4249/OpenSceneGraph34.changes 2020-10-07 14:17:30.737439202 +0200 @@ -1,0 +2,6 @@ +Mon Oct 5 21:45:38 UTC 2020 - Stefan Brüns + +- Explicitly request wxWidgets <= 3.0 when building the examples, + wxGLCanvas has changed API with wxWidgets 3.1. Fixes build on TW. + +--- Other differences: -- ++ OpenSceneGraph34.spec ++ --- /var/tmp/diff_new_pack.0Qpb4M/_old 2020-10-07 14:17:31.325439670 +0200 +++ /var/tmp/diff_new_pack.0Qpb4M/_new 2020-10-07 14:17:31.325439670 +0200 @@ -55,7 +55,7 @@ BuildRequires: pkgconfig BuildRequires: unzip BuildRequires: update-desktop-files -BuildRequires: wxWidgets-devel +BuildRequires: wxWidgets-devel < 3.1 BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5WebKitWidgets) BuildRequires: pkgconfig(Qt5Widgets)
commit OpenSceneGraph34 for openSUSE:Factory
Hello community,
here is the log from the commit of package OpenSceneGraph34 for
openSUSE:Factory checked in at 2020-02-05 19:41:41
Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old)
and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.26092 (New)
Package is "OpenSceneGraph34"
Wed Feb 5 19:41:41 2020 rev:5 rq:770049 version:3.4.1
Changes:
--- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes
2019-12-12 23:20:09.334202755 +0100
+++
/work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.26092/OpenSceneGraph34.changes
2020-02-05 19:41:42.419267837 +0100
@@ -1,0 +2,9 @@
+Mon Feb 3 14:42:19 UTC 2020 - Stefan Brüns
+
+- Replace wrong Requires: SDL-devel in devel package with
+ pkgconfig(sdl2).
+- Replace PowerPC specific _constraints with ones for all
+ architectures, there are no differences in real life, avoids
+ failures for other architectures.
+
+---
Other differences:
--
++ OpenSceneGraph34.spec ++
--- /var/tmp/diff_new_pack.T7hOjU/_old 2020-02-05 19:41:43.135268178 +0100
+++ /var/tmp/diff_new_pack.T7hOjU/_new 2020-02-05 19:41:43.135268178 +0100
@@ -1,7 +1,7 @@
#
# spec file for package OpenSceneGraph34
#
-# Copyright (c) 2019 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
@@ -35,7 +35,7 @@
# 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/%{sname}/archive/%{sname}-%{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
@@ -110,7 +110,6 @@
%package -n libOpenSceneGraph%{_osg_so_nr}-devel
Summary:OpenSceneGraph development files
Group: Development/Libraries/C and C++
-Requires: SDL-devel
Requires: curl-devel
Requires: freeglut-devel
Requires: giflib-devel
@@ -123,6 +122,7 @@
Requires: pkgconfig(libtiff-4)
Requires: pkgconfig(openal)
Requires: pkgconfig(poppler-glib)
+Requires: pkgconfig(sdl2)
Requires: pkgconfig(xrandr)
Conflicts: libOpenSceneGraph1-devel
Provides: libOpenSceneGraph-devel = %{version}
++ _constraints ++
--- /var/tmp/diff_new_pack.T7hOjU/_old 2020-02-05 19:41:43.171268196 +0100
+++ /var/tmp/diff_new_pack.T7hOjU/_new 2020-02-05 19:41:43.171268196 +0100
@@ -1,14 +1,8 @@
-
-
- ppc64
- ppc64le
-
-
-
-4
-
-
-
+
+
+ 6
+
+
commit OpenSceneGraph34 for openSUSE:Factory
Hello community, here is the log from the commit of package OpenSceneGraph34 for openSUSE:Factory checked in at 2019-12-12 23:19:59 Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old) and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4691 (New) Package is "OpenSceneGraph34" Thu Dec 12 23:19:59 2019 rev:4 rq:756030 version:3.4.1 Changes: --- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes 2019-10-12 22:28:16.247992313 +0200 +++ /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4691/OpenSceneGraph34.changes 2019-12-12 23:20:09.334202755 +0100 @@ -1,0 +2,6 @@ +Tue Dec 10 11:07:08 UTC 2019 - Michael Vetter + +- bsc#1158895: Remove dependency on jasper (due to planned removal) + Removes JPEG2000 support. + +--- Other differences: -- ++ OpenSceneGraph34.spec ++ --- /var/tmp/diff_new_pack.vcTDzK/_old 2019-12-12 23:20:09.894202704 +0100 +++ /var/tmp/diff_new_pack.vcTDzK/_new 2019-12-12 23:20:09.898202705 +0100 @@ -69,7 +69,6 @@ BuildRequires: pkgconfig(gstreamer-video-1.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtkglext-1.0) -BuildRequires: pkgconfig(jasper) BuildRequires: pkgconfig(librsvg-2.0) >= 2.35 BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0)
commit OpenSceneGraph34 for openSUSE:Factory
Hello community, here is the log from the commit of package OpenSceneGraph34 for openSUSE:Factory checked in at 2019-10-12 22:28:13 Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old) and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.2352 (New) Package is "OpenSceneGraph34" Sat Oct 12 22:28:13 2019 rev:3 rq:735563 version:3.4.1 Changes: --- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes 2019-07-11 13:14:33.478844860 +0200 +++ /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.2352/OpenSceneGraph34.changes 2019-10-12 22:28:16.247992313 +0200 @@ -1,0 +2,5 @@ +Mon Sep 30 14:06:35 UTC 2019 - Michel Normand + +- Add _constraints for PowerPC to avoid linker failure + +--- New: _constraints Other differences: -- ++ _constraints ++ ppc64 ppc64le 4
commit OpenSceneGraph34 for openSUSE:Factory
Hello community,
here is the log from the commit of package OpenSceneGraph34 for
openSUSE:Factory checked in at 2019-07-11 13:14:32
Comparing /work/SRC/openSUSE:Factory/OpenSceneGraph34 (Old)
and /work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4615 (New)
Package is "OpenSceneGraph34"
Thu Jul 11 13:14:32 2019 rev:2 rq:713162 version:3.4.1
Changes:
--- /work/SRC/openSUSE:Factory/OpenSceneGraph34/OpenSceneGraph34.changes
2018-07-24 17:25:32.923542206 +0200
+++
/work/SRC/openSUSE:Factory/.OpenSceneGraph34.new.4615/OpenSceneGraph34.changes
2019-07-11 13:14:33.478844860 +0200
@@ -1,0 +2,6 @@
+Tue Jul 2 18:40:00 UTC 2019 - Stefan Brüns
+
+- Fix failing builds with CMake 3.14 and later
+ Add fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
+
+---
New:
fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
Other differences:
--
++ OpenSceneGraph34.spec ++
--- /var/tmp/diff_new_pack.BPcFy3/_old 2019-07-11 13:14:34.282844529 +0200
+++ /var/tmp/diff_new_pack.BPcFy3/_new 2019-07-11 13:14:34.290844526 +0200
@@ -1,7 +1,7 @@
#
# spec file for package OpenSceneGraph34
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,7 +12,7 @@
# 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/
#
@@ -42,6 +42,8 @@
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
+# PATCH-FIX-UPSTREAM
https://github.com/openscenegraph/OpenSceneGraph/issues/779
+Patch2: fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch
BuildRequires: cmake
BuildRequires: curl-devel
BuildRequires: fltk-devel
@@ -114,6 +116,7 @@
Requires: freeglut-devel
Requires: giflib-devel
Requires: libOpenSceneGraph%{_osg_so_nr} = %{version}
+Requires: libOpenThreads%{_opt_so_nr}-devel = %{version}
Requires: libjpeg-devel
Requires: libpng-devel
Requires: pkgconfig(freetype2)
@@ -122,7 +125,6 @@
Requires: pkgconfig(openal)
Requires: pkgconfig(poppler-glib)
Requires: pkgconfig(xrandr)
-Requires: libOpenThreads%{_opt_so_nr}-devel = %{version}
Conflicts: libOpenSceneGraph1-devel
Provides: libOpenSceneGraph-devel = %{version}
# library is versioned, but headers conflict
@@ -201,6 +203,7 @@
%setup -q -n %{sname}-%{sname}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
for file in *.txt ChangeLog; do
sed -i "s/\r//g" "$file"
done
++ fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch ++
>From f21f269302d8796fa794b6231cb116cc51eb92ab Mon Sep 17 00:00:00 2001
From: StefanBruens
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(GLUT)
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)
