hasufell    14/11/05 19:37:37

  Modified:             ChangeLog metadata.xml
  Added:                ogre-1.9.0-r1.ebuild
  Log:
  fix bug #506058, thanks to Sven Eden
  
  (Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 
BDEED020)

Revision  Changes    Path
1.98                 dev-games/ogre/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.98&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?rev=1.98&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ChangeLog?r1=1.97&r2=1.98

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- ChangeLog   8 Mar 2014 23:22:37 -0000       1.97
+++ ChangeLog   5 Nov 2014 19:37:37 -0000       1.98
@@ -1,6 +1,13 @@
 # ChangeLog for dev-games/ogre
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.97 2014/03/08 
23:22:37 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ChangeLog,v 1.98 2014/11/05 
19:37:37 hasufell Exp $
+
+*ogre-1.9.0-r1 (05 Nov 2014)
+
+  05 Nov 2014; Julian Ospald <hasuf...@gentoo.org> +ogre-1.9.0-r1.ebuild,
+  +files/ogre-1.9.0-remove_media_path_to_bindir.patch,
+  +files/ogre-1.9.0-remove_resource_path_to_bindir.patch, metadata.xml:
+  fix bug #506058, thanks to Sven Eden
 
   08 Mar 2014; Julian Ospald <hasuf...@gentoo.org> ogre-1.8.1.ebuild,
   ogre-1.9.0.ebuild:



1.10                 dev-games/ogre/metadata.xml

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/metadata.xml?rev=1.10&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/metadata.xml?rev=1.10&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/metadata.xml?r1=1.9&r2=1.10

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/ogre/metadata.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- metadata.xml        1 Nov 2012 19:34:35 -0000       1.9
+++ metadata.xml        5 Nov 2014 19:37:37 -0000       1.10
@@ -78,7 +78,9 @@
     <flag name="cg">NVIDIA toolkit plugin</flag>
     <flag name="double-precision">more precise calculations at the expense of 
speed</flag>
        <flag name="freeimage">support images via freeimage</flag>
+       <flag name="gl3plus">Build OpenGL 3+ RenderSystem (EXPERIMENTAL)</flag>
        <flag name="gles2">build OpenGL ES 2.x RenderSystem</flag>
+       <flag name="gles3">Enable OpenGL ES 3.x Features</flag>
     <flag name="ois">pull in Object-oriented Input System library for 
samples</flag>
     <flag name="poco">when USE=threads, use poco for threading</flag>
     <flag name="tbb">when USE=threads, use tbb for threading</flag>



1.1                  dev-games/ogre/ogre-1.9.0-r1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild?rev=1.1&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild?rev=1.1&content-type=text/plain

Index: ogre-1.9.0-r1.ebuild
===================================================================
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.9.0-r1.ebuild,v 1.1 
2014/11/05 19:37:37 hasufell Exp $

EAPI=5
CMAKE_REMOVE_MODULES="yes"
CMAKE_REMOVE_MODULES_LIST="FindFreetype"

inherit eutils cmake-utils vcs-snapshot

DESCRIPTION="Object-oriented Graphics Rendering Engine"
HOMEPAGE="http://www.ogre3d.org/";
SRC_URI="https://bitbucket.org/sinbad/ogre/get/v${PV//./-}.tar.bz2 -> 
${P}.tar.bz2"

LICENSE="MIT public-domain"
SLOT="0/1.9.0"
KEYWORDS="~amd64 ~x86"

# gles1 currently broken wrt bug #418201
# gles1 does not even build wrt bug #506058
IUSE="+boost cg doc double-precision examples +freeimage gl3plus gles2 gles3 
ois +opengl poco profile tbb threads tools +zip"

REQUIRED_USE="threads? ( ^^ ( boost poco tbb ) )
        poco? ( threads )
        tbb? ( threads )
        ?? ( gl3plus ( || ( gles2 gles3 ) ) )
        gles3? ( gles2 )
        gl3plus? ( opengl )"

RESTRICT="test" #139905

RDEPEND="
        dev-libs/tinyxml
        media-libs/freetype:2
        virtual/opengl
        virtual/glu
        x11-libs/libX11
        x11-libs/libXaw
        x11-libs/libXrandr
        x11-libs/libXt
        boost? ( dev-libs/boost )
        cg? ( media-gfx/nvidia-cg-toolkit )
        freeimage? ( media-libs/freeimage )
        gles2? ( >=media-libs/mesa-9.0.0[gles2] )
        gles3? ( >=media-libs/mesa-10.0.0[gles2] )
        gl3plus? ( >=media-libs/mesa-9.2.5 )
        ois? ( dev-games/ois )
        threads? (
                poco? ( dev-libs/poco )
                tbb? ( dev-cpp/tbb )
        )
        zip? ( sys-libs/zlib dev-libs/zziplib )"
DEPEND="${RDEPEND}
        x11-proto/xf86vidmodeproto
        virtual/pkgconfig
        doc? ( app-doc/doxygen )"

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

        # Fix some path issues
        epatch "${FILESDIR}/${P}-remove_resource_path_to_bindir.patch" \
                "${FILESDIR}/${P}-remove_media_path_to_bindir.patch"
}

src_configure() {
        local mycmakeargs=(
                -DOGRE_FULL_RPATH=NO
                $(cmake-utils_use boost OGRE_USE_BOOST)
                $(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
                $(cmake-utils_use doc OGRE_INSTALL_DOCS)
                $(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
                $(cmake-utils_use examples OGRE_INSTALL_SAMPLES)
                $(cmake-utils_use freeimage OGRE_CONFIG_ENABLE_FREEIMAGE)
                $(cmake-utils_use opengl OGRE_BUILD_RENDERSYSTEM_GL)
                $(cmake-utils_use gl3plus OGRE_BUILD_RENDERSYSTEM_GL3PLUS)
                -DOGRE_BUILD_RENDERSYSTEM_GLES=FALSE
                $(cmake-utils_use gles2 OGRE_BUILD_RENDERSYSTEM_GLES2)
                $(cmake-utils_use gles3 OGRE_CONFIG_ENABLE_GLES3_SUPPORT)
                $(cmake-utils_use profile OGRE_PROFILING)
                $(cmake-utils_use examples OGRE_BUILD_SAMPLES)
                $(cmake-utils_use examples OGRE_INSTALL_SAMPLES_SOURCE)
                -DOGRE_BUILD_TESTS=FALSE
                $(usex threads "-DOGRE_CONFIG_THREADS=2" 
"-DOGRE_CONFIG_THREADS=0")
                $(cmake-utils_use tools OGRE_BUILD_TOOLS)
                $(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)
        )

        if use threads ; then
                local f
                for f in boost poco tbb ; do
                        use ${f} || continue
                        mycmakeargs+=( -DOGRE_CONFIG_THREAD_PROVIDER=${f} )
                        break
                done
        fi

        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
}




Reply via email to