Skip to contentSkip to conversation

gstreamer1.0: musl fixes + updates for git recipes

PATCH New Andre McCurdy 1 participant 6 messages Feb 5, 2016

lore
Share & tools
lore

Andre McCurdy

author
#0 lore raw

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

v2 changes:

- Update comments to clarify why compiler warnings only need to be fixed in git recipes.

- Move gstreamer1.0 fix into gstreamer1.0.inc (ie also apply to the 1.6.3 recipe).

- Move the gstreamer1.0-plugins-base freetype dependency into the 1.6.3 recipe.

Andre McCurdy (5):
gstreamer1.0: 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: move freetype dependency into 1.6.3 recipe

 .../avoid-including-sys-poll.h-directly.patch      | 30 +++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-bad_git.bb      |  1 +
 .../gstreamer/gstreamer1.0-plugins-base.inc        |  3 +-
 .../gstreamer/gstreamer1.0-plugins-base_1.6.3.bb   |  6 +++
 .../gstreamer/gstreamer1.0-plugins-base_git.bb     |  6 ++-
 .../avoid-including-sys-poll.h-directly.patch      | 44 ++++++++++++++++++++++
 .../gstreamer/gstreamer1.0-plugins-good_git.bb     |  1 +
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc |  3 ++
 8 files changed, 91 insertions(+), 3 deletions(-)
 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
author
#1 lore raw

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

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

The warnings only cause problems for the git versions (-Werror is turned off for GStreamer stable releases), but since <sys/poll.h> can be conviently disabled via configure let's avoid it for all versions.

Signed-off-by Andre McCurdy <[email protected]>
---
 meta/recipes-multimedia/gstreamer/gstreamer1.0.inc | 3 +++
 1 file changed, 3 insertions(+)
meta/recipes-multimedia/gstreamer/gstreamer1.0.inc +3 -0
index 218b4b3..662cd1a 100644
@@ -24,6 +24,9 @@ EXTRA_OECONF = " \
 
 CACHED_CONFIGUREVARS += "ac_cv_header_valgrind_valgrind_h=no"
 
+# musl libc generates warnings if <sys/poll.h> is included directly
+CACHED_CONFIGUREVARS += "ac_cv_header_sys_poll_h=no"
+
 PACKAGES += "${PN}-bash-completion"
 
 FILES_${PN} += "${libdir}/gstreamer-1.0/*.so"
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH v2 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.

The warnings only cause problems for the git versions (-Werror is turned off for GStreamer stable releases).

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
author
#3 lore raw

PATCH v2 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.

The warnings only cause problems for the git versions (-Werror is turned off for GStreamer stable releases).

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
author
#4 lore raw

PATCH v2 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
author
#5 lore raw

PATCH v2 5/5 gstreamer1.0-plugins-base: move freetype dependency into 1.6.3 recipe

In reply to Andre McCurdy

The dependency on freetype was dropped shortly after the 1.7.1 release so is no longer required for the git recipe.

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.inc     | 3 +--
 .../recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb | 6 ++++++
 2 files changed, 7 insertions(+), 2 deletions(-)
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base.inc +1 -2
index 5d18752..e04096c 100644
@@ -2,7 +2,7 @@ require gstreamer1.0-plugins.inc
 
 LICENSE = "GPLv2+ & LGPLv2+"
 
-DEPENDS += "freetype iso-codes util-linux zlib"
+DEPENDS += "iso-codes util-linux zlib"
 
 inherit gettext
 

@@ -31,7 +31,6 @@ PACKAGECONFIG[x11]          = "${X11ENABLEOPTS},${X11DISABLEOPTS},${X11DEPENDS}"
 
 EXTRA_OECONF += " \
     --enable-zlib \
-    --disable-freetypetest \
 "
 
 CACHED_CONFIGUREVARS_append_x86 = " ac_cv_header_emmintrin_h=no ac_cv_header_xmmintrin_h=no"
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.6.3.bb +6 -0
index b9ed3f4..429dc93 100644
@@ -4,6 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c54ce9345727175ff66d17b67ff51f58 \
                     file://COPYING.LIB;md5=6762ed442b3822387a51c92d928ead0d \
                     file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=a4e1830fce078028c8f0974161272607"
 
+# Note: The dependency on freetype was dropped shortly after the 1.7.1 release
+# so these lines should be removed during the update to 1.8.x
+# http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=183610c035dd6955c9b3540b940aec50474af031
+DEPENDS += "freetype"
+EXTRA_OECONF += "--disable-freetypetest"
+
 SRC_URI = " \
     http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-${PV}.tar.xz \
     file://get-caps-from-src-pad-when-query-caps.patch \
Signature · 1 line
1.9.1