Permalink
Browse files

imported into main tree

  • Loading branch information...
hasufell
hasufell committed Oct 31, 2012
1 parent def3972 commit a93b20e89b45ad0bbfcf37bc07b680591f2fadfb
View
@@ -1,6 +0,0 @@
-AUX mygui-3.2.0-FHS.patch 1672 SHA256 098414560499f620b42a46832d4a3ff002582399224c2fdf53adf440d47bb3e5 SHA512 76e78fdf0fcf79765997279d4eb7594255cb3a42c5042ea3d849210a34b16dc86f0e32f829b45ab4045f7e9fee32953ec868915f1d591f0fd4dde94675e0075c WHIRLPOOL a58b552331854da185ce3b2518e40823d2545b7f731936cba3f389c5890cf014acd75b56e320856e9004518d65842c001a2e2d4067431af2aa633c76318490c3
-AUX mygui-3.2.0-build.patch 2816 SHA256 3ca747abd0eafbb4bd67076cdb8a739cec2192bc33467adfd13ab6228b3aa8ae SHA512 cdee522192db35213530c195c525e0bfd6bbb2d6cf041d0e4fec923bf2665d6c5c813933725167d5106097ee06040e790d9d2fa5a31a6e421215387159125020 WHIRLPOOL c6534d64de21ca2f7e2b00b6162287b0ced253b698006112d2d736b49c41c3db8a20c4a2fbc5ee6729374c362697c3c4a76b4b785d3124497a3be55c55587278
-AUX mygui-3.2.0-underlinking.patch 398 SHA256 7ae82493e90b9543bf592060348adff59b64c5469ea3b3d08a44f416ac27a614 SHA512 ad0e5e0e8aacdb65ea9195175f597eb95f265b07d0154482f2380ae6e837672d5d41b6d43b1266abb12dec319625426dd65a892aca7fdca297131bd4db2312b9 WHIRLPOOL 195a7786c561b9844e8385dd562e336ef88feeff13d1703e246a34bf28a9f6919c9ba9899bbe50b5f2f0b25efc7b5916046bec083f8ddd20168da8b4d3caf890
-DIST MyGUI_3.2.0.zip 14383788 SHA256 1704006f364b733b2d2cc6807c6dc10833cf695542b797aee50b8fd061eea19a SHA512 8ff8de065a6f355a03e45bfeac6d8db706ee7a122346f41ef26664dc8280d4d1cba8ac943afbaae27c5a1b7fb8bfa8729a1758cc87e8764370284aec943f9278 WHIRLPOOL 982c8fd9e714d7ebc5583a884953ef41fd6a2b2c1f62ec56bc81768ee607135116c14973e3eb4f528e636cf3ca1df6dd155931ea93b26fe537a66cb09a44aba4
-EBUILD mygui-3.2.0-r1.ebuild 3279 SHA256 ac79a445a260e9a0a22de738b9039cc810fad4b77ed2935a6a9697c02b1c302d SHA512 f316a45bab7df8546738047681ebade919ce49a43068defb8b9e9d8c684f87f1ef7af1fbc2281b4507b615809c63b5167317952e4b4c46ba1aca4fd9a5a49893 WHIRLPOOL c21bda19f315e642648bd7192420a09c3d089372814553dd088b2b5fcfc1bc242ae818ffb8c13c388a8c8f64d6c3419d7c3720e10f29e6d8c5ef830ac660cbe4
-MISC metadata.xml 554 SHA256 0298fd580ef7fd5ef296b4f41f09675d3cd16d184f52051c93fc0a471700a4a1 SHA512 2055979870b9e4411b2602558350614f7272ef851e5ef392bf226832bc66828243df81da0101c3463468ce0f461847587e93f152b47cba4ab645d85c228b26d0 WHIRLPOOL cc8818c3d883fa8e89c2a5784050dea5b733a01e6426339e6ba2ff8bc5429d632b18c8f1f8ccaf88e4cd9f4534c90a15619873c1815eba77aa952b1d120a7db5
@@ -1,63 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 27 22:39:31 UTC 2012
-Subject: FHS
-
-paths hardcoded until upstream fixed the logic
-
---- Common/Base/Ogre/BaseManager.cpp
-+++ Common/Base/Ogre/BaseManager.cpp
-@@ -47,14 +47,14 @@
- mWindow(nullptr),
- mExit(false),
- mPluginCfgName("plugins.cfg"),
-- mResourceXMLName("resources.xml"),
-+ mResourceXMLName("/etc/MYGUI/resources.xml"),
- mResourceFileName("MyGUI_Core.xml"),
- mNode(nullptr)
- {
- #if MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
- mResourcePath = macBundlePath() + "/Contents/Resources/";
- #else
-- mResourcePath = "";
-+ mResourcePath = "/etc/MYGUI/";
- #endif
- }
-
-@@ -65,12 +65,16 @@
- bool BaseManager::create()
- {
- Ogre::String pluginsPath;
-+ char *homedir;
-+ homedir = getenv("HOME");
-+ std::string homePath;
-+ homePath = homedir;
-
- #ifndef OGRE_STATIC_LIB
- pluginsPath = mResourcePath + mPluginCfgName;
- #endif
-
-- mRoot = new Ogre::Root(pluginsPath, mResourcePath + "ogre.cfg", mResourcePath + "Ogre.log");
-+ mRoot = new Ogre::Root(pluginsPath, homePath + "/mygui-ogre.cfg", homePath + "/mygui-Ogre.log");
-
- setupResources();
-
---- CMake/InstallResources.cmake
-+++ CMake/InstallResources.cmake
-@@ -24,7 +24,7 @@
- else ()
- install(FILES
- ${MYGUI_BINARY_DIR}/bin/${FILENAME}
-- DESTINATION "bin"
-+ DESTINATION "/etc/MYGUI"
- )
- endif ()
- endfunction(install_file)
-@@ -51,7 +51,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 ()
@@ -1,72 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 21:58:45 UTC 2012
-
-use proper destinations and allow Gentoo build type
-rename demo targets to avoid confusion
-
---- CMake/Utils/MyGUIConfigTargets.cmake
-+++ 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")
-@@ -56,6 +58,12 @@
- # 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 ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
-@@ -170,7 +178,13 @@
- 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)
-
-@@ -326,4 +340,4 @@
- INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
- set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
- endif ()
--endfunction(mygui_config_sample)
-\ No newline at end of file
-+endfunction(mygui_config_sample)
---- CMake/ConfigureBuild.cmake
-+++ 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 @@
- 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
-
@@ -1,20 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Fri Jun 15 10:42:42 UTC 2012
-Subject: build system
-
-fix underlinking
-
---- MyGUIEngine/CMakeLists.txt
-+++ MyGUIEngine/CMakeLists.txt
-@@ -48,7 +48,10 @@
- if (MYGUI_USE_FREETYPE)
- target_link_libraries(${PROJECTNAME}
- ${FREETYPE_LIBRARIES}
-- )
-+ dl)
-+else()
-+ target_link_libraries(${PROJECTNAME}
-+ dl)
- endif()
-
- # platform specific dependencies
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer>
- <email>hasufell@gentoo.org</email>
- <name>Julian Ospald</name>
- </maintainer>
- <use>
- <flag name="freetype">Use freetype for font rendering</flag>
- <flag name="media">Install media files</flag>
- <flag name="plugins">Build MyGUI plugins</flag>
- <flag name="samples">Install MyGUI demos</flag>
- <flag name="tools">Build the tools</flag>
- <flag name="wrapper">Build the wrapper</flag>
-
- </use>
-</pkgmetadata>
-
@@ -1,133 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils cmake-utils flag-o-matic multilib
-
-MY_PN=MyGUI
-MY_P=${MY_PN}_${PV}
-
-DESCRIPTION="A library for creating GUIs for games"
-HOMEPAGE="http://mygui.info/"
-SRC_URI="mirror://sourceforge/my-gui/${MY_PN}/${MY_P}/${MY_P}.zip"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug doc media plugins samples static-libs test tools linguas_ru"
-
-RDEPEND="dev-games/ogre[freeimage,opengl]
- media-libs/freetype:2
- samples? ( dev-games/ois )
- tools? ( dev-games/ois )"
-DEPEND="${RDEPEND}
- app-arch/unzip
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-S=${WORKDIR}/${MY_P}
-STATIC_BUILD=${WORKDIR}/${P}_build_static
-
-pkg_pretend() {
- # media files are always needed for tools and samples
- if use tools || use samples ; then
- einfo
- einfo "useflag 'media' enabled due to dependencies"
- einfo
- fi
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-underlinking.patch \
- "${FILESDIR}"/${P}-build.patch \
- "${FILESDIR}"/${P}-FHS.patch
-}
-
-src_configure() {
- use debug && append-cppflags -DDEBUG
-
- local mycmakeargs=()
-
- # static configuration
- if use static-libs ; then
- mycmakeargs=( -DMYGUI_STATIC=ON
- -DMYGUI_BUILD_DOCS=OFF
- -DMYGUI_INSTALL_DOCS=OFF
- -DMYGUI_USE_FREETYPE=ON
- $(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
- -DMYGUI_BUILD_DEMOS=OFF
- -DMYGUI_INSTALL_SAMPLES=OFF
- -DMYGUI_BUILD_TOOLS=OFF
- -DMYGUI_INSTALL_TOOLS=OFF
- -DMYGUI_BUILD_WRAPPER=OFF
- -DMYGUI_RENDERSYSTEM=2 )
-
- CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure
- unset mycmakeargs
- fi
-
- # main configuration
- mycmakeargs=( -DMYGUI_STATIC=OFF
- $(cmake-utils_use doc MYGUI_BUILD_DOCS)
- $(cmake-utils_use doc MYGUI_INSTALL_DOCS)
- -DMYGUI_USE_FREETYPE=ON
- $(cmake-utils_use plugins MYGUI_BUILD_PLUGINS)
- $(cmake-utils_use samples MYGUI_BUILD_DEMOS)
- $(cmake-utils_use samples MYGUI_INSTALL_SAMPLES)
- $(cmake-utils_use tools MYGUI_BUILD_TOOLS)
- $(cmake-utils_use tools MYGUI_INSTALL_TOOLS)
- -DMYGUI_BUILD_WRAPPER=OFF
- -DMYGUI_RENDERSYSTEM=2 )
-
- if use tools || use samples ; then
- mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON )
- else
- mycmakeargs+=( $(cmake-utils_use media MYGUI_INSTALL_MEDIA) )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- # build system does not support building static and shared at once,
- # run a double build
- if use static-libs ; then
- CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_compile
- fi
-
- cmake-utils_src_compile
-
- use doc && emake -C "${CMAKE_BUILD_DIR}"/Docs api-docs
-}
-
-src_install() {
- cmake-utils_src_install
-
- if use static-libs ; then
- find "${STATIC_BUILD}" -name "*.a" \! -name "libCommon.a" -exec dolib.a '{}' \;
- insinto /usr/$(get_libdir)/pkgconfig
- doins "${STATIC_BUILD}"/pkgconfig/MYGUIStatic.pc
- fi
-
- if use doc ; then
- dohtml -r "${CMAKE_BUILD_DIR}"/Docs/html/*
-
- if use linguas_ru ; then
- docompress -x /usr/share/doc/${PF}/Papers
- dodoc -r Docs/Papers
- fi
- fi
-
- # test media not needed at runtime
- rm -rf "${D}"/usr/share/MYGUI/Media/UnitTests
- # wrapper not available for linux, remove related media
- rm -rf "${D}"/usr/share/MYGUI/Media/Wrapper
-}
-
-pkg_postinst() {
- einfo
- elog "ogre.cfg and Ogre.log are created as"
- elog "~/mygui-ogre.cfg and ~/mygui-Ogre.log"
- einfo
-}

0 comments on commit a93b20e

Please sign in to comment.