commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2020-10-29 09:49:22
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.3463 (New)
Package is "SimGear"
Thu Oct 29 09:49:22 2020 rev:17 rq:844705 version:2020.3.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2020-06-30
21:58:43.307177911 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.3463/SimGear.changes
2020-10-29 09:49:24.556223885 +0100
@@ -1,0 +2,6 @@
+Wed Oct 28 22:04:55 UTC 2020 - Stefan Brüns
+
+- Update to 2020.3.1
+ * http://wiki.flightgear.org/Changelog_2020.3
+
+---
Old:
simgear-2020.1.3.tar.bz2
New:
simgear-2020.3.1.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.PO6MHQ/_old 2020-10-29 09:49:25.156224397 +0100
+++ /var/tmp/diff_new_pack.PO6MHQ/_new 2020-10-29 09:49:25.160224401 +0100
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2020_1_3
-%define main_version 2020.1
+%define libname libSimGearCore-2020_3_1
+%define main_version 2020.3
Name: SimGear
-Version:%{main_version}.3
+Version:%{main_version}.1
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
++ simgear-2020.1.3.tar.bz2 -> simgear-2020.3.1.tar.bz2 ++
7565 lines of diff (skipped)
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2020-06-30 21:57:59
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.3060 (New)
Package is "SimGear"
Tue Jun 30 21:57:59 2020 rev:16 rq:81 version:2020.1.3
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2020-06-14
18:35:25.178563101 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.3060/SimGear.changes
2020-06-30 21:58:43.307177911 +0200
@@ -1,0 +2,6 @@
+Sat Jun 27 16:58:53 UTC 2020 - Stefan Brüns
+
+- Update to 2020.1.3
+ * http://wiki.flightgear.org/Changelog_2020.1#2020.1.3_point_release
+
+---
Old:
simgear-2020.1.2.tar.bz2
New:
simgear-2020.1.3.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.7SL2gq/_old 2020-06-30 21:58:46.675188335 +0200
+++ /var/tmp/diff_new_pack.7SL2gq/_new 2020-06-30 21:58:46.679188348 +0200
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2020_1_2
+%define libname libSimGearCore-2020_1_3
%define main_version 2020.1
Name: SimGear
-Version:%{main_version}.2
+Version:%{main_version}.3
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
++ simgear-2020.1.2.tar.bz2 -> simgear-2020.1.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2020.1.2/CMakeLists.txt
new/simgear-2020.1.3/CMakeLists.txt
--- old/simgear-2020.1.2/CMakeLists.txt 2020-05-24 17:13:35.0 +0200
+++ new/simgear-2020.1.3/CMakeLists.txt 2020-06-26 00:07:33.0 +0200
@@ -227,7 +227,7 @@
endif()
find_package(Boost REQUIRED)
-set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION")
+set (BOOST_CXX_FLAGS "-DBOOST_BIMAP_DISABLE_SERIALIZATION
-DBOOST_NO_STDLIB_CONFIG")
include(BoostTestTargets)
if(SIMGEAR_HEADLESS)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/simgear-2020.1.2/simgear/scene/model/SGPickAnimation.cxx
new/simgear-2020.1.3/simgear/scene/model/SGPickAnimation.cxx
--- old/simgear-2020.1.2/simgear/scene/model/SGPickAnimation.cxx
2020-05-24 17:13:36.0 +0200
+++ new/simgear-2020.1.3/simgear/scene/model/SGPickAnimation.cxx
2020-06-26 00:07:33.0 +0200
@@ -136,11 +136,19 @@
virtual void update(double dt, int keyModState)
{
- if (!_condition || _condition->test()) {
- SG_UNUSED(keyModState);
- if (!_repeatable)
- return;
+ SG_UNUSED(keyModState);
+ if (_condition && !_condition->test()) {
+ return;
+ }
+ if (!_repeatable)
+ return;
+
+ const bool zeroInterval = (_repeatInterval <= 0.0);
+ if (zeroInterval) {
+ // fire once per frame
+ fireBindingList(_bindingsDown);
+ } else {
_repeatTime += dt;
while (_repeatInterval < _repeatTime) {
_repeatTime -= _repeatInterval;
@@ -678,12 +686,18 @@
if (_hasDragged) {
return;
}
-
-_repeatTime += dt;
-while (_repeatInterval < _repeatTime) {
-_repeatTime -= _repeatInterval;
+
+const bool zeroInterval = (_repeatInterval <= 0.0);
+if (zeroInterval) {
+// fire once per frame
fire(keyModState & osgGA::GUIEventAdapter::MODKEY_SHIFT,
_direction);
-} // of repeat iteration
+} else {
+_repeatTime += dt;
+while (_repeatInterval < _repeatTime) {
+_repeatTime -= _repeatInterval;
+fire(keyModState & osgGA::GUIEventAdapter::MODKEY_SHIFT,
_direction);
+} // of repeat iteration
+}
}
bool hover( const osg::Vec2d& windowPos, const Info& ) override
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2020.1.2/version new/simgear-2020.1.3/version
--- old/simgear-2020.1.2/version2020-05-24 17:13:36.0 +0200
+++ new/simgear-2020.1.3/version2020-06-26 00:07:33.0 +0200
@@ -1 +1 @@
-2020.1.2
+2020.1.3
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2020-06-14 18:32:09
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.3606 (New)
Package is "SimGear"
Sun Jun 14 18:32:09 2020 rev:15 rq:814219 version:2020.1.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2020-06-11
14:50:17.522392971 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.3606/SimGear.changes
2020-06-14 18:35:25.178563101 +0200
@@ -1,0 +2,6 @@
+Thu May 28 10:19:17 UTC 2020 - Stefan Brüns
+
+- Update to 2020.1.2
+ * http://wiki.flightgear.org/Changelog_2020.1#2020.1.2_point_release
+
+---
Old:
simgear-2020.1.1.tar.bz2
New:
simgear-2020.1.2.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.R2p2Bj/_old 2020-06-14 18:35:25.838565203 +0200
+++ /var/tmp/diff_new_pack.R2p2Bj/_new 2020-06-14 18:35:25.838565203 +0200
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2020_1_1
+%define libname libSimGearCore-2020_1_2
%define main_version 2020.1
Name: SimGear
-Version:%{main_version}.1
+Version:%{main_version}.2
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
++ simgear-2020.1.1.tar.bz2 -> simgear-2020.1.2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2020.1.1/CMakeLists.txt
new/simgear-2020.1.2/CMakeLists.txt
--- old/simgear-2020.1.1/CMakeLists.txt 2020-05-10 22:31:07.0 +0200
+++ new/simgear-2020.1.2/CMakeLists.txt 2020-05-24 17:13:35.0 +0200
@@ -445,15 +445,18 @@
# fix Boost compilation :(
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
- set(CMAKE_C_FLAGS
-"${CMAKE_C_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
- set(CMAKE_CXX_FLAGS
-"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
-elseif (ENABLE_SIMD)
+# override CMake default RelWithDebInfo flags.
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -g -DNDEBUG")
+
+if (ENABLE_SIMD)
if (X86 OR X86_64)
set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
+
+# propogate to the RelWithDebInfo flags
+set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELEASE} -g
-DNDEBUG")
+set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELEASE} -g
-DNDEBUG")
endif()
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2020.1.1/version new/simgear-2020.1.2/version
--- old/simgear-2020.1.1/version2020-05-10 22:31:08.0 +0200
+++ new/simgear-2020.1.2/version2020-05-24 17:13:36.0 +0200
@@ -1 +1 @@
-2020.1.1
+2020.1.2
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2020-06-11 14:49:33
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.3606 (New)
Package is "SimGear"
Thu Jun 11 14:49:33 2020 rev:14 rq:805267 version:2020.1.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-10-16
09:17:34.683113030 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.3606/SimGear.changes
2020-06-11 14:50:17.522392971 +0200
@@ -1,0 +2,16 @@
+Tue May 12 18:49:45 UTC 2020 - Stefan Brüns
+
+- Update to 2020.1.1
+ * changelog: http://wiki.flightgear.org/Changelog_2020.1
+- Drop upstream patches:
+ * 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
+ * 0001-Remove-deprecated-boost-utility.patch
+ * 0001-boost-enable_if-Support-Boost-versions-1.56.patch
+
+---
+Sat May 9 17:38:35 UTC 2020 - Stefan Brüns
+
+- Update to 2018.3.5
+ * changelog:
http://wiki.flightgear.org/Changelog_2018.3#2018.3.5_point_release
+
+---
Old:
0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
0001-Remove-deprecated-boost-utility.patch
0001-boost-enable_if-Support-Boost-versions-1.56.patch
simgear-2018.3.4.tar.bz2
New:
SimGear-rpmlintrc
simgear-2020.1.1.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.KgzjAJ/_old 2020-06-11 14:50:20.322401958 +0200
+++ /var/tmp/diff_new_pack.KgzjAJ/_new 2020-06-11 14:50:20.326401971 +0200
@@ -1,7 +1,7 @@
#
# spec file for package SimGear
#
-# 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
@@ -20,35 +20,29 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2018_3_4
-%define main_version 2018.3
+%define libname libSimGearCore-2020_1_1
+%define main_version 2020.1
Name: SimGear
-Version:%{main_version}.4
+Version:%{main_version}.1
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
License:LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT
Group: Amusements/Games/3D/Simulation
-Url:http://www.flightgear.org/
+URL:https://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM 0001-Remove-deprecated-boost-utility.patch
-Patch1: 0001-Remove-deprecated-boost-utility.patch
-# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch
-Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch
-# PATCH-FIX-UPSTREAM
-Patch3: 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
+Source99: SimGear-rpmlintrc
BuildRequires: cmake
BuildRequires: gcc-c++
-BuildRequires: libOpenSceneGraph-devel < 3.6
-BuildConflicts: libOpenSceneGraph-devel < 3.2
+BuildRequires: libOpenSceneGraph-devel
BuildRequires: libboost_headers-devel
BuildRequires: pkgconfig
+BuildRequires: udns-devel
BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(zlib)
-BuildRequires: udns-devel
%description
SimGear is a set of open-source libraries designed to be used as building
@@ -88,9 +82,6 @@
%prep
%setup -q -n simgear-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
%build
export CFLAGS="%{optflags}"
++ SimGear-rpmlintrc ++
# The plugins version has to be the same version as the OpenSceneGraph library
addFilter("libSimGearCore-.*: E:
shlib-fixed-dependency.*OpenSceneGraph-plugins")
++ simgear-2018.3.4.tar.bz2 -> simgear-2020.1.1.tar.bz2 ++
30651 lines of diff (skipped)
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-10-16 09:17:34
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.2352 (New)
Package is "SimGear"
Wed Oct 16 09:17:34 2019 rev:13 rq:738484 version:2018.3.4
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-08-22
10:58:09.201653337 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.2352/SimGear.changes
2019-10-16 09:17:34.683113030 +0200
@@ -1,0 +2,8 @@
+Thu Sep 26 11:41:34 UTC 2019 - Stefan Brüns
+
+- Fix build with cmake 3.15 due to
https://cmake.org/cmake/help/v3.15/policy/CMP0093.html
+ 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
+- Use system expat and udns libraries
+- Enable OpenMP support
+
+---
New:
0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.Pvoh7q/_old 2019-10-16 09:17:35.167111782 +0200
+++ /var/tmp/diff_new_pack.Pvoh7q/_new 2019-10-16 09:17:35.167111782 +0200
@@ -35,20 +35,20 @@
Patch1: 0001-Remove-deprecated-boost-utility.patch
# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch
Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch
+# PATCH-FIX-UPSTREAM
+Patch3: 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel < 3.6
BuildConflicts: libOpenSceneGraph-devel < 3.2
+BuildRequires: libboost_headers-devel
BuildRequires: pkgconfig
+BuildRequires: pkgconfig(expat)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(openal)
BuildRequires: pkgconfig(zlib)
-%if 0%{?suse_version} > 1330
-BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
+BuildRequires: udns-devel
%description
SimGear is a set of open-source libraries designed to be used as building
@@ -75,14 +75,11 @@
Summary:Development libraries and headers for SimGear
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
-%if 0%{?suse_version} > 1330
BuildRequires: libboost_headers-devel
-%else
-BuildRequires: boost-devel
-%endif
Requires: libOpenSceneGraph-devel = %{openscenegraph_version}
Requires: libjpeg-devel
Requires: openal-soft-devel
+Requires: udns-devel
Requires: zlib-devel
%description devel
@@ -93,6 +90,7 @@
%setup -q -n simgear-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
%build
export CFLAGS="%{optflags}"
@@ -100,8 +98,12 @@
# configure to build shared simgear libraries
%cmake \
-DSIMGEAR_SHARED:BOOL=ON \
+ -DSYSTEM_EXPAT:BOOL=ON \
+ -DSYSTEM_UDNS:BOOL=ON \
+ -DENABLE_OPENMP:BOOL=ON \
-DENABLE_TESTS:BOOL=OFF
-make %{?_smp_mflags}
+
+%cmake_build
%install
%cmake_install
++ 0001-Always-add-PROJECT_BINARY_DIR-to-include_directories.patch ++
>From efc88b61330961965decc7a8d33310327c3306f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?=
Date: Mon, 14 Oct 2019 20:30:35 +0200
Subject: [PATCH] Always add PROJECT_BINARY_DIR to include_directories
The directory is added by BoostTestTargets.cmake when Boost is found,
but due to a bug in the file it fails to detect boost even when it is
available.
---
CMakeLists.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a2f59f..3cb28ae 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -520,6 +520,7 @@ include(CheckCXXFeatures)
# use BEFORE to ensure local directories are used first,
# ahead of system-installed libs
include_directories(BEFORE ${PROJECT_BINARY_DIR}/simgear)
+include_directories(BEFORE ${PROJECT_BINARY_DIR})
add_definitions(-DHAVE_CONFIG_H)
--
2.23.0
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-08-22 10:58:04
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.22127 (New)
Package is "SimGear"
Thu Aug 22 10:58:04 2019 rev:12 rq:725144 version:2018.3.4
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-03-22
15:11:05.365301439 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new.22127/SimGear.changes
2019-08-22 10:58:09.201653337 +0200
@@ -1,0 +2,8 @@
+Fri Aug 16 22:11:30 UTC 2019 - Stefan Brüns
+
+- Update to 2018.3.4
+ * changelog:
http://wiki.flightgear.org/Changelog_2018.3#2018.3.4_point_release
+- Drop upstream patches:
+ * 0001-Improve-HTTP-redirect-handling-and-add-test.patch
+
+---
Old:
0001-Improve-HTTP-redirect-handling-and-add-test.patch
simgear-2018.3.2.tar.bz2
New:
simgear-2018.3.4.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.67F6tt/_old 2019-08-22 10:58:10.313653188 +0200
+++ /var/tmp/diff_new_pack.67F6tt/_new 2019-08-22 10:58:10.317653187 +0200
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2018_3_2
+%define libname libSimGearCore-2018_3_4
%define main_version 2018.3
Name: SimGear
-Version:%{main_version}.2
+Version:%{main_version}.4
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
@@ -31,8 +31,6 @@
Group: Amusements/Games/3D/Simulation
Url:http://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM 0001-Improve-HTTP-redirect-handling-and-add-test.patch
-Patch0: 0001-Improve-HTTP-redirect-handling-and-add-test.patch
# PATCH-FIX-UPSTREAM 0001-Remove-deprecated-boost-utility.patch
Patch1: 0001-Remove-deprecated-boost-utility.patch
# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch
@@ -93,7 +91,6 @@
%prep
%setup -q -n simgear-%{version}
-%patch0 -p1
%patch1 -p1
%patch2 -p1
++ simgear-2018.3.2.tar.bz2 -> simgear-2018.3.4.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.2/simgear/io/HTTPClient.cxx
new/simgear-2018.3.4/simgear/io/HTTPClient.cxx
--- old/simgear-2018.3.2/simgear/io/HTTPClient.cxx 2019-01-29
14:17:36.0 +0100
+++ new/simgear-2018.3.4/simgear/io/HTTPClient.cxx 2019-08-09
13:48:36.0 +0200
@@ -472,12 +472,26 @@
return actualBytes;
}
+bool isRedirectStatus(int code)
+{
+return ((code >= 300) && (code < 400));
+}
+
size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t
nitems, void *userdata)
{
size_t byteSize = size * nitems;
Request* req = static_cast(userdata);
std::string h = strutils::simplify(std::string(rawBuffer, byteSize));
+ if (req->readyState() >= HTTP::Request::HEADERS_RECEIVED) {
+ // this can happen with chunked transfers (secondary chunks)
+ // or redirects
+ if (isRedirectStatus(req->responseCode())) {
+ req->responseStart(h);
+ return byteSize;
+ }
+ }
+
if (req->readyState() == HTTP::Request::OPENED) {
req->responseStart(h);
return byteSize;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.2/simgear/io/HTTPRequest.cxx
new/simgear-2018.3.4/simgear/io/HTTPRequest.cxx
--- old/simgear-2018.3.2/simgear/io/HTTPRequest.cxx 2019-01-29
14:17:36.0 +0100
+++ new/simgear-2018.3.4/simgear/io/HTTPRequest.cxx 2019-08-09
13:48:36.0 +0200
@@ -329,6 +329,16 @@
}
//--
+void Request::setSuccess(int code)
+{
+_responseStatus = code;
+_responseReason.clear();
+if( !isComplete() ) {
+setReadyState(DONE);
+}
+}
+
+//--
void Request::setFailure(int code, const std::string& reason)
{
SG_LOG(SG_IO, SG_WARN, "HTTP request: set failure:" << code << " reason "
<< reason);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.2/simgear/io/HTTPRequest.hxx
new/simgear-2018.3.4/simgear/io/HTTPRequest.hxx
--- old/simgear-2018.3.2/
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-03-22 15:10:55
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.25356 (New)
Package is "SimGear"
Fri Mar 22 15:10:55 2019 rev:11 rq:687431 version:2018.3.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-03-06
15:51:04.692439578 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new.25356/SimGear.changes
2019-03-22 15:11:05.365301439 +0100
@@ -1,0 +2,7 @@
+Thu Mar 21 18:22:45 UTC 2019 - Stefan Brüns
+
+- Fix building with booost 1.69:
+ * Add 0001-Remove-deprecated-boost-utility.patch
+ * Add 0001-boost-enable_if-Support-Boost-versions-1.56.patch
+
+---
New:
0001-Remove-deprecated-boost-utility.patch
0001-boost-enable_if-Support-Boost-versions-1.56.patch
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.CwxBle/_old 2019-03-22 15:11:07.753301132 +0100
+++ /var/tmp/diff_new_pack.CwxBle/_new 2019-03-22 15:11:07.773301129 +0100
@@ -33,6 +33,10 @@
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
# PATCH-FIX-UPSTREAM 0001-Improve-HTTP-redirect-handling-and-add-test.patch
Patch0: 0001-Improve-HTTP-redirect-handling-and-add-test.patch
+# PATCH-FIX-UPSTREAM 0001-Remove-deprecated-boost-utility.patch
+Patch1: 0001-Remove-deprecated-boost-utility.patch
+# PATCH-FIX-UPSTREAM 0001-boost-enable_if-Support-Boost-versions-1.56.patch
+Patch2: 0001-boost-enable_if-Support-Boost-versions-1.56.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel < 3.6
@@ -90,6 +94,8 @@
%prep
%setup -q -n simgear-%{version}
%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
export CFLAGS="%{optflags}"
++ 0001-Remove-deprecated-boost-utility.patch ++
>From 4b793d5344af26a0fca4f6d7ccc7ce0b55d3c935 Mon Sep 17 00:00:00 2001
From: Scott Giese
Date: Sat, 2 Feb 2019 19:46:04 -0600
Subject: [PATCH] Remove deprecated boost/utility. This is enable compatibility
with boost 1.69.
---
simgear/nasal/cppbind/NasalHash.hxx| 1 +
simgear/props/props.hxx| 3 ++-
simgear/structure/SGWeakReferenced.hxx | 2 +-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/simgear/nasal/cppbind/NasalHash.hxx
b/simgear/nasal/cppbind/NasalHash.hxx
index aac672fd..5019d08b 100644
--- a/simgear/nasal/cppbind/NasalHash.hxx
+++ b/simgear/nasal/cppbind/NasalHash.hxx
@@ -24,6 +24,7 @@
#include
#include
+#include
namespace nasal
{
diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index c94186cb..68d3c03c 100644
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -55,13 +55,14 @@ namespace boost {
struct disable_if : public disable_if_c {};
}
#else
-# include
# include
+# include
# include
# include
# include
#endif
+
#include
#include
diff --git a/simgear/structure/SGWeakReferenced.hxx
b/simgear/structure/SGWeakReferenced.hxx
index 3bb70ffa..27f647b4 100644
--- a/simgear/structure/SGWeakReferenced.hxx
+++ b/simgear/structure/SGWeakReferenced.hxx
@@ -22,7 +22,7 @@
#include "SGSharedPtr.hxx"
#include
-#include
+#include
#ifdef _MSC_VER
# pragma warning(push)
--
2.21.0
++ 0001-boost-enable_if-Support-Boost-versions-1.56.patch ++
>From 7246edcb4b5180bf14c25a012562120ff0805fac Mon Sep 17 00:00:00 2001
From: Scott Giese
Date: Tue, 5 Feb 2019 12:20:06 -0600
Subject: [PATCH] [boost::enable_if] Support Boost versions < 1.56
---
simgear/nasal/cppbind/NasalHash.hxx| 4
simgear/props/props.hxx| 6 +-
simgear/structure/SGWeakReferenced.hxx | 4
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/simgear/nasal/cppbind/NasalHash.hxx
b/simgear/nasal/cppbind/NasalHash.hxx
index 5019d08b..59281643 100644
--- a/simgear/nasal/cppbind/NasalHash.hxx
+++ b/simgear/nasal/cppbind/NasalHash.hxx
@@ -24,7 +24,11 @@
#include
#include
+#if BOOST_VERSION >= 105600
#include
+#else
+#include
+#endif
namespace nasal
{
diff --git a/simgear/props/props.hxx b/simgear/props/props.hxx
index 68d3c03c..3afc8796 100644
--- a/simgear/props/props.hxx
+++ b/simgear/props/props.hxx
@@ -56,7 +56,11 @@ namespace boost {
}
#else
# include
-# include
+#if BOOST_VERSION >= 105600
+#include
+#else
+#include
+#endif
# include
# include
diff --git a/simgear/structure/SGWeakReferenced.hxx
b/simgear/structure/SGWeakReferenced.hxx
index 27f647b4..24db41b8 100644
--- a/simgear/structure/SGWeakReferenced.hxx
+++ b/simgear/structure/SGWeakReferenced.hxx
@@ -22,7 +22,11 @@
#inc
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-03-06 15:50:56
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.28833 (New)
Package is "SimGear"
Wed Mar 6 15:50:56 2019 rev:10 rq:681969 version:2018.3.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-02-19
12:00:07.541147076 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new.28833/SimGear.changes
2019-03-06 15:51:04.692439578 +0100
@@ -1,0 +2,6 @@
+Mon Mar 4 20:09:34 UTC 2019 - Stefan Brüns
+
+- Fix redirect handling, add
+ 0001-Improve-HTTP-redirect-handling-and-add-test.patch
+
+---
New:
0001-Improve-HTTP-redirect-handling-and-add-test.patch
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.uvPEE9/_old 2019-03-06 15:51:06.140439319 +0100
+++ /var/tmp/diff_new_pack.uvPEE9/_new 2019-03-06 15:51:06.168439314 +0100
@@ -1,7 +1,7 @@
#
# spec file for package SimGear
#
-# 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
@@ -31,6 +31,8 @@
Group: Amusements/Games/3D/Simulation
Url:http://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
+# PATCH-FIX-UPSTREAM 0001-Improve-HTTP-redirect-handling-and-add-test.patch
+Patch0: 0001-Improve-HTTP-redirect-handling-and-add-test.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel < 3.6
@@ -87,6 +89,7 @@
%prep
%setup -q -n simgear-%{version}
+%patch0 -p1
%build
export CFLAGS="%{optflags}"
++ 0001-Improve-HTTP-redirect-handling-and-add-test.patch ++
>From 34b3c52a288d62779073fc7694344d0658755645 Mon Sep 17 00:00:00 2001
From: James Turner
Date: Wed, 13 Feb 2019 12:34:17 +
Subject: [PATCH] Improve HTTP redirect handling, and add test.
Ensure we get the final status code for the request after redirecting.
---
simgear/io/HTTPClient.cxx | 14 ++
simgear/io/HTTPRequest.cxx | 10 ++
simgear/io/HTTPRequest.hxx | 2 +-
simgear/io/test_HTTP.cxx | 36 +++-
simgear/io/test_HTTP.hxx | 6 ++
5 files changed, 62 insertions(+), 6 deletions(-)
diff --git a/simgear/io/HTTPClient.cxx b/simgear/io/HTTPClient.cxx
index 0c31354b..0adf0be8 100644
--- a/simgear/io/HTTPClient.cxx
+++ b/simgear/io/HTTPClient.cxx
@@ -476,12 +476,26 @@ size_t Client::requestReadCallback(char *ptr, size_t
size, size_t nmemb, void *u
return actualBytes;
}
+bool isRedirectStatus(int code)
+{
+return ((code >= 300) && (code < 400));
+}
+
size_t Client::requestHeaderCallback(char *rawBuffer, size_t size, size_t
nitems, void *userdata)
{
size_t byteSize = size * nitems;
Request* req = static_cast(userdata);
std::string h = strutils::simplify(std::string(rawBuffer, byteSize));
+ if (req->readyState() >= HTTP::Request::HEADERS_RECEIVED) {
+ // this can happen with chunked transfers (secondary chunks)
+ // or redirects
+ if (isRedirectStatus(req->responseCode())) {
+ req->responseStart(h);
+ return byteSize;
+ }
+ }
+
if (req->readyState() == HTTP::Request::OPENED) {
req->responseStart(h);
return byteSize;
diff --git a/simgear/io/HTTPRequest.cxx b/simgear/io/HTTPRequest.cxx
index 294d2f0c..7266d780 100644
--- a/simgear/io/HTTPRequest.cxx
+++ b/simgear/io/HTTPRequest.cxx
@@ -328,6 +328,16 @@ unsigned int Request::responseLength() const
return _responseLength;
}
+//--
+void Request::setSuccess(int code)
+{
+_responseStatus = code;
+_responseReason.clear();
+if( !isComplete() ) {
+setReadyState(DONE);
+}
+}
+
//--
void Request::setFailure(int code, const std::string& reason)
{
diff --git a/simgear/io/HTTPRequest.hxx b/simgear/io/HTTPRequest.hxx
index 0def0888..9ba8db3e 100644
--- a/simgear/io/HTTPRequest.hxx
+++ b/simgear/io/HTTPRequest.hxx
@@ -224,7 +224,7 @@ protected:
virtual void onAlways();
void setFailure(int code, const std::string& reason);
-
+void setSuccess(int code);
private:
friend class Client;
friend class Connection;
diff --git a/simgear/io/test_HTTP.cxx b/simgear/io/test_HTTP.cxx
index 3bf9947d..ccef3f9e 100644
--- a
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-02-19 11:59:17
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.28833 (New)
Package is "SimGear"
Tue Feb 19 11:59:17 2019 rev:9 rq:676834 version:2018.3.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2019-01-08
12:26:32.172399664 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new.28833/SimGear.changes
2019-02-19 12:00:07.541147076 +0100
@@ -1,0 +2,6 @@
+Mon Feb 11 22:45:29 UTC 2019 - Stefan Brüns
+
+- Update to 2018.3.2
+ * changelog:
http://wiki.flightgear.org/Changelog_2018.3#2018.3.2_point_release
+
+---
Old:
simgear-2018.3.1.tar.bz2
New:
simgear-2018.3.2.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.tULLqT/_old 2019-02-19 12:00:08.417146615 +0100
+++ /var/tmp/diff_new_pack.tULLqT/_new 2019-02-19 12:00:08.421146612 +0100
@@ -20,10 +20,10 @@
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2018_3_1
+%define libname libSimGearCore-2018_3_2
%define main_version 2018.3
Name: SimGear
-Version:%{main_version}.1
+Version:%{main_version}.2
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
++ simgear-2018.3.1.tar.bz2 -> simgear-2018.3.2.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.1/CMakeLists.txt
new/simgear-2018.3.2/CMakeLists.txt
--- old/simgear-2018.3.1/CMakeLists.txt 2018-12-03 16:41:22.0 +0100
+++ new/simgear-2018.3.2/CMakeLists.txt 2019-01-29 14:17:36.0 +0100
@@ -125,9 +125,14 @@
option(USE_AEONWAVE "Set to ON to use AeonWave instead of OpenAL" ON)
option(ENABLE_PKGUTIL "Set to ON to build the sg_pkgutil application
(default)" ON)
option(ENABLE_DNS "Set to ON to use udns library and DNS service
resolver" ON)
-option(ENABLE_SIMD "Enable SSE/SSE2 support for x86 compilers" ON)
+option(ENABLE_SIMD "Enable SSE/SSE2 support for compilers" ON)
+option(ENABLE_SIMD_CODE"Enable SSE/SSE2 support code for compilers"
OFF)
option(ENABLE_OPENMP"Enable OpenMP compiler support" OFF)
+if (NOT ENABLE_SIMD AND ENABLE_SIMD_CODE)
+ set(ENABLE_SIMD_CODE OFF)
+endif()
+
include (DetectArch)
# until the fstream fix is applied and generally available in OSG,
@@ -412,8 +417,8 @@
"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline")
elseif (ENABLE_SIMD)
if (X86 OR X86_64)
-set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
endif()
endif()
@@ -440,8 +445,8 @@
"${CMAKE_CXX_FLAGS} -O0 -fno-omit-frame-pointer -fno-inline-functions")
elseif (ENABLE_SIMD)
if (X86 OR X86_64)
-set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse")
+set(CMAKE_C_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
+set(CMAKE_CXX_FLAGS_RELEASE "-O3 -msse2 -mfpmath=sse -ftree-vectorize
-ftree-slp-vectorize")
endif()
endif()
endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.1/simgear/math/simd.hxx
new/simgear-2018.3.2/simgear/math/simd.hxx
--- old/simgear-2018.3.1/simgear/math/simd.hxx 2018-12-03 16:41:22.0
+0100
+++ new/simgear-2018.3.2/simgear/math/simd.hxx 2019-01-29 14:17:36.0
+0100
@@ -309,7 +309,7 @@
return v;
}
-#ifdef ENABLE_SIMD
+#ifdef ENABLE_SIMD_CODE
# ifdef __SSE__
namespace simd4
@@ -1305,7 +1305,7 @@
# endif
-#endif /* ENABLE_SIMD */
+#endif /* ENABLE_SIMD_CODE */
#endif /* __SIMD_H__ */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simgear-2018.3.1/simgear/math/simd4x4.hxx
new/simgear-2018.3.2/simgear/math/simd4x4.hxx
--- old/simgear-2018.3.1/simgear/math/simd4x4.hxx 2018-12-03
16:41:22.0 +0100
+++ new/simgear-2018.3.2/simgear/math/simd4x4.hxx 2019-01-29
14:17:36.0 +0100
@@ -289,7 +289,7 @@
}
-#ifdef ENABLE_SIMD
+#ifdef
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2019-01-08 12:24:29
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new.28833 (New)
Package is "SimGear"
Tue Jan 8 12:24:29 2019 rev:8 rq:659948 version:2018.3.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2018-07-24
17:24:52.539490764 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new.28833/SimGear.changes
2019-01-08 12:26:32.172399664 +0100
@@ -1,0 +2,7 @@
+Tue Dec 18 00:06:29 UTC 2018 - Stefan Brüns
+
+- Update to 2018.3.1
+ * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.3
+- Drop upstream 0001-Add-missing-return-value.patch
+
+---
Old:
0001-Add-missing-return-value.patch
simgear-2018.2.2.tar.bz2
New:
simgear-2018.3.1.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.tvJLmO/_old 2019-01-08 12:26:32.980398780 +0100
+++ /var/tmp/diff_new_pack.tvJLmO/_new 2019-01-08 12:26:32.984398775 +0100
@@ -12,17 +12,18 @@
# 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/
#
+
# We want specific versions of the devel and plugins OpenSceneGraph subpackages
# in our requirements, i.e. the same version we have built against
%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2018_2_2
-%define main_version 2018.2
+%define libname libSimGearCore-2018_3_1
+%define main_version 2018.3
Name: SimGear
-Version:%{main_version}.2
+Version:%{main_version}.1
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
@@ -30,8 +31,6 @@
Group: Amusements/Games/3D/Simulation
Url:http://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM 0001-Add-missing-return-value.patch
-Patch0: 0001-Add-missing-return-value.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel < 3.6
@@ -88,7 +87,6 @@
%prep
%setup -q -n simgear-%{version}
-%patch0 -p1
%build
export CFLAGS="%{optflags}"
++ simgear-2018.2.2.tar.bz2 -> simgear-2018.3.1.tar.bz2 ++
4551 lines of diff (skipped)
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2018-07-24 17:24:38
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new (New)
Package is "SimGear"
Tue Jul 24 17:24:38 2018 rev:7 rq:624571 version:2018.2.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2018-01-05
01:00:32.345583874 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2018-07-24
17:24:52.539490764 +0200
@@ -1,0 +2,30 @@
+Thu Jul 19 00:44:12 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Adjust BuildRequires and Requires
+ * Use BuildConflicts to force a OSG version >= 3.2
+ * Drop BuildRequires for OSG plugins, not needed
+ * Add versioned Requires: openSceneGraph-plugins. We want plugins
+with the same version as the linked library
+- Use %license for COPYING
+
+---
+Sun Jul 1 03:21:06 UTC 2018 - stefan.bru...@rwth-aachen.de
+
+- Fix failing build, no-return-in-nonvoid-function
+ 0001-Add-missing-return-value.patch
+- Change BuildRequires, OpenSceneGraph 3.6 has an incompatible API
+
+---
+Wed Jun 27 15:43:30 UTC 2018 - mathias.hom...@opensuse.org
+
+- Update to 2018.2.2
+ * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.2
+ * Fixes boo#1099288 (update requested)
+
+---
+Fri May 4 21:52:40 UTC 2018 - mathias.hom...@opensuse.org
+
+- Update to 2018.1.1
+ * changelog: see upstream, http://wiki.flightgear.org/Changelog_2018.1
+
+---
Old:
simgear-2017.3.1.tar.bz2
New:
0001-Add-missing-return-value.patch
simgear-2018.2.2.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.fleGly/_old 2018-07-24 17:24:55.927495081 +0200
+++ /var/tmp/diff_new_pack.fleGly/_new 2018-07-24 17:24:55.927495081 +0200
@@ -15,27 +15,31 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+# We want specific versions of the devel and plugins OpenSceneGraph subpackages
+# in our requirements, i.e. the same version we have built against
+%define openscenegraph_version %(rpm -qa --nosignature --nodigest
libOpenSceneGraph\*-devel | sed 's/.*-devel-\\(.*\\)-.*/\\1/')
-%define libname libSimGearCore-2017_3_1
-%define main_version 2017.3
+%define libname libSimGearCore-2018_2_2
+%define main_version 2018.2
Name: SimGear
-Version:%{main_version}.1
+Version:%{main_version}.2
Release:0
Summary:Simulator Construction Gear
# https://sourceforge.net/p/flightgear/codetickets/1940/
-License:LGPL-2.0+ and GPL-2.0+ and MIT
+License:LGPL-2.0-or-later AND GPL-2.0-or-later AND MIT
Group: Amusements/Games/3D/Simulation
Url:http://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
-BuildRequires: OpenSceneGraph-plugins >= 3.2
+# PATCH-FIX-UPSTREAM 0001-Add-missing-return-value.patch
+Patch0: 0001-Add-missing-return-value.patch
BuildRequires: cmake
BuildRequires: gcc-c++
-BuildRequires: libOpenSceneGraph-devel > 1.2
+BuildRequires: libOpenSceneGraph-devel < 3.6
+BuildConflicts: libOpenSceneGraph-devel < 3.2
BuildRequires: pkgconfig
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(libcurl)
BuildRequires: pkgconfig(openal)
-BuildRequires: pkgconfig(openthreads)
BuildRequires: pkgconfig(zlib)
%if 0%{?suse_version} > 1330
BuildRequires: libboost_headers-devel
@@ -54,7 +58,7 @@
%package -n %{libname}
Summary:Simulator Construction Gear
Group: Amusements/Games/3D/Simulation
-Requires: OpenSceneGraph-plugins >= 3.0
+Requires: OpenSceneGraph-plugins = %{openscenegraph_version}
%description -n %{libname}
SimGear is a set of open-source libraries designed to be used as building
@@ -68,9 +72,12 @@
Summary:Development libraries and headers for SimGear
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
-Requires: boost-devel
-Requires: libOpenSceneGraph-devel > 1.2
-Requires: libOpenThreads-devel
+%if 0%{?suse_version} > 1330
+BuildRequires: libboost_headers-devel
+%else
+BuildRequires: boost-devel
+%endif
+Requires: libOpenSceneGraph-devel = %{openscenegraph_version}
Requires: libjpeg-devel
Requires: openal-soft-devel
Requires: zlib-devel
@@ -81,6 +88,7 @@
%prep
%setup -q -n simgear-%{version}
+%patch0 -p1
%build
export CFLAG
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2018-01-05 01:00:27
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new (New)
Package is "SimGear"
Fri Jan 5 01:00:27 2018 rev:6 rq:561448 version:2017.3.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2017-12-12
21:22:50.110816843 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2018-01-05
01:00:32.345583874 +0100
@@ -1,0 +2,5 @@
+Wed Jan 3 12:19:56 UTC 2018 - r...@fthiessen.de
+
+- Fixed dependencies
+
+---
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.Ea1rlV/_old 2018-01-05 01:00:34.880740394 +0100
+++ /var/tmp/diff_new_pack.Ea1rlV/_new 2018-01-05 01:00:34.884739064 +0100
@@ -1,7 +1,7 @@
#
# spec file for package SimGear
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -27,16 +27,21 @@
Group: Amusements/Games/3D/Simulation
Url:http://www.flightgear.org/
Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
-BuildRequires: OpenSceneGraph-plugins >= 3.0
-BuildRequires: boost-devel
+BuildRequires: OpenSceneGraph-plugins >= 3.2
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel > 1.2
-BuildRequires: libOpenThreads-devel
-BuildRequires: libjpeg-devel
-BuildRequires: openal-soft-devel
-BuildRequires: zlib-devel
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(gl)
+BuildRequires: pkgconfig(libcurl)
+BuildRequires: pkgconfig(openal)
+BuildRequires: pkgconfig(openthreads)
+BuildRequires: pkgconfig(zlib)
+%if 0%{?suse_version} > 1330
+BuildRequires: libboost_headers-devel
+%else
+BuildRequires: boost-devel
+%endif
%description
SimGear is a set of open-source libraries designed to be used as building
@@ -46,12 +51,12 @@
SimGear is developed as part of the FlightGear project and used by the
FlightGear flight simulator and many of its related utilities.
-%package -n %libname
+%package -n %{libname}
Summary:Simulator Construction Gear
Group: Amusements/Games/3D/Simulation
Requires: OpenSceneGraph-plugins >= 3.0
-%description -n %libname
+%description -n %{libname}
SimGear is a set of open-source libraries designed to be used as building
blocks for quickly assembling 3D simulations, games, and visualization
applications.
@@ -91,17 +96,14 @@
install -m 755 -d %{buildroot}%{_docdir}/%{name}
install -m 644 -t %{buildroot}%{_docdir}/%{name} AUTHORS ChangeLog NEWS README
-%post -n %libname -p /sbin/ldconfig
-
-%postun -n %libname -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
-%files -n %libname
-%defattr(-,root,root,-)
+%files -n %{libname}
%doc COPYING
%{_libdir}/libSimGear*.so.*
%files devel
-%defattr(-,root,root,-)
%doc %{_docdir}/%{name}
%{_includedir}/simgear/
%{_libdir}/libSimGear*.so
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2017-12-12 21:22:48
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new (New)
Package is "SimGear"
Tue Dec 12 21:22:48 2017 rev:5 rq:556012 version:2017.3.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2017-10-03
23:20:29.759305275 +0200
+++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2017-12-12
21:22:50.110816843 +0100
@@ -1,0 +2,7 @@
+Tue Dec 5 12:49:39 UTC 2017 - stefan.bru...@rwth-aachen.de
+
+- Drop lots of unused BuildRequires, as a side effect, fixes building
+ on Factory (as it no longer requires openSSL 1_0_0 and 1_1_0)
+- Remove no longer used/known -DJPEG_FACTORY:BOOL=ON
+
+---
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.l06fk9/_old 2017-12-12 21:22:51.034772240 +0100
+++ /var/tmp/diff_new_pack.l06fk9/_new 2017-12-12 21:22:51.034772240 +0100
@@ -30,18 +30,12 @@
BuildRequires: OpenSceneGraph-plugins >= 3.0
BuildRequires: boost-devel
BuildRequires: cmake
-BuildRequires: freealut-devel
-BuildRequires: freeglut-devel
BuildRequires: gcc-c++
BuildRequires: libOpenSceneGraph-devel > 1.2
BuildRequires: libOpenThreads-devel
BuildRequires: libjpeg-devel
BuildRequires: openal-soft-devel
-BuildRequires: pkgconfig
-BuildRequires: plib-devel
-BuildRequires: subversion-devel
BuildRequires: zlib-devel
-BuildRequires: pkgconfig(apr-1)
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -70,16 +64,11 @@
Group: Development/Libraries/C and C++
Requires: %{libname} = %{version}
Requires: boost-devel
-Requires: freealut-devel
-Requires: freeglut-devel
Requires: libOpenSceneGraph-devel > 1.2
Requires: libOpenThreads-devel
Requires: libjpeg-devel
Requires: openal-soft-devel
-Requires: plib-devel
-Requires: subversion-devel
Requires: zlib-devel
-Requires: pkgconfig(apr-1)
%description devel
Development headers and libraries for building applications against
@@ -94,8 +83,7 @@
# configure to build shared simgear libraries
%cmake \
-DSIMGEAR_SHARED:BOOL=ON \
- -DENABLE_TESTS:BOOL=OFF \
- -DJPEG_FACTORY:BOOL=ON
+ -DENABLE_TESTS:BOOL=OFF
make %{?_smp_mflags}
%install
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2017-10-03 23:20:26
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new (New)
Package is "SimGear"
Tue Oct 3 23:20:26 2017 rev:4 rq:530938 version:2017.3.1
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2017-03-24
02:20:26.238398593 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2017-10-03
23:20:29.759305275 +0200
@@ -1,0 +2,20 @@
+Tue Sep 26 10:02:38 UTC 2017 - mathias.hom...@opensuse.org
+
+- Update to 2017.3.1
+ * Change API for thumbnail access, so each variant can have a
+unique thumbnail alongside other data. Map existing catalog
+XML format to this system.
+ * New alternative terrain engine - SGMesh utilizing pagedLOD.
+ * OSG 3.5.x support
+ * Package APIs to support multiple primary aircraft, this
+will allow packages to supply multiple primary aircraft.
+ * Fix bug "dns timeout, no terrasync servers found"
+ * Allow animations to take an object as the centre and axis.
+ * Fix mesh visibility on pick animations.
+ * Fix animation axis text for new calling conventions.
+ * Enable display lists for random trees.
+ * Add efficient hasTag check to Package.
+ * Persistent thumbnail cache for aircraft packages.
+ * Clear Uniform cache on reset.
+
+---
Old:
simgear-2017.1.2.tar.bz2
New:
simgear-2017.3.1.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.8oKzCh/_old 2017-10-03 23:20:30.567191580 +0200
+++ /var/tmp/diff_new_pack.8oKzCh/_new 2017-10-03 23:20:30.571191017 +0200
@@ -16,16 +16,17 @@
#
-%define libname libSimGearCore-2017_1_2
+%define libname libSimGearCore-2017_3_1
+%define main_version 2017.3
Name: SimGear
-Version:2017.1.2
+Version:%{main_version}.1
Release:0
Summary:Simulator Construction Gear
+# https://sourceforge.net/p/flightgear/codetickets/1940/
License:LGPL-2.0+ and GPL-2.0+ and MIT
Group: Amusements/Games/3D/Simulation
-# https://sourceforge.net/p/flightgear/codetickets/1940/
Url:http://www.flightgear.org/
-Source0:
http://downloads.sourceforge.net/project/flightgear/release-2017.1/simgear-%{version}.tar.bz2
+Source0:
https://sourceforge.net/projects/flightgear/files/release-%{main_version}/simgear-%{version}.tar.bz2
BuildRequires: OpenSceneGraph-plugins >= 3.0
BuildRequires: boost-devel
BuildRequires: cmake
++ simgear-2017.1.2.tar.bz2 -> simgear-2017.3.1.tar.bz2 ++
16752 lines of diff (skipped)
commit SimGear for openSUSE:Factory
Hello community,
here is the log from the commit of package SimGear for openSUSE:Factory checked
in at 2017-03-24 02:20:25
Comparing /work/SRC/openSUSE:Factory/SimGear (Old)
and /work/SRC/openSUSE:Factory/.SimGear.new (New)
Package is "SimGear"
Fri Mar 24 02:20:25 2017 rev:3 rq:480001 version:2017.1.2
Changes:
--- /work/SRC/openSUSE:Factory/SimGear/SimGear.changes 2017-02-03
17:31:03.477116360 +0100
+++ /work/SRC/openSUSE:Factory/.SimGear.new/SimGear.changes 2017-03-24
02:20:26.238398593 +0100
@@ -1,0 +2,5 @@
+Thu Mar 9 22:26:50 UTC 2017 - w...@ire.pw.edu.pl
+
+- Update to 2017.1.2
+
+---
Old:
simgear-2016.4.4.tar.bz2
New:
simgear-2017.1.2.tar.bz2
Other differences:
--
++ SimGear.spec ++
--- /var/tmp/diff_new_pack.afrSgw/_old 2017-03-24 02:20:27.458225997 +0100
+++ /var/tmp/diff_new_pack.afrSgw/_new 2017-03-24 02:20:27.458225997 +0100
@@ -16,16 +16,16 @@
#
-%define libname libSimGearCore-2016_4_4
+%define libname libSimGearCore-2017_1_2
Name: SimGear
-Version:2016.4.4
+Version:2017.1.2
Release:0
Summary:Simulator Construction Gear
-# https://sourceforge.net/p/flightgear/codetickets/1940/
License:LGPL-2.0+ and GPL-2.0+ and MIT
Group: Amusements/Games/3D/Simulation
+# https://sourceforge.net/p/flightgear/codetickets/1940/
Url:http://www.flightgear.org/
-Source0:
http://downloads.sourceforge.net/project/flightgear/release-2016.4/simgear-%{version}.tar.bz2
+Source0:
http://downloads.sourceforge.net/project/flightgear/release-2017.1/simgear-%{version}.tar.bz2
BuildRequires: OpenSceneGraph-plugins >= 3.0
BuildRequires: boost-devel
BuildRequires: cmake
++ simgear-2016.4.4.tar.bz2 -> simgear-2017.1.2.tar.bz2 ++
20098 lines of diff (skipped)
