Patchwork gstreamer: add xorg support

login
register
mail settings
Submitter Simon Dawson
Date June 3, 2012, 12:29 p.m.
Message ID <1338726592-3168-1-git-send-email-spdawson@gmail.com>
Download mbox | patch
Permalink /patch/162501/
State Superseded
Headers show

Comments

Simon Dawson - June 3, 2012, 12:29 p.m.
From: Simon Dawson <spdawson@gmail.com>

GStreamer requires xorg support in order for the ximagesink and xvimagesink
plugins to be available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 .../gst-plugins-base/gst-plugins-base.mk           |   16 +++++++++++++---
 .../gst-plugins-good/gst-plugins-good.mk           |   16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)
Thomas Petazzoni - June 3, 2012, 1:23 p.m.
Le Sun,  3 Jun 2012 13:29:52 +0100,
spdawson@gmail.com a écrit :

> +ifeq ($(BR2_PACKAGE_XORG7),y)
> +GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server
> +GST_PLUGINS_BASE_CONF_OPT += \
> +	--enable-x \
> +	--enable-xshm \
> +	--enable-xvideo
> +else
> +GST_PLUGINS_BASE_CONF_OPT += \
> +	--disable-x \
> +	--disable-xshm \
> +	--disable-xvideo
> +endif

Are you sure that the dependency is on xserver_xorg-server? I would
rather suspect that the real dependency is on a certain set of X11
client libraries (libX11 for the core protocol, libXv fdor the Xvideo
extension, etc.).

Thomas
Simon Dawson - June 3, 2012, 6:50 p.m.
> Are you sure that the dependency is on xserver_xorg-server? I would
> rather suspect that the real dependency is on a certain set of X11
> client libraries (libX11 for the core protocol, libXv fdor the Xvideo
> extension, etc.).

Right you are, thanks; I'll fix this and resubmit.

Simon.

Patch

diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 848eaf2..6c5befe 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -17,15 +17,25 @@  GST_PLUGINS_BASE_CONF_ENV =
 
 GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-examples \
-		--disable-x \
-		--disable-xvideo \
-		--disable-xshm \
 		--disable-oggtest \
 		--disable-vorbistest \
 		--disable-freetypetest
 
 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server
+GST_PLUGINS_BASE_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST_PLUGINS_BASE_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
 ifeq ($(BR2_PACKAGE_ORC),y)
 GST_PLUGINS_BASE_DEPENDENCIES += orc
 endif
diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
index 4e6b73e..74ae6ba 100644
--- a/package/multimedia/gst-plugins-good/gst-plugins-good.mk
+++ b/package/multimedia/gst-plugins-good/gst-plugins-good.mk
@@ -14,9 +14,6 @@  GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-sunaudio \
 		--disable-osx_audio \
 		--disable-osx_video \
-		--disable-x \
-		--disable-xshm \
-		--disable-xvideo \
 		--disable-aalib \
 		--disable-aalibtest \
 		--disable-esd \
@@ -25,6 +22,19 @@  GST_PLUGINS_GOOD_CONF_OPT = \
 
 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_GOOD_DEPENDENCIES += xserver_xorg-server
+GST_PLUGINS_GOOD_CONF_OPT += \
+	--enable-x \
+	--enable-xshm \
+	--enable-xvideo
+else
+GST_PLUGINS_GOOD_CONF_OPT += \
+	--disable-x \
+	--disable-xshm \
+	--disable-xvideo
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
 GST_PLUGINS_GOOD_DEPENDENCIES += jpeg