diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-10-09 18:53:29 +0100 |
commit | 4f2d7949f03e1c198bc888f2d05f421d35c57e21 (patch) | |
tree | ba5f07bf3f9d22d82e54a462313f5d244036c768 /media-libs/libprojectm/files |
reinit the tree, so we can have metadata
Diffstat (limited to 'media-libs/libprojectm/files')
3 files changed, 98 insertions, 0 deletions
diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch new file mode 100644 index 000000000000..e3e156620935 --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-fix-c++14.patch @@ -0,0 +1,64 @@ +Properly call namespaced std::isnan and use implicit +conversion operators, such that they work in C++98 and C++14. +See also: +https://bugs.gentoo.org/show_bug.cgi?id=582866 +https://sourceforge.net/p/projectm/code/ci/92226e25192a69839b9ae3b66ea7173732c639b3 + +--- libprojectM/Common.hpp ++++ libprojectM/Common.hpp +@@ -63,7 +63,7 @@ + + #ifdef LINUX + #include <cstdlib> +-#define projectM_isnan isnan ++#define projectM_isnan std::isnan + + #endif + +--- libprojectM/MilkdropPresetFactory/Parser.cpp ++++ libprojectM/MilkdropPresetFactory/Parser.cpp +@@ -1406,7 +1406,7 @@ + PerFrameEqn * per_frame_eqn; + GenExpr * gen_expr; + +- if (fs == NULL) ++ if (fs.fail()) + return NULL; + if (param_string == NULL) + return NULL; +@@ -1561,7 +1561,7 @@ + + if (preset == NULL) + return NULL; +- if (fs == NULL) ++ if (fs.fail()) + return NULL; + + if ((token = parseToken(fs, name)) != tEq) +@@ -1875,7 +1875,7 @@ + /* Null argument checks */ + if (preset == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (fs.fail()) + return PROJECTM_FAILURE; + if (token == NULL) + return PROJECTM_FAILURE; +@@ -2166,7 +2166,7 @@ + + if (token == NULL) + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (fs.fail()) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; +@@ -2348,7 +2348,7 @@ + if (token == NULL) + + return PROJECTM_FAILURE; +- if (fs == NULL) ++ if (fs.fail()) + return PROJECTM_FAILURE; + if (preset == NULL) + return PROJECTM_FAILURE; diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch new file mode 100644 index 000000000000..aceee30e6278 --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-multilib.patch @@ -0,0 +1,21 @@ +--- libprojectM/CMakeLists.txt ++++ libprojectM/CMakeLists.txt +@@ -35,7 +35,7 @@ + + ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") + +-SET(LIB_INSTALL_DIR "\${exec_prefix}/lib" ++SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}" + CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" + FORCE) + +@@ -234,7 +234,7 @@ + FILE(GLOB presets "presets/*.milk" "presets/*.prjm" "presets/*.tga") + INSTALL(FILES ${presets} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/presets) + INSTALL(FILES ${Renderer_SOURCE_DIR}/projectM.cg ${Renderer_SOURCE_DIR}/blur.cg DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM/shaders) +-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig) ++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libprojectM.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig) + INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/config.inp DESTINATION ${CMAKE_INSTALL_PREFIX}/share/projectM) + INSTALL(FILES projectM.hpp event.h dlldefs.h fatal.h PCM.hpp Common.hpp DESTINATION include/libprojectM) +-INSTALL(TARGETS projectM DESTINATION lib) ++INSTALL(TARGETS projectM DESTINATION lib${LIB_SUFFIX}) diff --git a/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch new file mode 100644 index 000000000000..bb780e8943ad --- /dev/null +++ b/media-libs/libprojectm/files/libprojectm-2.1.0-path.patch @@ -0,0 +1,13 @@ +Index: projectM-complete-2.1.0-Source/src/libprojectM/CMakeLists.txt +=================================================================== +--- libprojectM/CMakeLists.txt ++++ libprojectM/CMakeLists.txt +@@ -33,7 +33,7 @@ set(PROJECTM_VERSION 2.1.0) + set(PROJECTM_ABI_LEVEL 2) + # + +-ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="\\\"${CMAKE_INSTALL_PREFIX}\\\"") ++ADD_DEFINITIONS(-DCMAKE_INSTALL_PREFIX="${CMAKE_INSTALL_PREFIX}") + + SET(LIB_INSTALL_DIR "\${exec_prefix}/lib${LIB_SUFFIX}" + CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is /lib)" |