| Message ID | 20180103183842.10182-8-gary.bisson@boundarydevices.com |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | imx: update packages to 4.9.x_1.0.0_ga release | expand |
Hello, On Wed, 3 Jan 2018 19:38:33 +0100, Gary Bisson wrote: > To match the new imx-gpu-g2d package. > > Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> > --- > package/gstreamer1/gst1-imx/Config.in | 6 +++--- > package/gstreamer1/gst1-imx/gst1-imx.mk | 4 ++++ > 2 files changed, 7 insertions(+), 3 deletions(-) > > diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in > index e4cee05b90..7b46233b53 100644 > --- a/package/gstreamer1/gst1-imx/Config.in > +++ b/package/gstreamer1/gst1-imx/Config.in > @@ -27,12 +27,12 @@ comment "imxeglvivsink needs the Vivante 3D libraries" > > config BR2_PACKAGE_GST1_IMX_G2D > bool "imxg2d" > - depends on BR2_PACKAGE_IMX_GPU_VIV_G2D > + depends on BR2_PACKAGE_IMX_GPU_G2D Doing this now is bogus... because you've removed the option BR2_PACKAGE_IMX_GPU_VIV_G2D since PATCH 03/16. You need a different ordering, otherwise you break bisectability. Perhaps you need to introduce the imx-gpu-g2d package first, then bump imx-gpu-viv and adjust the packages using imx-gpu-d2d at the same time. Thomas
diff --git a/package/gstreamer1/gst1-imx/Config.in b/package/gstreamer1/gst1-imx/Config.in index e4cee05b90..7b46233b53 100644 --- a/package/gstreamer1/gst1-imx/Config.in +++ b/package/gstreamer1/gst1-imx/Config.in @@ -27,12 +27,12 @@ comment "imxeglvivsink needs the Vivante 3D libraries" config BR2_PACKAGE_GST1_IMX_G2D bool "imxg2d" - depends on BR2_PACKAGE_IMX_GPU_VIV_G2D + depends on BR2_PACKAGE_IMX_GPU_G2D help Elements leveraging the 2D GPU -comment "imxg2d needs the Vivante 2D libraries" - depends on !BR2_PACKAGE_IMX_GPU_VIV_G2D +comment "imxg2d needs the G2D libraries" + depends on !BR2_PACKAGE_IMX_GPU_G2D config BR2_PACKAGE_GST1_IMX_IPU bool "imxipu" diff --git a/package/gstreamer1/gst1-imx/gst1-imx.mk b/package/gstreamer1/gst1-imx/gst1-imx.mk index a8fe6fe041..43b4d9b15f 100644 --- a/package/gstreamer1/gst1-imx/gst1-imx.mk +++ b/package/gstreamer1/gst1-imx/gst1-imx.mk @@ -33,6 +33,10 @@ ifeq ($(BR2_PACKAGE_IMX_GPU_VIV),y) GST1_IMX_DEPENDENCIES += imx-gpu-viv endif +ifeq ($(BR2_PACKAGE_IMX_GPU_G2D),y) +GST1_IMX_DEPENDENCIES += imx-gpu-g2d +endif + ifeq ($(BR2_PACKAGE_GST1_IMX_EGLVISINK),y) # There's no --enable-eglvivsink option ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
To match the new imx-gpu-g2d package. Signed-off-by: Gary Bisson <gary.bisson@boundarydevices.com> --- package/gstreamer1/gst1-imx/Config.in | 6 +++--- package/gstreamer1/gst1-imx/gst1-imx.mk | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-)