Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package jasper for openSUSE:Factory checked in at 2022-02-01 14:02:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/jasper (Old) and /work/SRC/openSUSE:Factory/.jasper.new.1898 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "jasper" Tue Feb 1 14:02:59 2022 rev:12 rq:950416 version:2.0.33 Changes: -------- --- /work/SRC/openSUSE:Factory/jasper/jasper.changes 2021-08-18 08:56:30.470932863 +0200 +++ /work/SRC/openSUSE:Factory/.jasper.new.1898/jasper.changes 2022-02-01 14:03:30.539845717 +0100 @@ -1,0 +2,9 @@ +Sun Jan 30 13:42:36 UTC 2022 - Carsten Ziepke <[email protected]> + +- Add jasper-freeglut.patch, fixes freeglut detection and linking +- Run spec-cleaner +- Change license from SUSE-Public-Domain to JasPer-2.0 +- Cleanup docdir, only package the html and pdf docs and not + the sources + +------------------------------------------------------------------- New: ---- jasper-freeglut.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jasper.spec ++++++ --- /var/tmp/diff_new_pack.USR0gS/_old 2022-02-01 14:03:31.143841577 +0100 +++ /var/tmp/diff_new_pack.USR0gS/_new 2022-02-01 14:03:31.143841577 +0100 @@ -1,7 +1,7 @@ # # spec file for package jasper # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,11 +20,13 @@ Version: 2.0.33 Release: 0 Summary: An Implementation of the JPEG-2000 Standard, Part 1 -License: SUSE-Public-Domain +License: JasPer-2.0 Group: Productivity/Graphics/Convertors URL: https://jasper-software.github.io/jasper Source: https://github.com/jasper-software/jasper/archive/version-%{version}.tar.gz -Source2: baselibs.conf +Source1: baselibs.conf +# PATCH-FIX-UPSTREAM jasper-freeglut.patch -- fix building with freeglut +Patch0: jasper-freeglut.patch BuildRequires: Mesa-libGL-devel BuildRequires: cmake BuildRequires: doxygen @@ -76,15 +78,17 @@ %prep %setup -q -n %{name}-version-%{version} +%patch0 -p1 %build export CFLAGS="%{optflags} -Wall -std=c99 -D_BSD_SOURCE" %cmake -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} -make %{?_smp_mflags} +%make_build %install %cmake_install mv doc/README doc/README.doc + %fdupes -s %{buildroot}/%{_docdir}/%{name} %post -n libjasper4 -p /sbin/ldconfig @@ -92,8 +96,10 @@ %files %license LICENSE -%doc COPYRIGHT README doc/* -%doc %{_docdir}/jasper +%doc COPYRIGHT NEWS README doc/README.doc +%doc %{_docdir}/jasper/*.pdf +%dir %{_docdir}/jasper/html +%doc %{_docdir}/jasper/html/* %{_bindir}/imgcmp %{_bindir}/imginfo %{_bindir}/jasper ++++++ jasper-freeglut.patch ++++++ diff -Nur jasper-version-2.0.33.orig/build/cmake/modules/JasOpenGL.cmake jasper-version-2.0.33/build/cmake/modules/JasOpenGL.cmake --- jasper-version-2.0.33.orig/build/cmake/modules/JasOpenGL.cmake 2021-08-01 22:50:31.000000000 +0200 +++ jasper-version-2.0.33/build/cmake/modules/JasOpenGL.cmake 2022-01-30 13:58:04.030121439 +0100 @@ -13,19 +13,18 @@ set(JAS_HAVE_OPENGL 0) message("OpenGL include directory: ${OPENGL_INCLUDE_DIR}") message("OpenGL libraries: ${OPENGL_LIBRARIES}") - find_package(GLUT ${JAS_REQUIRED}) - message("GLUT library found: ${GLUT_FOUND}") - if (GLUT_FOUND) - message("GLUT include directory: ${GLUT_INCLUDE_DIR}") - message("GLUT libraries: ${GLUT_LIBRARIES}") - set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR}) - check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H) - check_include_files(glut.h JAS_HAVE_GLUT_H) + find_package(FreeGLUT ${JAS_REQUIRED}) + message("GLUT library found: ${FreeGLUT_FOUND}") + if (FreeGLUT_FOUND) + message("GLUT include directory: ${FreeGLUT_INCLUDE_DIR}") + message("GLUT libraries: ${FreeGLUT_LIBRARIES}") + set(CMAKE_REQUIRED_INCLUDES ${FreeGLUT_INCLUDE_DIR}) + check_include_files(GL/freeglut.h JAS_HAVE_GL_GLUT_H) if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H) set(JAS_HAVE_OPENGL 1) - include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + include_directories(${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) else() - message(WARNING "The header files GL/glut.h and glut.h both appear to be missing.") + message(WARNING "The header files GL/freeglut.h and glut.h both appear to be missing.") message(WARNING "Disabling OpenGL.") endif() endif() @@ -49,6 +48,6 @@ set(JAS_HAVE_OPENGL 0) set(OPENGL_INCLUDE_DIR "") set(OPENGL_LIBRARIES "") - set(GLUT_INCLUDE_DIR "") + set(FreeGLUT_INCLUDE_DIR "") set(GLUT_LIBRARIES "") endif() diff -Nur jasper-version-2.0.33.orig/src/appl/CMakeLists.txt jasper-version-2.0.33/src/appl/CMakeLists.txt --- jasper-version-2.0.33.orig/src/appl/CMakeLists.txt 2021-08-01 22:50:31.000000000 +0200 +++ jasper-version-2.0.33/src/appl/CMakeLists.txt 2022-01-30 13:59:19.422360668 +0100 @@ -23,8 +23,8 @@ if(JAS_HAVE_OPENGL) add_executable(jiv jiv.c) target_include_directories(jiv PUBLIC - ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) - target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES} + ${FreeGLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} -lglut ${OPENGL_LIBRARIES} ${MATH_LIBRARY}) set(programs "${programs}" jiv) set(man_pages "${man_pages}" jiv.1) diff -Nur jasper-version-2.0.33.orig/src/appl/jiv.c jasper-version-2.0.33/src/appl/jiv.c --- jasper-version-2.0.33.orig/src/appl/jiv.c 2021-08-01 22:50:31.000000000 +0200 +++ jasper-version-2.0.33/src/appl/jiv.c 2022-01-30 13:59:53.774469682 +0100 @@ -68,7 +68,7 @@ #include <math.h> #include <inttypes.h> #if defined(JAS_HAVE_GL_GLUT_H) -#include <GL/glut.h> +#include <GL/freeglut.h> #else #include <glut.h> #endif
