| 1 |
aballier 09/09/10 09:41:49 |
| 2 |
|
| 3 |
Added: schroedinger-1.0.7-gst_adapter_get_buffer.patch |
| 4 |
Log: |
| 5 |
Add a patch by Randall Wald <rdwald@×××××.com>, bug #284071, to include the correct headers so that we get the required function declarations. |
| 6 |
(Portage version: 2.2_rc40/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/schroedinger/files/schroedinger-1.0.7-gst_adapter_get_buffer.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: schroedinger-1.0.7-gst_adapter_get_buffer.patch |
| 15 |
=================================================================== |
| 16 |
https://bugs.gentoo.org/show_bug.cgi?id=284071 |
| 17 |
|
| 18 |
|
| 19 |
------- Comment #2 From Randall Wald 2009-09-10 08:48:52 0000 [reply] ------- |
| 20 |
|
| 21 |
After looking a bit at the code that was breaking, I realized that the problem |
| 22 |
occurred because the developers had created modified versions of some system |
| 23 |
gstreamer header files (notably, adding the gst_adapter_get_buffer function), |
| 24 |
but then used #includes which referred to the system copies, not the new copies |
| 25 |
they wanted. I made a patch to switch which copies of these files are included, |
| 26 |
and this let my build of schroedinger pass QA. I'll attach my patch and the |
| 27 |
modified ebuild which uses it. |
| 28 |
|
| 29 |
------- Comment #3 From Randall Wald 2009-09-10 08:53:04 0000 [reply] ------- |
| 30 |
|
| 31 |
Created an attachment (id=203664) [edit] |
| 32 |
Patch to change which headers are included in a few key files |
| 33 |
|
| 34 |
This patch modifies three files (gstbasevideoparse.h, gstbasevideodecoder.h, |
| 35 |
and gstbasevideocodec.h) to use copies of gstbasevideocodec.h and |
| 36 |
gstbasevideoutils.h included with schroedinger's source tarball, rather than |
| 37 |
using the system copies of these files. This is important because the |
| 38 |
schroedinger copy of gstbasevideoutils.h defines the function |
| 39 |
gst_adapter_get_buffer, while the system copy (at least, on my system) does |
| 40 |
not. |
| 41 |
|
| 42 |
|
| 43 |
diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h |
| 44 |
--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h.orig 2009-09-10 04:37:44.206319157 -0400 |
| 45 |
+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideoparse.h 2009-09-10 04:38:06.719330934 -0400 |
| 46 |
@@ -20,8 +20,8 @@ |
| 47 |
#ifndef _GST_BASE_VIDEO_PARSE_H_ |
| 48 |
#define _GST_BASE_VIDEO_PARSE_H_ |
| 49 |
|
| 50 |
-#include <gst/video/gstbasevideocodec.h> |
| 51 |
-#include <gst/video/gstbasevideoutils.h> |
| 52 |
+#include "gstbasevideocodec.h" |
| 53 |
+#include "gstbasevideoutils.h" |
| 54 |
|
| 55 |
G_BEGIN_DECLS |
| 56 |
|
| 57 |
diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h |
| 58 |
--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h.orig 2009-09-10 04:38:21.985071525 -0400 |
| 59 |
+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideodecoder.h 2009-09-10 04:38:49.917081149 -0400 |
| 60 |
@@ -20,7 +20,7 @@ |
| 61 |
#ifndef _GST_BASE_VIDEO_DECODER_H_ |
| 62 |
#define _GST_BASE_VIDEO_DECODER_H_ |
| 63 |
|
| 64 |
-#include <gst/video/gstbasevideocodec.h> |
| 65 |
+#include "gstbasevideocodec.h" |
| 66 |
|
| 67 |
G_BEGIN_DECLS |
| 68 |
|
| 69 |
diff -ur schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h |
| 70 |
--- schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h.orig 2009-09-10 04:39:10.407323883 -0400 |
| 71 |
+++ schroedinger-1.0.7/gst-libs/gst/video/gstbasevideocodec.h 2009-09-10 04:39:25.443233871 -0400 |
| 72 |
@@ -22,7 +22,7 @@ |
| 73 |
|
| 74 |
#include <gst/gst.h> |
| 75 |
#include <gst/video/gstvideocompat.h> |
| 76 |
-#include <gst/video/gstbasevideoutils.h> |
| 77 |
+#include "gstbasevideoutils.h" |
| 78 |
|
| 79 |
G_BEGIN_DECLS |
Archives