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
commitde803724f7b17a3f1cb415739efd04bed9a0251b (patch)
treeea12c6aed3cd6b23ee197d68c8663ec698d7bc4d
parentConvert to EAPI=3 for Prefix, bug #364305 (diff)
downloadgentoo-2-de803724f7b17a3f1cb415739efd04bed9a0251b.tar.gz
gentoo-2-de803724f7b17a3f1cb415739efd04bed9a0251b.tar.bz2
gentoo-2-de803724f7b17a3f1cb415739efd04bed9a0251b.zip
Build with new ffmpeg. Bug #347481
(Portage version: 2.1.9.46/cvs/Linux x86_64)
-rw-r--r--dev-games/openscenegraph/ChangeLog6
-rw-r--r--dev-games/openscenegraph/files/openscenegraph-2.8.3-ffmpeg.patch10
-rw-r--r--dev-games/openscenegraph/openscenegraph-2.8.3.ebuild3
3 files changed, 17 insertions, 2 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/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() {