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
commit0fc698290dffb719a4afbfde5bad22222546230b (patch)
tree341d33d25cbb5b24567271d54eebc463938db334 /dev-games
parentVersion bump (diff)
downloadhistorical-0fc698290dffb719a4afbfde5bad22222546230b.tar.gz
historical-0fc698290dffb719a4afbfde5bad22222546230b.tar.bz2
historical-0fc698290dffb719a4afbfde5bad22222546230b.zip
Add patch to build with newer curl submitted by Ed Catmur (bug #383719)
Package-Manager: portage-2.1.10.11/cvs/Linux i686
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/openscenegraph/ChangeLog6
-rw-r--r--dev-games/openscenegraph/Manifest15
-rw-r--r--dev-games/openscenegraph/files/openscenegraph-2.8.3-curl.patch12
-rw-r--r--dev-games/openscenegraph/openscenegraph-2.8.3.ebuild3
4 files changed, 22 insertions, 14 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/Manifest b/dev-games/openscenegraph/Manifest
index f8cca85797cb..5e82f44bbac8 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,16 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX openscenegraph-2.8.3-cmake.patch 11939 RMD160 7685d55a3dc62aa373e98631b4589e9926cffb36 SHA1 52b5ca79fe325dc58a89980dd84760dbe09397f0 SHA256 8f29e3e8f41af0b120a16c8763c1e304d481fb52d92d2737fd97d30046d31531
+AUX openscenegraph-2.8.3-curl.patch 345 RMD160 dd156aadfe3c6b368f4515475f800b8dd976ac7a SHA1 3e2082275c85a81dde66b0cf512a20b8b0fea82e SHA256 e3c8a3456620907af99dbd9861d930867d4adf254515435617695c327aff5ead
AUX openscenegraph-2.8.3-ffmpeg.patch 367 RMD160 d631abecf98c20824b8ee7cb8f0992df92c73d7c SHA1 fe7e574af4fd3bccc9552c35abd8b6ece8e13e3f SHA256 9adb7f5f1fa1e22130f2aa08b66ff680667f7adc44de4ddddafeaf3c4549277d
DIST OpenSceneGraph-2.8.3.zip 6740017 RMD160 40a4988f4aefff7dbb6aab5225204ae41c945277 SHA1 90502e4cbd47aac1689cc39d25ab62bbe0bba9fc SHA256 3a7b80ea02eeb39c37ded4d07e28ed4071a4a0ceba93f2834d39be7f7487115e
-EBUILD openscenegraph-2.8.3.ebuild 3878 RMD160 bc8bb8d82571343897573e60be56aa2e8db8557a SHA1 ecdac21d0a9ba5444f4408f9b5d78f6c0cbfa02c SHA256 481a2ec650116dd8b7c900cef3e3777e976c6710b5242dccc04bd9a6eaa378b9
-MISC ChangeLog 5930 RMD160 02d4183a4ec0959164bbdb065b6c93db53268568 SHA1 c50113795043a532589c21fcc4fabe24d9bfb1d9 SHA256 7c220ea179620b447fe5ed0d6e258dde3274510b34bab4a010bb14787a5ceb80
+EBUILD openscenegraph-2.8.3.ebuild 3912 RMD160 13a24147e35670fd2f4a41bd0205162064da4d85 SHA1 336b29a780391fa10b4c81ddf2dfe585fbf86bd7 SHA256 83ded21eb9e4525eda70cae21fc88efbf487c4338d922820ffa640ccd2676849
+MISC ChangeLog 6134 RMD160 cd503d2ab9cc763988ced83c65a31cf34e90e5b6 SHA1 10b3d934e811104afae0e222bad8d9bab38d6c90 SHA256 a5547e8671759714f79fc4fac67d7810eb081e6c703f13c74ec78af73f2c7f5c
MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk2xPDIACgkQIY77eQFFFC3BWwCdF+bdmgix4NKCpvmt08IQq/P2
-NicAoL87a89vEk88G6pf1amifGY5tMV3
-=FOv7
------END PGP SIGNATURE-----
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() {