summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Olbrich <m.olbrich@pengutronix.de>2019-04-24 15:48:16 +0200
committerMichael Olbrich <m.olbrich@pengutronix.de>2019-04-25 17:37:42 +0200
commit966343e3e2f9e533b643fddd4332658b9b3daa9f (patch)
tree738e885a88472c4deccf967500b2f29408662649
parente867292430b771a0af2208646ccfc9d02baa463f (diff)
downloadptxdist-966343e3e2f9e533b643fddd4332658b9b3daa9f.tar.gz
ptxdist-966343e3e2f9e533b643fddd4332658b9b3daa9f.tar.xz
gstreamer-vaapi1: version bump 1.14.4 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
-rw-r--r--rules/gstreamer-vaapi1.in1
-rw-r--r--rules/gstreamer-vaapi1.make33
2 files changed, 14 insertions, 20 deletions
diff --git a/rules/gstreamer-vaapi1.in b/rules/gstreamer-vaapi1.in
index 9837c1b46..7e3ae51f5 100644
--- a/rules/gstreamer-vaapi1.in
+++ b/rules/gstreamer-vaapi1.in
@@ -2,6 +2,7 @@
config GSTREAMER_VAAPI1
tristate
+ select HOST_MESON
select LIBVA
select GSTREAMER1
select GSTREAMER1_DEBUG
diff --git a/rules/gstreamer-vaapi1.make b/rules/gstreamer-vaapi1.make
index c02171cd6..7b2f0139e 100644
--- a/rules/gstreamer-vaapi1.make
+++ b/rules/gstreamer-vaapi1.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GSTREAMER_VAAPI1) += gstreamer-vaapi1
#
# Paths and names
#
-GSTREAMER_VAAPI1_VERSION := 1.14.4
-GSTREAMER_VAAPI1_MD5 := 2fae3442f5f23e7354a0c592bc7b9065
+GSTREAMER_VAAPI1_VERSION := 1.16.0
+GSTREAMER_VAAPI1_MD5 := 8c3f9ee3e47cbdb75a94f7183460b721
GSTREAMER_VAAPI1 := gstreamer-vaapi-$(GSTREAMER_VAAPI1_VERSION)
GSTREAMER_VAAPI1_SUFFIX := tar.xz
GSTREAMER_VAAPI1_URL := http://gstreamer.freedesktop.org/src/gstreamer-vaapi/$(GSTREAMER_VAAPI1).$(GSTREAMER_VAAPI1_SUFFIX)
@@ -29,27 +29,20 @@ GSTREAMER_VAAPI1_LICENSE := LGPL-2.0-or-later
# Prepare
# ----------------------------------------------------------------------------
-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
-# 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
+# meson
#
-GSTREAMER_VAAPI1_CONF_TOOL := autoconf
+GSTREAMER_VAAPI1_CONF_TOOL := meson
GSTREAMER_VAAPI1_CONF_OPT = \
- $(CROSS_AUTOCONF_USR) \
- $(GSTREAMER1_BASIC_CONF_OPT) \
- \
- --disable-examples \
- --enable-encoders \
- $(addprefix --enable-,$(GSTREAMER_VAAPI1_ENABLE-y)) \
- $(addprefix --disable-,$(GSTREAMER_VAAPI1_ENABLE-)) \
- --with-glapi=$(call ptx/ifdef,PTXCONF_GSTREAMER_VAAPI1_OPENGL,any,no) \
- --without-gtk
+ $(CROSS_MESON_USR) \
+ -Dexamples=disabled \
+ -Dgtk_doc=disabled \
+ -Dwith_drm=yes \
+ -Dwith_egl=$(call ptx/yesno, PTXCONF_GSTREAMER_VAAPI1_OPENGL) \
+ -Dwith_encoders=yes \
+ -Dwith_glx=$(call ptx/yesno, PTXCONF_GSTREAMER_VAAPI1_GLX) \
+ -Dwith_wayland=$(call ptx/yesno, PTXCONF_GSTREAMER_VAAPI1_WAYLAND) \
+ -Dwith_x11=$(call ptx/yesno, PTXCONF_GSTREAMER_VAAPI1_X11) \
# ----------------------------------------------------------------------------
# Target-Install