diff --git a/OpenSceneGraph-3.6.3.tar.gz b/OpenSceneGraph-3.6.3.tar.gz deleted file mode 100644 index fd6a69c..0000000 --- a/OpenSceneGraph-3.6.3.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:51bbc79aa73ca602cd1518e4e25bd71d41a10abd296e18093a8acfebd3c62696 -size 5784660 diff --git a/OpenSceneGraph-3.6.5.tar.gz b/OpenSceneGraph-3.6.5.tar.gz new file mode 100644 index 0000000..f33c6f6 --- /dev/null +++ b/OpenSceneGraph-3.6.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:aea196550f02974d6d09291c5d83b51ca6a03b3767e234a8c0e21322927d1e12 +size 5780762 diff --git a/OpenSceneGraph.changes b/OpenSceneGraph.changes index 3a0cacf..f1cb4ac 100644 --- a/OpenSceneGraph.changes +++ b/OpenSceneGraph.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Mar 27 13:07:18 UTC 2020 - Christophe Giboudeaux + +- Update to 3.6.5. Check the ChangeLog file for the list of changes. +- Drop fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch. Merged + upstream. + ------------------------------------------------------------------- Mon Feb 3 14:52:44 UTC 2020 - Stefan BrĂ¼ns diff --git a/OpenSceneGraph.spec b/OpenSceneGraph.spec index f50d55f..9acaa84 100644 --- a/OpenSceneGraph.spec +++ b/OpenSceneGraph.spec @@ -24,7 +24,7 @@ %bcond_with gdal %endif Name: OpenSceneGraph -Version: 3.6.3 +Version: 3.6.5 Release: 0 Summary: 3D graphics toolkit # Actually they call it OpenSceneGraph Public License, Version 0.0, which is @@ -37,8 +37,6 @@ Group: Productivity/Graphics/Other URL: http://openscenegraph.org/projects/osg Source0: https://github.com/openscenegraph/%{name}/archive/%{name}-%{version}.tar.gz Source99: %{name}-rpmlintrc -# https://github.com/openscenegraph/OpenSceneGraph/issues/779 -Patch0: fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch BuildRequires: cmake BuildRequires: curl-devel BuildRequires: fltk-devel @@ -182,7 +180,7 @@ This package contains some example applications built with OpenSceneGraph %prep %setup -q -n %{name}-%{name}-%{version} -%patch0 -p1 + for file in *.md *.txt ChangeLog; do sed -i "s/\r//g" "$file" done @@ -190,15 +188,18 @@ chmod 644 *.md *.txt ChangeLog %build %cmake \ - -DBUILD_OSG_EXAMPLES=ON \ - -DBUILD_OSG_PLUGINS=ON \ - -DBUILD_DOCUMENTATION=OFF \ - -DBUILD_OSG_WRAPPER=ON \ - -DBUILD_OSG_APPLICATIONS=ON \ - -DCMAKE_BUILD_TYPE=Release \ - -DDYNAMIC_OPENSCENEGRAPH=ON \ - -DDYNAMIC_OPENTHREADS=ON -make %{?_smp_mflags} + -DBUILD_OSG_EXAMPLES=ON \ + -DBUILD_OSG_PLUGINS=ON \ + -DBUILD_DOCUMENTATION=OFF \ + -DBUILD_OSG_APPLICATIONS=ON \ + -DCMAKE_BUILD_TYPE=Release \ + -DDYNAMIC_OPENSCENEGRAPH=ON \ + -DDYNAMIC_OPENTHREADS=ON \ +%if "%{_lib}" == "lib64" + -DLIB_POSTFIX=64 +%endif + +%cmake_build %install %cmake_install diff --git a/fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch b/fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch deleted file mode 100644 index 2573bda..0000000 --- a/fix_deprecated_FIND_PACKAGE_wxWidgets_usage.patch +++ /dev/null @@ -1,29 +0,0 @@ -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(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) -