diff options
| author |   Stefan Strogin <steils@gentoo.org> | 2021-11-16 09:20:34 +0200 |
|---|---|---|
| committer | Stefan Strogin <steils@gentoo.org> | 2021-11-16 08:06:59 +0000 |
| commit | 9def8a59b19109ab55dbe0ea7486235e8fb71d0b (patch) | |
| tree | 5d15617d4d0fc4e3bd98723e8207556db9a84cef /dev-games/mygui/files | |
| parent | www-servers/apache: x86 stable wrt bug #823898 (diff) | |
| download | gentoo-9def8a59b19109ab55dbe0ea7486235e8fb71d0b.tar.gz gentoo-9def8a59b19109ab55dbe0ea7486235e8fb71d0b.tar.bz2 gentoo-9def8a59b19109ab55dbe0ea7486235e8fb71d0b.zip | |
dev-games/mygui: upgrade to 3.4.1
Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Stefan Strogin <steils@gentoo.org>
Diffstat (limited to 'dev-games/mygui/files')
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.1-FHS.patch | 27 | ||||
| -rw-r--r-- | dev-games/mygui/files/mygui-3.4.1-build.patch | 52 |
2 files changed, 79 insertions, 0 deletions
diff --git a/dev-games/mygui/files/mygui-3.4.1-FHS.patch b/dev-games/mygui/files/mygui-3.4.1-FHS.patch new file mode 100644 index 000000000000..b6d7bbe8e327 --- /dev/null +++ b/dev-games/mygui/files/mygui-3.4.1-FHS.patch @@ -0,0 +1,27 @@ +From: Julian Ospald <hasufell@gentoo.org> +Date: Sat Oct 27 22:39:31 UTC 2012 +Subject: FHS + +paths hardcoded until upstream fixed the logic + +--- mygui-MyGUI3.2.2.orig/CMake/InstallResources.cmake ++++ mygui-MyGUI3.2.2/CMake/InstallResources.cmake +@@ -24,7 +24,7 @@ + else () + install(FILES + ${MYGUI_BINARY_DIR}/bin/${FILENAME} +- DESTINATION "bin" ++ DESTINATION "/etc/MYGUI" + ) + endif () + endfunction(install_file) +@@ -53,7 +53,7 @@ + if (WIN32) + set(MYGUI_MEDIA_DIR "../../Media") + elseif (UNIX) +- set(MYGUI_MEDIA_DIR "../share/MYGUI/Media") ++ set(MYGUI_MEDIA_DIR "${CMAKE_INSTALL_PREFIX}/share/MYGUI/Media") + else () + set(MYGUI_MEDIA_DIR "../../Media") + endif () + diff --git a/dev-games/mygui/files/mygui-3.4.1-build.patch b/dev-games/mygui/files/mygui-3.4.1-build.patch new file mode 100644 index 000000000000..5729be5d4380 --- /dev/null +++ b/dev-games/mygui/files/mygui-3.4.1-build.patch @@ -0,0 +1,52 @@ +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) +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) + |