| Message ID | 20230205023709.799349-1-james.hilliard1@gmail.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/1] package/gst1-vaapi: fix x11 dependencies | expand |
James, All, On 2023-02-04 19:37 -0700, James Hilliard spake thusly: > The x11 feature needs libx11 and libxrandr support. > > Select and depend on these when x11 is enabled. > > Fixes: > gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake > > Signed-off-by: James Hilliard <james.hilliard1@gmail.com> Applied to master, thanks. Regards, Yann E. MORIN. > --- > package/gstreamer1/gst1-vaapi/Config.in | 2 ++ > package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in > index ade8b83a5f..a1062097ed 100644 > --- a/package/gstreamer1/gst1-vaapi/Config.in > +++ b/package/gstreamer1/gst1-vaapi/Config.in > @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI > select BR2_PACKAGE_LIBDRM > select BR2_PACKAGE_GST1_PLUGINS_BASE > select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 > help > gstreamer-vaapi consists in a collection of VA-API based > plugins for GStreamer and helper libraries. > diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > index 3d9eb91ffb..9533cdf2b6 100644 > --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk > @@ -43,8 +43,9 @@ else > GST1_VAAPI_CONF_OPTS += -Dwayland=disabled > endif > > -ifeq ($(BR2_PACKAGE_XORG7),y) > +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) > GST1_VAAPI_CONF_OPTS += -Dx11=enabled > +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr > ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) > GST1_VAAPI_CONF_OPTS += -Dglx=enabled > else > -- > 2.34.1 > > _______________________________________________ > buildroot mailing list > buildroot@buildroot.org > https://lists.buildroot.org/mailman/listinfo/buildroot
diff --git a/package/gstreamer1/gst1-vaapi/Config.in b/package/gstreamer1/gst1-vaapi/Config.in index ade8b83a5f..a1062097ed 100644 --- a/package/gstreamer1/gst1-vaapi/Config.in +++ b/package/gstreamer1/gst1-vaapi/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_GST1_VAAPI select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_GST1_PLUGINS_BASE select BR2_PACKAGE_GST1_PLUGINS_BAD # gstreamer-codecparsers + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7 help gstreamer-vaapi consists in a collection of VA-API based plugins for GStreamer and helper libraries. diff --git a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk index 3d9eb91ffb..9533cdf2b6 100644 --- a/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk +++ b/package/gstreamer1/gst1-vaapi/gst1-vaapi.mk @@ -43,8 +43,9 @@ else GST1_VAAPI_CONF_OPTS += -Dwayland=disabled endif -ifeq ($(BR2_PACKAGE_XORG7),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBX11)$(BR2_PACKAGE_XLIB_LIBXRANDR),yy) GST1_VAAPI_CONF_OPTS += -Dx11=enabled +GST1_VAAPI_DEPENDENCIES += xlib_libX11 xlib_libXrandr ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) GST1_VAAPI_CONF_OPTS += -Dglx=enabled else
The x11 feature needs libx11 and libxrandr support. Select and depend on these when x11 is enabled. Fixes: gst1-vaapi-1.22.0/meson.build:96:0: ERROR: Dependency "xrandr" not found, tried pkgconfig and cmake Signed-off-by: James Hilliard <james.hilliard1@gmail.com> --- package/gstreamer1/gst1-vaapi/Config.in | 2 ++ package/gstreamer1/gst1-vaapi/gst1-vaapi.mk | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-)