Commit e607b0f9 authored by Simon Dawson's avatar Simon Dawson Committed by Peter Korsgaard
Browse files

gstreamer: add xorg support 



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

Signed-off-by: default avatarSimon Dawson <spdawson@gmail.com>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 07bae756

package/multimedia/gst-plugins-base/Config.in

+3 −0
Original line number Diff line number Diff line 
menuconfig BR2_PACKAGE_GST_PLUGINS_BASE

	bool "gst-plugins-base"

	depends on BR2_PACKAGE_GSTREAMER

	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7

	select BR2_PACKAGE_XLIB_LIBXV if BR2_PACKAGE_XORG7

	help

	  A basic set of well-supported plug-ins for GStreamer.

package/multimedia/gst-plugins-base/gst-plugins-base.mk

+13 −3
Original line number Diff line number Diff line
@@ -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 += xlib_libX11 xlib_libXext xlib_libXv

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

package/multimedia/gst-plugins-good/gst-plugins-good.mk

+13 −3
Original line number Diff line number Diff line
@@ -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 += xlib_libX11 xlib_libXext xlib_libXv

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