diff options
Diffstat (limited to 'media-gfx/freepv')
| -rw-r--r-- | media-gfx/freepv/ChangeLog | 10 | ||||
| -rw-r--r-- | media-gfx/freepv/files/freepv-0.3.0-gcc44.patch | 72 | ||||
| -rw-r--r-- | media-gfx/freepv/files/freepv-0.3.0-noplugin.patch | 30 | ||||
| -rw-r--r-- | media-gfx/freepv/freepv-0.3.0-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-gfx/freepv/freepv-0.3.0-r2.ebuild | 34 |
5 files changed, 116 insertions, 34 deletions
diff --git a/media-gfx/freepv/ChangeLog b/media-gfx/freepv/ChangeLog index 0193d03d68bf..5373a7eb95d6 100644 --- a/media-gfx/freepv/ChangeLog +++ b/media-gfx/freepv/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for media-gfx/freepv # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.6 2010/02/18 22:07:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.7 2010/03/11 15:30:44 voyageur Exp $ + +*freepv-0.3.0-r2 (11 Mar 2010) + + 11 Mar 2010; Bernard Cafarelli <voyageur@gentoo.org> + freepv-0.3.0-r1.ebuild, +freepv-0.3.0-r2.ebuild, + files/freepv-0.3.0-gcc44.patch, +files/freepv-0.3.0-noplugin.patch: + gcc 4.4 updated with glibc 2.10 support, limit xulrunner support in -r1 to + 1.9.1, revision bump that drops the mozilla plugin, bug #308825 18 Feb 2010; Samuli Suominen <ssuominen@gentoo.org> freepv-0.3.0-r1.ebuild: diff --git a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch index 60d55f8b002c..af5b1a0d196e 100644 --- a/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch +++ b/media-gfx/freepv/files/freepv-0.3.0-gcc44.patch @@ -1,19 +1,19 @@ -Index: freepv/trunk/src/libfreepv/Utils/signatures.cpp -=================================================================== ---- freepv/trunk/src/libfreepv/Utils/signatures.cpp (révision 162) -+++ freepv/trunk/src/libfreepv/Utils/signatures.cpp (révision 163) -@@ -24,6 +24,7 @@ +diff -Naur freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp +--- freepv-0.3.0.orig/src/libfreepv/OpenGLRenderer.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/OpenGLRenderer.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -26,7 +26,8 @@ + #include <config.h> - #include "signatures.h" - #include <iostream> + #include <vector> +-#include <math.h> ++#include <cmath> +#include <cstdio> - namespace FPV{ - namespace Utils{ -Index: freepv/trunk/src/libfreepv/QTVRDecoder.cpp -=================================================================== ---- freepv/trunk/src/libfreepv/QTVRDecoder.cpp (révision 162) -+++ freepv/trunk/src/libfreepv/QTVRDecoder.cpp (révision 163) + #include "OpenGLRenderer.h" + #include "Scene.h" +diff -Naur freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp +--- freepv-0.3.0.orig/src/libfreepv/QTVRDecoder.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/QTVRDecoder.cpp 2010-03-11 16:25:15.000000000 +0100 @@ -42,6 +42,7 @@ #include <errno.h> #include <vector> @@ -22,10 +22,34 @@ Index: freepv/trunk/src/libfreepv/QTVRDecoder.cpp #include <zlib.h> -Index: freepv/trunk/src/libfreepv/utils.cpp -=================================================================== ---- freepv/trunk/src/libfreepv/utils.cpp (révision 162) -+++ freepv/trunk/src/libfreepv/utils.cpp (révision 163) +diff -Naur freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp freepv-0.3.0/src/libfreepv/SPiVparser.cpp +--- freepv-0.3.0.orig/src/libfreepv/SPiVparser.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/SPiVparser.cpp 2010-03-11 16:18:53.000000000 +0100 +@@ -488,8 +488,8 @@ + //This method remplace the nodes that has src attributes + void SPiVparser::parseNodeURL(const char* _url) + { +- char * aux_url=NULL; +- char * url=(char*) _url; ++ const char * aux_url=NULL; ++ const char * url=(char*) _url; + if(aux_url = strrchr (_url,'/')) + { + url=aux_url; +diff -Naur freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp freepv-0.3.0/src/libfreepv/Utils/signatures.cpp +--- freepv-0.3.0.orig/src/libfreepv/Utils/signatures.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/Utils/signatures.cpp 2010-03-11 16:25:15.000000000 +0100 +@@ -24,6 +24,7 @@ + + #include "signatures.h" + #include <iostream> ++#include <cstdio> + + namespace FPV{ + namespace Utils{ +diff -Naur freepv-0.3.0.orig/src/libfreepv/utils.cpp freepv-0.3.0/src/libfreepv/utils.cpp +--- freepv-0.3.0.orig/src/libfreepv/utils.cpp 2010-03-11 16:15:04.000000000 +0100 ++++ freepv-0.3.0/src/libfreepv/utils.cpp 2010-03-11 16:25:15.000000000 +0100 @@ -23,6 +23,7 @@ */ @@ -34,17 +58,3 @@ Index: freepv/trunk/src/libfreepv/utils.cpp #include "utils.h" -Index: freepv/trunk/src/libfreepv/OpenGLRenderer.cpp -=================================================================== ---- freepv/trunk/src/libfreepv/OpenGLRenderer.cpp (révision 162) -+++ freepv/trunk/src/libfreepv/OpenGLRenderer.cpp (révision 163) -@@ -26,7 +26,8 @@ - #include <config.h> - - #include <vector> --#include <math.h> -+#include <cmath> -+#include <cstdio> - - #include "OpenGLRenderer.h" - #include "Scene.h" diff --git a/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch new file mode 100644 index 000000000000..4ea51d50b0cc --- /dev/null +++ b/media-gfx/freepv/files/freepv-0.3.0-noplugin.patch @@ -0,0 +1,30 @@ +diff -Naur freepv-0.3.0.orig//CMakeLists.txt freepv-0.3.0/CMakeLists.txt +--- freepv-0.3.0.orig//CMakeLists.txt 2010-03-11 16:05:09.000000000 +0100 ++++ freepv-0.3.0/CMakeLists.txt 2010-03-11 16:05:18.000000000 +0100 +@@ -89,7 +89,6 @@ + find_package(FREEGLUT REQUIRED) + find_package(OpenGL REQUIRED) + find_package(X11 REQUIRED) +-find_package(GECKO REQUIRED) + find_package(LibXml2 REQUIRED) + find_package(PNG REQUIRED) + find_package(XF86VM REQUIRED) +@@ -107,7 +106,6 @@ + ${OPENGL_INCLUDE_DIR} + ${FREEGLUT_INCLUDE_DIR} + ${X11_INCLUDE_DIR} +- ${GECKO_INCLUDE_DIR} + ${LIBXML2_INCLUDE_DIR} + ${PNG_INCLUDE_DIR} + ${XF86VM_INCLUDE_DIR}) +diff -Naur freepv-0.3.0.orig//src/CMakeLists.txt freepv-0.3.0/src/CMakeLists.txt +--- freepv-0.3.0.orig//src/CMakeLists.txt 2010-03-11 16:05:09.000000000 +0100 ++++ freepv-0.3.0/src/CMakeLists.txt 2010-03-11 16:05:28.000000000 +0100 +@@ -5,7 +5,6 @@ + add_subdirectory (freepv-glut) + add_subdirectory (utils) + if(UNIX) +- add_subdirectory (freepv-mozilla) + add_subdirectory (freepv-glx) + endif(UNIX) + diff --git a/media-gfx/freepv/freepv-0.3.0-r1.ebuild b/media-gfx/freepv/freepv-0.3.0-r1.ebuild index 89ed328a1de8..11c99891d9ab 100644 --- a/media-gfx/freepv/freepv-0.3.0-r1.ebuild +++ b/media-gfx/freepv/freepv-0.3.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r1.ebuild,v 1.3 2010/02/18 22:07:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r1.ebuild,v 1.4 2010/03/11 15:30:44 voyageur Exp $ EAPI=2 @@ -18,7 +18,7 @@ IUSE="" DEPEND="dev-libs/libxml2 media-libs/jpeg media-libs/libpng - net-libs/xulrunner:1.9 + =net-libs/xulrunner-1.9.1* virtual/glut sys-libs/zlib x11-libs/libXmu diff --git a/media-gfx/freepv/freepv-0.3.0-r2.ebuild b/media-gfx/freepv/freepv-0.3.0-r2.ebuild new file mode 100644 index 000000000000..41fe1da322d4 --- /dev/null +++ b/media-gfx/freepv/freepv-0.3.0-r2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r2.ebuild,v 1.1 2010/03/11 15:30:44 voyageur Exp $ + +EAPI=2 + +inherit cmake-utils + +DESCRIPTION="Panorama viewer (Quicktime, PangeaVR, GLPanoView formats)" +HOMEPAGE="http://freepv.sourceforge.net/" +SRC_URI="mirror://sourceforge/freepv/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="dev-libs/libxml2 + media-libs/jpeg + media-libs/libpng + virtual/glut + sys-libs/zlib + x11-libs/libXmu + x11-libs/libXt + x11-libs/libXxf86vm" +RDEPEND="${DEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-gcc44.patch + epatch "${FILESDIR}"/${P}-noplugin.patch + sed -i \ + -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \ + src/libfreepv/JpegReader.cpp || die +} |