]> code.ossystems Code Review - openembedded-core.git/commitdiff
gstreamer1.0: fix builds with make 4.3
authorAnuj Mittal <anuj.mittal@intel.com>
Fri, 10 Jul 2020 00:09:59 +0000 (08:09 +0800)
committerAnuj Mittal <anuj.mittal@intel.com>
Tue, 28 Jul 2020 08:16:52 +0000 (16:16 +0800)
Depend on make-native instead of using host make to avoid errors like:

| controller-enumtypes.c:10:1: error: stray '\' in program
|    10 | \#include "gstinterpolationcontrolsource.h"
|       | ^
| controller-enumtypes.c:10:2: error: stray '#' in program
|    10 | \#include "gstinterpolationcontrolsource.h"
|       |  ^
| controller-enumtypes.c:10:11: error: expected '=', ',', ';', 'asm' or '__attribute__' before string constant
|    10 | \#include "gstinterpolationcontrolsource.h"
|       |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| controller-enumtypes.c:11:1: error: stray '\' in program
|    11 | \#include "gstlfocontrolsource.h"
|       | ^
| controller-enumtypes.c:11:2: error: stray '#' in program
|    11 | \#include "gstlfocontrolsource.h"

This helps building on autobuilder where some workers have buildtools
with make 4.3 installed.

Building using meson works fine so later branches are not affected and
upstream has rejected patches to fix this:

https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/515

Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
meta/recipes-multimedia/gstreamer/gstreamer1.0-plugins.inc
meta/recipes-multimedia/gstreamer/gstreamer1.0-rtsp-server_1.16.2.bb
meta/recipes-multimedia/gstreamer/gstreamer1.0_1.16.2.bb

index bc24b05fec96bd72fad134b7ddab1504e4141b61..92b473add6b970e2ad33523c495a57634b5a1d5e 100644 (file)
@@ -3,7 +3,7 @@ HOMEPAGE = "http://gstreamer.freedesktop.org/"
 BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 
-DEPENDS = "gstreamer1.0 glib-2.0-native"
+DEPENDS = "gstreamer1.0 glib-2.0-native make-native"
 
 SRC_URI_append = " file://gtk-doc-tweaks.patch"
 
index 15ef5d1b2894d77f8fab1eef4ec69381887cf923..b7470b0047f7f7e9adbbb355d76295a8653ae754 100644 (file)
@@ -4,7 +4,7 @@ SECTION = "multimedia"
 LICENSE = "LGPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=6762ed442b3822387a51c92d928ead0d"
 
-DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base"
+DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base make-native"
 
 PNREAL = "gst-rtsp-server"
 
index cf7c1bca128206b77b2cbee00c15b057555382be..96a6ade22bc39fcd609e2b448a66a55acc37a2e5 100644 (file)
@@ -6,7 +6,7 @@ BUGTRACKER = "https://bugzilla.gnome.org/enter_bug.cgi?product=Gstreamer"
 SECTION = "multimedia"
 LICENSE = "LGPLv2+"
 
-DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native"
+DEPENDS = "glib-2.0 glib-2.0-native libcap libxml2 bison-native flex-native make-native"
 
 inherit autotools pkgconfig gettext upstream-version-is-even gobject-introspection gtk-doc ptest