diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-23 22:08:21 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-04-25 17:37:41 +0200 |
| commit | 3be2a3ebcc60d11c2b3a97424e89bdcbc983f3cb (patch) | |
| tree | 7193ca122c88dcb7c01d0d71282ec729b028bed9 | |
| parent | ea59a265489ae1062f7210f21fe9d1eac81ebeff (diff) | |
| download | ptxdist-3be2a3ebcc60d11c2b3a97424e89bdcbc983f3cb.tar.gz ptxdist-3be2a3ebcc60d11c2b3a97424e89bdcbc983f3cb.tar.xz | |
gst-libav1: version bump 1.14.4 -> 1.16.0
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | rules/gst-libav1.in | 7 | ||||
| -rw-r--r-- | rules/gst-libav1.make | 41 |
2 files changed, 9 insertions, 39 deletions
diff --git a/rules/gst-libav1.in b/rules/gst-libav1.in index 6ad55f82a..4052c0e65 100644 --- a/rules/gst-libav1.in +++ b/rules/gst-libav1.in @@ -2,14 +2,11 @@ config GST_LIBAV1 tristate - select CROSS_NASM + select HOST_MESON select GLIB select GSTREAMER1 select GST_PLUGINS_BASE1 - select BZIP2 - select BZIP2_LIBBZ2 - select XZ - select ORC + select FFMPEG prompt "gst-libav" help Libav plugin for GStreamer diff --git a/rules/gst-libav1.make b/rules/gst-libav1.make index 26fe42108..69d5d96cd 100644 --- a/rules/gst-libav1.make +++ b/rules/gst-libav1.make @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_GST_LIBAV1) += gst-libav1 # # Paths and names # -GST_LIBAV1_VERSION := 1.14.4 -GST_LIBAV1_MD5 := 58342db11dbb201a66a62577dcf7bab5 +GST_LIBAV1_VERSION := 1.16.0 +GST_LIBAV1_MD5 := e3a201a45985ddc1327cd496046ca818 GST_LIBAV1 := gst-libav-$(GST_LIBAV1_VERSION) GST_LIBAV1_SUFFIX := tar.xz GST_LIBAV1_URL := http://gstreamer.freedesktop.org/src/gst-libav/$(GST_LIBAV1).$(GST_LIBAV1_SUFFIX) @@ -29,41 +29,14 @@ GST_LIBAV1_LICENSE := GPL-2.0-or-later AND LGPL-2.0-or-later # Prepare # ---------------------------------------------------------------------------- -GST_LIBAV1_CONF_ENV := \ - $(CROSS_ENV) \ - AS=$(CROSS_CC) - -ifdef PTXCONF_GST_LIBAV1 -GST_LIBAV1_CPU := $(strip $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.*'-march=\([^']*\)'.*/\1/p" | tail -n1)) -ifeq ($(GST_LIBAV1_CPU),) -GST_LIBAV1_CPU := $(strip $(shell ptxd_cross_cc_v | sed -n "s/COLLECT_GCC_OPTIONS=.*'-mcpu=\([^']*\)'.*/\1/p" | tail -n1)) -endif -ifeq ($(GST_LIBAV1_CPU),) -GST_LIBAV1_CPU := generic -endif -endif - # -# autoconf +# meson # -GST_LIBAV1_CONF_TOOL := autoconf +GST_LIBAV1_CONF_TOOL := meson GST_LIBAV1_CONF_OPT := \ - $(CROSS_AUTOCONF_USR) \ - --enable-orc \ - --disable-fatal-warnings \ - --enable-extra-check \ - --disable-valgrind \ - --disable-gcov \ - $(GLOBAL_LARGE_FILE_OPTION) \ - --disable-gtk-doc \ - --disable-gtk-doc-html \ - --disable-gtk-doc-pdf \ - --disable-gobject-cast-checks \ - --disable-glib-asserts \ - --disable-gpl \ - --with-package-origin="PTXdist" \ - --without-system-libav \ - --with-libav-extra-configure="--x86asmexe=nasm --cpu=$(GST_LIBAV1_CPU)" + $(CROSS_MESON_USR) \ + -Dpackage-name="GStreamer FFMPEG Plug-ins source release" \ + -Dpackage-origin=PTXdist # ---------------------------------------------------------------------------- # Target-Install |