diff --git a/Config.in.legacy b/Config.in.legacy index 719f99c06f..2d6868cd10 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,13 @@ endif comment "Legacy options removed in 2026.02" +config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX + bool "gst1-plugins-base dispmanx option removed" + select BR2_LEGACY + help + Due to the removal of the rpi-userland package, the dispmanx + OpenGL plug-in from GStreamer plugin base has been removed. + config BR2_PACKAGE_RPI_FIRMWARE_INSTALL_VCDBG bool "rpi-firmware vcdbg option removed" select BR2_LEGACY diff --git a/package/gstreamer1/gst1-plugins-base/Config.in b/package/gstreamer1/gst1-plugins-base/Config.in index df10774ac7..6eff685c2f 100644 --- a/package/gstreamer1/gst1-plugins-base/Config.in +++ b/package/gstreamer1/gst1-plugins-base/Config.in @@ -178,7 +178,6 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX default y depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL depends on BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR # mesa needs big X - depends on !BR2_PACKAGE_RPI_USERLAND # x11 select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XORGPROTO select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11 @@ -186,13 +185,9 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_GLX help OpenGL Extension to the X Window System -comment "glx not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - comment "glx needs the opengl API and modular X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL || \ - !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR) + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_OPENGL || \ + !BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL bool "egl" @@ -214,19 +209,14 @@ config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_X11 bool "x11" default y depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM - depends on !BR2_PACKAGE_RPI_USERLAND depends on BR2_PACKAGE_XORG7 select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW -comment "x11 not supported with rpi-userland" - depends on BR2_PACKAGE_RPI_USERLAND - comment "x11 needs a platform and X.org" - depends on !BR2_PACKAGE_RPI_USERLAND && \ - (!BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM || \ - !BR2_PACKAGE_XORG7) + depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_PLATFORM || \ + !BR2_PACKAGE_XORG7 config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_WAYLAND bool "wayland" @@ -240,18 +230,6 @@ comment "wayland needs the egl platform and the wayland package" depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \ !BR2_PACKAGE_WAYLAND -config BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX - bool "dispmanx" - default y - depends on BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL - depends on BR2_PACKAGE_RPI_USERLAND - select BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_HAS_WINDOW - help - Raspberry Pi's Dispmanx windowing system - -comment "dispmanx needs the egl platform and rpi-userland" - depends on !BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_EGL || \ - !BR2_PACKAGE_RPI_USERLAND endif comment "opengl needs an OpenGL or OpenGL ES backend" diff --git a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk index 456cd205bb..adfb407386 100644 --- a/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk +++ b/package/gstreamer1/gst1-plugins-base/gst1-plugins-base.mk @@ -93,10 +93,6 @@ GST1_PLUGINS_BASE_WINSYS_LIST += wayland GST1_PLUGINS_BASE_DEPENDENCIES += wayland wayland-protocols endif -ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_LIB_OPENGL_DISPMANX),y) -GST1_PLUGINS_BASE_WINSYS_LIST += dispmanx -GST1_PLUGINS_BASE_DEPENDENCIES += rpi-userland -endif GST1_PLUGINS_BASE_CONF_OPTS += -Dgl_winsys='$(subst $(space),$(comma),$(GST1_PLUGINS_BASE_WINSYS_LIST))' ifeq ($(BR2_PACKAGE_GST1_PLUGINS_BASE_PLUGIN_ADDER),y)