summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlfredo Tupone <tupone@gentoo.org>2011-04-22 08:28:23 +0000
committerAlfredo Tupone <tupone@gentoo.org>2011-04-22 08:28:23 +0000
commit88751d389e47b5abe9b0c31f3c518bacf16b7cf1 (patch)
tree5efa65f94c5aa3bb1dcd1c8d7f8fcf1ecbabccc2 /dev-games
parentConvert to EAPI=3 for Prefix, bug #364305 (diff)
downloadhistorical-88751d389e47b5abe9b0c31f3c518bacf16b7cf1.tar.gz
historical-88751d389e47b5abe9b0c31f3c518bacf16b7cf1.tar.bz2
historical-88751d389e47b5abe9b0c31f3c518bacf16b7cf1.zip
Build with new ffmpeg. Bug #347481
Package-Manager: portage-2.1.9.46/cvs/Linux x86_64
Diffstat (limited to 'dev-games')
-rw-r--r--dev-games/openscenegraph/ChangeLog6
-rw-r--r--dev-games/openscenegraph/Manifest11
-rw-r--r--dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch10
-rw-r--r--dev-games/openscenegraph/openscenegraph-2.8.3.ebuild3
4 files changed, 23 insertions, 7 deletions
diff --git a/dev-games/openscenegraph/ChangeLog b/dev-games/openscenegraph/ChangeLog
index 4c9cfd584a16..512329bc969f 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.39 2011/03/31 15:41:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.40 2011/04/22 08:28:23 tupone Exp $
+
+ 22 Apr 2011; Tupone Alfredo <tupone@gentoo.org> openscenegraph-2.8.3.ebuild,
+ +files/openscenegraph-2.8.3-ffmpeg.patch:
+ Build with new ffmpeg. Bug #347481 by Juergen Rose
31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org>
openscenegraph-2.8.3.ebuild:
diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index 47196c4ed45c..f8cca85797cb 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -2,14 +2,15 @@
Hash: SHA1
AUX openscenegraph-2.8.3-cmake.patch 11939 RMD160 7685d55a3dc62aa373e98631b4589e9926cffb36 SHA1 52b5ca79fe325dc58a89980dd84760dbe09397f0 SHA256 8f29e3e8f41af0b120a16c8763c1e304d481fb52d92d2737fd97d30046d31531
+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 3848 RMD160 68e5fd798e64d4def96aed75ceccf6146522095f SHA1 c7c853706f0d683eff0e5464ba8d7a72ffe7676c SHA256 9e5e962f18e57647660ec78e376262ec378879221866c5fc065cb7a2965d8ec8
-MISC ChangeLog 5756 RMD160 35a5ca11ffc8d01428925a0446fea2cb62828718 SHA1 a714bec55771fbe1912eba0c2d1e045ad6eadbf1 SHA256 d882d2c764d909f7afb8eddc12ba49e18942c86314e1c1d40fa1587ad04849a7
+EBUILD openscenegraph-2.8.3.ebuild 3878 RMD160 bc8bb8d82571343897573e60be56aa2e8db8557a SHA1 ecdac21d0a9ba5444f4408f9b5d78f6c0cbfa02c SHA256 481a2ec650116dd8b7c900cef3e3777e976c6710b5242dccc04bd9a6eaa378b9
+MISC ChangeLog 5930 RMD160 02d4183a4ec0959164bbdb065b6c93db53268568 SHA1 c50113795043a532589c21fcc4fabe24d9bfb1d9 SHA256 7c220ea179620b447fe5ed0d6e258dde3274510b34bab4a010bb14787a5ceb80
MISC metadata.xml 1115 RMD160 ca10b4eb4fdf20ffe7db6fe29ee2d290fda4a695 SHA1 eb1cb05392044f03e8d2a6ee5077d933044cabf9 SHA256 f3ea3669edf3bdc96dc9747d59447433fb9677185764d69a3aea6115b9d58643
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.17 (GNU/Linux)
-iEYEARECAAYFAk2UoDEACgkQHB6c3gNBRYdozgCdE86/ir4tsT56JDM/fLydmD9X
-hPoAnA8+tPg+wMe/ZmxtQg1xGjfVOxwc
-=sW3J
+iEYEARECAAYFAk2xPDIACgkQIY77eQFFFC3BWwCdF+bdmgix4NKCpvmt08IQq/P2
+NicAoL87a89vEk88G6pf1amifGY5tMV3
+=FOv7
-----END PGP SIGNATURE-----
diff --git a/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch b/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch
new file mode 100644
index 000000000000..5a2fc6575ce2
--- /dev/null
+++ b/dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch
@@ -0,0 +1,10 @@
+--- src/osgPlugins/ffmpeg/FFmpegHeaders.hpp.old 2011-04-21 16:28:29.026069826 +0200
++++ src/osgPlugins/ffmpeg/FFmpegHeaders.hpp 2011-04-21 16:29:01.115068086 +0200
+@@ -6,6 +6,7 @@
+ extern "C"
+ {
+ #define __STDC_CONSTANT_MACROS
++#define FF_API_OLD_SAMPLE_FMT 0
+ #include <errno.h> // for error codes defined in avformat.h
+ #include <stdint.h>
+ #include <avcodec.h>
diff --git a/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild b/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild
index 4f837a52d0ef..7679791e7097 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.15 2011/03/31 15:41:23 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-2.8.3.ebuild,v 1.16 2011/04/22 08:28:23 tupone Exp $
EAPI=2
@@ -86,6 +86,7 @@ DOCS=(AUTHORS.txt ChangeLog NEWS.txt)
PATCHES=(
"${FILESDIR}/${P}-cmake.patch"
+ "${FILESDIR}/${P}-ffmpeg.patch"
)
src_configure() {