Signed-off-by: Michael Tretter <m.tret...@pengutronix.de>
---
rules/gst-plugins-good1.in | 28 ++++++++++++++++++++++++++++
rules/gst-plugins-good1.make | 10 +++++++---
2 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in
index 147507095..c7f7ed086 100644
--- a/rules/gst-plugins-good1.in
+++ b/rules/gst-plugins-good1.in
@@ -14,6 +14,8 @@ menuconfig GST_PLUGINS_GOOD1
select LIBCACA if GST_PLUGINS_GOOD1_LIBCACA
select XORG_LIB_X11 if GST_PLUGINS_GOOD1_X
select GDK_PIXBUF if GST_PLUGINS_GOOD1_GDK_PIXBUF
+ select GTK if GST_PLUGINS_GOOD1_GTK3
+ select LAME if GST_PLUGINS_GOOD1_LAME
select LIBSOUP if GST_PLUGINS_GOOD1_SOUP
select SPEEX if GST_PLUGINS_GOOD1_SPEEX
select FLAC if GST_PLUGINS_GOOD1_FLAC
@@ -24,6 +26,10 @@ menuconfig GST_PLUGINS_GOOD1
select V4L_UTILS_LIBV4L2 if GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2
select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2
select PULSEAUDIO if GST_PLUGINS_GOOD1_PULSE
+ select QT5 if GST_PLUGINS_GOOD1_QT
+ select QT5_GUI if GST_PLUGINS_GOOD1_QT
+ select QT5_MODULE_QTDECLARATIVE if GST_PLUGINS_GOOD1_QT
+ select TWOLAME if GST_PLUGINS_GOOD1_TWOLAME
prompt "gst-plugins-good "
help
@@ -253,6 +259,10 @@ config GST_PLUGINS_GOOD1_GDK_PIXBUF
bool
prompt "gdk_pixbuf"
+config GST_PLUGINS_GOOD1_GTK3
+ bool
+ prompt "gtk3"
+
config GST_PLUGINS_GOOD1_JACK
bool
prompt "jack"
@@ -262,6 +272,10 @@ config GST_PLUGINS_GOOD1_JPEG
bool
prompt "jpeg"
+config GST_PLUGINS_GOOD1_LAME
+ bool
+ prompt "lame"
+
config GST_PLUGINS_GOOD1_LIBCACA
bool
prompt "libcaca"
@@ -275,6 +289,12 @@ config GST_PLUGINS_GOOD1_LIBPNG
bool
prompt "libpng"
+config GST_PLUGINS_GOOD1_MPG123
+ bool
+ prompt "mpg123"
+ # needs libmpg123
+ depends on BROKEN
+
config GST_PLUGINS_GOOD1_PULSE
bool
prompt "pulse"
@@ -284,6 +304,10 @@ config GST_PLUGINS_GOOD1_DV1394
depends on BROKEN
prompt "dv1394"
+config GST_PLUGINS_GOOD1_QT
+ bool
+ prompt "qt"
+
config GST_PLUGINS_GOOD1_SHOUT2
bool
prompt "shout2"
@@ -301,6 +325,10 @@ config GST_PLUGINS_GOOD1_TAGLIB
depends on BROKEN
prompt "taglib"
+config GST_PLUGINS_GOOD1_TWOLAME
+ bool
+ prompt "twolame"
+
config GST_PLUGINS_GOOD1_VPX
bool
depends on BROKEN
diff --git a/rules/gst-plugins-good1.make b/rules/gst-plugins-good1.make
index d02a6fb03..b621a8ebf 100644
--- a/rules/gst-plugins-good1.make
+++ b/rules/gst-plugins-good1.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_GOOD1) += gst-plugins-good1
#
# Paths and names
#
-GST_PLUGINS_GOOD1_VERSION := 1.12.4
-GST_PLUGINS_GOOD1_MD5 := bdf4791a2b788ec6a149b81ff4032038
+GST_PLUGINS_GOOD1_VERSION := 1.14.0
+GST_PLUGINS_GOOD1_MD5 := 48584b02e469a314b0e71f1553a2d2a7
GST_PLUGINS_GOOD1 := gst-plugins-good-$(GST_PLUGINS_GOOD1_VERSION)
GST_PLUGINS_GOOD1_SUFFIX := tar.xz
GST_PLUGINS_GOOD1_URL :=
http://gstreamer.freedesktop.org/src/gst-plugins-good/$(GST_PLUGINS_GOOD1).$(GST_PLUGINS_GOOD1_SUFFIX)
@@ -89,20 +89,25 @@ GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_CAIRO)
+= cairo
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_FLAC) += flac
GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) +=
gdk_pixbuf
GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_GDK_PIXBUF) +=
gdkpixbuf
+GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_GTK3) += gtk3
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JACK) += jack
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_JPEG) += jpeg
+GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LAME) += lame
GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) +=
libcaca
GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBCACA) +=
cacasink
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_LIBDV) += libdv
GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) +=
libpng
GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_LIBPNG) += png
+GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_MPG123) +=
mpg123
GST_PLUGINS_GOOD1_ENABLEC-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) += pulse
GST_PLUGINS_GOOD1_ENABLEP-$(PTXCONF_GST_PLUGINS_GOOD1_PULSE) +=
pulseaudio
+GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_QT) += qt
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_DV1394) +=
dv1394
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SHOUT2) +=
shout2
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SOUP) += soup
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_SPEEX) += speex
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TAGLIB) +=
taglib
+GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_TWOLAME) +=
twolame
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_VPX) += vpx
GST_PLUGINS_GOOD1_ENABLE-$(PTXCONF_GST_PLUGINS_GOOD1_WAVPACK) +=
wavpack
@@ -129,7 +134,6 @@ GST_PLUGINS_GOOD1_CONF_OPT = \
--disable-directsound \
--disable-waveform \
\
- --disable-sunaudio \
--disable-osx_audio \
--disable-osx_video \
--disable-aalibtest \
--
2.16.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
