diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-05-24 20:20:15 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-05-24 20:23:22 +0200 |
| commit | 58fe85f18e9a4c4636b6e7a08363b2c2912ee2a2 (patch) | |
| tree | 658029fc3db9cc956834c3111798168d6a5fafea | |
| parent | 02fbe2c0d286143c3ed4ea9999c6db96b0a2ed8a (diff) | |
| download | ptxdist-58fe85f18e9a4c4636b6e7a08363b2c2912ee2a2.tar.gz ptxdist-58fe85f18e9a4c4636b6e7a08363b2c2912ee2a2.tar.xz | |
gstreamer-vaapi1: adapt to libva changes
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/gstreamer-vaapi1.in | 13 | ||||
| -rw-r--r-- | rules/gstreamer-vaapi1.make | 5 |
2 files changed, 9 insertions, 9 deletions
diff --git a/rules/gstreamer-vaapi1.in b/rules/gstreamer-vaapi1.in index 9af55c2cb..9837c1b46 100644 --- a/rules/gstreamer-vaapi1.in +++ b/rules/gstreamer-vaapi1.in @@ -7,9 +7,8 @@ config GSTREAMER_VAAPI1 select GSTREAMER1_DEBUG select GST_PLUGINS_BAD1 select GST_PLUGINS_BASE1 - select GST_PLUGINS_BASE1_GL if GSTREAMER_VAAPI1_EGL - select GST_PLUGINS_BASE1_EGL if GSTREAMER_VAAPI1_EGL - select MESALIB if GSTREAMER_VAAPI1_EGL + select MESALIB if GSTREAMER_VAAPI1_OPENGL + select XORG_LIB_XRANDR if GSTREAMER_VAAPI1_X11 prompt "gstreamer-vaapi1" help Gstreamer-vaapi is a collection of GStreamer plugins and helper @@ -18,6 +17,10 @@ config GSTREAMER_VAAPI1 if GSTREAMER_VAAPI1 +config GSTREAMER_VAAPI1_OPENGL + bool + default GST_PLUGINS_BASE1_GL + config GSTREAMER_VAAPI1_X11 bool default LIBVA_X11 @@ -30,8 +33,4 @@ config GSTREAMER_VAAPI1_WAYLAND bool default LIBVA_WAYLAND -config GSTREAMER_VAAPI1_EGL - bool - default LIBVA_EGL - endif diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make index 576423d69..c3d9d080b 100644 --- a/rules/gstreamer-vaapi1.make +++ b/rules/gstreamer-vaapi1.make @@ -33,7 +33,8 @@ GSTREAMER_VAAPI1_ENABLE-y := drm GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_X11) += x11 GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_GLX) += glx GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_WAYLAND) += wayland -GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_EGL) += egl +# EGL backend is gone but configure only looks for OpenGL if glx or egl is enabled +GSTREAMER_VAAPI1_ENABLE-$(PTXCONF_GSTREAMER_VAAPI1_OPENGL) += egl # # autoconf @@ -47,7 +48,7 @@ GSTREAMER_VAAPI1_CONF_OPT = \ --enable-encoders \ $(addprefix --enable-,$(GSTREAMER_VAAPI1_ENABLE-y)) \ $(addprefix --disable-,$(GSTREAMER_VAAPI1_ENABLE-)) \ - --with-glapi=any \ + --with-glapi=$(call ptx/ifdef,PTXCONF_GSTREAMER_VAAPI1_OPENGL,any,no) \ --without-gtk # ---------------------------------------------------------------------------- |