Patchwork Danny - backport - gst-meta-base x11 fix

login
mail settings
Submitter Saul Wold
Date Nov. 30, 2012, 10:37 p.m.
Message ID <50B93513.4020209@linux.intel.com>
Download mbox | patch
Permalink /patch/40001/
State New
Headers show

Comments

Saul Wold - Nov. 30, 2012, 10:37 p.m.
Ross,

Since we have a fix in master (1.4) already for this, we should just 
backport it.

OE-Core: 6e44bf71fd4645ea09b3e34b907b17e92b5225e3
Poky: 115076c0d8fa0e9f100136b8f060e59d978c4fca

Thanks
Ross Burton - Dec. 3, 2012, 1:54 p.m.
On 30 November 2012 22:37, Saul Wold <sgw@linux.intel.com> wrote:
> Since we have a fix in master (1.4) already for this, we should just
> backport it.
>
> OE-Core: 6e44bf71fd4645ea09b3e34b907b17e92b5225e3
> Poky: 115076c0d8fa0e9f100136b8f060e59d978c4fca

Without any other changes, doesn't that mean that ximagesink doesn't
get into the images anymore?

Ross

Patch

From 115076c0d8fa0e9f100136b8f060e59d978c4fca Mon Sep 17 00:00:00 2001
From: Saul Wold <sgw@linux.intel.com>
Date: Wed, 24 Oct 2012 13:52:17 -0700
Subject: [PATCH] gst-meta-base: include ximagesink plugin when x11 is a
 feature

(From OE-Core rev: 6e44bf71fd4645ea09b3e34b907b17e92b5225e3)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
index 1788104..2fb39d5 100644
--- a/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-meta-base_0.10.bb
@@ -5,10 +5,11 @@  LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
                     file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
 
 
-PR = "r10"
+PR = "r11"
 
 PACKAGES = "\
     gst-meta-base \
+    gst-meta-x11-base \
     gst-meta-audio \
     gst-meta-debug \
     gst-meta-video"
@@ -23,7 +24,6 @@  RDEPENDS_gst-meta-base = "\
     gst-plugins-base-gio \
     gst-plugins-base-alsa \
     gst-plugins-base-volume \
-    gst-plugins-base-ximagesink \
     gst-plugins-base-audioconvert \
     gst-plugins-base-audioresample \
     gst-plugins-base-typefindfunctions \
@@ -32,6 +32,7 @@  RDEPENDS_gst-meta-base = "\
     gst-plugins-good-autodetect \
     gst-plugins-good-souphttpsrc"
 
+RDEPENDS_gst-meta-x11-base = "${@base_contains('DISTRO_FEATURES', 'x11', 'gst-plugins-base-ximagesink', '', d)}"
 
 RDEPENDS_gst-meta-audio = "\
     gst-meta-base \
-- 
1.8.0