* [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs
@ 2018-07-21 8:20 Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 2/6] gstreamer1.0-plugin-good: " Carlos Rafael Giani
` (5 more replies)
0 siblings, 6 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
* Add patches for gbm, libpng, libjpeg to conditionally enable/disable
them in the configure script
* Reorder the packageconfigs alphabetically
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
...r-explicitely-enabling-disabling-GBM.patch | 69 +++++++++++
...for-explicitely-enabling-disabling-P.patch | 107 ++++++++++++++++++
.../gstreamer1.0-plugins-base_1.14.1.bb | 26 +++--
3 files changed, 192 insertions(+), 10 deletions(-)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch
new file mode 100644
index 0000000000..5d7367eaf8
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch
@@ -0,0 +1,69 @@
+From 7f93afc497010384da9f9d15163c31a862bd1dfa Mon Sep 17 00:00:00 2001
+From: Carlos Rafael Giani <dv@pseudoterminal.org>
+Date: Thu, 19 Jul 2018 10:30:54 +0200
+Subject: [PATCH] gl: Add switch for explicitely enabling/disabling GBM support
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=796833]
+---
+ m4/gst-gl.m4 | 38 +++++++++++++++++++++++++++++---------
+ 1 file changed, 29 insertions(+), 9 deletions(-)
+
+diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
+index 1e9724094..20b2233de 100644
+--- a/m4/gst-gl.m4
++++ b/m4/gst-gl.m4
+@@ -117,6 +117,15 @@ AC_ARG_ENABLE([dispmanx],
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-dispmanx]) ;;
+ esac],[NEED_DISPMANX=auto])
+
++AC_ARG_ENABLE([gbm],
++ [ --enable-gbm Enable Mesa3D GBM support (requires EGL) @<:@default=auto@:>@],
++ [case "${enableval}" in
++ yes) NEED_GBM=yes ;;
++ no) NEED_GBM=no ;;
++ auto) NEED_GBM=auto ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-gbm]) ;;
++ esac],[NEED_GBM=auto])
++
+ AG_GST_PKG_CHECK_MODULES(X11_XCB, x11-xcb)
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+@@ -172,15 +181,26 @@ case $host in
+ AC_CHECK_LIB([EGL], [fbGetDisplay], [HAVE_VIV_FB_EGL=yes])
+ fi
+
+- if test "x$HAVE_EGL" = "xyes"; then
+- PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
+- AC_SUBST(DRM_CFLAGS)
+- AC_SUBST(DRM_LIBS)
+- if test "x$HAVE_DRM" = "xyes" -a "x$HAVE_GUDEV" = "xyes"; then
+- PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no)
+- AC_SUBST(GBM_CFLAGS)
+- AC_SUBST(GBM_LIBS)
+- fi
++ if test "x$HAVE_EGL" = "xyes" -a "x$NEED_GBM" != "xno"; then
++ PKG_CHECK_MODULES(DRM, libdrm >= 2.4.55, HAVE_DRM=yes, HAVE_DRM=no)
++ AC_SUBST(DRM_CFLAGS)
++ AC_SUBST(DRM_LIBS)
++ if test "x$NEED_GBM" = "xyes"; then
++ if test "x$HAVE_DRM" = "xno"; then
++ AC_MSG_ERROR([GBM support requested but libdrm is not available])
++ fi
++ if test "x$HAVE_GUDEV" = "xno"; then
++ AC_MSG_ERROR([GBM support requested but gudev is not available])
++ fi
++ fi
++ if test "x$HAVE_DRM" = "xyes" -a "x$HAVE_GUDEV" = "xyes"; then
++ PKG_CHECK_MODULES(GBM, gbm, HAVE_GBM_EGL=yes, HAVE_GBM_EGL=no)
++ if test "x$HAVE_GBM_EGL" = "xno" -a "x$NEED_GBM" = "xyes"; then
++ AC_MSG_ERROR([GBM support requested but gbm library is not available])
++ fi
++ AC_SUBST(GBM_CFLAGS)
++ AC_SUBST(GBM_LIBS)
++ fi
+ fi
+
+ dnl FIXME: Mali EGL depends on GLESv1 or GLESv2
+--
+2.17.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch
new file mode 100644
index 0000000000..a61dfb8950
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch
@@ -0,0 +1,107 @@
+From 092aadfc1df69c46d920b0cd39f98d363d6988b3 Mon Sep 17 00:00:00 2001
+From: Carlos Rafael Giani <dv@pseudoterminal.org>
+Date: Thu, 19 Jul 2018 11:16:05 +0200
+Subject: [PATCH] gl: Add switches for explicitely enabling/disabling PNG and
+ JPEG support
+
+Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=796833]
+---
+ m4/gst-gl.m4 | 66 ++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 46 insertions(+), 20 deletions(-)
+
+diff --git a/m4/gst-gl.m4 b/m4/gst-gl.m4
+index 20b2233de..f8809981c 100644
+--- a/m4/gst-gl.m4
++++ b/m4/gst-gl.m4
+@@ -126,6 +126,24 @@ AC_ARG_ENABLE([gbm],
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-gbm]) ;;
+ esac],[NEED_GBM=auto])
+
++AC_ARG_ENABLE([png],
++ [ --enable-png Enable libpng support @<:@default=auto@:>@],
++ [case "${enableval}" in
++ yes) NEED_PNG=yes ;;
++ no) NEED_PNG=no ;;
++ auto) NEED_PNG=auto ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-png]) ;;
++ esac],[NEED_PNG=auto])
++
++AC_ARG_ENABLE([jpeg],
++ [ --enable-jpeg Enable libjpeg support @<:@default=auto@:>@],
++ [case "${enableval}" in
++ yes) NEED_JPEG=yes ;;
++ no) NEED_JPEG=no ;;
++ auto) NEED_JPEG=auto ;;
++ *) AC_MSG_ERROR([bad value ${enableval} for --enable-jpeg]) ;;
++ esac],[NEED_JPEG=auto])
++
+ AG_GST_PKG_CHECK_MODULES(X11_XCB, x11-xcb)
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+@@ -1043,9 +1061,13 @@ dnl Needed by plugins that use g_module_*() API
+ PKG_CHECK_MODULES(GMODULE_NO_EXPORT, gmodule-no-export-2.0)
+
+ dnl libpng is optional
+-PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no)
+-if test "x$HAVE_PNG" = "xyes"; then
+- AC_DEFINE(HAVE_PNG, [1] , [Use libpng])
++if test "x$NEED_PNG" != "xno"; then
++ PKG_CHECK_MODULES(LIBPNG, libpng >= 1.0, HAVE_PNG=yes, HAVE_PNG=no)
++ if test "x$HAVE_PNG" = "xyes"; then
++ AC_DEFINE(HAVE_PNG, [1] , [Use libpng])
++ elif test "x$NEED_PNG" = "xyes"; then
++ AC_MSG_ERROR([libpng support requested but libpng is not available])
++ fi
+ fi
+ AC_SUBST(HAVE_PNG)
+ AC_SUBST(LIBPNG_LIBS)
+@@ -1053,25 +1075,29 @@ AC_SUBST(LIBPNG_CFLAGS)
+
+ dnl libjpeg is optional
+ AC_ARG_WITH(jpeg-mmx, [ --with-jpeg-mmx, path to MMX'ified JPEG library])
+-OLD_LIBS="$LIBS"
+-if test x$with_jpeg_mmx != x; then
+- LIBS="$LIBS -L$with_jpeg_mmx"
+-fi
+-AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+-JPEG_LIBS="$LIBS -ljpeg-mmx"
+-LIBS="$OLD_LIBS"
+-if test x$HAVE_JPEG != xyes; then
+- JPEG_LIBS="-ljpeg"
+- AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
+-fi
++if test "x$NEED_JPEG" != "xno"; then
++ OLD_LIBS="$LIBS"
++ if test x$with_jpeg_mmx != x; then
++ LIBS="$LIBS -L$with_jpeg_mmx"
++ fi
++ AC_CHECK_LIB(jpeg-mmx, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
++ JPEG_LIBS="$LIBS -ljpeg-mmx"
++ LIBS="$OLD_LIBS"
++ if test x$HAVE_JPEG != xyes; then
++ JPEG_LIBS="-ljpeg"
++ AC_CHECK_LIB(jpeg, jpeg_set_defaults, HAVE_JPEG="yes", HAVE_JPEG="no")
++ fi
+
+-if test x$HAVE_JPEG = xyes; then
+- AC_DEFINE(HAVE_JPEG, [1], [Use libjpeg])
+-else
+- JPEG_LIBS=
++ if test x$HAVE_JPEG = xyes; then
++ AC_DEFINE(HAVE_JPEG, [1], [Use libjpeg])
++ elif test "x$NEED_JPEG" = "xyes"; then
++ AC_MSG_ERROR([libjpeg support requested but libjpeg is not available])
++ else
++ JPEG_LIBS=
++ fi
++ AC_SUBST(JPEG_LIBS)
++ AC_SUBST(HAVE_JPEG)
+ fi
+-AC_SUBST(JPEG_LIBS)
+-AC_SUBST(HAVE_JPEG)
+ ])
+
+ dnl --------------------------------------------------------------------------
+--
+2.17.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
index 8d7d3c6192..8de3b69060 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.14.1.bb
@@ -17,6 +17,8 @@ SRC_URI = " \
file://0004-rtsp-drop-incorrect-reference-to-gstreamer-sdp-in-Ma.patch \
file://0009-glimagesink-Downrank-to-marginal.patch \
file://0001-gstreamer-gl.pc.in-don-t-append-GL_CFLAGS-to-CFLAGS.patch \
+ file://0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch \
+ file://0011-gl-Add-switches-for-explicitely-enabling-disabling-P.patch \
file://link-with-libvchostif.patch \
"
SRC_URI[md5sum] = "c42154ab6f85c59f0e449d8d7e290342"
@@ -30,12 +32,15 @@ inherit gettext
PACKAGES_DYNAMIC =+ "^libgst.*"
+# opengl packageconfig factored out to make it easy for distros
+# and BSP layers to pick either (desktop) opengl, gles2, or no GL
PACKAGECONFIG_GL ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gles2 egl', '', d)}"
+
PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
- ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
- gio-unix-2.0 ogg pango theora vorbis zlib jpeg \
${PACKAGECONFIG_GL} \
+ ${@bb.utils.filter('DISTRO_FEATURES', 'alsa x11', d)} \
+ gio-unix-2.0 jpeg ogg pango png theora vorbis zlib \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland egl', '', d)} \
"
@@ -45,26 +50,27 @@ X11DISABLEOPTS = "--disable-x --disable-xvideo --disable-xshm"
PACKAGECONFIG[alsa] = "--enable-alsa,--disable-alsa,alsa-lib"
PACKAGECONFIG[cdparanoia] = "--enable-cdparanoia,--disable-cdparanoia,cdparanoia"
+PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
+PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm,virtual/libgbm libgudev libdrm"
PACKAGECONFIG[gio-unix-2.0] = "--enable-gio_unix_2_0,--disable-gio_unix_2_0,glib-2.0"
+PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
PACKAGECONFIG[ivorbis] = "--enable-ivorbis,--disable-ivorbis,tremor"
+PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
PACKAGECONFIG[ogg] = "--enable-ogg,--disable-ogg,libogg"
+PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
PACKAGECONFIG[opus] = "--enable-opus,--disable-opus,libopus"
PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango"
+PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng"
PACKAGECONFIG[theora] = "--enable-theora,--disable-theora,libtheora"
-PACKAGECONFIG[visual] = "--enable-libvisual,--disable-libvisual,libvisual"
PACKAGECONFIG[vorbis] = "--enable-vorbis,--disable-vorbis,libvorbis"
PACKAGECONFIG[x11] = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
-PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl,virtual/libgl libglu"
-PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,virtual/libgles2"
-PACKAGECONFIG[egl] = "--enable-egl,--disable-egl,virtual/egl"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
-PACKAGECONFIG[jpeg] = ",,jpeg"
+PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
+FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
FILES_${MLPREFIX}libgsttag-1.0 += "${datadir}/gst-plugins-base/1.0/license-translations.dict"
do_compile_prepend() {
export GIR_EXTRA_LIBS_PATH="${B}/gst-libs/gst/tag/.libs:${B}/gst-libs/gst/video/.libs:${B}/gst-libs/gst/audio/.libs:${B}/gst-libs/gst/rtp/.libs:${B}/gst-libs/gst/allocators/.libs"
}
-
-FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 2/6] gstreamer1.0-plugin-good: Update packageconfigs
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
@ 2018-07-21 8:20 ` Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 3/6] gstreamer1.0-plugin-bad: " Carlos Rafael Giani
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
* There is no twolame recipe in oe-core or in meta-openembedded, so
disable it
* Reorder the packageconfigs alphabetically
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
.../gstreamer/gstreamer1.0-plugins-good_1.14.1.bb | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb
index 36eb3107ae..beae43f915 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.14.1.bb
@@ -28,20 +28,24 @@ PACKAGECONFIG ??= " \
${GSTREAMER_ORC} \
${@bb.utils.filter('DISTRO_FEATURES', 'pulseaudio x11', d)} \
${@bb.utils.contains_any('DISTRO_FEATURES', d.getVar('GTK3DISTROFEATURES'), 'gtk', '', d)} \
- cairo flac gdk-pixbuf gudev jpeg libpng soup speex taglib v4l2 bz2 zlib mpg123 lame \
+ bz2 cairo flac gdk-pixbuf gudev jpeg lame libpng mpg123 soup speex taglib v4l2 zlib \
"
X11DEPENDS = "virtual/libx11 libsm libxrender libxfixes libxdamage"
+PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
PACKAGECONFIG[cairo] = "--enable-cairo,--disable-cairo,cairo"
PACKAGECONFIG[dv1394] = "--enable-dv1394,--disable-dv1394,libiec61883 libavc1394 libraw1394"
PACKAGECONFIG[flac] = "--enable-flac,--disable-flac,flac"
PACKAGECONFIG[gdk-pixbuf] = "--enable-gdk_pixbuf,--disable-gdk_pixbuf,gdk-pixbuf"
+PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
PACKAGECONFIG[gudev] = "--with-gudev,--without-gudev,libgudev"
PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack"
PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg"
+PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame"
PACKAGECONFIG[libpng] = "--enable-libpng,--disable-libpng,libpng"
PACKAGECONFIG[libv4l2] = "--with-libv4l2,--without-libv4l2,v4l-utils"
+PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio"
PACKAGECONFIG[soup] = "--enable-soup,--disable-soup,libsoup-2.4"
PACKAGECONFIG[speex] = "--enable-speex,--disable-speex,speex"
@@ -50,11 +54,7 @@ PACKAGECONFIG[v4l2] = "--enable-gst_v4l2 --enable-v4l2-probe,--disable-gst
PACKAGECONFIG[vpx] = "--enable-vpx,--disable-vpx,libvpx"
PACKAGECONFIG[wavpack] = "--enable-wavpack,--disable-wavpack,wavpack"
PACKAGECONFIG[x11] = "--enable-x,--disable-x,${X11DEPENDS}"
-PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib"
-PACKAGECONFIG[lame] = "--enable-lame,--disable-lame,lame"
-PACKAGECONFIG[mpg123] = "--enable-mpg123,--disable-mpg123,mpg123"
-PACKAGECONFIG[gtk] = "--enable-gtk3,--disable-gtk3,gtk+3"
# qt5 support is disabled, because it is not present in OE core, and requires more work than
# just adding a packageconfig (it requires access to moc, uic, rcc, and qmake paths).
@@ -71,9 +71,10 @@ EXTRA_OECONF += " \
--disable-oss4 \
--disable-osx_audio \
--disable-osx_video \
+ --disable-qt \
--disable-shout2 \
+ --disable-twolame \
--disable-waveform \
- --disable-qt \
"
FILES_${PN}-equalizer += "${datadir}/gstreamer-1.0/presets/*.prs"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 3/6] gstreamer1.0-plugin-bad: Update packageconfigs
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 2/6] gstreamer1.0-plugin-good: " Carlos Rafael Giani
@ 2018-07-21 8:20 ` Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 4/6] gstreamer1.0-vaapi: Remove unnecessary FILESPATH modification Carlos Rafael Giani
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
* Add packageconfigs for gl, libde265, lcms2, openh264, tinyalsa, ttml,
webrtc, webrtcdsp
* Add note about neon being dead (and --disable-neon config switch)
* Remove unnecessary gstglconfig.h line, since that file is no longer
part of -bad (it is in -base now)
* Update EXTRA_OECONF flags, since new plugins got added to -bad
* Add ttml to the default packageconfigs since its dependencies are
all in oe-core
---
.../gstreamer1.0-plugins-bad_1.14.1.bb | 35 ++++++++++++++-----
1 file changed, 26 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
index 0e477e5a9c..721df60b8d 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.14.1.bb
@@ -27,9 +27,14 @@ PACKAGECONFIG ??= " \
${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', 'bluez', '', d)} \
${@bb.utils.filter('DISTRO_FEATURES', 'directfb vulkan', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \
- bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile uvch264 webp \
+ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)} \
+ bz2 curl dash dtls hls rsvg sbc smoothstreaming sndfile ttml uvch264 webp \
"
+# the gl packageconfig enables OpenGL elements that haven't been ported
+# to -base yet. They depend on the gstgl library in -base, so we do
+# not add GL dependencies here, since these are taken care of in -base.
+
PACKAGECONFIG[assrender] = "--enable-assrender,--disable-assrender,libass"
PACKAGECONFIG[bluez] = "--enable-bluez,--disable-bluez,${BLUEZ}"
PACKAGECONFIG[bz2] = "--enable-bz2,--disable-bz2,bzip2"
@@ -43,13 +48,17 @@ PACKAGECONFIG[faad] = "--enable-faad,--disable-faad,faad2"
PACKAGECONFIG[flite] = "--enable-flite,--disable-flite,flite-alsa"
PACKAGECONFIG[fluidsynth] = "--enable-fluidsynth,--disable-fluidsynth,fluidsynth"
PACKAGECONFIG[hls] = "--enable-hls --with-hls-crypto=nettle,--disable-hls,nettle"
+PACKAGECONFIG[gl] = "--enable-gl,--disable-gl,"
PACKAGECONFIG[kms] = "--enable-kms,--disable-kms,libdrm"
+PACKAGECONFIG[libde265] = "--enable-libde265,--disable-libde265,libde265"
PACKAGECONFIG[libmms] = "--enable-libmms,--disable-libmms,libmms"
PACKAGECONFIG[libssh2] = "--enable-libssh2,--disable-libssh2,libssh2"
+PACKAGECONFIG[lcms2] = "--enable-lcms2,--disable-lcms2,lcms"
PACKAGECONFIG[modplug] = "--enable-modplug,--disable-modplug,libmodplug"
PACKAGECONFIG[neon] = "--enable-neon,--disable-neon,neon"
PACKAGECONFIG[openal] = "--enable-openal,--disable-openal,openal-soft"
PACKAGECONFIG[opencv] = "--enable-opencv,--disable-opencv,opencv"
+PACKAGECONFIG[openh264] = "--enable-openh264,--disable-openh264,openh264"
PACKAGECONFIG[openjpeg] = "--enable-openjpeg,--disable-openjpeg,openjpeg"
# the opus encoder/decoder elements are now in the -base package,
# but the opus parser remains in -bad
@@ -61,28 +70,38 @@ PACKAGECONFIG[sbc] = "--enable-sbc,--disable-sbc,sbc"
PACKAGECONFIG[smoothstreaming] = "--enable-smoothstreaming,--disable-smoothstreaming,libxml2"
PACKAGECONFIG[sndfile] = "--enable-sndfile,--disable-sndfile,libsndfile1"
PACKAGECONFIG[srtp] = "--enable-srtp,--disable-srtp,libsrtp"
+PACKAGECONFIG[tinyalsa] = "--enable-tinyalsa,--disable-tinyalsa,tinyalsa"
+PACKAGECONFIG[ttml] = "--enable-ttml,--disable-ttml,libxml2 pango cairo"
PACKAGECONFIG[uvch264] = "--enable-uvch264,--disable-uvch264,libusb1 libgudev"
PACKAGECONFIG[voaacenc] = "--enable-voaacenc,--disable-voaacenc,vo-aacenc"
PACKAGECONFIG[voamrwbenc] = "--enable-voamrwbenc,--disable-voamrwbenc,vo-amrwbenc"
PACKAGECONFIG[vulkan] = "--enable-vulkan,--disable-vulkan,vulkan"
PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland wayland-protocols libdrm"
PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp"
+PACKAGECONFIG[webrtc] = "--enable-webrtc,--disable-webrtc,libnice"
+PACKAGECONFIG[webrtcdsp] = "--enable-webrtcdsp,--disable-webrtcdsp,webrtc-audio-processing"
# these plugins have no corresponding library in OE-core or meta-openembedded:
# openni2 winks direct3d directsound winscreencap acm apple_media iqa
-# android_media avc bs2b chromaprint daala dts fdkaac gme gsm kate ladspa libde265
-# lv2 mpeg2enc mplex msdk musepack nvenc ofa openh264 opensles soundtouch spandsp
-# spc teletextdec tinyalsa vdpau wasapi x265 zbar webrtcdsp
+# android_media avc bs2b chromaprint daala dts fdkaac gme gsm kate ladspa
+# lv2 mpeg2enc mplex msdk musepack nvenc ofa openmpt opensles soundtouch
+# spandsp spc teletextdec vdpau wasapi x265 zbar
+
+# these plugins have been removed from oe-core because their upstream dependencies
+# are no longer maintained or available:
+# neon
EXTRA_OECONF += " \
--enable-decklink \
--enable-dvb \
--enable-fbdev \
+ --enable-ipcpipeline \
--enable-netsim \
--enable-shm \
--enable-vcd \
--disable-acm \
--disable-android_media \
+ --disable-aom \
--disable-apple_media \
--disable-avc \
--disable-bs2b \
@@ -97,26 +116,25 @@ EXTRA_OECONF += " \
--disable-iqa \
--disable-kate \
--disable-ladspa \
- --disable-libde265 \
--disable-lv2 \
--disable-mpeg2enc \
--disable-mplex \
--disable-msdk \
--disable-musepack \
+ --disable-neon \
--disable-nvenc \
--disable-ofa \
--disable-openexr \
- --disable-openh264 \
+ --disable-openmpt \
--disable-openni2 \
--disable-opensles \
--disable-soundtouch \
--disable-spandsp \
--disable-spc \
+ --disable-srt \
--disable-teletextdec \
- --disable-tinyalsa \
--disable-vdpau \
--disable-wasapi \
- --disable-webrtcdsp \
--disable-wildmidi \
--disable-winks \
--disable-winscreencap \
@@ -130,7 +148,6 @@ export OPENCV_PREFIX = "${STAGING_DIR_TARGET}${prefix}"
ARM_INSTRUCTION_SET_armv4 = "arm"
ARM_INSTRUCTION_SET_armv5 = "arm"
-FILES_${PN}-dev += "${libdir}/gstreamer-${LIBV}/include/gst/gl/gstglconfig.h"
FILES_${PN}-freeverb += "${datadir}/gstreamer-${LIBV}/presets/GstFreeverb.prs"
FILES_${PN}-opencv += "${datadir}/gst-plugins-bad/${LIBV}/opencv*"
FILES_${PN}-voamrwbenc += "${datadir}/gstreamer-${LIBV}/presets/GstVoAmrwbEnc.prs"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 4/6] gstreamer1.0-vaapi: Remove unnecessary FILESPATH modification
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 2/6] gstreamer1.0-plugin-good: " Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 3/6] gstreamer1.0-plugin-bad: " Carlos Rafael Giani
@ 2018-07-21 8:20 ` Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 5/6] gstreamer1.0-vaapi: Add patch for EGL CFLAGS for proper EGL support Carlos Rafael Giani
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb | 1 -
1 file changed, 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
index 906dc6e6c4..e647458fab 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
@@ -4,7 +4,6 @@ based plugins for GStreamer and helper libraries: `vaapidecode', \
`vaapiconvert', and `vaapisink'."
REALPN = "gstreamer-vaapi"
-FILESPATH = "${@base_set_filespath(["${FILE_DIRNAME}/${REALPN}", "${FILE_DIRNAME}/${REALPN}"], d)}"
LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 5/6] gstreamer1.0-vaapi: Add patch for EGL CFLAGS for proper EGL support
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
` (2 preceding siblings ...)
2018-07-21 8:20 ` [PATCH v3 4/6] gstreamer1.0-vaapi: Remove unnecessary FILESPATH modification Carlos Rafael Giani
@ 2018-07-21 8:20 ` Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 6/6] gstreamer1.0-libav: Replace German umlaut to avoid parsing problems Carlos Rafael Giani
2018-07-21 8:32 ` ✗ patchtest: failure for "[v3] gstreamer1.0-plugin-base:..." and 5 more Patchwork
5 siblings, 0 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
...le.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch | 33 +++++++++++++++++++
.../gstreamer/gstreamer1.0-vaapi_1.14.1.bb | 1 +
2 files changed, 34 insertions(+)
create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch
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
new file mode 100644
index 0000000000..d7b8984953
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi/0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch
@@ -0,0 +1,33 @@
+From 5403a89e6a7ac72a23e0221075c0c19b5f85a021 Mon Sep 17 00:00:00 2001
+From: Fabio Berton <fabio.berton@ossystems.com.br>
+Date: Wed, 13 Jun 2018 09:09:25 -0300
+Subject: [PATCH] gst/vaapi/Makefile.am: Add EGL_CFLAGS to libgstvaapi CFLAGS
+Organization: O.S. Systems Software LTDA.
+
+We need this to pass correctly EGL CFLAGS when building with EGL support.
+
+Upstream-Status: Pending
+
+Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
+---
+ gst/vaapi/Makefile.am | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gst/vaapi/Makefile.am b/gst/vaapi/Makefile.am
+index b299ac98..d6cab71f 100644
+--- a/gst/vaapi/Makefile.am
++++ b/gst/vaapi/Makefile.am
+@@ -24,6 +24,10 @@ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-glx.la
+ endif
+
+ if USE_EGL
++libgstvaapi_CFLAGS += \
++ $(EGL_CFLAGS) \
++ $(NULL)
++
+ libgstvaapi_LIBS += $(top_builddir)/gst-libs/gst/vaapi/libgstvaapi-egl.la
+ endif
+
+--
+2.17.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
index e647458fab..63290326a5 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-vaapi_1.14.1.bb
@@ -9,6 +9,7 @@ LICENSE = "LGPLv2.1+"
LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
SRC_URI = "https://gstreamer.freedesktop.org/src/${REALPN}/${REALPN}-${PV}.tar.xz \
+ file://0001-gst-vaapi-Makefile.am-Add-EGL_CFLAGS-to-libgstvaapi-.patch \
"
SRC_URI[md5sum] = "38c5b2390797b7a0a269a5ab6c8cbe8f"
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v3 6/6] gstreamer1.0-libav: Replace German umlaut to avoid parsing problems
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
` (3 preceding siblings ...)
2018-07-21 8:20 ` [PATCH v3 5/6] gstreamer1.0-vaapi: Add patch for EGL CFLAGS for proper EGL support Carlos Rafael Giani
@ 2018-07-21 8:20 ` Carlos Rafael Giani
2018-07-21 8:32 ` ✗ patchtest: failure for "[v3] gstreamer1.0-plugin-base:..." and 5 more Patchwork
5 siblings, 0 replies; 7+ messages in thread
From: Carlos Rafael Giani @ 2018-07-21 8:20 UTC (permalink / raw)
To: openembedded-core
The umlaut can cause issues related to encoding; avoid by replacing it
Signed-off-by: Carlos Rafael Giani <dv@pseudoterminal.org>
---
.../workaround-to-build-gst-libav-for-i586-with-gcc.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
index 36abf8607e..5355480aa4 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-libav/workaround-to-build-gst-libav-for-i586-with-gcc.patch
@@ -1,5 +1,5 @@
Description: Workaround to build libav for i586 with gcc 4.9.2 by avoiding memset
-Author: Bernhard Übelacker <bernhardu@vr-web.de>
+Author: Bernhard Uebelacker <bernhardu@vr-web.de>
---
Bug-Debian: https://bugs.debian.org/783082
--
2.17.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* ✗ patchtest: failure for "[v3] gstreamer1.0-plugin-base:..." and 5 more
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
` (4 preceding siblings ...)
2018-07-21 8:20 ` [PATCH v3 6/6] gstreamer1.0-libav: Replace German umlaut to avoid parsing problems Carlos Rafael Giani
@ 2018-07-21 8:32 ` Patchwork
5 siblings, 0 replies; 7+ messages in thread
From: Patchwork @ 2018-07-21 8:32 UTC (permalink / raw)
To: Carlos Rafael Giani; +Cc: openembedded-core
== Series Details ==
Series: "[v3] gstreamer1.0-plugin-base:..." and 5 more
Revision: 1
URL : https://patchwork.openembedded.org/series/13139/
State : failure
== Summary ==
Thank you for submitting this patch series to OpenEmbedded Core. This is
an automated response. Several tests have been executed on the proposed
series by patchtest resulting in the following failures:
* Issue Series does not apply on top of target branch [test_series_merge_on_head]
Suggested fix Rebase your series on top of targeted branch
Targeted branch master (currently at ff0b682b80)
* Patch [v3,3/6] gstreamer1.0-plugin-bad: Update packageconfigs
Issue Patch is missing Signed-off-by [test_signed_off_by_presence]
Suggested fix Sign off the patch (either manually or with "git commit --amend -s")
* Issue A patch file has been added, but does not have a Signed-off-by tag [test_signed_off_by_presence]
Suggested fix Sign off the added patch file (meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base/0010-gl-Add-switch-for-explicitely-enabling-disabling-GBM.patch)
If you believe any of these test results are incorrect, please reply to the
mailing list (openembedded-core@lists.openembedded.org) raising your concerns.
Otherwise we would appreciate you correcting the issues and submitting a new
version of the patchset if applicable. Please ensure you add/increment the
version number when sending the new version (i.e. [PATCH] -> [PATCH v2] ->
[PATCH v3] -> ...).
---
Guidelines: https://www.openembedded.org/wiki/Commit_Patch_Message_Guidelines
Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest
Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-07-21 8:32 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-07-21 8:20 [PATCH v3 1/6] gstreamer1.0-plugin-base: Update packageconfigs Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 2/6] gstreamer1.0-plugin-good: " Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 3/6] gstreamer1.0-plugin-bad: " Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 4/6] gstreamer1.0-vaapi: Remove unnecessary FILESPATH modification Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 5/6] gstreamer1.0-vaapi: Add patch for EGL CFLAGS for proper EGL support Carlos Rafael Giani
2018-07-21 8:20 ` [PATCH v3 6/6] gstreamer1.0-libav: Replace German umlaut to avoid parsing problems Carlos Rafael Giani
2018-07-21 8:32 ` ✗ patchtest: failure for "[v3] gstreamer1.0-plugin-base:..." and 5 more Patchwork
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox