summaryrefslogtreecommitdiffstats
path: root/meta/recipes-multimedia
diff options
context:
space:
mode:
authorCarlos Rafael Giani <crg7475@mailbox.org>2020-01-12 14:59:50 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-01-16 22:33:08 +0000
commitc84a522fd444d495e2a28ab2a0a9b001fe981a93 (patch)
treede99b5841e568b0f144a68964c79f2b1e108788a /meta/recipes-multimedia
parent1e05d67ed1a802098e6ba07a44cd6d50404232b8 (diff)
downloadpoky-c84a522fd444d495e2a28ab2a0a9b001fe981a93.tar.gz
gstreamer1.0-vaapi: Transition to meson based builds
* Removed autotools/M4 related patch 0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch. (From OE-Core rev: 5dc07f58832483ae44e8bfb6c3aa1787d607b8f3) Signed-off-by: Carlos Rafael Giani <crg7475@mailbox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia')
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch33
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb26
2 files changed, 17 insertions, 42 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch
deleted file mode 100644
index d7b8984953..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 5403a89e6a7ac72a23e0221075c0c19b5f85a021 Mon Sep 17 00:00:00 2001
2From: Fabio Berton <fabio.berton@ossystems.com.br>
3Date: Wed, 13 Jun 2018 09:09:25 -0300
4Subject: [PATCH] gst/vaapi/Makefile.am: Add EGL_CFLAGS to libgstvaapi CFLAGS
5Organization: O.S. Systems Software LTDA.
6
7We need this to pass correctly EGL CFLAGS when building with EGL support.
8
9Upstream-Status: Pending
10
11Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
12---
13 gst/vaapi/Makefile.am | 4 ++++
14 1 file changed, 4 insertions(+)
15
16diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
17index b299ac98..d6cab71f 100644
18--- a/gst/vaapi/Makefile.am
19+++ b/gst/vaapi/Makefile.am
20@@ -24,6 +24,10 @@ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
21 endif
22
23 if USE_EGL
24+libgstvaapi_CFLAGS += \
25+ $(EGL_CFLAGS) \
26+ $(NULL)
27+
28 libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
29 endif
30
31--
322.17.1
33
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb
index b8c2126d9b..a78807cc19 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.16.1.bb
@@ -9,7 +9,6 @@ LICENSE = "LGPLv2.1+"
9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c" 9LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
10 10
11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \ 11SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \
12 file://0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch \
13 file://0001-vaapsink-downgrade-to-marginal.patch \ 12 file://0001-vaapsink-downgrade-to-marginal.patch \
14 " 13 "
15 14
@@ -19,10 +18,18 @@ SRC_URI[sha256sum] = "cb570f6f1e78cb364fbe3c4fb8751824ee9db0c942ba61b62380b9b5ab
19S = "${WORKDIR}/${REALPN}-${PV}" 18S = "${WORKDIR}/${REALPN}-${PV}"
20DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad" 19DEPENDS = "libva gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-bad"
21 20
22inherit autotools pkgconfig gtk-doc features_check upstream-version-is-even 21inherit meson pkgconfig gtk-doc features_check upstream-version-is-even
23 22
24REQUIRED_DISTRO_FEATURES ?= "opengl" 23REQUIRED_DISTRO_FEATURES ?= "opengl"
25 24
25EXTRA_OEMESON += " \
26 -Dexamples=disabled \
27"
28
29GTKDOC_MESON_OPTION = "gtk_doc"
30GTKDOC_MESON_ENABLE_FLAG = "enabled"
31GTKDOC_MESON_DISABLE_FLAG = "disabled"
32
26PACKAGES =+ "${PN}-tests" 33PACKAGES =+ "${PN}-tests"
27 34
28# OpenGL packageconfig factored out to make it easy for distros 35# OpenGL packageconfig factored out to make it easy for distros
@@ -33,17 +40,18 @@ PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'glx'
33 bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \ 40 bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl', \
34 '', d), d)}" 41 '', d), d)}"
35 42
36PACKAGECONFIG ??= "drm \ 43PACKAGECONFIG ??= "drm encoders \
37 ${PACKAGECONFIG_GL} \ 44 ${PACKAGECONFIG_GL} \
38 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" 45 ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}"
39 46
40PACKAGECONFIG[drm] = "--enable-drm,--disable-drm,udev libdrm" 47PACKAGECONFIG[drm] = "-Dwith_drm=yes,-Dwith_drm=no,udev libdrm"
41PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl" 48PACKAGECONFIG[egl] = "-Dwith_egl=yes,-Dwith_egl=no,virtual/egl"
42PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,virtual/libgl" 49PACKAGECONFIG[encoders] = "-Dwith_encoders=yes,-Dwith_encoders=no"
43PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols" 50PACKAGECONFIG[glx] = "-Dwith_glx=yes,-Dwith_glx=no,virtual/libgl"
44PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxrandr libxrender" 51PACKAGECONFIG[wayland] = "-Dwith_wayland=yes,-Dwith_wayland=no,wayland-native wayland wayland-protocols"
52PACKAGECONFIG[x11] = "-Dwith_x11=yes,-Dwith_x11=no,virtual/libx11 libxrandr libxrender"
45 53
46FILES_${PN} += "${libdir}/gstreamer-*/*.so" 54FILES_${PN} += "${libdir}/gstreamer-*/*.so"
47FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug" 55FILES_${PN}-dbg += "${libdir}/gstreamer-*/.debug"
48FILES_${PN}-dev += "${libdir}/gstreamer-*/*.la ${libdir}/gstreamer-*/*.a" 56FILES_${PN}-dev += "${libdir}/gstreamer-*/*.a"
49FILES_${PN}-tests = "${bindir}/*" 57FILES_${PN}-tests = "${bindir}/*"