[PATCH 0/5] gstreamer1.0: musl fixes + updates for git recipes

[PATCH 0/5] gstreamer1.0: musl fixes + updates for git recipes

[Andre McCurdy]

Andre McCurdy (5):
  gstreamer1.0_git: avoid including <sys/poll.h> directly
  gstreamer1.0-plugins-good_git: avoid including <sys/poll.h> directly
  gstreamer1.0-plugins-bad_git: avoid including <sys/poll.h> directly
  gstreamer1.0-plugins-base_git: update to git master 1.7.1-79-g6414289
  gstreamer1.0-plugins-base_git: drop obsolete dependency on freetype

 .../avoid-including-sys-poll.h-directly.patch      | 30 +++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |  1 +
 .../gstreamer/gstreamer1.0-plugins-base_git.bb     | 11 +++++-
 .../avoid-including-sys-poll.h-directly.patch      | 44 ++++++++++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  1 +
 .../gstreamer/gstreamer1.0_git.bb                  |  3 ++
 6 files changed, 89 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch

-- 
1.9.1

[PATCH 1/5] gstreamer1.0_git: avoid including <sys/poll.h> directly

[Andre McCurdy]

musl libc generates warnings if <sys/poll.h> is included directly.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
index 4fff533..77653af 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb
@@ -18,6 +18,9 @@ SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
+# musl libc generates warnings if <sys/poll.h> is included directly
+CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no"
+
 do_configure_prepend() {
 	${S}/autogen.sh --noconfigure
 }
-- 
1.9.1

[PATCH 2/5] gstreamer1.0-plugins-good_git: avoid including <sys/poll.h> directly

[Andre McCurdy]

musl libc generates warnings if <sys/poll.h> is included directly.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../avoid-including-sys-poll.h-directly.patch      | 44 ++++++++++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  1 +
 2 files changed, 45 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch
new file mode 100644
index 0000000..c7f3630
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch
@@ -0,0 +1,44 @@
+From 4bfe2c8570a4a7080ec662504882969054d8a072 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <armccurdy@gmail.com>
+Date: Wed, 3 Feb 2016 18:12:38 -0800
+Subject: [PATCH] avoid including <sys/poll.h> directly
+
+musl libc generates warnings if <sys/poll.h> is included directly.
+
+Upstream-Status: Pending
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+---
+ ext/raw1394/gstdv1394src.c  | 2 +-
+ ext/raw1394/gsthdv1394src.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c
+index dbc7607..3c42b41 100644
+--- a/ext/raw1394/gstdv1394src.c
++++ b/ext/raw1394/gstdv1394src.c
+@@ -37,7 +37,7 @@
+ #include "config.h"
+ #endif
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <errno.h>
+ #include <fcntl.h>
+diff --git a/ext/raw1394/gsthdv1394src.c b/ext/raw1394/gsthdv1394src.c
+index 0b07a37..9785a15 100644
+--- a/ext/raw1394/gsthdv1394src.c
++++ b/ext/raw1394/gsthdv1394src.c
+@@ -36,7 +36,7 @@
+ #include "config.h"
+ #endif
+ #include <unistd.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/socket.h>
+ #include <errno.h>
+ #include <fcntl.h>
+-- 
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
index 5f36f49..915be73 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb
@@ -10,6 +10,7 @@ SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/gst-plugins-good;name=base \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
     file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
+    file://avoid-including-sys-poll.h-directly.patch \
 "
 
 PV = "1.7.1+git${SRCPV}"
-- 
1.9.1

[PATCH 3/5] gstreamer1.0-plugins-bad_git: avoid including <sys/poll.h> directly

[Andre McCurdy]

musl libc generates warnings if <sys/poll.h> is included directly.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 .../avoid-including-sys-poll.h-directly.patch      | 30 ++++++++++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |  1 +
 2 files changed, 31 insertions(+)
 create mode 100644 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
new file mode 100644
index 0000000..357fd78
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch
@@ -0,0 +1,30 @@
+From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <armccurdy@gmail.com>
+Date: Wed, 3 Feb 2016 18:05:41 -0800
+Subject: [PATCH] avoid including <sys/poll.h> directly
+
+musl libc generates warnings if <sys/poll.h> is included directly.
+
+Upstream-Status: Pending
+
+Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
+---
+ sys/dvb/gstdvbsrc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sys/dvb/gstdvbsrc.c b/sys/dvb/gstdvbsrc.c
+index b93255f..49f145a 100644
+--- a/sys/dvb/gstdvbsrc.c
++++ b/sys/dvb/gstdvbsrc.c
+@@ -93,7 +93,7 @@
+ #include <gst/gst.h>
+ #include <gst/glib-compat-private.h>
+ #include <sys/ioctl.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <stdio.h>
+-- 
+1.9.1
+
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
index 99690a3..0ebf622 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb
@@ -12,6 +12,7 @@ SRC_URI = " \
     git://anongit.freedesktop.org/gstreamer/common;destsuffix=git/common;name=common \
     file://configure-allow-to-disable-libssh2.patch \
     file://fix-maybe-uninitialized-warnings-when-compiling-with-Os.patch \
+    file://avoid-including-sys-poll.h-directly.patch \
 "
 
 PV = "1.7.1+git${SRCPV}"
-- 
1.9.1

[PATCH 4/5] gstreamer1.0-plugins-base_git: update to git master 1.7.1-79-g6414289

[Andre McCurdy]

Includes an important fix for:

  https://bugzilla.gnome.org/show_bug.cgi?id=760938

The fix is not a simple backport to 1.7.1, so just update to latest
version from the current git master branch.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
index 8ac3a7b..956b24a 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -14,12 +14,16 @@ SRC_URI = " \
 
 PV = "1.7.1+git${SRCPV}"
 
-SRCREV_base = "5f98203bd753c32666c8fa7a2fde6d186c2a4247"
+SRCREV_base = "641428966e09d16b0a46540040f2faf3791eb7c9"
 SRCREV_common = "86e46630ed8af8d94796859db550a9c3d89c9f65"
 SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
 do_configure_prepend() {
+
+	# Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1
+	sed 's/^GST_REQ=1\.7\.1\.1/GST_REQ=1.7.1/' -i ${S}/configure.ac
+
 	${S}/autogen.sh --noconfigure
 }
-- 
1.9.1

[PATCH 5/5] gstreamer1.0-plugins-base_git: drop obsolete dependency on freetype

[Andre McCurdy]

The dependency on freetype was dropped shortly after the 1.7.1 release

  http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
index 956b24a..06afb04 100644
--- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
+++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
@@ -20,6 +20,11 @@ SRCREV_FORMAT = "base"
 
 S = "${WORKDIR}/git"
 
+# The dependency on freetype was dropped shortly after the 1.7.1 release
+# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
+DEPENDS_remove = "freetype"
+EXTRA_OECONF_remove = "--disable-freetypetest"
+
 do_configure_prepend() {
 
 	# Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1
-- 
1.9.1

Re: [PATCH 5/5] gstreamer1.0-plugins-base_git: drop obsolete dependency on freetype

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1860 bytes --]

On Thu, Feb 04, 2016 at 03:04:18PM -0800, Andre McCurdy wrote:
> The dependency on freetype was dropped shortly after the 1.7.1 release
> 
>   http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
> 
> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
> ---
>  meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
> index 956b24a..06afb04 100644
> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
> @@ -20,6 +20,11 @@ SRCREV_FORMAT = "base"
>  
>  S = "${WORKDIR}/git"
>  
> +# The dependency on freetype was dropped shortly after the 1.7.1 release
> +# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
> +DEPENDS_remove = "freetype"
> +EXTRA_OECONF_remove = "--disable-freetypetest"

Please remove both in:
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
and add them only to 1.6*bb recipe

If you keep the comment like this, then there is small change that the next
time the automated package upgrade will bump the main recipe, someone
will notice and remove this.

>  do_configure_prepend() {
>  
>  	# Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1
> -- 
> 1.9.1
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [PATCH 1/5] gstreamer1.0_git: avoid including <sys/poll.h> directly

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 209 bytes --]

On 4 February 2016 at 23:04, Andre McCurdy <armccurdy@gmail.com> wrote:

> musl libc generates warnings if <sys/poll.h> is included directly.
>

Are these not required for the versioned recipes?

Ross

[-- Attachment #2: Type: text/html, Size: 652 bytes --]

Re: [PATCH 1/5] gstreamer1.0_git: avoid including <sys/poll.h> directly

[Andre McCurdy]

On Fri, Feb 5, 2016 at 7:55 AM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 4 February 2016 at 23:04, Andre McCurdy <armccurdy@gmail.com> wrote:
>>
>> musl libc generates warnings if <sys/poll.h> is included directly.
>
> Are these not required for the versioned recipes?

Official releases of GStreamer don't enable -Werror, so the warnings
are only a problem when building the git versions.

> Ross

Re: [PATCH 5/5] gstreamer1.0-plugins-base_git: drop obsolete dependency on freetype

[Andre McCurdy]

On Fri, Feb 5, 2016 at 6:55 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Thu, Feb 04, 2016 at 03:04:18PM -0800, Andre McCurdy wrote:
>> The dependency on freetype was dropped shortly after the 1.7.1 release
>>
>>   http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
>>
>> Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
>> ---
>>  meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
>> index 956b24a..06afb04 100644
>> --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
>> +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb
>> @@ -20,6 +20,11 @@ SRCREV_FORMAT = "base"
>>
>>  S = "${WORKDIR}/git"
>>
>> +# The dependency on freetype was dropped shortly after the 1.7.1 release
>> +# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
>> +DEPENDS_remove = "freetype"
>> +EXTRA_OECONF_remove = "--disable-freetypetest"
>
> Please remove both in:
> meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc
> and add them only to 1.6*bb recipe
>
> If you keep the comment like this, then there is small change that the next
> time the automated package upgrade will bump the main recipe, someone
> will notice and remove this.

Good point. I'll send a v2.

>>  do_configure_prepend() {
>>
>>       # Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1
>> --
>> 1.9.1
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> --
> Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com