Skip to contentSkip to conversation

GStreamer: add xorg support Signed-off-by: Massimiliano Marretta <[email protected]>

PATCH New Massimiliano Marretta 1 participant 1 message Aug 25, 2010

lore
Share & tools
lore

Massimiliano Marretta

author
#0 lore raw

PATCH 1/1 GStreamer: add xorg support Signed-off-by: Massimiliano Marretta <[email protected]>

---
 .../gst-plugins-base/gst-plugins-base.mk           |   16 +++++++++++++---
 .../gst-plugins-good/gst-plugins-good.mk           |   16 +++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)
package/multimedia/gst-plugins-base/gst-plugins-base.mk +13 -3
index 91d9f1b..fcffe28 100644
@@ -18,9 +18,6 @@ GST_PLUGINS_BASE_CONF_ENV =
 
 GST_PLUGINS_BASE_CONF_OPT = \
 		--disable-examples \
-		--disable-x \
-		--disable-xvideo \
-		--disable-xshm \
 		--disable-oggtest \
 		--disable-vorbistest \
 		--disable-freetypetest

@@ -28,6 +25,19 @@ GST_PLUGINS_BASE_CONF_OPT = \
 GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil \
 		$(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib)
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server
+GST_PLUGINS_BASE_CONF_OPT += \
+		--enable-x \
+		--enable-xvideo \
+		--enable-xshm
+else
+GST_PLUGINS_BASE_CONF_OPT += \
+		--disable-x \
+		--disable-xvideo \
+		--disable-xshm
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y)
 GST_PLUGINS_BASE_CONF_OPT += --enable-adder
 else
package/multimedia/gst-plugins-good/gst-plugins-good.mk +13 -3
index c44bdff..c11b865 100644
@@ -16,9 +16,6 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 		--disable-osx_audio \
 		--disable-osx_video \
 		--disable-gst_v4l2 \
-		--disable-x \
-		--disable-xshm \
-		--disable-xvideo \
 		--disable-aalib \
 		--disable-aalibtest \
 		--disable-esd \

@@ -28,6 +25,19 @@ GST_PLUGINS_GOOD_CONF_OPT = \
 
 GST_PLUGINS_GOOD_DEPENDENCIES = gstreamer gst-plugins-base
 
+ifeq ($(BR2_PACKAGE_XORG7),y)
+GST_PLUGINS_BASE_DEPENDENCIES += xserver_xorg-server
+GST_PLUGINS_BASE_CONF_OPT += \
+		--enable-x \
+		--enable-xvideo \
+		--enable-xshm
+else
+GST_PLUGINS_BASE_CONF_OPT += \
+		--disable-x \
+		--disable-xvideo \
+		--disable-xshm
+endif
+
 ifeq ($(BR2_PACKAGE_GST_PLUGINS_GOOD_JPEG),y)
 GST_PLUGINS_GOOD_CONF_OPT += --enable-jpeg
 GST_PLUGINS_GOOD_DEPENDENCIES += jpeg
Signature · 1 line
1.7.1