[packages/simage] - updated to 1.8.3

Sat Mar 25 16:16:30 CET 2023

commit 299b459e2cf390b6503bcc181eb46ad6db916d9b
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 25 16:18:53 2023 +0100

    - updated to 1.8.3

 simage-doxygen.patch | 32 ++++++++++++++++----------------
 simage-gifutil.patch | 21 ---------------------
 simage-link.patch    | 13 -------------
 simage.spec          | 41 +++++++++++++++++++++++++++++++----------
 4 files changed, 47 insertions(+), 60 deletions(-)
---

diff --git a/simage.spec b/simage.spec
index 6d927cf..b325e1d 100644
--- a/simage.spec
+++ b/simage.spec
@@ -3,32 +3,37 @@
 %bcond_without	apidocs		# API documentation
 %bcond_with	qt		# load/save images using Qt
 %bcond_with	qt4		# Qt4 instead of Qt5
+%bcond_with	qt6		# Qt6 instead of Qt5
 #
 Summary:	Library with image format loaders and front-ends to common import libraries
 Summary(pl.UTF-8):	Biblioteka z wczytywaniem formatów obrazów oraz frontendami do popularnych bibliotek importujących
 Name:		simage
-Version:	1.8.0
+Version:	1.8.3
 Release:	1
 License:	MIT, MPEG
 Group:		Libraries
 #Source0Download: https://github.com/coin3d/simage/releases
-Source0:	https://github.com/coin3d/simage/releases/download/simage-%{version}/%{name}-%{version}-src.tar.gz
-# Source0-md5:	a1810e0c2a1c9c7a6c191198bd8465bc
-Patch0:		%{name}-gifutil.patch
-Patch1:		%{name}-doxygen.patch
-Patch2:		%{name}-link.patch
+Source0:	https://github.com/coin3d/simage/releases/download/v%{version}/%{name}-%{version}-src.tar.gz
+# Source0-md5:	af4faec8a7881937cc6b4440e45405bf
+Patch0:		%{name}-doxygen.patch
 URL:		https://github.com/coin3d/simage
 %if %{with qt}
 %if %{with qt4}
 BuildRequires:	QtCore-devel >= 4
 BuildRequires:	QtGui-devel >= 4
 %else
+%if %{with qt6}
+BuildRequires:	Qt6Core-devel >= 6
+BuildRequires:	Qt6Gui-devel >= 6
+%else
 BuildRequires:	Qt5Core-devel >= 5
 BuildRequires:	Qt5Gui-devel >= 5
 %endif
 %endif
+%endif
 BuildRequires:	cmake >= 3.0
 %{?with_apidocs:BuildRequires:	doxygen}
+BuildRequires:	flac-devel
 BuildRequires:	giflib-devel >= 5.2.1-2
 BuildRequires:	jasper-devel
 BuildRequires:	libjpeg-devel
@@ -38,8 +43,11 @@ BuildRequires:	libsndfile-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libvorbis-devel
+BuildRequires:	opus-devel
 BuildRequires:	rpmbuild(macros) >= 1.752
+BuildRequires:	xz-devel
 BuildRequires:	zlib-devel
+BuildRequires:	zstd-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -58,6 +66,18 @@ Summary:	Header files for simage library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki simage
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	flac-devel
+Requires:	jasper-devel
+Requires:	libjpeg-devel
+Requires:	libogg-devel
+Requires:	libpng-devel
+Requires:	libsndfile-devel
+Requires:	libtiff-devel
+Requires:	libvorbis-devel
+Requires:	opus-devel
+Requires:	xz-devel
+Requires:	zlib-devel
+Requires:	zstd-devel
 
 %description devel
 Header files for simage library.
@@ -80,14 +100,13 @@ Dokumentacja API biblioteki simage.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %build
 install -d builddir
 cd builddir
 %cmake .. \
 	%{?with_apidocs:-DSIMAGE_BUILD_DOCUMENTATION=ON} \
+	-DSIMAGE_LIBJASPER_SUPPORT=ON \
 	%{?with_qt:-DSIMAGE_USE_QIMAGE=ON} \
 	%{?with_qt4:-DSIMAGE_USE_QT5=OFF} \
 	-DSIMAGE_XWD_SUPPORT=ON
@@ -102,8 +121,6 @@ rm -rf $RPM_BUILD_ROOT
 
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/html
-# bogus location
-%{__rm} -r $RPM_BUILD_ROOT%{_infodir}/simage1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -119,10 +136,14 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/simage-config
 %attr(755,root,root) %{_libdir}/libsimage.so
 %{_includedir}/simage.h
 %{_pkgconfigdir}/simage.pc
 %{_libdir}/cmake/simage-%{version}
+%dir %{_datadir}/Coin
+%dir %{_datadir}/Coin/conf
+%{_datadir}/Coin/conf/simage-default.cfg
 
 %if %{with apidocs}
 %files apidocs
diff --git a/simage-doxygen.patch b/simage-doxygen.patch
index 1c404f2..6b1dff0 100644
--- a/simage-doxygen.patch
+++ b/simage-doxygen.patch
@@ -1,16 +1,16 @@
---- simage/CMakeLists.txt.orig	2020-11-30 19:58:08.803833373 +0100
-+++ simage/CMakeLists.txt	2020-11-30 20:04:50.568323495 +0100
-@@ -543,9 +543,12 @@
-   set(DOXYGEN_WARN_IF_UNDOCUMENTED YES)
-   set(DOXYGEN_EXCLUDE)
- 
-+  set(simage_src_dir "${CMAKE_CURRENT_SOURCE_DIR}")
-+  set(SIMAGE_DOC_HTML YES)
-+  set(HTML_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html")
-   set(DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
-   set(DOXYGEN_OUTPUT "${CMAKE_BINARY_DIR}/html/index.html")
--  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/docs/simage.doxygen.cmake.in" ${DOXYFILE} @ONLY)
-+  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/docs/simage.doxygen.in" ${DOXYFILE} @ONLY)
- 
- # ############################################################################
- # Setup documentation targets
+--- simage/CMakeLists.txt.orig	2023-03-25 11:07:46.880467261 +0100
++++ simage/CMakeLists.txt	2023-03-25 13:03:22.299561537 +0100
+@@ -730,9 +730,12 @@ if(SIMAGE_BUILD_DOCUMENTATION)
+   set(DOXYGEN_WARN_IF_UNDOCUMENTED YES)
+   set(DOXYGEN_EXCLUDE)
+ 
++  set(simage_src_dir "${CMAKE_CURRENT_SOURCE_DIR}")
++  set(SIMAGE_DOC_HTML YES)
++  set(HTML_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html")
+   set(DOXYFILE "${CMAKE_CURRENT_BINARY_DIR}/Doxyfile")
+   set(DOXYGEN_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/html/index.html")
+-  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/docs/simage.doxygen.cmake.in" ${DOXYFILE} @ONLY)
++  configure_file("${CMAKE_CURRENT_SOURCE_DIR}/docs/simage.doxygen.in" ${DOXYFILE} @ONLY)
+ 
+ # ############################################################################
+ # Setup documentation targets
diff --git a/simage-gifutil.patch b/simage-gifutil.patch
deleted file mode 100644
index 630a025..0000000
--- a/simage-gifutil.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- simage/CMakeLists.txt.orig	2019-12-24 02:00:09.000000000 +0100
-+++ simage/CMakeLists.txt	2020-11-30 19:57:02.597525377 +0100
-@@ -432,7 +432,7 @@
- 
- if(GIF_FOUND)
-   target_include_directories(simage PRIVATE ${GIF_INCLUDE_DIR})
--  target_link_libraries(simage PRIVATE ${GIF_LIBRARIES})
-+  target_link_libraries(simage PRIVATE ${GIF_LIBRARIES} gifutil)
- endif()
- 
- if(JASPER_FOUND)
---- simage/src/simage_gif.c.orig	2019-12-24 02:00:09.000000000 +0100
-+++ simage/src/simage_gif.c	2020-11-30 19:57:31.320703103 +0100
-@@ -30,6 +30,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <gif_lib.h>
-+#include <gif_util.h>
- 
- #if GIFLIB_MAJOR > 5 || GIFLIB_MAJOR == 5 && GIFLIB_MINOR >= 1
- #define DGifCloseFile(gif) DGifCloseFile(gif, NULL)
diff --git a/simage-link.patch b/simage-link.patch
deleted file mode 100644
index 2596f2f..0000000
--- a/simage-link.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- simage/CMakeLists.txt.orig	2020-11-30 20:05:24.851471101 +0100
-+++ simage/CMakeLists.txt	2020-11-30 20:46:46.764692090 +0100
-@@ -478,6 +478,10 @@
-   target_link_libraries(simage PRIVATE ${VFW_LIBRARIES})
- endif()
- 
-+if(UNIX)
-+  target_link_libraries(simage PRIVATE m)
-+endif()
-+
- # ############################################################################
- # Build examples
- # ############################################################################
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/simage.git/commitdiff/299b459e2cf390b6503bcc181eb46ad6db916d9b

