diff options
| author | Simon Dawson <spdawson@gmail.com> | 2012-06-04 20:11:42 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-06-24 00:49:18 +0200 |
| commit | e607b0f9e3efaf96ffb2c3196f736c80232adc1b (patch) | |
| tree | 0a77ab676240aa5a335e407e9e91b595e20b4e82 | |
| parent | 07bae75635ebc0b2b3a2df8aca2f5022debacddb (diff) | |
| download | buildroot-novena-e607b0f9e3efaf96ffb2c3196f736c80232adc1b.tar.gz buildroot-novena-e607b0f9e3efaf96ffb2c3196f736c80232adc1b.zip | |
gstreamer: add xorg support
GStreamer requires xorg support in order for the ximagesink and xvimagesink
plugins to be available.
Signed-off-by: Simon Dawson <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | package/multimedia/gst-plugins-base/Config.in | 3 | ||||
| -rw-r--r-- | package/multimedia/gst-plugins-base/gst-plugins-base.mk | 16 | ||||
| -rw-r--r-- | package/multimedia/gst-plugins-good/gst-plugins-good.mk | 16 |
3 files changed, 29 insertions, 6 deletions
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in index 851337b05..5d8253395 100644 --- a/package/multimedia/gst-plugins-base/Config.in +++ b/package/multimedia/gst-plugins-base/Config.in @@ -1,6 +1,9 @@ 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. diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk index 848eaf290..e35a606dd 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 += 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 diff --git a/package/multimedia/gst-plugins-good/gst-plugins-good.mk b/package/multimedia/gst-plugins-good/gst-plugins-good.mk index 4e6b73e5d..ebd463b0e 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 += 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 |