rebuilt with dcmtk 3.6.7 [release 3.6.5-2mamba;Mon May 30 2022]

OpenSceneGraph-3.6.5-ffmpeg-4.4.patch

@@ -0,0 +1,30 @@
+diff --git a/CMakeModules/FindFFmpeg.cmake b/CMakeModules/FindFFmpeg.cmake
+index d548e7a98..7a53cfe25 100644
+--- a/CMakeModules/FindFFmpeg.cmake
++++ b/CMakeModules/FindFFmpeg.cmake
+@@ -43,7 +43,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg ffmpeg4
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -62,7 +62,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/include # Blastwave
+         /opt/include
+         /usr/freeware/include
+-        PATH_SUFFIXES ffmpeg
++        PATH_SUFFIXES ffmpeg ffmpeg4
+         DOC "Location of FFMPEG Headers"
+     )
+ 
+@@ -84,6 +84,7 @@ MACRO(FFMPEG_FIND varname shortname headername)
+         /opt/csw/lib
+         /opt/lib
+         /usr/freeware/lib64
++        PATH_SUFFIXES ffmpeg4
+         DOC "Location of FFMPEG Libraries"
+     )
+ 

OpenSceneGraph-3.6.5-libocct-7.6.0.patch

@@ -0,0 +1,11 @@
+--- OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp.orig	2022-05-30 15:26:10.398318867 +0200
++++ OpenSceneGraph-OpenSceneGraph-3.6.5/src/osgPlugins/OpenCASCADE/ReaderWriterOpenCASCADE.cpp	2022-05-30 15:29:22.685202309 +0200
+@@ -211,7 +211,7 @@
+                 {
+                     // populate vertex list
+                     // Ref: http://www.opencascade.org/org/forum/thread_16694/?forum=3
+-                    gp_Pnt pt = (triangulation->Nodes())(j).Transformed(transformation * location.Transformation());
++                    gp_Pnt pt = triangulation->Node(j).Transformed(transformation * location.Transformation());
+                     vertexList->push_back(osg::Vec3(pt.X(), pt.Y(), pt.Z()));
+ 
+                     // populate color list

OpenSceneGraph.spec

@@ -1,14 +1,16 @@
 Name:          OpenSceneGraph
 Version:       3.6.5
-Release:       1mamba
+Release:       2mamba
 Summary:       An open source high performance 3D graphics toolkit
 Group:         Applications/Graphics
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://trac.openscenegraph.org/projects/osg/
+URL:           http://www.openscenegraph.org/
 Source:        https://github.com/openscenegraph/OpenSceneGraph/archive/refs/tags/OpenSceneGraph-%{version}.tar.gz
 Patch0:        %{name}-2.9.7-ffmpeg-0.6.1.patch
+Patch1:        OpenSceneGraph-3.6.5-libocct-7.6.0.patch
+Patch2:        OpenSceneGraph-3.6.5-ffmpeg-4.4.patch
 License:       OSGPL
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -16,11 +18,10 @@ BuildRequires: libSDL-devel
 BuildRequires: libX11-devel
 BuildRequires: libXinerama-devel
 BuildRequires: libXrandr-devel
-BuildRequires: libavcodec-ffmpeg-devel
+BuildRequires: libavcodec-ffmpeg4-devel
-BuildRequires: libavdevice-ffmpeg-devel
+BuildRequires: libavdevice-ffmpeg4-devel
-BuildRequires: libavformat-ffmpeg-devel
+BuildRequires: libavformat-ffmpeg4-devel
-BuildRequires: libavresample-ffmpeg-devel
+BuildRequires: libavutil-ffmpeg4-devel
-BuildRequires: libavutil-ffmpeg-devel
 BuildRequires: libcairo-devel
 BuildRequires: libcoin-devel
 BuildRequires: libcurl-devel
@@ -35,11 +36,10 @@ BuildRequires: libglib-devel
 BuildRequires: libglvnd-devel
 BuildRequires: libgst-plugins-base-devel
 BuildRequires: libgstreamer-devel
-BuildRequires: libicu-devel
 BuildRequires: libjasper-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libnsl-devel
-BuildRequires: libopenssl-devel
+BuildRequires: libocct-devel
 BuildRequires: libpng-devel
 BuildRequires: libpoppler-glib-devel
 BuildRequires: librsvg-devel
@@ -48,13 +48,11 @@ BuildRequires: libswresample-ffmpeg-devel
 BuildRequires: libswscale-ffmpeg-devel
 BuildRequires: libtiff-devel
 BuildRequires: libvncserver-devel
-BuildRequires: libwrap-devel
-BuildRequires: libxml2-devel
 BuildRequires: libz-devel
 ## AUTOBUILDREQ-END
-BuildRequires: libdcmtk-devel >= 3.6.6
+BuildRequires: libdcmtk-devel >= 3.6.7
-BuildRequires: dcmtk >= 3.6.6
+BuildRequires: dcmtk >= 3.6.7
-BuildRequires: libgdal-devel >= 3.3.0
+BuildRequires: libgdal-devel >= 3.5.0
 BuildRequires: cmake
 Requires:      libosg = %{?epoch:%epoch:}%{version}-%{release}
 
@@ -84,6 +82,8 @@ This package contains libraries and header files for developing applications tha
 #-D -T
 #:<< _EOF
 #%patch0 -p1
+%patch1 -p1
+%patch2 -p1 -b .ffmpeg-4.4
 
 %define minver %(echo %version | cut -d. -f2)
 
@@ -95,6 +95,8 @@ fi
 
 %build
 #:<< _EOF
+export PKG_CONFIG_PATH="%{_libdir}/ffmpeg4/pkgconfig"
+
 %cmake -d build \
 \
 %ifarch x86_64 aarch64
@@ -141,6 +143,9 @@ fi
 %{_libdir}/libosg*.so
 
 %changelog
+* Mon May 30 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.5-2mamba
+- rebuilt with dcmtk 3.6.7
+
 * Mon Jun 21 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 3.6.5-1mamba
 - update to 3.6.5