[packages/jasper] - updated to 4.2.8 (new soname)
qboosh
qboosh at pld-linux.org
Fri Sep 26 18:30:59 CEST 2025
commit e5a85a2b4139c81f89451558df7059f7ee48a0a7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Fri Sep 26 18:34:04 2025 +0200
- updated to 4.2.8 (new soname)
jasper.spec | 19 +++++++++----------
parallel-doc-build.patch | 45 ---------------------------------------------
2 files changed, 9 insertions(+), 55 deletions(-)
---
diff --git a/jasper.spec b/jasper.spec
index 55eddab..41814c2 100644
--- a/jasper.spec
+++ b/jasper.spec
@@ -6,15 +6,14 @@
Summary: JasPer - collection of software for coding and manipulation of images
Summary(pl.UTF-8): JasPer - zestaw oprogramowania do obróbki obrazków
Name: jasper
-Version: 3.0.6
-Release: 2
+Version: 4.2.8
+Release: 1
Epoch: 0
License: JasPer v2.0 (BSD-like)
Group: Libraries
#Source0Download: https://github.com/jasper-software/jasper/releases
Source0: https://github.com/jasper-software/jasper/releases/download/version-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: f9388d52a6220303141a42d4c2c81e62
-Patch0: parallel-doc-build.patch
+# Source0-md5: 418bccc49963b8bbaecf61473e83553f
URL: https://www.ece.uvic.ca/~frodo/jasper/
%{?with_opengl:BuildRequires: OpenGL-glut-devel}
BuildRequires: cmake >= 3.12
@@ -100,12 +99,12 @@ kolorów powinna jednak wystarczyć.
%prep
%setup -q
-%patch -P0 -p1
%build
# there is upstream directory named "build", use different name
-install -d builddir
-cd builddir
+# InSourceBuild.cmake requires build dir to be outside source dir or have "tmp" prefix
+install -d tmp_builddir
+cd tmp_builddir
# note: build/jasper.pc.in expects CMAKE_INSTALL_INCLUDEDIR and CMAKE_INSTALL_LIBDIR relative to CMAKE_INSTALL_PREFIX
%cmake .. \
-DCMAKE_INSTALL_INCLUDEDIR:PATH=include \
@@ -120,7 +119,7 @@ cd builddir
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -C builddir install \
+%{__make} -C tmp_builddir install \
DESTDIR=$RPM_BUILD_ROOT
# PDFs packaged as %doc, HTML redundant
@@ -145,11 +144,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%doc ChangeLog LICENSE.txt NEWS.txt README.md doc/jpeg2000.pdf
%attr(755,root,root) %{_libdir}/libjasper.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libjasper.so.6
+%ghost %{_libdir}/libjasper.so.7
%files devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libjasper.so
+%{_libdir}/libjasper.so
%{_includedir}/jasper
%{_pkgconfigdir}/jasper.pc
diff --git a/parallel-doc-build.patch b/parallel-doc-build.patch
deleted file mode 100644
index 64a3dd6..0000000
--- a/parallel-doc-build.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From f2d2e5d6f06bdd60d3be8277726e238659bc56b5 Mon Sep 17 00:00:00 2001
-From: Jan Palus <jpalus at fastmail.com>
-Date: Mon, 27 Mar 2023 13:55:04 +0200
-Subject: [PATCH] doc/CMakeLists.txt: fix prallel build of api docs and pdf
- manual
-
-according to cmake docs DEPENDS in add_custom_command with file being
-output of other custom command:
-
-> If any dependency is an OUTPUT of another custom command in the same
-> directory (CMakeLists.txt file), CMake automatically brings the other
-> custom command into the target in which this command is built.
-
-this means "manual_pdf" target will not wait for previous doxygen
-invocation but will trigger its own. in case of parallel build two
-doxygen invocations with same input parameters might overwrite each
-other's output resulting in broken files. it could be verified with just
-grepping cmake output:
-
-```
-$ grep -r 'doxygen Doxyfile' builddir/doc
-builddir/doc/CMakeFiles/doc.dir/build.make: cd /home/users/builder/rpm/BUILD/jasper-3.0.6/builddir/doc && /usr/bin/doxygen Doxyfile
-builddir/doc/CMakeFiles/manual_pdf.dir/build.make: cd /home/users/builder/rpm/BUILD/jasper-3.0.6/builddir/doc && /usr/bin/doxygen Doxyfile
-```
-
-instead of putting dependency on "latex/index.tex" file, use "doc"
-target as dependency resulting in ordering "doc" before "manual_pdf" and
-single doxygen invocation.
----
- doc/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 1db63e64..02055555 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -44,7 +44,7 @@ if(DOXYGEN_FOUND)
- add_custom_command(OUTPUT "latex/refman.pdf"
- COMMAND "${PDFLATEX_COMPILER}" refman.tex
- WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/latex"
-- DEPENDS "latex/index.tex"
-+ DEPENDS "doc"
- )
-
- add_custom_target(manual_pdf ALL
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/jasper.git/commitdiff/e5a85a2b4139c81f89451558df7059f7ee48a0a7
More information about the pld-cvs-commit
mailing list