Skip to contentSkip to conversation

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

PATCH New Peter Seiderer 2 participants 2 messages Nov 28, 2019 – Nov 29, 2019

lore
Share & tools
lore
#0 lore raw

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

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 save 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

---
 package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk | 8 --------
 1 file changed, 8 deletions(-)
package/gstreamer1/gst1-plugins-bad/gst1-plugins-bad.mk +0 -8
index 856db88e49..b611b33eb3 100644
@@ -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
Signature · 1 line
2.24.0
#1 lore raw

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

Quoted 26 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Seiderer <[email protected]> writes:

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 save 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

Quoted 1 line

[1] https://bugs.busybox.net/show_bug.cgi?id=12366

You don't have any [1] references ;)

Committed with that fixed, thanks.

Signature · 1 line
Bye, Peter Korsgaard