[gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, dev-games/ogre/files/

[gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, dev-games/ogre/files/

[Azamat H. Hackimov]

commit:     5281c3472a4f72e4d9c39f4c26480c0799a61f87
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Fri Jan  4 16:42:32 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Fri Jan  4 16:42:32 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5281c347

Remove old lib.

---
 dev-games/ogre/ChangeLog                    |   48 ---------------
 dev-games/ogre/files/ogre-1.7.3-gcc46.patch |   10 ---
 dev-games/ogre/metadata.xml                 |   25 --------
 dev-games/ogre/ogre-1.7.3.ebuild            |   85 ---------------------------
 4 files changed, 0 insertions(+), 168 deletions(-)

diff --git a/dev-games/ogre/ChangeLog b/dev-games/ogre/ChangeLog
deleted file mode 100644
index ce207f3..0000000
--- a/dev-games/ogre/ChangeLog
+++ /dev/null
@@ -1,48 +0,0 @@
-# ChangeLog for dev-games/ogre
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: $
-
-  08 Nov 2012; Michael Palimaka <kensington@gentoo.org> ogre-1.7.3.ebuild:
-  Migrate to virtual/pkgconfig.
-
-*ogre-1.7.3 (05 Mar 2012)
-
-  05 Mar 2012; Azamat H. Hackimov <azamat.hackimov@gmail.com>
-  +files/ogre-1.7.3-gcc46.patch, +metadata.xml, +ogre-1.7.3.ebuild:
-  Revert "[dev-games/ogre]        back in portage ogre-1.7.3.ebuild"
-
-  FreeImage is newer than in portage and use different patchstack.
-  Ogre needed to review additionaly.
-
-  This reverts commit f237cbe57d2efef60849cab03ff2dd01c4794f83.
-
-  04 Mar 2012; Marcel Unbehaun <marcel@frostworx.de>
-  -files/ogre-1.7.3-gcc46.patch, -metadata.xml, -ogre-1.7.3.ebuild:
-  back in portage ogre-1.7.3.ebuild
-  [media-libs/freeimage]  back in portage freeimage-3.15.2.ebuild
-
-*ogre-1.7.3 (11 Jun 2011)
-
-  11 Jun 2011; Azamat H. Hackimov <azamat.hackimov@gmail.com>
-  -files/ogre-1.7.2-gcc46.patch, +files/ogre-1.7.3-gcc46.patch,
-  -ogre-1.7.2.ebuild, +ogre-1.7.3.ebuild:
-  Version bump to 1.7.3
-
-*ogre-1.7.2 (24 Apr 2011)
-
-  24 Apr 2011; Azamat H. Hackimov <azamat.hackimov@gmail.com>
-  +files/ogre-1.7.2-gcc46.patch, -ogre-1.7.1.ebuild, +ogre-1.7.2.ebuild:
-  version bump to 1.7.2
-  Fixed doc USE-flag, added gcc 4.6 patch.
-
-*ogre-1.7.1 (26 Jun 2010)
-
-  26 Jun 2010; Azamat H. Hackimov <azamat.hackimov@gmail.com> +metadata.xml,
-  +ogre-1.7.1.ebuild:
-  OGRE 1.7.1 initial commit
-  Mostly based on my ebuild from Bugzilla (#307205)
-  There is some minor bugs:
-  * docs placed in wrong place (not /usr/share/doc/${P})
-  * test units not tested :)
-  * static compilation
-

diff --git a/dev-games/ogre/files/ogre-1.7.3-gcc46.patch b/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
deleted file mode 100644
index 7fe766a..0000000
--- a/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/OgreMain/include/OgreOptimisedUtil.h
-+++ b/OgreMain/include/OgreOptimisedUtil.h
-@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
- #ifndef __OptimisedUtil_H__
- #define __OptimisedUtil_H__
- 
-+#include <cstddef>
- #include "OgrePrerequisites.h"
- #include "OgreEdgeListBuilder.h"
- 

diff --git a/dev-games/ogre/metadata.xml b/dev-games/ogre/metadata.xml
deleted file mode 100644
index b855bb8..0000000
--- a/dev-games/ogre/metadata.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<herd>games</herd>
-<maintainer>
-<email>azamat.hackimov@gmail.com</email>
-<name>Azamat H. Hackimov</name>
-</maintainer>
-<longdescription lang="en">
-Object-oriented Graphics Rendering Engine
-</longdescription>
-<use>
-  <flag name="boost">Add support for boost</flag>
-  <flag name="boost-threads">Build with boost as threads provider</flag>
-  <flag name="poco-threads">Build with poco as threads provider</flag>
-  <flag name="tbb-threads">Build with tbb as threads provider</flag>
-  <flag name="cg">NVIDIA toolkit plugin</flag>
-  <flag name="double-precision">more precise calculations at the expense of speed</flag>
-  <flag name="ois">OIS plugin</flag>
-  <flag name="freeimage">freeimage plugin</flag>
-  <flag name="tools">Build Ogre's command line tools</flag>
-  <flag name="zip">zip plugin</flag>
-</use>
-</pkgmetadata>
-

diff --git a/dev-games/ogre/ogre-1.7.3.ebuild b/dev-games/ogre/ogre-1.7.3.ebuild
deleted file mode 100644
index a4d3550..0000000
--- a/dev-games/ogre/ogre-1.7.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.3 2009/12/21 20:44:22 mr_bones_ Exp $
-
-EAPI=3
-inherit multilib eutils cmake-utils
-
-MY_PV="${PV//./-}"
-DESCRIPTION="Object-oriented Graphics Rendering Engine"
-HOMEPAGE="http://www.ogre3d.org/"
-SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost +boost-threads doc cg double-precision examples +freeimage +ois +opengl poco-threads test tbb-threads tools +zip"
-RESTRICT="test" #139905
-
-RDEPEND="media-libs/freetype:2
-	virtual/opengl
-	virtual/glu
-	x11-libs/libX11
-	x11-libs/libXaw
-	x11-libs/libXrandr
-	x11-libs/libXt
-	boost? ( dev-libs/boost )
-	boost-threads? ( dev-libs/boost )
-	cg? ( media-gfx/nvidia-cg-toolkit )
-	freeimage? ( media-libs/freeimage )
-	ois? ( dev-games/ois )
-	poco-threads? ( dev-libs/poco )
-	tbb-threads? ( dev-cpp/tbb )
-	zip? ( sys-libs/zlib dev-libs/zziplib )"
-DEPEND="${RDEPEND}
-	x11-proto/xf86vidmodeproto
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cppunit )"
-
-S="${WORKDIR}/${PN}_src_v${MY_PV}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-gcc46.patch"
-	if use doc; then
-		sed -i -e "s:share/OGRE/docs:share/doc/${P}:" \
-			Docs/CMakeLists.txt || die "sed failed"
-	fi
-}
-
-src_configure() {
-	#-DOGRE_STATIC=ON
-	local mycmakeargs="
-		-DOGRE_LIB_DIRECTORY="$(get_libdir)"
-		$(cmake-utils_use boost OGRE_USE_BOOST)
-		$(cmake-utils_use cg OGRE_BUILD_PLUGIN_CG)
-		$(cmake-utils_use double-precision OGRE_CONFIG_DOUBLE)
-		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
-		$(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 test OGRE_BUILD_TESTS)
-		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
-		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)"
-
-	use cg && [ -d /opt/nvidia-cg-toolkit ] && ogre_dynamic_config+="-DCg_HOME=/opt/nvidia-cg-toolkit"
-	use freeimage && LDFLAGS="$LDFLAGS $(pkg-config --libs freeimage)"
-
-	if use boost-threads; then
-		einfo "Enabling boost as Threading provider"
-		mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"boost\""
-	elif use poco-threads; then
-		einfo "Enabling poco as Threading provider"
-	    mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"poco\""
-	elif use tbb-threads; then
-		einfo "Enabling tbb as Threading provider"
-	    mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=ON -DOGRE_CONFIG_THREAD_PROVIDER=\"tbb\""
-	else
-		echo
-		ewarn "Threading support is disabled!"
-		echo
-		mycmakeargs="${mycmakeargs} -DOGRE_CONFIG_THREADS=OFF"
-	fi
-	CMAKE_BUILD_TYPE="Release"
-	cmake-utils_src_configure
-}

[gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, dev-games/ogre/files/

[Azamat H. Hackimov]

commit:     19d90af2446c9cfbdeebcfbfb46a2a476f36e7ac
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sat Jun 11 19:25:33 2011 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sat Jun 11 19:25:33 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=19d90af2

[dev-games/ogre] Version bump to 1.7.3

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

---
 ...re-1.7.2-gcc46.patch => ogre-1.7.3-gcc46.patch} |    0
 .../ogre/{ogre-1.7.2.ebuild => ogre-1.7.3.ebuild}  |    3 ++-
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/dev-games/ogre/files/ogre-1.7.2-gcc46.patch b/dev-games/ogre/files/ogre-1.7.3-gcc46.patch
similarity index 100%
rename from dev-games/ogre/files/ogre-1.7.2-gcc46.patch
rename to dev-games/ogre/files/ogre-1.7.3-gcc46.patch

diff --git a/dev-games/ogre/ogre-1.7.2.ebuild b/dev-games/ogre/ogre-1.7.3.ebuild
similarity index 95%
rename from dev-games/ogre/ogre-1.7.2.ebuild
rename to dev-games/ogre/ogre-1.7.3.ebuild
index 47b582f..94ccb3a 100644
--- a/dev-games/ogre/ogre-1.7.2.ebuild
+++ b/dev-games/ogre/ogre-1.7.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_src_v${MY_PV}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="+boost +boost-threads doc cg double-precision examples +freeimage +ois poco-threads test tbb-threads tools +zip"
+IUSE="+boost +boost-threads doc cg double-precision examples +freeimage +ois +opengl poco-threads test tbb-threads tools +zip"
 RESTRICT="test" #139905
 
 RDEPEND="media-libs/freetype:2
@@ -57,6 +57,7 @@ src_configure() {
 		$(cmake-utils_use doc OGRE_INSTALL_DOCS)
 		$(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 test OGRE_BUILD_TESTS)
 		$(cmake-utils_use tools OGRE_BUILD_TOOLS)
 		$(cmake-utils_use zip OGRE_CONFIG_ENABLE_ZIP)"

[gentoo-commits] proj/gamerlay:master commit in: dev-games/ogre/, dev-games/ogre/files/

[Azamat H. Hackimov]

commit:     5c10e05caa0b103884e01a758b47488d322c2354
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Apr 24 10:03:49 2011 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun Apr 24 10:03:49 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=5c10e05c

[dev-games/ogre] version bump to 1.7.2
Fixed doc USE-flag, added gcc 4.6 patch.

(Portage version: 2.1.9.42/git/Linux x86_64, unsigned Manifest commit)

---
 dev-games/ogre/files/ogre-1.7.2-gcc46.patch        |   10 ++++++++++
 .../ogre/{ogre-1.7.1.ebuild => ogre-1.7.2.ebuild}  |   14 +++++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/dev-games/ogre/files/ogre-1.7.2-gcc46.patch b/dev-games/ogre/files/ogre-1.7.2-gcc46.patch
new file mode 100644
index 0000000..7fe766a
--- /dev/null
+++ b/dev-games/ogre/files/ogre-1.7.2-gcc46.patch
@@ -0,0 +1,10 @@
+--- a/OgreMain/include/OgreOptimisedUtil.h
++++ b/OgreMain/include/OgreOptimisedUtil.h
+@@ -29,6 +29,7 @@ Torus Knot Software Ltd.
+ #ifndef __OptimisedUtil_H__
+ #define __OptimisedUtil_H__
+ 
++#include <cstddef>
+ #include "OgrePrerequisites.h"
+ #include "OgreEdgeListBuilder.h"
+ 

diff --git a/dev-games/ogre/ogre-1.7.1.ebuild b/dev-games/ogre/ogre-1.7.2.ebuild
similarity index 91%
rename from dev-games/ogre/ogre-1.7.1.ebuild
rename to dev-games/ogre/ogre-1.7.2.ebuild
index 6c0e5af..47b582f 100644
--- a/dev-games/ogre/ogre-1.7.1.ebuild
+++ b/dev-games/ogre/ogre-1.7.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/dev-games/ogre/ogre-1.6.4.ebuild,v 1.3 2009/12/21 20:44:22 mr_bones_ Exp $
 
-EAPI=2
+EAPI=3
 inherit multilib eutils cmake-utils
 
 MY_PV="${PV//./-}"
@@ -33,12 +33,20 @@ RDEPEND="media-libs/freetype:2
 	zip? ( sys-libs/zlib dev-libs/zziplib )"
 DEPEND="${RDEPEND}
 	x11-proto/xf86vidmodeproto
-	dev-util/cmake
 	dev-util/pkgconfig
+	doc? ( app-doc/doxygen )
 	test? ( dev-util/cppunit )"
 
 S="${WORKDIR}/${PN}_src_v${MY_PV}"
 
+src_prepare() {
+	epatch "${FILESDIR}/${P}-gcc46.patch"
+	if use doc; then
+		sed -i -e "s:share/OGRE/docs:share/doc/${P}:" \
+			Docs/CMakeLists.txt || die "sed failed"
+	fi
+}
+
 src_configure() {
 	#-DOGRE_STATIC=ON
 	local mycmakeargs="