package/gst1-plugins-bad: remove rpi-userland extra include paths

Fixes #12366 [1]

The rpi-userland extra include paths where added with [2] including
a rpi-userland dependency for the dispmanx option.

The dispmanx option was moved to gst1-plugins-base with commit [3],
including the rpi-userland dependency, excluding the extra include
paths.

Tested gst1-plugins-base with dispmanx enabled compiles without
failures. It seems to be safe to remove the extra includes from
gst1-plugins-bad.

Fixes (from meson-log.txt):

  Sanity check compile stderr:
  arm-buildroot-linux-uclibcgnueabihf-gcc.br_real: error:
  /.../host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/IL:
  No such file or directory
  arm-buildroot-linux-uclibcgnueabihf-gcc.br_real: error:
  /.../host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/interface/vcos/pthreads:
  No such file
  arm-buildroot-linux-uclibcgnueabihf-gcc.br_real: error:
  /.../host/arm-buildroot-linux-uclibcgnueabihf/sysroot/usr/include/interface/vmcs_host/linux:
  No such file

[1] https://bugs.busybox.net/show_bug.cgi?id=12366
[2] https://git.buildroot.net/buildroot/commit/?id=962ffda68cd9b0c4ab6055c97c14e762a5439571
[3] https://git.buildroot.net/buildroot/commit/?id=3f2aef56127fbe71378e6a2d55192a0835d962ab

Signed-off-by: Peter Seiderer <ps.report@gmx.net>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

diff --git a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
index 856db88e49a38b1f8fa35b1ed69e719a63a2977b..b611b33eb3f531670b58d3763043b110d07da5d3 100644 (file)
--- a/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
+++ b/package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk
@@ -64,14 +64,6 @@ GST1_PLUGINS_BAD_CONF_OPTS += \
 
 GST1_PLUGINS_BAD_DEPENDENCIES = gst1-plugins-base gstreamer1
 
-ifeq ($(BR2_PACKAGE_RPI_USERLAND),y)
-# RPI has odd locations for several required headers.
-GST1_PLUGINS_BAD_CFLAGS=$(TARGET_CPPFLAGS) \
-       $(STAGING_DIR)/usr/include/IL \
-       $(STAGING_DIR)/usr/include/interface/vcos/pthreads \
-       $(STAGING_DIR)/usr/include/interface/vmcs_host/linux
-endif
-
 ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND),y)
 GST1_PLUGINS_BAD_CONF_OPTS += -Dwayland=enabled
 GST1_PLUGINS_BAD_DEPENDENCIES += wayland wayland-protocols