Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

framework-5.94.0

Browse Source
This commit is contained in:
Rmys
2022-05-14 14:27:07 +03:00
parent e70fc45728
commit 3c2fbdcea8
4 changed files with 103 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/kde/framework/extra-cmake-modules/pspec.xml
+8 -1
View File
@@ -12,7 +12,7 @@
<IsA>library</IsA>
<Summary>Extra cmake modules for KDE5</Summary>
<Description>Extra cmake modules KDE5</Description>
<Archive sha1sum="0554595c4fdb9a00ddb5e9c1e4658d4bd9e23507" type="tarxz">mirrors://kde/stable/frameworks/5.93/extra-cmake-modules-5.93.0.tar.xz</Archive>
<Archive sha1sum="fbf8b825f638d3a3579bafbc11779c7e487b615c" type="tarxz">mirrors://kde/stable/frameworks/5.94/extra-cmake-modules-5.94.0.tar.xz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>flex</Dependency>
@@ -34,6 +34,13 @@
</Package>
<History>
<Update release="48">
<Date>2022-05-14</Date>
<Version>5.94.0</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="47">
<Date>2022-04-12</Date>
<Version>5.93.0</Version>
multimedia/graphics/jasper/actions.py
+1
View File
@@ -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")
multimedia/graphics/jasper/files/fix-opengl-linking.patch
+85
View File
@@ -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()
multimedia/graphics/jasper/pspec.xml
+9 -1
View File
@@ -13,7 +13,7 @@
<IsA>library</IsA>
<Summary>Software implementation of JPEG-2000 Part 1</Summary>
<Description>JasPer is a software-based implementation of the codec specified in the JPEG-2000 Part-1 standard (ISO/IEC 15444-1:2000).</Description>
<Archive sha1sum="32c959d883fdb661c32afd76c94b206638972cb1" type="targz">http://www.ece.uvic.ca/~frodo/jasper/software/jasper-2.0.14.tar.gz</Archive>
<Archive sha1sum="6a29dd39cb42bf8766c67f8d41fa7dfdef02a9f0" type="targz">https://github.com/jasper-software/jasper/releases/download/version-2.0.33/jasper-2.0.33.tar.gz</Archive>
<BuildDependencies>
<Dependency>cmake</Dependency>
<Dependency>libjpeg-turbo-devel</Dependency>
@@ -22,6 +22,7 @@
</BuildDependencies>
<Patches>
<Patch level="1">jasper-1.900.1-fix-filename-buffer-overflow.patch</Patch>
<Patch level="1">fix-opengl-linking.patch</Patch>
</Patches>
</Source>
@@ -83,6 +84,13 @@
</Package>
<History>
<Update release="9">
<Date>2022-05-14</Date>
<Version>2.0.33</Version>
<Comment>Version bump.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="8">
<Date>2020-01-05</Date>
<Version>2.0.14</Version>