gstreamer1.0: musl fixes + updates for git recipes

PATCH Superseded Andre McCurdy 3 participants 10 messages Feb 4, 2016 – Feb 5, 2016

Share & tools

Andre McCurdy

author

2016-02-04 23:04 UTC #0 lore raw

cover gstreamer1.0: musl fixes + updates for git recipes

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

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-04 23:04 UTC #1 lore raw

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

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

Signed-off-by Andre McCurdy <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb | 3 +++
 1 file changed, 3 insertions(+)

meta/recipes-multimedia/gstreamer/gstreamer1.0_git.bb +3 -0

index 4fff533..77653af 100644
@@ -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
 }

Signature · 1 line

1.9.1

Burton, Ross

2016-02-05 15:55 UTC #2 lore raw

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

Quoted 2 lines · Andre McCurdy

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

Are these not required for the versioned recipes?

Ross

Andre McCurdy

author

2016-02-05 19:46 UTC #3 lore raw

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

Quoted 6 lines · Ross

Quoted 2 lines · Andre McCurdy
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.

Quoted 1 line

Ross

Andre McCurdy

author

2016-02-04 23:04 UTC #4 lore raw

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

In reply to Andre McCurdy

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

Signed-off-by Andre McCurdy <[email protected]>

---
 .../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

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good/avoid-including-sys-poll.h-directly.patch new file +44 -0

new file mode 100644
index 0000000..c7f3630
@@ -0,0 +1,44 @@
+From 4bfe2c8570a4a7080ec662504882969054d8a072 Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <[email protected]>
+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 <[email protected]>
+---
+ 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
+

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_git.bb +1 -0

index 5f36f49..915be73 100644
@@ -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}"

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-04 23:04 UTC #5 lore raw

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

In reply to Andre McCurdy

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

Signed-off-by Andre McCurdy <[email protected]>

---
 .../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

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad/avoid-including-sys-poll.h-directly.patch new file +30 -0

new file mode 100644
index 0000000..357fd78
@@ -0,0 +1,30 @@
+From 72561a0fca562d03567ace7b4cfc94992cd6525c Mon Sep 17 00:00:00 2001
+From: Andre McCurdy <[email protected]>
+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 <[email protected]>
+---
+ 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
+

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_git.bb +1 -0

index 99690a3..0ebf622 100644
@@ -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}"

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-04 23:04 UTC #6 lore raw

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

In reply to 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 <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +5 -1

index 8ac3a7b..956b24a 100644
@@ -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
 }

Signature · 1 line

1.9.1

Andre McCurdy

author

2016-02-04 23:04 UTC #7 lore raw

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

In reply to 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 <[email protected]>

---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
 1 file changed, 5 insertions(+)

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +5 -0

index 956b24a..06afb04 100644
@@ -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

Signature · 1 line

1.9.1

Martin Jansa

2016-02-05 14:52 UTC #8 lore raw

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

Quoted 14 lines · 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 <[email protected]>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +0 -0
index 956b24a..06afb04 100644

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb SRCREV_FORMAT = "base" · line 26

Quoted 7 lines

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +4 -0

@@ -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.

Quoted 11 lines

meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +0 -0

 do_configure_prepend() {
 
 	# Temp solution for git snapshot: relax version checks so we can build against GStreamer 1.7.1

Signature · 7 lines

1.9.1

-- 
_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Andre McCurdy

author

2016-02-05 19:52 UTC #9 lore raw

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

Quoted 27 lines · Martin Jansa

Quoted 14 lines · 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 <[email protected]>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb | 5 +++++
 1 file changed, 5 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +0 -0
index 956b24a..06afb04 100644
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb SRCREV_FORMAT = "base" · line 26
Quoted 7 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +4 -0
@@ -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

Quoted 3 lines

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.

Quoted 14 lines

Quoted 11 lines
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_git.bb +0 -1
 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
[email protected]
http://lists.openembedded.org/mailman/listinfo/openembedded-core
--
Martin 'JaMa' Jansa jabber: [email protected]