Add a patch by Randall Wald <rdwald@gmail.com>, bug #284071, to include the correct headers so that we get the required function declarations.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 114 insertions, 1 deletions

diff --git a/media-libs/schroedinger/ChangeLog b/media-libs/schroedinger/ChangeLog
index ebd31e2b284d..2ababeb9acef 100644
--- a/media-libs/schroedinger/ChangeLog
+++ b/media-libs/schroedinger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/schroedinger
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.29 2009/08/16 12:49:50 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/ChangeLog,v 1.30 2009/09/10 09:41:49 aballier Exp $
+
+*schroedinger-1.0.7-r2 (10 Sep 2009)
+
+  10 Sep 2009; Alexis Ballier <aballier@gentoo.org>
+  +schroedinger-1.0.7-r2.ebuild,
+  +files/schroedinger-1.0.7-gst_adapter_get_buffer.patch:
+  Add a patch by Randall Wald <rdwald@gmail.com>, bug #284071, to include
+  the correct headers so that we get the required function declarations.
 
 *schroedinger-1.0.7-r1 (16 Aug 2009)
 
diff --git a/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch b/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch
new file mode 100644
index 000000000000..b66108262abc
--- /dev/null
+++ b/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch
@@ -0,0 +1,66 @@
+https://bugs.gentoo.org/show_bug.cgi?id=284071
+
+
+------- Comment #2 From Randall Wald 2009-09-10 08:48:52 0000 [reply] -------
+
+After looking a bit at the code that was breaking, I realized that the problem
+occurred because the developers had created modified versions of some system
+gstreamer header files (notably, adding the gst_adapter_get_buffer function),
+but then used #includes which referred to the system copies, not the new copies
+they wanted. I made a patch to switch which copies of these files are included,
+and this let my build of schroedinger pass QA. I'll attach my patch and the
+modified ebuild which uses it.
+
+------- Comment  #3 From Randall Wald  2009-09-10 08:53:04 0000  [reply] -------
+
+Created an attachment (id=203664) [edit]
+Patch to change which headers are included in a few key files
+
+This patch modifies three files (gstbasevideoparse.h, gstbasevideodecoder.h,
+and gstbasevideocodec.h) to use copies of gstbasevideocodec.h and
+gstbasevideoutils.h included with schroedinger's source tarball, rather than
+using the system copies of these files. This is important because the
+schroedinger copy of gstbasevideoutils.h defines the function
+gst_adapter_get_buffer, while the system copy (at least, on my system) does
+not.
+
+
+diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h
+--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig	2009-09-10 04:37:44.206319157 -0400
++++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h	2009-09-10 04:38:06.719330934 -0400
+@@ -20,8 +20,8 @@
+ #ifndef _GST_BASE_VIDEO_PARSE_H_
+ #define _GST_BASE_VIDEO_PARSE_H_
+ 
+-#include <gst/video/gstbasevideocodec.h>
+-#include <gst/video/gstbasevideoutils.h>
++#include "gstbasevideocodec.h"
++#include "gstbasevideoutils.h"
+ 
+ G_BEGIN_DECLS
+ 
+diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h
+--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig	2009-09-10 04:38:21.985071525 -0400
++++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h	2009-09-10 04:38:49.917081149 -0400
+@@ -20,7 +20,7 @@
+ #ifndef _GST_BASE_VIDEO_DECODER_H_
+ #define _GST_BASE_VIDEO_DECODER_H_
+ 
+-#include <gst/video/gstbasevideocodec.h>
++#include "gstbasevideocodec.h"
+ 
+ G_BEGIN_DECLS
+ 
+diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h
+--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig	2009-09-10 04:39:10.407323883 -0400
++++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h	2009-09-10 04:39:25.443233871 -0400
+@@ -22,7 +22,7 @@
+ 
+ #include <gst/gst.h>
+ #include <gst/video/gstvideocompat.h>
+-#include <gst/video/gstbasevideoutils.h>
++#include "gstbasevideoutils.h"
+ 
+ G_BEGIN_DECLS
+ 
+
diff --git a/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild b/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild
new file mode 100644
index 000000000000..b93e3d89caec
--- /dev/null
+++ b/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/schroedinger/schroedinger-1.0.7-r2.ebuild,v 1.1 2009/09/10 09:41:49 aballier Exp $
+
+EAPI=2
+inherit eutils libtool
+
+DESCRIPTION="C-based libraries and GStreamer plugins for the Dirac video codec"
+HOMEPAGE="http://www.diracvideo.org"
+SRC_URI="http://www.diracvideo.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="|| ( MPL-1.1 LGPL-2.1 GPL-2 MIT )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="gstreamer"
+
+RDEPEND=">=dev-libs/liboil-0.3.16
+	gstreamer? ( >=media-libs/gstreamer-0.10.24
+		>=media-libs/gst-plugins-base-0.10.24 )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gst_adapter_masked_scan_uint32.patch
+	epatch "${FILESDIR}"/${P}-gst_adapter_get_buffer.patch
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-dependency-tracking \
+		--disable-gtk-doc \
+		$(use_enable gstreamer)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS NEWS TODO
+}