From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5AFE4138350 for ; Wed, 12 Feb 2020 05:34:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5496DE08FE; Wed, 12 Feb 2020 05:34:47 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0CFD3E08FE for ; Wed, 12 Feb 2020 05:34:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id ADC8834EC22 for ; Wed, 12 Feb 2020 05:34:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B2D8210C for ; Wed, 12 Feb 2020 05:34:43 +0000 (UTC) From: "Stefan Strogin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Stefan Strogin" Message-ID: <1581485654.8d9db411331b8bedd40cf819f590a6827ed4dcba.steils@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/mygui/files/, dev-games/mygui/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/mygui/Manifest dev-games/mygui/files/mygui-3.4.0-build.patch dev-games/mygui/files/mygui-3.4.0-underlinking.patch dev-games/mygui/mygui-3.4.0.ebuild X-VCS-Directories: dev-games/mygui/ dev-games/mygui/files/ X-VCS-Committer: steils X-VCS-Committer-Name: Stefan Strogin X-VCS-Revision: 8d9db411331b8bedd40cf819f590a6827ed4dcba X-VCS-Branch: master Date: Wed, 12 Feb 2020 05:34:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e737e82c-28bb-49c2-9675-829e1002ff23 X-Archives-Hash: 057e14522d56afcf907bd0c4d4f9a414 commit: 8d9db411331b8bedd40cf819f590a6827ed4dcba Author: Stefan Strogin gentoo org> AuthorDate: Wed Feb 12 05:18:15 2020 +0000 Commit: Stefan Strogin gentoo org> CommitDate: Wed Feb 12 05:34:14 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d9db411 dev-games/mygui: version bump to 3.4.0 Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Stefan Strogin gentoo.org> dev-games/mygui/Manifest | 1 + dev-games/mygui/files/mygui-3.4.0-build.patch | 61 ++++++++ .../mygui/files/mygui-3.4.0-underlinking.patch | 21 +++ dev-games/mygui/mygui-3.4.0.ebuild | 159 +++++++++++++++++++++ 4 files changed, 242 insertions(+) diff --git a/dev-games/mygui/Manifest b/dev-games/mygui/Manifest index 901646e5996..0a6549d1495 100644 --- a/dev-games/mygui/Manifest +++ b/dev-games/mygui/Manifest @@ -1 +1,2 @@ DIST MyGUI3.2.2.tar.gz 22081236 BLAKE2B 3a28e0838a8203d20565822d5a19423a733149cca250dc4169de43f22beb7d37fccbf3d282ea9b4f284cb71df2df9a9073bac40124e1d8a90d15c5fda2af798a SHA512 1290ce1d78b9e4bfe72bea3fb1bc6cdd25969b44be2844df62a1f425b3e221a68b61658fdf45271fb50a1957f12b5ada1c9be971e00ecfe41f53ae0a83ae18d4 +DIST mygui-3.4.0.tar.gz 22391483 BLAKE2B 5628cca98625285368b9363acd95e541e1ba7d86fd1d471f687c553d0f0abd9ccb2f47981cf0bb91f44a68489bb7ec3fbcb451734758e2435ab9ef320214465a SHA512 3f560fd9c7e5b514da40e41c7753dc20649f80b763f5ee20afc9627df3be14242ea833eff09eac16b9e88b1c9fbed7c09def0c5068c832e710c247191fb53487 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 00000000000..71ed87d8bcb --- /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 00000000000..1dcf2dbbbfd --- /dev/null +++ b/dev-games/mygui/files/mygui-3.4.0-underlinking.patch @@ -0,0 +1,21 @@ +From: Julian Ospald +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 diff --git a/dev-games/mygui/mygui-3.4.0.ebuild b/dev-games/mygui/mygui-3.4.0.ebuild new file mode 100644 index 00000000000..15c88e7a864 --- /dev/null +++ b/dev-games/mygui/mygui-3.4.0.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +CMAKE_REMOVE_MODULES="yes" +CMAKE_REMOVE_MODULES_LIST="FindFreetype" +inherit cmake-utils flag-o-matic multilib + +MY_PN=MyGUI +MY_P=${MY_PN}${PV} + +DESCRIPTION="A library for creating GUIs for games and 3D applications" +HOMEPAGE="http://mygui.info" +SRC_URI="https://github.com/MyGUI/mygui/archive/${MY_P}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc +ogre -opengl plugins samples static-libs test tools l10n_ru" +RESTRICT="!test? ( test )" +REQUIRED_USE="ogre? ( !opengl ) + opengl? ( !ogre )" + +RDEPEND="media-libs/freetype:2 + sys-libs/zlib + ogre? ( + dev-games/ogre:0=[freeimage,opengl] + samples? ( dev-games/ois ) + ) + opengl? ( + virtual/opengl + media-libs/glew:0= + ) + tools? ( dev-games/ois )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig + doc? ( app-doc/doxygen )" + +S=${WORKDIR}/mygui-${MY_P} +STATIC_BUILD=${WORKDIR}/${P}_build_static + +PATCHES=( + "${FILESDIR}"/${P}-underlinking.patch + "${FILESDIR}"/${P}-build.patch + "${FILESDIR}"/${PN}-3.2.2-FHS.patch +) + +pkg_setup() { + if use samples && use !ogre ; then + ewarn "Samples disabled, because they only work with ogre!" + ewarn "Enable ogre USE flag if you want to use samples." + fi +} + +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=$(usex opengl "4" "$(usex ogre "3" "1")") ) + + CMAKE_BUILD_DIR=${STATIC_BUILD} cmake-utils_src_configure + unset mycmakeargs + fi + + # main configuration + mycmakeargs=( + -DMYGUI_STATIC=OFF + -DMYGUI_BUILD_DOCS=$(usex doc) + -DMYGUI_INSTALL_DOCS=$(usex doc) + -DMYGUI_USE_FREETYPE=ON + -DMYGUI_BUILD_PLUGINS=$(usex plugins) + -DMYGUI_BUILD_TOOLS=$(usex tools) + -DMYGUI_INSTALL_TOOLS=$(usex tools) + -DMYGUI_USE_SYSTEM_GLEW=$(usex opengl) + -DMYGUI_BUILD_WRAPPER=OFF + -DMYGUI_RENDERSYSTEM=$(usex opengl "4" "$(usex ogre "3" "1")") + ) + + if use ogre && use samples; then + mycmakeargs+=( + -DMYGUI_BUILD_DEMOS=ON + -DMYGUI_INSTALL_SAMPLES=ON + ) + else + mycmakeargs+=( + -DMYGUI_BUILD_DEMOS=OFF + -DMYGUI_INSTALL_SAMPLES=OFF + ) + + fi + + if use tools || (use samples && use ogre) ; then + mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=ON ) + else + mycmakeargs+=( -DMYGUI_INSTALL_MEDIA=OFF ) + 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 + dodoc -r "${CMAKE_BUILD_DIR}"/Docs/html/ + + if use l10n_ru ; then + docompress -x /usr/share/doc/${PF}/Papers + dodoc -r Docs/Papers + fi + fi + + keepdir /etc/MYGUI + fperms o+w /etc/MYGUI + + # test media not needed at runtime + rm -rf "${ED%/}"/usr/share/MYGUI/Media/UnitTests || die + # wrapper not available for linux, remove related media + rm -rf "${ED%/}"/usr/share/MYGUI/Media/Wrapper || die +} + +pkg_postinst() { + elog + elog "ogre.cfg and Ogre.log are created as" + elog "${EROOT%/}/etc/MYGUI/mygui-ogre.cfg and /etc/MYGUI/mygui-Ogre.log" + elog +}