From 3c2fbdcea8ce3630daa2f6218e394c89bb891216 Mon Sep 17 00:00:00 2001 From: Rmys Date: Sat, 14 May 2022 14:27:07 +0300 Subject: [PATCH] framework-5.94.0 --- .../framework/extra-cmake-modules/pspec.xml | 9 +- multimedia/graphics/jasper/actions.py | 1 + .../jasper/files/fix-opengl-linking.patch | 85 +++++++++++++++++++ multimedia/graphics/jasper/pspec.xml | 10 ++- 4 files changed, 103 insertions(+), 2 deletions(-) create mode 100644 multimedia/graphics/jasper/files/fix-opengl-linking.patch diff --git a/desktop/kde/framework/extra-cmake-modules/pspec.xml b/desktop/kde/framework/extra-cmake-modules/pspec.xml index f76ed046f1..41e86c6691 100755 --- a/desktop/kde/framework/extra-cmake-modules/pspec.xml +++ b/desktop/kde/framework/extra-cmake-modules/pspec.xml @@ -12,7 +12,7 @@ library Extra cmake modules for KDE5 Extra cmake modules KDE5 - mirrors://kde/stable/frameworks/5.93/extra-cmake-modules-5.93.0.tar.xz + mirrors://kde/stable/frameworks/5.94/extra-cmake-modules-5.94.0.tar.xz cmake flex @@ -34,6 +34,13 @@ + + 2022-05-14 + 5.94.0 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-04-12 5.93.0 diff --git a/multimedia/graphics/jasper/actions.py b/multimedia/graphics/jasper/actions.py index d386ff4a0b..eeee216db1 100644 --- a/multimedia/graphics/jasper/actions.py +++ b/multimedia/graphics/jasper/actions.py @@ -11,6 +11,7 @@ from pisi.actionsapi import libtools from pisi.actionsapi import get def setup(): + shelltools.system("sed -r 's|(CMAKE_SKIP_BUILD_RPATH) FALSE|\1 TRUE|g' -i CMakeLists.txt") shelltools.makedirs("build") shelltools.cd("build") diff --git a/multimedia/graphics/jasper/files/fix-opengl-linking.patch b/multimedia/graphics/jasper/files/fix-opengl-linking.patch new file mode 100644 index 0000000000..e4998ed205 --- /dev/null +++ b/multimedia/graphics/jasper/files/fix-opengl-linking.patch @@ -0,0 +1,85 @@ +diff --git a/build/cmake/modules/JasOpenGL.cmake b/build/cmake/modules/JasOpenGL.cmake +index b58b8de..4e58ead 100644 +--- a/build/cmake/modules/JasOpenGL.cmake ++++ b/build/cmake/modules/JasOpenGL.cmake +@@ -5,50 +5,28 @@ + if (JAS_ENABLE_OPENGL) + set(OpenGL_GL_PREFERENCE GLVND) + find_package(OpenGL ${JAS_REQUIRED}) +- message("OpenGL library found: ${OPENGL_FOUND}") +-else() +- set(OPENGL_FOUND false) +-endif() +-if (JAS_ENABLE_OPENGL AND OPENGL_FOUND) +- set(JAS_HAVE_OPENGL 0) +- message("OpenGL include directory: ${OPENGL_INCLUDE_DIR}") +- message("OpenGL libraries: ${OPENGL_LIBRARIES}") ++ if (TARGET OpenGL::GL) ++ message("OpenGL library found: ${OPENGL_FOUND}") ++ message("OpenGL include directory: ${OPENGL_INCLUDE_DIR}") ++ message("OpenGL libraries: ${OPENGL_LIBRARIES}") ++ endif() + find_package(GLUT ${JAS_REQUIRED}) +- message("GLUT library found: ${GLUT_FOUND}") +- if (GLUT_FOUND) ++ if (TARGET GLUT::GLUT) + message("GLUT include directory: ${GLUT_INCLUDE_DIR}") + message("GLUT libraries: ${GLUT_LIBRARIES}") +- set(CMAKE_REQUIRED_INCLUDES ${GLUT_INCLUDE_DIR}) ++ endif() ++ if((TARGET OpenGL::GL) AND (TARGET GLUT::GLUT)) + check_include_files(GL/glut.h JAS_HAVE_GL_GLUT_H) + check_include_files(glut.h JAS_HAVE_GLUT_H) + if (JAS_HAVE_GL_GLUT_H OR JAS_HAVE_GLUT_H) ++ set(JAS_OPENGL_TARGETS GLUT::GLUT OpenGL::GL) ++ if (TARGET OpenGL::GLU) ++ set(JAS_OPENGL_TARGETS ${JAS_OPENGL_TARGETS} OpenGL::GLU) ++ endif() + set(JAS_HAVE_OPENGL 1) +- include_directories(${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) + else() + message(WARNING "The header files GL/glut.h and glut.h both appear to be missing.") + message(WARNING "Disabling OpenGL.") + endif() + endif() +- # On some systems (e.g., Fedora 21), there is a bug in the cmake code +- # that detects GLUT libraries. The following ugliness is a workaround for +- # this problem. +- if (NOT GLUT_Xmu_LIBRARY OR NOT GLUT_Xmi_LIBRARY) +- if (NOT GLUT_Xmu_LIBRARY) +- set(GLUT_Xmu_LIBRARY "") +- message(WARNING "Clearing bogus value for GLUT_Xmu_LIBRARY.") +- message(WARNING "Your version of CMake may be buggy.") +- endif() +- if (NOT GLUT_Xmi_LIBRARY) +- set(GLUT_Xmi_LIBRARY "") +- message(WARNING "Clearing bogus value for GLUT_Xmi_LIBRARY.") +- message(WARNING "Your version of CMake may be buggy.") +- endif() +- set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}") +- endif() +-else() +- set(JAS_HAVE_OPENGL 0) +- set(OPENGL_INCLUDE_DIR "") +- set(OPENGL_LIBRARIES "") +- set(GLUT_INCLUDE_DIR "") +- set(GLUT_LIBRARIES "") + endif() +diff --git a/src/appl/CMakeLists.txt b/src/appl/CMakeLists.txt +index 1b865de..3d0c57b 100644 +--- a/src/appl/CMakeLists.txt ++++ b/src/appl/CMakeLists.txt +@@ -22,10 +22,9 @@ set(man_pages "${man_pages}" imgcmp.1) + # The jiv program (which requires GLUT) + 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} +- ${OPENGL_LIBRARIES} ${MATH_LIBRARY}) ++ target_link_libraries(jiv libjasper ++ ${JPEG_LIBRARIES} ${HEIF_LIBRARIES} ${JAS_OPENGL_TARGETS} ++ ${JAS_OPENGL_TARGETS} ${MATH_LIBRARY} ${THREAD_LIBRARY}) + set(programs "${programs}" jiv) + set(man_pages "${man_pages}" jiv.1) + else() diff --git a/multimedia/graphics/jasper/pspec.xml b/multimedia/graphics/jasper/pspec.xml index bc3aa263c0..4cc5c6a0be 100644 --- a/multimedia/graphics/jasper/pspec.xml +++ b/multimedia/graphics/jasper/pspec.xml @@ -13,7 +13,7 @@ library Software implementation of JPEG-2000 Part 1 JasPer is a software-based implementation of the codec specified in the JPEG-2000 Part-1 standard (ISO/IEC 15444-1:2000). - http://www.ece.uvic.ca/~frodo/jasper/software/jasper-2.0.14.tar.gz + https://github.com/jasper-software/jasper/releases/download/version-2.0.33/jasper-2.0.33.tar.gz cmake libjpeg-turbo-devel @@ -22,6 +22,7 @@ jasper-1.900.1-fix-filename-buffer-overflow.patch + fix-opengl-linking.patch @@ -83,6 +84,13 @@ + + 2022-05-14 + 2.0.33 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-05 2.0.14