Signed-off-by: Michael Tretter <[email protected]>
---
rules/gst-plugins-base1.in | 56 ++++++++++++++++++++++++++++++++++++++++++++
rules/gst-plugins-base1.make | 17 +++++++++++---
rules/gstreamer-vaapi1.in | 5 ++--
3 files changed, 72 insertions(+), 6 deletions(-)
diff --git a/rules/gst-plugins-base1.in b/rules/gst-plugins-base1.in
index a9dc123c9..ca15d47ce 100644
--- a/rules/gst-plugins-base1.in
+++ b/rules/gst-plugins-base1.in
@@ -24,6 +24,15 @@ menuconfig GST_PLUGINS_BASE1
select OPUS if GST_PLUGINS_BASE1_OPUS
select ZLIB if GST_PLUGINS_BASE1_ZLIB
select LIBTREMOR if GST_PLUGINS_BASE1_IVORBIS
+ select MESALIB if GST_PLUGINS_BASE1_OPENGL ||
GST_PLUGINS_BASE1_GLES2 || GST_PLUGINS_BASE1_EGL
+ select MESALIB_OPENGL if GST_PLUGINS_BASE1_OPENGL
+ select GLU if GST_PLUGINS_BASE1_OPENGL
+ select MESALIB_GLES2 if GST_PLUGINS_BASE1_GLES2
+ select MESALIB_EGL if GST_PLUGINS_BASE1_EGL
+ select MESALIB_EGL_WAYLAND if GST_PLUGINS_BASE1_EGL_WAYLAND
+ select MESALIB_GLX if GST_PLUGINS_BASE1_GLX
+ select XORG_LIB_X11 if GST_PLUGINS_BASE1_EGL_X11
+ select LIBGUDEV if GST_PLUGINS_BASE1_EGL
# x features need libx11 + Xv
select XORG if GST_PLUGINS_BASE1_X
@@ -59,6 +68,10 @@ config GST_PLUGINS_BASE1_AUDIOCONVERT
bool
prompt "audioconvert"
+config GST_PLUGINS_BASE1_AUDIOMIXER
+ bool
+ prompt "audiomixer"
+
config GST_PLUGINS_BASE1_AUDIORATE
bool
prompt "audiorate"
@@ -138,6 +151,49 @@ config GST_PLUGINS_BASE1_CDPARANOIA
depends on BROKEN
prompt "cdparanoia [BROKEN]"
+config GST_PLUGINS_BASE1_GL
+ bool
+ prompt "gl"
+
+if GST_PLUGINS_BASE1_GL
+
+config GST_PLUGINS_BASE1_GLES2
+ bool
+ depends on !GST_PLUGINS_BASE1_OPENGL
+ prompt "gles2"
+
+config GST_PLUGINS_BASE1_OPENGL
+ bool
+ prompt "opengl"
+
+config GST_PLUGINS_BASE1_EGL
+ bool
+ prompt "egl"
+
+if GST_PLUGINS_BASE1_EGL
+
+config GST_PLUGINS_BASE1_EGL_X11
+ bool
+ select GST_PLUGINS_BASE1_X11
+ prompt "x11 egl"
+
+config GST_PLUGINS_BASE1_EGL_WAYLAND
+ bool
+ prompt "wayland egl"
+
+endif
+
+config GST_PLUGINS_BASE1_GLX
+ bool
+ select GST_PLUGINS_BASE1_OPENGL
+ select GST_PLUGINS_BASE1_X11
+ prompt "glx"
+
+config GST_PLUGINS_BASE1_X11
+ bool
+
+endif
+
config GST_PLUGINS_BASE1_IVORBIS
bool
prompt "ivorbis"
diff --git a/rules/gst-plugins-base1.make b/rules/gst-plugins-base1.make
index c3854b141..0954f1d9f 100644
--- a/rules/gst-plugins-base1.make
+++ b/rules/gst-plugins-base1.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_PLUGINS_BASE1) += gst-plugins-base1
#
# Paths and names
#
-GST_PLUGINS_BASE1_VERSION := 1.12.4
-GST_PLUGINS_BASE1_MD5 := b35b04071f69b8ab69a7f3a497ff0131
+GST_PLUGINS_BASE1_VERSION := 1.14.0
+GST_PLUGINS_BASE1_MD5 := 370271327dd23110421a9c2927ac989a
GST_PLUGINS_BASE1 := gst-plugins-base-$(GST_PLUGINS_BASE1_VERSION)
GST_PLUGINS_BASE1_SUFFIX := tar.xz
GST_PLUGINS_BASE1_URL :=
http://gstreamer.freedesktop.org/src/gst-plugins-base/$(GST_PLUGINS_BASE1).$(GST_PLUGINS_BASE1_SUFFIX)
@@ -32,11 +32,14 @@ GST_PLUGINS_BASE1_LICENSE := LGPL-2.0-or-later
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ADDER) += adder
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_APP) += app
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOCONVERT) +=
audioconvert
+GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOMIXER) +=
audiomixer
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIORATE)
+= audiorate
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIOTESTSRC) +=
audiotestsrc
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_ENCODING) +=
encoding
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VIDEOCONVERT) +=
videoconvert
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_GIO) += gio
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GL) += gl
+GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_GL) +=
opengl
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PLAYBACK) +=
playback
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_AUDIORESAMPLE) +=
audioresample
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_SUBPARSE) +=
subparse
@@ -57,11 +60,17 @@
GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_IVORBIS) +=
ivorbis
GST_PLUGINS_BASE1_ENABLEP-$(PTXCONF_GST_PLUGINS_BASE1_IVORBIS) +=
ivorbisdec
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_LIBVISUAL)
+= libvisual
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OGG) += ogg
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_OPENGL) +=
opengl
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GLES2) += gles2
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_EGL) += egl
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_EGL_WAYLAND) +=
wayland
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_GLX) += glx
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_OPUS) += opus
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_PANGO) += pango
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_RAWPARSE) +=
rawparse
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_THEORA) +=
theora
GST_PLUGINS_BASE1_ENABLE-$(PTXCONF_GST_PLUGINS_BASE1_VORBIS) +=
vorbis
+GST_PLUGINS_BASE1_ENABLEC-$(PTXCONF_GST_PLUGINS_BASE1_X11) += x11
GST_PLUGINS_BASE1_ENABLEC-y += $(GST_PLUGINS_BASE1_ENABLE-y)
GST_PLUGINS_BASE1_ENABLEC- += $(GST_PLUGINS_BASE1_ENABLE-)
@@ -77,11 +86,13 @@ GST_PLUGINS_BASE1_CONF_OPT = \
\
--enable-external \
--disable-experimental \
- $(GLOBAL_LARGE_FILE_OPTION) \
--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
\
--enable-orc \
\
+ --disable-wgl \
+ --disable-cocoa \
+ --disable-dispmanx \
--disable-iso-codes \
--$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_ZLIB)-zlib \
--$(call ptx/endis,PTXCONF_GST_PLUGINS_BASE1_XSHM)-xshm
diff --git a/rules/gstreamer-vaapi1.in b/rules/gstreamer-vaapi1.in
index 34bb712be..2fae03864 100644
--- a/rules/gstreamer-vaapi1.in
+++ b/rules/gstreamer-vaapi1.in
@@ -6,9 +6,8 @@ config GSTREAMER_VAAPI1
select GSTREAMER1
select GSTREAMER1_DEBUG
select GST_PLUGINS_BASE1
- select GST_PLUGINS_BAD1
- select GST_PLUGINS_BAD1_GL if GSTREAMER_VAAPI1_EGL
- select GST_PLUGINS_BAD1_EGL if GSTREAMER_VAAPI1_EGL
+ select GST_PLUGINS_BASE1_GL if GSTREAMER_VAAPI1_EGL
+ select GST_PLUGINS_BASE1_EGL if GSTREAMER_VAAPI1_EGL
select MESALIB if GSTREAMER_VAAPI1_EGL
prompt "gstreamer-vaapi1"
help
--
2.16.1
_______________________________________________
ptxdist mailing list
[email protected]
