diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-02-17 01:16:38 +0000 |
| commit | 53cba99042fa967e2a93da9f8db806fe2d035543 (patch) | |
| tree | 9780d3b87dfc6bdebc6b7b7d15af1ecb813c6853 /dev-games/mygui/files | |
| parent | 71deace00d1a2b091313fe137ab7092418c6f87c (diff) | |
gentoo resync : 17.02.2020
Diffstat (limited to 'dev-games/mygui/files')
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.0-build.patch | 61 | ||||
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.0-underlinking.patch | 21 |
2 files changed, 82 insertions, 0 deletions
diff --git a/dev-games/mygui/files/mygui-3.4.0-build.patch b/dev-games/mygui/files/mygui-3.4.0-build.patch new file mode 100644 index 000000000000..71ed87d8bcb8 --- /dev/null +++ b/dev-games/mygui/files/mygui-3.4.0-build.patch @@ -0,0 +1,61 @@ +diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake +--- a/CMake/ConfigureBuild.cmake ++++ b/CMake/ConfigureBuild.cmake +@@ -4,6 +4,8 @@ + # also prepare package files for pkg-config and CMake. + ####################################################################### + ++include(GNUInstallDirs) ++ + # should we build static libs? + if (MYGUI_STATIC) + set(MYGUI_LIB_TYPE STATIC) +@@ -47,7 +49,7 @@ if (UNIX) + else () + configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY) + endif () +- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig) ++ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + # configure additional packages + +diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake +--- a/CMake/Utils/MyGUIConfigTargets.cmake ++++ b/CMake/Utils/MyGUIConfigTargets.cmake +@@ -1,6 +1,8 @@ + # Configure settings and install targets + # FIXME: Copypasted from Ogre and need lots of changes + ++include(GNUInstallDirs) ++ + if (WIN32) + set(MYGUI_RELEASE_PATH "/Release") + set(MYGUI_RELWDBG_PATH "/RelWithDebInfo") +@@ -32,6 +34,12 @@ endif () + + # install targets according to current build type + function(mygui_install_target TARGETNAME SUFFIX) ++ install(TARGETS ${TARGETNAME} ++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" CONFIGURATIONS Gentoo "" ++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" ++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" CONFIGURATIONS Gentoo "" ++ FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Gentoo "" ++ ) + install(TARGETS ${TARGETNAME} + RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None "" + LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None "" +@@ -183,7 +191,13 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER) + endif () + add_executable(${PROJECTNAME} ${MYGUI_EXEC_TYPE} ${HEADER_FILES} ${SOURCE_FILES}) + endif () +- set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) ++ ++ # rename demo target ++ if (${SOLUTIONFOLDER} STREQUAL "Demos") ++ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER} OUTPUT_NAME MYGUI-${PROJECTNAME}) ++ else() ++ set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER}) ++ endif() + + add_dependencies(${PROJECTNAME} MyGUIEngine Common) + diff --git a/dev-games/mygui/files/mygui-3.4.0-underlinking.patch b/dev-games/mygui/files/mygui-3.4.0-underlinking.patch new file mode 100644 index 000000000000..1dcf2dbbbfda --- /dev/null +++ b/dev-games/mygui/files/mygui-3.4.0-underlinking.patch @@ -0,0 +1,21 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Fri Jun 15 10:42:42 UTC 2012 +Subject: build system + +fix underlinking + +diff --git a/MyGUIEngine/CMakeLists.txt b/MyGUIEngine/CMakeLists.txt +--- a/MyGUIEngine/CMakeLists.txt ++++ b/MyGUIEngine/CMakeLists.txt +@@ -44,7 +44,10 @@ if (MYGUI_USE_FREETYPE) + target_link_libraries(${PROJECTNAME} + ${FREETYPE_LIBRARIES} + ${ZLIB_LIBRARIES} +- ) ++ dl) ++else() ++ target_link_libraries(${PROJECTNAME} ++ dl) + endif() + + # platform specific dependencies |