Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 476530 Details for
Bug 601068
media-libs/jasper-2.0.0 should depend on x11-libs/libXmu...no, not really
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for jasper sources
jasper-opengl-cleanup.patch (text/plain), 2.30 KB, created by
Rafał Mużyło
on 2017-06-15 13:47:43 UTC
(
hide
)
Description:
patch for jasper sources
Filename:
MIME Type:
Creator:
Rafał Mużyło
Created:
2017-06-15 13:47:43 UTC
Size:
2.30 KB
patch
obsolete
>diff -dupr jasper-version-2.0.12-old/CMakeLists.txt jasper-version-2.0.12/CMakeLists.txt >--- jasper-version-2.0.12-old/CMakeLists.txt 2017-03-02 19:00:04.000000000 +0100 >+++ jasper-version-2.0.12/CMakeLists.txt 2017-06-15 14:18:11.146422935 +0200 >@@ -294,19 +294,7 @@ if (JAS_ENABLE_OPENGL AND OPENGL_FOUND) > # 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() >+ set(GLUT_LIBRARIES "${GLUT_glut_LIBRARY}") > else() > set(JAS_HAVE_OPENGL 0) > set(OPENGL_INCLUDE_DIR "") >diff -dupr jasper-version-2.0.12-old/src/appl/CMakeLists.txt jasper-version-2.0.12/src/appl/CMakeLists.txt >--- jasper-version-2.0.12-old/src/appl/CMakeLists.txt 2017-03-02 19:00:04.000000000 +0100 >+++ jasper-version-2.0.12/src/appl/CMakeLists.txt 2017-06-15 15:23:14.580320672 +0200 >@@ -24,6 +24,9 @@ if(JAS_HAVE_OPENGL) > add_executable(jiv jiv.c) > target_include_directories(jiv PUBLIC > ${GLUT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR}) >+ if(JAS_HAVE_GL_GLUT_H) >+ set_source_files_properties(jiv.c PROPERTIES COMPILE_DEFINITIONS JAS_HAVE_GL_GLUT_H) >+ endif() > target_link_libraries(jiv libjasper ${JPEG_LIBRARIES} ${GLUT_LIBRARIES} > ${OPENGL_LIBRARIES} ${MATH_LIBRARY}) > set(programs "${programs}" jiv) >diff -dupr jasper-version-2.0.12-old/src/libjasper/include/jasper/jas_config.h.in jasper-version-2.0.12/src/libjasper/include/jasper/jas_config.h.in >--- jasper-version-2.0.12-old/src/libjasper/include/jasper/jas_config.h.in 2017-03-02 19:00:04.000000000 +0100 >+++ jasper-version-2.0.12/src/libjasper/include/jasper/jas_config.h.in 2017-06-15 15:01:56.601375470 +0200 >@@ -26,9 +26,6 @@ > #cmakedefine JAS_HAVE_GETTIMEOFDAY 1 > #cmakedefine JAS_HAVE_GETRUSAGE 1 > >-#cmakedefine JAS_HAVE_GL_GLUT_H 1 >-#cmakedefine JAS_HAVE_GLUT_H 1 >- > #define JAS_HAVE_SNPRINTF 1 > > #else
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 601068
:
454588
|
454708
| 476530 |
476532