summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Neumann <s.neumann@raumfeld.com>2011-07-07 07:39:01 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2011-07-07 08:55:54 (GMT)
commite04026794b5112576f7eaf902e1f9fc57afb2f26 (patch)
treea43d4e320554cf50dd40328ff53088e131978f57
parente67b65eed8f5e4551a527a07948e7ecc74764da3 (diff)
downloadbuildroot-e04026794b5112576f7eaf902e1f9fc57afb2f26.tar.gz
buildroot-e04026794b5112576f7eaf902e1f9fc57afb2f26.tar.bz2
gst-plugins: ivborbis (aka tremor) moved to gst-plugins-base
The integer vorbis decoder moved from gst-plugins-bad to gst-plugins-base. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/multimedia/gst-plugins-bad/Config.in4
-rw-r--r--package/multimedia/gst-plugins-bad/gst-plugins-bad.mk7
-rw-r--r--package/multimedia/gst-plugins-base/Config.in4
-rw-r--r--package/multimedia/gst-plugins-base/gst-plugins-base.mk7
4 files changed, 11 insertions, 11 deletions
diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in
index e25b756..23d5916 100644
--- a/package/multimedia/gst-plugins-bad/Config.in
+++ b/package/multimedia/gst-plugins-bad/Config.in
@@ -192,10 +192,6 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_SDL
bool "sdl"
select BR2_PACKAGE_SDL
-config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR
- bool "tremor"
- select BR2_PACKAGE_TREMOR
-
config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD
bool "vcd"
diff --git a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
index 31d998f..5bbb53a 100644
--- a/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
+++ b/package/multimedia/gst-plugins-bad/gst-plugins-bad.mk
@@ -355,13 +355,6 @@ else
GST_PLUGINS_BAD_CONF_OPT += --disable-sdl
endif
-ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_TREMOR),y)
-GST_PLUGINS_BAD_CONF_OPT += --enable-ivorbis
-GST_PLUGINS_BAD_DEPENDENCIES += tremor
-else
-GST_PLUGINS_BAD_CONF_OPT += --disable-ivorbis
-endif
-
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_VCD),y)
GST_PLUGINS_BAD_CONF_OPT += --enable-vcd
else
diff --git a/package/multimedia/gst-plugins-base/Config.in b/package/multimedia/gst-plugins-base/Config.in
index 3ac4dac..851337b 100644
--- a/package/multimedia/gst-plugins-base/Config.in
+++ b/package/multimedia/gst-plugins-base/Config.in
@@ -86,6 +86,10 @@ config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_THEORA
bool "theora (*.ogg video)"
select BR2_PACKAGE_LIBTHEORA
+config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR
+ bool "tremor"
+ select BR2_PACKAGE_TREMOR
+
config BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS
bool "vorbis (*.ogg audio)"
select BR2_PACKAGE_LIBVORBIS
diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
index 7218873..79ced30 100644
--- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk
+++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk
@@ -156,6 +156,13 @@ else
GST_PLUGINS_BASE_CONF_OPT += --disable-theora
endif
+ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_TREMOR),y)
+GST_PLUGINS_BASE_CONF_OPT += --enable-ivorbis
+GST_PLUGINS_BASE_DEPENDENCIES += tremor
+else
+GST_PLUGINS_BASE_CONF_OPT += --disable-ivorbis
+endif
+
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_VORBIS),y)
GST_PLUGINS_BASE_CONF_OPT += --enable-vorbis
GST_PLUGINS_BASE_DEPENDENCIES += libvorbis