From 5bd13816bdc4742c8e781379ca215587dc3a9fed Mon Sep 17 00:00:00 2001 From: Markus Meier Date: Sun, 18 Oct 2009 15:30:58 +0000 Subject: version bump by Chris Foster in bug #288558, remove old (Portage version: 2.2_rc46/cvs/Linux i686) --- media-gfx/aqsis/ChangeLog | 8 ++- media-gfx/aqsis/aqsis-1.4.2.ebuild | 72 --------------------------- media-gfx/aqsis/aqsis-1.6.0.ebuild | 71 ++++++++++++++++++++++++++ media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch | 57 --------------------- 4 files changed, 78 insertions(+), 130 deletions(-) delete mode 100644 media-gfx/aqsis/aqsis-1.4.2.ebuild create mode 100644 media-gfx/aqsis/aqsis-1.6.0.ebuild delete mode 100644 media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch (limited to 'media-gfx') diff --git a/media-gfx/aqsis/ChangeLog b/media-gfx/aqsis/ChangeLog index 17a058685326..604e5595b562 100644 --- a/media-gfx/aqsis/ChangeLog +++ b/media-gfx/aqsis/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for media-gfx/aqsis # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.19 2009/08/07 16:18:59 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/ChangeLog,v 1.20 2009/10/18 15:30:57 maekke Exp $ + +*aqsis-1.6.0 (18 Oct 2009) + + 18 Oct 2009; Markus Meier -aqsis-1.4.2.ebuild, + -files/aqsis-1.4.2-gcc44.patch, +aqsis-1.6.0.ebuild: + version bump by Chris Foster in bug #288558, remove old 07 Aug 2009; Samuli Suominen aqsis-1.4.2.ebuild, +files/aqsis-1.4.2-gcc44.patch: diff --git a/media-gfx/aqsis/aqsis-1.4.2.ebuild b/media-gfx/aqsis/aqsis-1.4.2.ebuild deleted file mode 100644 index 6c24e9b6049c..000000000000 --- a/media-gfx/aqsis/aqsis-1.4.2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.4.2.ebuild,v 1.2 2009/08/07 16:18:59 ssuominen Exp $ - -EAPI="1" - -inherit versionator multilib eutils cmake-utils - -DESCRIPTION="Open source RenderMan-compliant 3D rendering solution" -HOMEPAGE="http://www.aqsis.org" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="+fltk openexr" - -if [[ "${P}" == *_p* ]] ; then - # snapshot - _PV=($(get_version_components ${PV})) - DATE="${_PV[3]/p/}" - DATE="${DATE:0:4}-${DATE:4:2}-${DATE:6:2}" - MY_P="${PN}-$(get_version_component_range 1-3)-${DATE}" - SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz" - S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" -else - SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz" -fi - -RDEPEND=" - >=dev-libs/boost-1.34.0 - >=media-libs/tiff-3.7.1 - >=sys-libs/zlib-1.1.4 - fltk? ( >=x11-libs/fltk-1.1.0:1.1 ) - openexr? ( media-libs/openexr )" - -DEPEND=" - ${RDEPEND} - dev-libs/libxslt - >=dev-util/cmake-2.4.6 - >=sys-devel/bison-1.35 - >=sys-devel/flex-2.5.4" - -PATCHES=( "${FILESDIR}/${P}-gcc44.patch" ) - -src_compile() { - if use fltk ; then - # hack to get fltk library/include paths - # (upstream doesn't autodetect the gentoo install path for fltk) - fltk_version="$(get_version_component_range 1-2 \ - $(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))" - mycmakeargs="${mycmakeargs} - -DAQSIS_USE_FLTK:BOOL=ON - -DAQSIS_FLTK_INCLUDE_DIR:PATH=/usr/include/fltk-${fltk_version} - -DAQSIS_FLTK_LIBRARIES_DIR:PATH=/usr/$(get_libdir)/fltk-${fltk_version}" - else - mycmakeargs="${mycmakeargs} -DAQSIS_USE_FLTK:BOOL=OFF" - fi - - mycmakeargs="${mycmakeargs} - -DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt - -DAQSIS_USE_OPENEXR:BOOL=$(use openexr && echo ON || echo OFF) - -DAQSIS_USE_RPATH:BOOL=OFF - -DLIBDIR:STRING=$(get_libdir) - -DSYSCONFDIR:STRING=/etc - -DCMAKE_INSTALL_PREFIX:PATH=/usr" - - cmake-utils_src_compile -} - -src_install() { - DOCS="AUTHORS INSTALL README ReleaseNotes" - cmake-utils_src_install -} diff --git a/media-gfx/aqsis/aqsis-1.6.0.ebuild b/media-gfx/aqsis/aqsis-1.6.0.ebuild new file mode 100644 index 000000000000..84fa5db6bce0 --- /dev/null +++ b/media-gfx/aqsis/aqsis-1.6.0.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/aqsis/aqsis-1.6.0.ebuild,v 1.1 2009/10/18 15:30:57 maekke Exp $ + +EAPI="1" + +inherit versionator multilib eutils cmake-utils + +DESCRIPTION="Open source RenderMan-compliant 3D rendering solution" +HOMEPAGE="http://www.aqsis.org" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="+fltk openexr" + +if [[ "${P}" == *_p* ]] ; then + # snapshot + _PV=($(get_version_components ${PV})) + DATE="${_PV[3]/p/}" + DATE="${DATE:0:4}-${DATE:4:2}-${DATE:6:2}" + MY_P="${PN}-$(get_version_component_range 1-3)-${DATE}" + SRC_URI="http://download.aqsis.org/builds/testing/source/tar/${MY_P}.tar.gz" + S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)" +else + SRC_URI="mirror://sourceforge/aqsis/${P}.tar.gz" +fi + +RDEPEND=" + >=dev-libs/boost-1.34.0 + >=media-libs/tiff-3.7.1 + >=sys-libs/zlib-1.1.4 + fltk? ( >=x11-libs/fltk-1.1.0:1.1 ) + openexr? ( media-libs/openexr )" + +DEPEND=" + ${RDEPEND} + dev-libs/libxslt + >=dev-util/cmake-2.6.3 + >=sys-devel/bison-1.35 + >=sys-devel/flex-2.5.4" + +src_compile() { + if use fltk ; then + # hack to get fltk library/include paths + # (upstream doesn't autodetect the gentoo install path for fltk) + fltk_version="$(get_version_component_range 1-2 \ + $(best_version x11-libs/fltk | sed -e 's/^x11-libs\/fltk//'))" + mycmakeargs="${mycmakeargs} + -DAQSIS_USE_FLTK:BOOL=ON + -DAQSIS_FLTK_INCLUDE_DIR:PATH=/usr/include/fltk-${fltk_version} + -DAQSIS_FLTK_LIBRARIES_DIR:PATH=/usr/$(get_libdir)/fltk-${fltk_version}" + else + mycmakeargs="${mycmakeargs} -DAQSIS_USE_FLTK:BOOL=OFF" + fi + + mycmakeargs="${mycmakeargs} + -DAQSIS_BOOST_LIB_SUFFIX:STRING=-mt + -DAQSIS_USE_OPENEXR:BOOL=$(use openexr && echo ON || echo OFF) + -DAQSIS_USE_RPATH:BOOL=OFF + -DLIBDIR:STRING=$(get_libdir) + -DSYSCONFDIR:STRING=/etc + -DCMAKE_INSTALL_PREFIX:PATH=/usr" + + cmake-utils_src_compile +} + +src_install() { + DOCS="AUTHORS INSTALL README" + newdoc "release-notes/1.6/summary-1.6.0.txt" ReleaseNotes + cmake-utils_src_install +} diff --git a/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch b/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch deleted file mode 100644 index fcb35d134493..000000000000 --- a/media-gfx/aqsis/files/aqsis-1.4.2-gcc44.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff -ur aqsis-1.4.2.orig/aqsistypes/logging.cpp aqsis-1.4.2/aqsistypes/logging.cpp ---- aqsis-1.4.2.orig/aqsistypes/logging.cpp 2009-01-21 23:12:32.000000000 +0200 -+++ aqsis-1.4.2/aqsistypes/logging.cpp 2009-08-07 19:08:35.000000000 +0300 -@@ -21,6 +21,8 @@ - #include "logging.h" - #include "logging_streambufs.h" - -+#include -+ - #include - #include - #include -diff -ur aqsis-1.4.2.orig/displays/d_xpm/aspXpm.cpp aqsis-1.4.2/displays/d_xpm/aspXpm.cpp ---- aqsis-1.4.2.orig/displays/d_xpm/aspXpm.cpp 2009-01-21 23:12:32.000000000 +0200 -+++ aqsis-1.4.2/displays/d_xpm/aspXpm.cpp 2009-08-07 19:10:14.000000000 +0300 -@@ -1,5 +1,6 @@ - #include "aspXpm.h" - -+#include - #include - - aspXpm::aspXpm( const char *filename, int width, int height, int bpp ) -diff -ur aqsis-1.4.2.orig/renderer/render/condition.cpp aqsis-1.4.2/renderer/render/condition.cpp ---- aqsis-1.4.2.orig/renderer/render/condition.cpp 2009-01-21 23:12:32.000000000 +0200 -+++ aqsis-1.4.2/renderer/render/condition.cpp 2009-08-07 19:14:34.000000000 +0300 -@@ -31,6 +31,8 @@ - #include "renderer.h" - #include "logging.h" - -+#include -+ - #include - - namespace Aqsis { -diff -ur aqsis-1.4.2.orig/shadercompiler/shaderexecenv/shadeops_tmap.cpp aqsis-1.4.2/shadercompiler/shaderexecenv/shadeops_tmap.cpp ---- aqsis-1.4.2.orig/shadercompiler/shaderexecenv/shadeops_tmap.cpp 2009-01-21 23:12:32.000000000 +0200 -+++ aqsis-1.4.2/shadercompiler/shaderexecenv/shadeops_tmap.cpp 2009-08-07 19:12:14.000000000 +0300 -@@ -25,6 +25,8 @@ - - #include "aqsis.h" - -+#include -+ - #ifdef AQSIS_SYSTEM_WIN32 - #include - #endif -diff -ur aqsis-1.4.2.orig/texturing/teqser/teqser.cpp aqsis-1.4.2/texturing/teqser/teqser.cpp ---- aqsis-1.4.2.orig/texturing/teqser/teqser.cpp 2009-01-21 23:12:32.000000000 +0200 -+++ aqsis-1.4.2/texturing/teqser/teqser.cpp 2009-08-07 19:17:42.000000000 +0300 -@@ -23,6 +23,7 @@ - \author Paul C. Gregory (pgregory@aqsis.org) - */ - -+#include - #include - #include - #include -- cgit v1.2.3-65-gdbad