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 4CD42138335 for ; Fri, 7 Sep 2018 11:42:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2F74E07B3; Fri, 7 Sep 2018 11:42: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 AE39FE07B3 for ; Fri, 7 Sep 2018 11:42:47 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 8891E335CC6 for ; Fri, 7 Sep 2018 11:42:45 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6A3743CC for ; Fri, 7 Sep 2018 11:42:43 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1536319370.220665f8a33f57b0c3c00301c120c5e248661e9a.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-games/ogre/files/, dev-games/ogre/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-games/ogre/Manifest dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch dev-games/ogre/ogre-1.10.11.ebuild X-VCS-Directories: dev-games/ogre/files/ dev-games/ogre/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 220665f8a33f57b0c3c00301c120c5e248661e9a X-VCS-Branch: master Date: Fri, 7 Sep 2018 11:42: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-Archives-Salt: 6a482a79-322e-4418-8eb2-c51712d30538 X-Archives-Hash: b1823d609549369bbab18ff20459bd75 commit: 220665f8a33f57b0c3c00301c120c5e248661e9a Author: Sven Eden gmx net> AuthorDate: Mon Aug 6 06:13:01 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 7 11:22:50 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=220665f8 dev-games/ogre: drop obsolete 1.10.11 dev-games/ogre/Manifest | 1 - ...ogre-1.10.11-fix_double_precision-88f0d5b.patch | 29 ------ dev-games/ogre/ogre-1.10.11.ebuild | 116 --------------------- 3 files changed, 146 deletions(-) diff --git a/dev-games/ogre/Manifest b/dev-games/ogre/Manifest index fa7ffd7cf96..93a14df137a 100644 --- a/dev-games/ogre/Manifest +++ b/dev-games/ogre/Manifest @@ -1,3 +1,2 @@ -DIST ogre-1.10.11.zip 133064317 BLAKE2B 88c64061377d8257853378219fb5906919d251f5b3c500f70bc1c04bc36e3083dc3dac4babb14d983c8b6fbb63ea3eecf698e3a0134f963db058055edd5dc4c4 SHA512 db207aec8330ec9da2a9781c8753411e69e08008995b8b3e127d454dc05aa899c75157718398ca24998644c586e2dd30cc7e9b7d98e045e4575537f5c81a5a54 DIST ogre-1.10.12.zip 133067192 BLAKE2B 188437153969504b169970d14c39d47c9e666308bf65412018f42ba8ad108876f164733fe2004ea31941ab5db534766c10b871b34ef525522d1120b175530b87 SHA512 63998ea4940d04adfc179a94aa91bb2598692307b429f4c7e5b86a1519c13817035de4c71afc9e4b33fde35e962504373d152de9b9cc8eebbbeb78b2c1942041 DIST ogre-1.9.0.tar.bz2 128098305 BLAKE2B 6e67a5b60a6606a910e099f1c7ba736eb525f079f3aba5cfb362329b9130059d303fc9df6f7b8611c0ba75e1e207fa018e543e93c9f5ce39a6621e4c72ed4a83 SHA512 b1ea93d80ac0978a7c228460a6714f8d17797450efd5af6765c9fa4402e9060a8ef3a700d2757593a3016fdc32276722c8f4a5d9889a3e2eb424f16162a52bde diff --git a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch b/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch deleted file mode 100644 index 53d7a0925d5..00000000000 --- a/dev-games/ogre/files/ogre-1.10.11-fix_double_precision-88f0d5b.patch +++ /dev/null @@ -1,29 +0,0 @@ -# HG changeset patch -# User niparx -# Date 1515160111 -7200 -# Node ID 88f0d5be23c521e7504e3f6cb2a153428efcf159 -# Parent bc4fb04c1de686c23c6207eee69ae0ca9fddcb7c -[OGRE-592] RTShaderSystem compile error when using double precision (#622) - -RTShaderSystem: compile error when using double precision - -https://ogre3d.atlassian.net/browse/OGRE-592 - -diff --git a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp ---- a/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -+++ b/Components/RTShaderSystem/src/OgreShaderFFPTexturing.cpp -@@ -654,8 +654,12 @@ - curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(alphaValue)), Operand::OPS_IN); - } - else -- { -- curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4(colourValue.ptr())), Operand::OPS_IN); -+ { -+ curFuncInvocation->pushOperand(ParameterFactory::createConstParam(Vector4((Real)colourValue.r, -+ (Real)colourValue.g, -+ (Real)colourValue.b, -+ (Real)colourValue.a)), -+ Operand::OPS_IN); - } - - curFuncInvocation->pushOperand(arg, Operand::OPS_OUT); diff --git a/dev-games/ogre/ogre-1.10.11.ebuild b/dev-games/ogre/ogre-1.10.11.ebuild deleted file mode 100644 index 3094851d1f6..00000000000 --- a/dev-games/ogre/ogre-1.10.11.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-utils - -DESCRIPTION="Object-oriented Graphics Rendering Engine" -HOMEPAGE="https://www.ogre3d.org/" -SRC_URI="https://github.com/OGRECave/${PN}/archive/v${PV}.zip -> ${P}.zip" - -LICENSE="MIT public-domain" -SLOT="0/1.10.0" -KEYWORDS="~amd64 ~arm ~x86" - -IUSE="cg doc double-precision examples +freeimage gl3plus gles2 gles3 ois +opengl profile tools" - -REQUIRED_USE="examples? ( ois ) - gles3? ( gles2 ) - gl3plus? ( opengl )" - -RESTRICT="test" #139905 - -RDEPEND=" - dev-libs/boost - dev-libs/zziplib - media-libs/freetype:2 - virtual/glu - virtual/opengl - x11-libs/libX11 - x11-libs/libXaw - x11-libs/libXrandr - x11-libs/libXt - cg? ( media-gfx/nvidia-cg-toolkit ) - freeimage? ( media-libs/freeimage ) - gl3plus? ( >=media-libs/mesa-9.2.5 ) - gles2? ( >=media-libs/mesa-9.0.0[gles2] ) - gles3? ( >=media-libs/mesa-10.0.0[gles2] ) - ois? ( dev-games/ois ) - tools? ( dev-libs/tinyxml[stl] )" -DEPEND="${RDEPEND} - virtual/pkgconfig - x11-base/xorg-proto - doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}/${P}-samples.patch" - "${FILESDIR}/${P}-resource_path.patch" - "${FILESDIR}/${P}-media_path.patch" - "${FILESDIR}/${P}-fix_double_precision-88f0d5b.patch" -) - -src_prepare() { - sed -i \ - -e "s:share/OGRE/docs:share/doc/${PF}:" \ - Docs/CMakeLists.txt || die - # Stupid build system hardcodes release names - sed -i \ - -e '/CONFIGURATIONS/s:CONFIGURATIONS Release.*::' \ - CMake/Utils/OgreConfigTargets.cmake || die - - # make sure we're not using the included tinyxml - # Update for 1.10.11: Unfortunately the build system does not - # search for a system wide tinyxml at this moment. However, - # TinyXML is meant to be built into and not linked to a using - # project anyway. - # rm -f Tools/XMLConverter/{include,src}/tiny*.* - - # Fix some path issues - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DOGRE_BUILD_COMPONENT_JAVA=NO - -DOGRE_BUILD_COMPONENT_PYTHON=NO - -DOGRE_BUILD_DEPENDENCIES=NO - -DOGRE_BUILD_PLUGIN_CG=$(usex cg) - -DOGRE_BUILD_SAMPLES=$(usex examples) - -DOGRE_BUILD_TESTS=FALSE - -DOGRE_BUILD_TOOLS=$(usex tools) - -DOGRE_CONFIG_DOUBLE=$(usex double-precision) - -DOGRE_CONFIG_ENABLE_FREEIMAGE=$(usex freeimage) - -DOGRE_CONFIG_THREADS=3 - -DOGRE_CONFIG_THREAD_PROVIDER=std - -DOGRE_FULL_RPATH=NO - -DOGRE_INSTALL_DOCS=$(usex doc) - -DOGRE_INSTALL_SAMPLES=$(usex examples) - -DOGRE_INSTALL_SAMPLES_SOURCE=$(usex examples) - -DOGRE_NODE_STORAGE_LEGACY=NO - -DOGRE_PROFILING=$(usex profile) - -DOGRE_RESOURCEMANAGER_STRICT=strict - -DOGRE_USE_STD11=YES - ) - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - CONFIGDIR=/etc/OGRE - SHAREDIR=/usr/share/OGRE - - # plugins and resources are the main configuration - insinto "${CONFIGDIR}" - doins "${CMAKE_BUILD_DIR}"/bin/plugins.cfg - doins "${CMAKE_BUILD_DIR}"/bin/resources.cfg - dosym "${CONFIGDIR}"/plugins.cfg "${SHAREDIR}"/plugins.cfg - dosym "${CONFIGDIR}"/resources.cfg "${SHAREDIR}"/resources.cfg - - # These are only for the sample browser - insinto "${SHAREDIR}" - doins "${CMAKE_BUILD_DIR}"/bin/quakemap.cfg - doins "${CMAKE_BUILD_DIR}"/bin/samples.cfg -}