From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by mx.groups.io with SMTP id smtpd.web09.8908.1603093068241942451 for ; Mon, 19 Oct 2020 00:37:49 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="body hash did not verify" header.i=@mailbox.org header.s=mail20150812 header.b=ESKqoP/F; spf=pass (domain: mailbox.org, ip: 80.241.56.171, mailfrom: crg7475@mailbox.org) Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4CF7rn1KhvzQjVN for ; Mon, 19 Oct 2020 09:37:45 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=mailbox.org; h= content-language:content-type:content-type:in-reply-to :mime-version:date:date:message-id:references:subject:subject :from:from:received; s=mail20150812; t=1603093060; bh=zAi3Q8VAxh Zu5dkdkMunGXpyOKp7x6hyHHx/Rkm6O3s=; b=ESKqoP/FIjHdOtmXrF1xRli8k0 U3i4iYs32CtGFL4E1wMxtFC10GPsdb5XUxeQHCeWQoPBkOnHx5a90Qf8PTLxnCeO /1tqG4s+NbpnIuyMD3FEcw4jbfHZvArVM/xYhgGSRANdGpguVXjrJEWeucddpEeJ IaflHEbunXaySZCfZMIIO25eLHHewqV1/ij3sJLq65ZETX6xI4RxmQP4zCn+eIon +YFCXwQeJiYI0a+zFpMOkaNFjbNK0hd6l6wGMWP8gly/ickZv/pPY43XvTI7GWQl l3ojLqqEKknM/yHaGfMOoDoIkxv8St+hLAcay5/i3xwUV8tdE+QkxDwGmMtw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mailbox.org; s=mail20150812; t=1603093063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xi2q0tdYhpbTl0egOUbM3MpM2FPCUBhCpJYsJRj0xcs=; b=AgmWW4EwqINAJQofAJScdUZg9WZ+V2e06L4cjWQeSwre1sn+7NF4Wd/zet7w+kpTipZff4 UgWNitk2V8nZZOYQWgcf2Wu3oF2ML2kcPJN1UAB24dfQDq6IRUtF7LOJbx9aW1nAapAkFE +Sl4YdB/id5QYIlmXbKlHWlsajARvAruzVbQe+5kJJPLxAD+yL6BCH4WvtGknBCVCBYVDF sIkSmbW2wGe7AC6NmDC//FlB92OC/RB4NIJIGfpPbnw+8+Y3ivcnEsrO1Xt47FOTLg/aj1 BAKAON1XT+RWR2stMi4FE4yM/NKw2tzqx3YYH2ayJLU2ANbufRivCJwNs3pHfw== X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter04.heinlein-hosting.de (spamfilter04.heinlein-hosting.de [80.241.56.122]) (amavisd-new, port 10030) with ESMTP id jFEG0lEhGPhg for ; Mon, 19 Oct 2020 09:37:40 +0200 (CEST) From: "Carlos Rafael Giani" Subject: Re: [OE-core] [PATCH v3 05/20] gstreamer1.0-plugins-good: upgrade to version 1.18.0 To: openembedded-core@lists.openembedded.org References: <20201018121002.1417335-1-quaresma.jose@gmail.com> <20201018121002.1417335-6-quaresma.jose@gmail.com> Message-ID: Date: Mon, 19 Oct 2020 09:37:39 +0200 MIME-Version: 1.0 In-Reply-To: <20201018121002.1417335-6-quaresma.jose@gmail.com> X-MBO-SPAM-Probability: X-Rspamd-Score: -7.07 / 15.00 / 15.00 X-Rspamd-Queue-Id: D0D9717DF X-Rspamd-UID: 6d4f8b Content-Type: multipart/alternative; boundary="------------442E6E47EEA078196EA3859A" Content-Language: en-US --------------442E6E47EEA078196EA3859A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable The code in ext/qt/meson.build looks for the Qt5WaylandClient pkg-config=20 file. Without this module, qmlglsink will not work with Wayland. This=20 can be tested by checking whether or not HAVE_QT_WAYLAND has been added=20 to the cflags in the autogenerated ninja file. I propose this change to fix the problem: --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.b= b +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.b= b @@ -28,6 +28,8 @@ X11DEPENDS =3D "virtual/libx11 libsm libxrender=20 libxfixes libxdamage" =C2=A0X11ENABLEOPTS =3D "-Dximagesrc=3Denabled -Dximagesrc-xshm=3Denabled= = =20 -Dximagesrc-xfixes=3Denabled -Dximagesrc-xdamage=3Denabled" =C2=A0X11DISABLEOPTS =3D "-Dximagesrc=3Ddisabled -Dximagesrc-xshm=3Ddisab= led=20 -Dximagesrc-xfixes=3Ddisabled -Dximagesrc-xdamage=3Ddisabled" +QT5WAYLANDDEPENDS =3D "${@bb.utils.contains("DISTRO_FEATURES", "wayland",= = =20 "qtwayland", "", d)}" + =C2=A0PACKAGECONFIG[asm]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-= Dasm=3Denabled,-Dasm=3Ddisabled,nasm" =C2=A0PACKAGECONFIG[bz2]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-= Dbz2=3Denabled,-Dbz2=3Ddisabled,bzip2" =C2=A0PACKAGECONFIG[cairo]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dcairo=3De= nabled,-Dcairo=3Ddisabled,cairo" @@ -43,7 +45,7 @@ PACKAGECONFIG[libpng]=C2=A0=C2=A0=C2=A0=C2=A0 =3D=20 "-Dpng=3Denabled,-Dpng=3Ddisabled,libpng" =C2=A0PACKAGECONFIG[libv4l2]=C2=A0=C2=A0=C2=A0 =3D=20 "-Dv4l2-libv4l2=3Denabled,-Dv4l2-libv4l2=3Ddisabled,v4l-utils" =C2=A0PACKAGECONFIG[mpg123]=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dmpg123=3Denabl= ed,-Dmpg123=3Ddisabled,mpg123" =C2=A0PACKAGECONFIG[pulseaudio] =3D "-Dpulse=3Denabled,-Dpulse=3Ddisabled= ,pulseaudio" -PACKAGECONFIG[qt5]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dqt5= =3Denabled,-Dqt5=3Ddisabled,qtbase=20 qtdeclarative qtbase-native" +PACKAGECONFIG[qt5]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dqt5= =3Denabled,-Dqt5=3Ddisabled,qtbase=20 qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}" =C2=A0PACKAGECONFIG[soup]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dsoup= = =3Denabled,-Dsoup=3Ddisabled,libsoup-2.4" =C2=A0PACKAGECONFIG[speex]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dspeex=3De= nabled,-Dspeex=3Ddisabled,speex" =C2=A0PACKAGECONFIG[taglib]=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dtaglib=3Denabl= ed,-Dtaglib=3Ddisabled,taglib" On 18.10.20 14:09, Jose Quaresma wrote: > * 0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch > Removed since these are included in 1.18.0 > > License-Update: removefile://common/coverage/coverage-report.pl > Upstream dont have it any more. > > Signed-off-by: Jose Quaresma > --- > ...defines-GLsync-to-fix-compile-on-som.patch | 70 ------------------- > ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch | 8 +-- > ...bb =3D> gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++-- > 3 files changed, 10 insertions(+), 82 deletions(-) > delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plug= ins-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch > rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.= 16.2.bb =3D> gstreamer1.0-plugins-good_1.18.0.bb} (84%) > > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good= /0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch b/meta/rec= ipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlgl-ensure-Qt-de= fines-GLsync-to-fix-compile-on-som.patch > deleted file mode 100644 > index 136848763b..0000000000 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-q= mlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch > +++ /dev/null > @@ -1,70 +0,0 @@ > -From 3e0d5577444b32579bdf5b69d720a322322ff7bc Mon Sep 17 00:00:00 2001 > -From: Milian Wolff > -Date: Tue, 26 Nov 2019 15:08:20 +0100 > -Subject: [PATCH] qmlgl: ensure Qt defines GLsync to fix compile on some= platforms > -MIME-Version: 1.0 > -Content-Type: text/plain; charset=3DUTF-8 > -Content-Transfer-Encoding: 8bit > - > -By explictly including QtGui/qopengl.h we force the code path that > -defines GLsync in the Qt-specific way. Without that, some platforms > -failed to compile the qmlgl plugin, since neither Qt nor gstreamer > -defined GLsync then, leading to e.g.: > - > -``` > -make[4]: Entering directory '/.../gst-plugins-good-1.16.1/ext/qt' > - CXX libgstqmlgl_la-qtitem.lo > -In file included from gstqtgl.h:32, > - from qtitem.h:27, > - from qtitem.cc:28: > -/.../usr/include/gstreamer-1.0/ > -gst/gl/gstglfuncs.h:93:17: error: expected identifier before =E2=80=98*= = =E2=80=99 token > - ret (GSTGLAPI *name) args; > - ^ > -/.../usr/include/gstreamer-1.0/ > -gst/gl/glprototypes/sync.h:27:1: note: in expansion of macro > -=E2=80=98GST_GL_EXT_FUNCTION=E2=80=99 > - GST_GL_EXT_FUNCTION (GLsync, FenceSync, > - ^~~~~~~~~~~~~~~~~~~ > -``` > -Signed-off-by: Khem Raj > -Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst= -plugins-good/commit/3e0d5577444b32579bdf5b69d720a322322ff7bc] > ---- > - ext/qt/gstqtgl.h | 18 +++++++++++------- > - 1 file changed, 11 insertions(+), 7 deletions(-) > - > ---- a/ext/qt/gstqtgl.h > -+++ b/ext/qt/gstqtgl.h > -@@ -22,14 +22,7 @@ > - #include > - #endif > - > --/* qt uses the same trick as us to typedef GLsync on GLES2 but to a di= fferent > -- * type which confuses the preprocessor. Instead of trying to reconcil= e the > -- * two, we instead use the GLsync definition from Qt from above, and e= nsure > -- * that we don't typedef GLsync in gstglfuncs.h */ > - #include > --#undef GST_GL_HAVE_GLSYNC > --#define GST_GL_HAVE_GLSYNC 1 > --#include > - > - /* The glext.h guard was renamed in 2018, but some software which > - * includes their own copy of the GL headers (such as qt) might have > -@@ -46,6 +39,17 @@ > - #endif > - #endif > - > -+/* pulls in GLsync, see below */ > -+#include > -+ > -+/* qt uses the same trick as us to typedef GLsync on GLES2 but to a di= fferent > -+ * type which confuses the preprocessor. Instead of trying to reconcil= e the > -+ * two, we instead use the GLsync definition from Qt from above, and e= nsure > -+ * that we don't typedef GLsync in gstglfuncs.h */ > -+#undef GST_GL_HAVE_GLSYNC > -+#define GST_GL_HAVE_GLSYNC 1 > -+#include > -+ > - #if defined(QT_OPENGL_ES_2) > - #include > - #include > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good= /0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/rec= ipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-= gstqtgl.h-instead-of-gst-gl-gstglf.patch > index 3d423154e0..788d752058 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-q= t-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-q= t-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch > @@ -1,4 +1,4 @@ > -From d08234a659bec1fd5c984fedefbeb8192af07839 Mon Sep 17 00:00:00 2001 > +From bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001 > From: Khem Raj > Date: Tue, 31 Mar 2020 21:23:28 -0700 > Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglf= uncs.h > @@ -26,7 +26,7 @@ Signed-off-by: Khem Raj > 2 files changed, 2 insertions(+), 2 deletions(-) > =20 > diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc > -index 2b314e0..12b15dd 100644 > +index a05d26e..4cc9fc6 100644 > --- a/ext/qt/gstqsgtexture.cc > +++ b/ext/qt/gstqsgtexture.cc > @@ -27,7 +27,7 @@ > @@ -39,7 +39,7 @@ index 2b314e0..12b15dd 100644 > > #define GST_CAT_DEFAULT gst_qsg_texture_debug > diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc > -index 62d26b6..bf68ebb 100644 > +index 9360c33..0dfd3f1 100644 > --- a/ext/qt/qtwindow.cc > +++ b/ext/qt/qtwindow.cc > @@ -25,7 +25,7 @@ > @@ -52,5 +52,5 @@ index 62d26b6..bf68ebb 100644 > #include "gstqsgtexture.h" > #include "gstqtglutility.h" > -- > -2.26.0 > +2.28.0 > =20 > diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good= _1.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.= 18.0.bb > similarity index 84% > rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_= 1.16.2.bb > rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.= 18.0.bb > index 17c9421394..c112f336b2 100644 > --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2= .bb > +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0= .bb > @@ -1,19 +1,16 @@ > require gstreamer1.0-plugins-common.inc > =20 > -SRC_URI =3D " \ > -https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good= -${PV}.tar.xz \ > -file://0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch = \ > -file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch = \ > - " > +SRC_URI =3D"https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-= plugins-good-${PV}.tar.xz=20 > \ +=20 > file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch= =20 > \ + " > =20 > -SRC_URI[md5sum] =3D "bd025f8f14974f94b75ac69a9d1b9c93" > -SRC_URI[sha256sum] =3D "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e= 97ac3f9b0171b1319" > +SRC_URI[md5sum] =3D "c437bf42bf830bc0f482c7d088fb37a5" > +SRC_URI[sha256sum] =3D "6329bc377a3afea5cf1ab329a91cc4a906f075781780d1e= dc59e8bea8c1a8bac" > =20 > S =3D "${WORKDIR}/gst-plugins-good-${PV}" > =20 > LICENSE =3D "GPLv2+ & LGPLv2.1+" > LIC_FILES_CHKSUM =3D"file://COPYING;md5=3Da6f89e2100d9b6cdffcea4f398e3= 7343 \ -=20 > file://common/coverage/coverage-report.pl;beginline=3D2;endline=3D17;md5= = =3Da4e1830fce078028c8f0974161272607=20 > \=20 > file://gst/replaygain/rganalysis.c;beginline=3D1;endline=3D23;md5=3Db60e= befd5b2f5a8e0cab6bfee391a5fe" > =20 > DEPENDS +=3D "gstreamer1.0-plugins-base libcap zlib" > @@ -54,6 +51,7 @@ PACKAGECONFIG[wavpack] =3D "-Dwavpack=3Denabled,-Dw= avpack=3Ddisabled,wavpack" > PACKAGECONFIG[x11] =3D "${X11ENABLEOPTS},${X11DISABLEOPTS},${X1= 1DEPENDS}" > =20 > EXTRA_OEMESON +=3D " \ > + -Ddoc=3Ddisabled \ > -Daalib=3Ddisabled \ > -Ddirectsound=3Ddisabled \ > -Ddv=3Ddisabled \ > >=20 > --------------442E6E47EEA078196EA3859A Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable

The code in ext/qt/meson.build looks for the Qt5WaylandClient pkg-config file. Without this module, qmlglsink will not work with Wayland. This can be tested by checking whether or not HAVE_QT_WAYLAND has been added to the cflags in the autogenerated ninja file.

I propose this change to fix the problem:

--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0= .bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0= .bb
@@ -28,6 +28,8 @@ X11DEPENDS =3D "virtual/libx11 libsm libxrender libxfixes libxdamage"
=C2=A0X11ENABLEOPTS =3D "-Dximagesrc=3Denabled -Dximagesrc-xshm=3Den= abled -Dximagesrc-xfixes=3Denabled -Dximagesrc-xdamage=3Denabled"
=C2=A0X11DISABLEOPTS =3D "-Dximagesrc=3Ddisabled -Dximagesrc-xshm=3D= disabled -Dximagesrc-xfixes=3Ddisabled -Dximagesrc-xdamage=3Ddisabled"
=C2=A0
+QT5WAYLANDDEPENDS =3D "${@bb.utils.contains("D= ISTRO_FEATURES", "wayland", "qtwayland", "", d)}"
+
=C2=A0PACKAGECONFIG[asm]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = =3D "-Dasm=3Denabled,-Dasm=3Ddisabled,nasm"
=C2=A0PACKAGECONFIG[bz2]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 = =3D "-Dbz2=3Denabled,-Dbz2=3Ddisabled,bzip2"
=C2=A0PACKAGECONFIG[cairo]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dcairo=3Denabled,-Dcairo=3Ddisabled,cairo"
@@ -43,7 +45,7 @@ PACKAGECONFIG[libpng]=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dpng=3Denabled,-Dpng=3Ddisabled,libpng"
=C2=A0PACKAGECONFIG[libv4l2]=C2=A0=C2=A0=C2=A0 =3D "-Dv4l2-libv4l2=3Denabled,-Dv4l2-libv4l2=3Ddisabled,v4l-utils"
=C2=A0PACKAGECONFIG[mpg123]=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dmpg123=3Denabled,-Dmpg123=3Ddisabled,mpg123"
=C2=A0PACKAGECONFIG[pulseaudio] =3D "-Dpulse=3Denabled,-Dpulse=3Ddisabled,pulseaudio"
-PACKAGECONFIG[qt5]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-= Dqt5=3Denabled,-Dqt5=3Ddisabled,qtbase qtdeclarative qtbase-native"
+PACKAGECONFIG[qt5]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-= Dqt5=3Denabled,-Dqt5=3Ddisabled,qtbase qtdeclarative qtbase-native ${QT5WAYLANDDEPENDS}"
=C2=A0PACKAGECONFIG[soup]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dsoup=3Denabled,-Dsoup=3Ddisabled,libsoup-2.4"
=C2=A0PACKAGECONFIG[speex]=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dspeex=3Denabled,-Dspeex=3Ddisabled,speex"
=C2=A0PACKAGECONFIG[taglib]=C2=A0=C2=A0=C2=A0=C2=A0 =3D "-Dtaglib=3Denabled,-Dtaglib=3Ddisabled,taglib"


On 18.10.20 14:09, Jose Quaresma wrote:= 
    * 0001-qmlgl-ensure-Qt-de=
fines-GLsync-to-fix-compile-on-som.patch
      Removed since these are included in 1.18.0

License-Update: remove file://common/coverage/coverage-report.p=
l
Upstream dont have it any more.

Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com>
---
 ...defines-GLsync-to-fix-compile-on-som.patch | 70 -------------------
 ...t-gstqtgl.h-instead-of-gst-gl-gstglf.patch |  8 +--
 ...bb =3D> gstreamer1.0-plugins-good_1.18.0.bb} | 14 ++--
 3 files changed, 10 insertions(+), 82 deletions(-)
 delete mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins=
-good/0001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
 rename meta/recipes-multimedia/gstreamer/{gstreamer1.0-plugins-good_1.16.=
2.bb =3D> gstreamer1.0-plugins-good_1.18.0.bb} (84%)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0=
001-qmlgl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch b/meta/recip=
es-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qmlgl-ensure-Qt-defi=
nes-GLsync-to-fix-compile-on-som.patch
deleted file mode 100644
index 136848763b..0000000000
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qml=
gl-ensure-Qt-defines-GLsync-to-fix-compile-on-som.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 3e0d5577444b32579bdf5b69d720a322322ff7bc Mon Sep 17 00:00:00 2001
-From: Milian Wolff <milian.wolff@kdab.com>
-Date: Tue, 26 Nov 2019 15:08:20 +0100
-Subject: [PATCH] qmlgl: ensure Qt defines GLsync to fix compile on some p=
latforms
-MIME-Version: 1.0
-Content-Type: text/plain; charset=3DUTF-8
-Content-Transfer-Encoding: 8bit
-
-By explictly including QtGui/qopengl.h we force the code path that
-defines GLsync in the Qt-specific way. Without that, some platforms
-failed to compile the qmlgl plugin, since neither Qt nor gstreamer
-defined GLsync then, leading to e.g.:
-
-```
-make[4]: Entering directory '/.../gst-plugins-good-1.16.1/ext/qt'
-  CXX      libgstqmlgl_la-qtitem.lo
-In file included from gstqtgl.h:32,
-                 from qtitem.h:27,
-                 from qtitem.cc:28:
-/.../usr/include/gstreamer-1.0/
-gst/gl/gstglfuncs.h:93:17: error: expected identifier before =E2=80=98*=
=E2=80=99 token
-   ret (GSTGLAPI *name) args;
-                 ^
-/.../usr/include/gstreamer-1.0/
-gst/gl/glprototypes/sync.h:27:1: note: in expansion of macro
-=E2=80=98GST_GL_EXT_FUNCTION=E2=80=99
- GST_GL_EXT_FUNCTION (GLsync, FenceSync,
- ^~~~~~~~~~~~~~~~~~~
-```
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-Status: Backport [https://gitlab.freedesktop.org/gstreamer/gst-p=
lugins-good/commit/3e0d5577444b32579bdf5b69d720a322322ff7bc]
----
- ext/qt/gstqtgl.h | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
---- a/ext/qt/gstqtgl.h
-+++ b/ext/qt/gstqtgl.h
-@@ -22,14 +22,7 @@
- #include <QtGui/qtgui-config.h>
- #endif
-=20
--/* qt uses the same trick as us to typedef GLsync on GLES2 but to a diff=
erent
-- * type which confuses the preprocessor. Instead of trying to reconcile =
the
-- * two, we instead use the GLsync definition from Qt from above, and ens=
ure
-- * that we don't typedef GLsync in gstglfuncs.h */
- #include <gst/gl/gstglconfig.h>
--#undef GST_GL_HAVE_GLSYNC
--#define GST_GL_HAVE_GLSYNC 1
--#include <gst/gl/gstglfuncs.h>
-=20
- /* The glext.h guard was renamed in 2018, but some software which
-  * includes their own copy of the GL headers (such as qt) might have
-@@ -46,6 +39,17 @@
- #endif
- #endif
-=20
-+/* pulls in GLsync, see below */
-+#include <QtGui/qopengl.h>
-+
-+/* qt uses the same trick as us to typedef GLsync on GLES2 but to a diff=
erent
-+ * type which confuses the preprocessor. Instead of trying to reconcile =
the
-+ * two, we instead use the GLsync definition from Qt from above, and ens=
ure
-+ * that we don't typedef GLsync in gstglfuncs.h */
-+#undef GST_GL_HAVE_GLSYNC
-+#define GST_GL_HAVE_GLSYNC 1
-+#include <gst/gl/gstglfuncs.h>
-+
- #if defined(QT_OPENGL_ES_2)
- #include <QtGui/QOpenGLContext>
- #include <QtGui/QOpenGLFunctions>
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0=
001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch b/meta/recip=
es-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-include-ext-qt-gs=
tqtgl.h-instead-of-gst-gl-gstglf.patch
index 3d423154e0..788d752058 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-=
include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/0001-qt-=
include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch
@@ -1,4 +1,4 @@
-From d08234a659bec1fd5c984fedefbeb8192af07839 Mon Sep 17 00:00:00 2001
+From bf8b2fa0f6870589d036f0f33c140a3f85b530a0 Mon Sep 17 00:00:00 2001
 From: Khem Raj <raj.khem@gmail.com>
 Date: Tue, 31 Mar 2020 21:23:28 -0700
 Subject: [PATCH] qt: include ext/qt/gstqtgl.h instead of gst/gl/gstglfunc=
s.h
@@ -26,7 +26,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
  2 files changed, 2 insertions(+), 2 deletions(-)
=20
 diff --git a/ext/qt/gstqsgtexture.cc b/ext/qt/gstqsgtexture.cc
-index 2b314e0..12b15dd 100644
+index a05d26e..4cc9fc6 100644
 --- a/ext/qt/gstqsgtexture.cc
 +++ b/ext/qt/gstqsgtexture.cc
 @@ -27,7 +27,7 @@
@@ -39,7 +39,7 @@ index 2b314e0..12b15dd 100644
  
  #define GST_CAT_DEFAULT gst_qsg_texture_debug
 diff --git a/ext/qt/qtwindow.cc b/ext/qt/qtwindow.cc
-index 62d26b6..bf68ebb 100644
+index 9360c33..0dfd3f1 100644
 --- a/ext/qt/qtwindow.cc
 +++ b/ext/qt/qtwindow.cc
 @@ -25,7 +25,7 @@
@@ -52,5 +52,5 @@ index 62d26b6..bf68ebb 100644
  #include "gstqsgtexture.h"
  #include "gstqtglutility.h"
 --=20
-2.26.0
+2.28.0
=20
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1=
.16.2.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18=
.0.bb
similarity index 84%
rename from meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.=
16.2.bb
rename to meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18=
.0.bb
index 17c9421394..c112f336b2 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.16.2.b=
b
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.18.0.b=
b
@@ -1,19 +1,16 @@
 require gstreamer1.0-plugins-common.inc
=20
-SRC_URI =3D " \
-            https://gstreamer.=
freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.xz \
-            file://0001-qmlgl-ens=
ure-Qt-defines-GLsync-to-fix-compile-on-som.patch \
-            file://0001-qt-includ=
e-ext-qt-gstqtgl.h-instead-of-gst-gl-gstglf.patch \
-            "
+SRC_URI =3D "https:/=
/gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-${PV}.tar.=
xz \
+           file://0001-qt-include-ext-qt-gstqtgl.h-instead-of-gst-gl-gstg=
lf.patch \
+           "
=20
-SRC_URI[md5sum] =3D "bd025f8f14974f94b75ac69a9d1b9c93"
-SRC_URI[sha256sum] =3D "40bb3bafda25c0b739c8fc36e48380fccf61c4d3f83747e97=
ac3f9b0171b1319"
+SRC_URI[md5sum] =3D "c437bf42bf830bc0f482c7d088fb37a5"
+SRC_URI[sha256sum] =3D "6329bc377a3afea5cf1ab329a91cc4a906f075781780d1edc=
59e8bea8c1a8bac"
=20
 S =3D "${WORKDIR}/gst-plugins-good-${PV}"
=20
 LICENSE =3D "GPLv2+ & LGPLv2.1+"
 LIC_FILES_CHKSUM =3D "file://COPYING;md5=3Da6f89e2100d9b6cdffcea4=
f398e37343 \
-                    file://common/coverage/coverage-report.pl;beginline=
=3D2;endline=3D17;md5=3Da4e1830fce078028c8f0974161272607 \
                     file://gst/replaygain/rganalysis.c;beginline=3D1;endl=
ine=3D23;md5=3Db60ebefd5b2f5a8e0cab6bfee391a5fe"
=20
 DEPENDS +=3D "gstreamer1.0-plugins-base libcap zlib"
@@ -54,6 +51,7 @@ PACKAGECONFIG[wavpack]    =3D "-Dwavpack=3Denabled,-Dwav=
pack=3Ddisabled,wavpack"
 PACKAGECONFIG[x11]        =3D "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DE=
PENDS}"
=20
 EXTRA_OEMESON +=3D " \
+    -Ddoc=3Ddisabled \
     -Daalib=3Ddisabled \
     -Ddirectsound=3Ddisabled \
     -Ddv=3Ddisabled \
--------------442E6E47EEA078196EA3859A--