summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Sterrett <mr_bones_@gentoo.org>2011-09-24 22:06:09 +0000
committerMichael Sterrett <mr_bones_@gentoo.org>2011-09-24 22:06:09 +0000
commit298f000f679d3d8f64cd260a746fb7e35e1f0524 (patch)
tree50c60c0184015160a0b3a31e6ae10daaca6d0df7 /dev-games/openscenegraph
parentVersion bump (diff)
downloadgentoo-2-298f000f679d3d8f64cd260a746fb7e35e1f0524.tar.gz
gentoo-2-298f000f679d3d8f64cd260a746fb7e35e1f0524.tar.bz2
gentoo-2-298f000f679d3d8f64cd260a746fb7e35e1f0524.zip
Add patch to build with newer curl submitted by Ed Catmur (bug #383719)
(Portage version: 2.1.10.11/cvs/Linux i686)
Diffstat (limited to 'dev-games/openscenegraph')
-rw-r--r--dev-games/openscenegraph/ChangeLog6
-rw-r--r--dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch12
-rw-r--r--dev-games/openscenegraph/openscenegraph-2.8.3.ebuild3
3 files changed, 19 insertions, 2 deletions
diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 512329bc969f..db5f1a9d8d7f 100644
--- a/dev-games/openscenegraph/ChangeLog
+++ b/dev-games/openscenegraph/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for dev-games/openscenegraph
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.40 2011/04/22 08:28:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.41 2011/09/24 22:06:09 mr_bones_ Exp $
+
+ 24 Sep 2011; Michael Sterrett <mr_bones_@gentoo.org>
+ openscenegraph-2.8.3.ebuild, +files/openscenegraph-2.8.3-curl.patch:
+ Add patch to build with newer curl submitted by Ed Catmur (bug #383719)
22 Apr 2011; Tupone Alfredo <tupone@gentoo.org> openscenegraph-2.8.3.ebuild,
+files/openscenegraph-2.8.3-ffmpeg.patch:
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch
new file mode 100644
index 000000000000..7ad1265e3aa1
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch
@@ -0,0 +1,12 @@
+diff --git a/src/osgPlugins/curl/ReaderWriterCURL.cpp b/src/osgPlugins/curl/ReaderWriterCURL.cpp
+index 83aee7b..daf156f 100644
+--- a/src/osgPlugins/curl/ReaderWriterCURL.cpp
++++ b/src/osgPlugins/curl/ReaderWriterCURL.cpp
+@@ -21,7 +21,6 @@
+ #include <fstream>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+
+ #include "ReaderWriterCURL.h"
+
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
index 7679791e7097..d0a228f8bd78 100644
--- a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
+++ b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.16 2011/04/22 08:28:23 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.17 2011/09/24 22:06:09 mr_bones_ Exp $
EAPI=2
@@ -87,6 +87,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
PATCHES=(
"${FILESDIR}/${P}-cmake.patch"
"${FILESDIR}/${P}-ffmpeg.patch"
+ "${FILESDIR}/${P}-curl.patch"
)
src_configure() {