diff options
Diffstat (limited to 'media-gfx')
-rw-r--r-- | media-gfx/openmesh/Manifest | 1 | ||||
-rw-r--r-- | media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch | 18 | ||||
-rw-r--r-- | media-gfx/openmesh/files/openmesh-1.0.0-gcc41.patch | 145 | ||||
-rw-r--r-- | media-gfx/openmesh/openmesh-2.3.1.ebuild | 52 |
4 files changed, 0 insertions, 216 deletions
diff --git a/media-gfx/openmesh/Manifest b/media-gfx/openmesh/Manifest index d13300c2f142..fdcf0346edbe 100644 --- a/media-gfx/openmesh/Manifest +++ b/media-gfx/openmesh/Manifest @@ -1,4 +1,3 @@ -DIST OpenMesh-2.3.1.tar.bz2 18203577 SHA256 5cd6537c64e1ff3f451e19328a70c02d283d06705e96698c19dde75c3749e4f8 SHA512 5d0822032111f07dc23751edebc7efa6e98d7e729ee020cfa6b5cf78b4c5e1a9f0ea1ca4a5cf3b1fe1cb1fc4389260f834b9e1c682a4f4c68cdc84035eef6c67 WHIRLPOOL 398fd2ae94e3927024fdc8489801480b9c27449e1ac5559f0e8c890ebee3d61b66207c6909f4b3ef73ec16829fee877e57e434a77c9dde2c0d22ec80a987e968 DIST OpenMesh-3.2.tar.bz2 23766435 SHA256 c74890539846c8222aae93ad63316132e84bf4b2080c9b8321790767723f32e5 SHA512 40b346a6c7b141c284183ca66a489d20b668e3c3c0fb5b4e4185b86ea4552f031ea3106e918b2c3cf8e1bc713f3aac325dd17b50ec4d29f6446cf2cbde9a3dd9 WHIRLPOOL 93d8a2d2443f3de8938bf02836f1e1af92fc5adcd0c8c8fbc404a489d566d8d0e4dc4ed86665a8de0c94b171c045713497a7ef6fdb2aa83e04c5a3e2c18a79d5 DIST OpenMesh-3.3.tar.bz2 24797682 SHA256 4eff6fff5685c57e2e7cdbf5b4b1ef183b3806db822eb01f74c8895e0fbe7a1d SHA512 3bed1f6a3d7db9b67d6c17647bf6c5efa26aca394763d14f5106f70573660329618d99287a51bea23c3a34b495117e38d5756d6d5bf49ea1add711d9e68bab8d WHIRLPOOL 3e6469940dd0ea5c6b83f79841faae8917c25558ea2bc43d78b7576c070fb8ab14b0280c1900e7d871f30a305ab42791a5498373a8869674179b0fd73dc626d5 DIST OpenMesh-4.1.tar.bz2 24728164 SHA256 3e30cd7325db6367175e2e88c7516c23b7f90c9e1ff739c7d62e7de21228bb8e SHA512 064a4d5cb467589869baf4a302e6c620bd84de874b24019252b97ef863b59e83f2fe23ea45e4a5162a7765847da19f75f563f084cf2b3ae77c7e704b4c859b71 WHIRLPOOL 6989d0ff9dd24bf5b8252e6fc0a416258015d1b5a6202b4e7583c1f2eefe59826a5e2aaa6d50f105083f43680431a67e1cab5b81ace06b119d4e3737267f79ee diff --git a/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch b/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch deleted file mode 100644 index f6be7bab8dad..000000000000 --- a/media-gfx/openmesh/files/QGLViewerWidget-hh-gcc-4.3-include-fix.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -urN a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh ---- a/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh 2008-07-01 09:05:13.000000000 -0400 -+++ b/OpenMesh/Apps/QtViewer/QGLViewerWidget.hh 2009-04-17 16:38:31.099766294 -0400 -@@ -36,11 +36,11 @@ - //== INCLUDES ================================================================= - - --#include <OpenMesh/Core/Geometry/VectorT.hh> --#include <QtOpenGL/qgl.h> --#include <string> -+#include <cstring> - #include <vector> - #include <map> -+#include <OpenMesh/Core/Geometry/VectorT.hh> -+#include <QtOpenGL/qgl.h> - - - //== FORWARD DECLARATIONS ===================================================== diff --git a/media-gfx/openmesh/files/openmesh-1.0.0-gcc41.patch b/media-gfx/openmesh/files/openmesh-1.0.0-gcc41.patch deleted file mode 100644 index ce6f5e108a5a..000000000000 --- a/media-gfx/openmesh/files/openmesh-1.0.0-gcc41.patch +++ /dev/null @@ -1,145 +0,0 @@ -From: Daniel Drake <dsd@gentoo.org> - -Index: OpenMesh/Core/IO/OMFormat.hh -=================================================================== ---- OpenMesh.orig/Core/IO/OMFormat.hh -+++ OpenMesh/Core/IO/OMFormat.hh -@@ -462,23 +462,6 @@ namespace OMFormat { - typedef GenProg::False t_unsigned; - - -- /// Store an integer with a wanted number of bits -- template< typename T > -- inline -- size_t -- store( std::ostream& _os, -- const T& _val, -- OMFormat::Chunk::Integer_Size _b, -- bool _swap) -- { -- assert( OMFormat::is_integer( _val ) ); -- -- if ( OMFormat::is_signed( _val ) ) -- return store( _os, _val, _b, _swap, t_signed() ); -- return store( _os, _val, _b, _swap, t_unsigned() ); -- } -- -- - // helper to store a an integer - template< typename T > - size_t -@@ -497,24 +480,22 @@ namespace OMFormat { - bool _swap, - t_unsigned); - -- -- /// Restore an integer with a wanted number of bits -+ /// Store an integer with a wanted number of bits - template< typename T > - inline - size_t -- restore( std::istream& _is, -- T& _val, -- OMFormat::Chunk::Integer_Size _b, -- bool _swap) -+ store( std::ostream& _os, -+ const T& _val, -+ OMFormat::Chunk::Integer_Size _b, -+ bool _swap) - { - assert( OMFormat::is_integer( _val ) ); -- -+ - if ( OMFormat::is_signed( _val ) ) -- return restore( _is, _val, _b, _swap, t_signed() ); -- return restore( _is, _val, _b, _swap, t_unsigned() ); -+ return store( _os, _val, _b, _swap, t_signed() ); -+ return store( _os, _val, _b, _swap, t_unsigned() ); - } - -- - // helper to store a an integer - template< typename T > inline - size_t restore( std::istream& _is, -@@ -530,18 +511,26 @@ namespace OMFormat { - OMFormat::Chunk::Integer_Size _b, - bool _swap, - t_unsigned); -- // -- // ---------------------------------------- storing vectors - -- /// storing a vector type -- template <typename VecT> inline -- size_t vector_store( std::ostream& _os, const VecT& _vec, bool _swap ) -- { -- return store( _os, _vec, -- GenProg::Int2Type< vector_traits<VecT>::size_ >(), -- _swap ); -+ /// Restore an integer with a wanted number of bits -+ template< typename T > -+ inline -+ size_t -+ restore( std::istream& _is, -+ T& _val, -+ OMFormat::Chunk::Integer_Size _b, -+ bool _swap) -+ { -+ assert( OMFormat::is_integer( _val ) ); -+ -+ if ( OMFormat::is_signed( _val ) ) -+ return restore( _is, _val, _b, _swap, t_signed() ); -+ return restore( _is, _val, _b, _swap, t_unsigned() ); - } - -+ // -+ // ---------------------------------------- storing vectors -+ - template <typename VecT> inline - size_t store( std::ostream& _os, const VecT& _vec, GenProg::Int2Type<1>, - bool _swap ) -@@ -579,19 +568,17 @@ namespace OMFormat { - return bytes; - } - -- // ---------------------------------------- restoring vectors -- -- /// Restoring a vector type -- template <typename VecT> -- inline -- size_t -- vector_restore( std::istream& _is, VecT& _vec, bool _swap ) -+ /// storing a vector type -+ template <typename VecT> inline -+ size_t vector_store( std::ostream& _os, const VecT& _vec, bool _swap ) - { -- return restore( _is, _vec, -- GenProg::Int2Type< vector_traits<VecT>::size_ >(), -- _swap ); -+ return store( _os, _vec, -+ GenProg::Int2Type< vector_traits<VecT>::size_ >(), -+ _swap ); - } - -+ // ---------------------------------------- restoring vectors -+ - - template <typename VecT> - inline -@@ -644,6 +631,17 @@ namespace OMFormat { - return bytes; - } - -+ /// Restoring a vector type -+ template <typename VecT> -+ inline -+ size_t -+ vector_restore( std::istream& _is, VecT& _vec, bool _swap ) -+ { -+ return restore( _is, _vec, -+ GenProg::Int2Type< vector_traits<VecT>::size_ >(), -+ _swap ); -+ } -+ - // ---------------------------------------- storing property names - - template <> diff --git a/media-gfx/openmesh/openmesh-2.3.1.ebuild b/media-gfx/openmesh/openmesh-2.3.1.ebuild deleted file mode 100644 index 1c73cd0d2127..000000000000 --- a/media-gfx/openmesh/openmesh-2.3.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="3" -inherit eutils cmake-utils - -MY_PN="OpenMesh" -MY_PV="${PV/_rc/-RC}" -S="${WORKDIR}/${MY_PN}-${MY_PV}" - -DESCRIPTION="A generic and efficient data structure for representing and manipulating polygonal meshes" -HOMEPAGE="http://www.openmesh.org/" -SRC_URI="http://openmesh.org/fileadmin/${PN}-files/${MY_PV/-RC/RC}/${MY_PN}-${MY_PV}.tar.bz2" - -LICENSE="LGPL-3-with-linking-exception" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="qt4 static-libs" - -RDEPEND="qt4? ( dev-qt/qtgui:4 - dev-qt/qtopengl:4 - media-libs/freeglut )" -DEPEND="${RDEPEND}" - -src_prepare() { - # Fix libdir and remove rpath. - sed -i \ - -e "s|\(set (ACG_PROJECT_LIBDIR \"\).*|\1$(get_libdir)/\")|" \ - -e "s|\(set (ACG_PROJECT_PLUGINDIR \"\)lib\(.*\)|\1$(get_libdir)\2|" \ - -e "s|\(BUILD_WITH_INSTALL_RPATH \)1|\1 0|" \ - -e "s|\(SKIP_BUILD_RPATH\) 0|\1 1|" \ - -e '/^ *INSTALL_RPATH/d' \ - cmake/ACGCommon.cmake || die - - if ! use static-libs; then - sed -i "s|\(SHARED\)ANDSTATIC|\1|" \ - src/${MY_PN}/{Core,Tools}/CMakeLists.txt || die - sed -i '/OpenMeshCoreStatic/d' \ - src/${MY_PN}/Tools/CMakeLists.txt || die - fi -} - -src_configure() { - mycmakeargs="$(cmake-utils_use_build "qt4" "APPS")" - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - dodoc LICENSE/* README CHANGELOG || die -} |