diff mbox series

[1/1] package/mesa3d: add missing depends and driver name to r100 driver

Message ID 20200209183441.130187-1-james.hilliard1@gmail.com
State Accepted
Headers show
Series [1/1] package/mesa3d: add missing depends and driver name to r100 driver | expand

Commit Message

James Hilliard Feb. 9, 2020, 6:34 p.m. UTC
Propagate libdrm dependencies.

Add r100 to menu name to differentiate from r200 dri driver.

Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
---
 package/mesa3d/Config.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Bernd Kuhls Sept. 23, 2020, 5:26 a.m. UTC | #1
Hi James,

Am Sun, 09 Feb 2020 11:34:41 -0700 schrieb James Hilliard:

> Propagate libdrm dependencies.
> 
> Add r100 to menu name to differentiate from r200 dri driver.
> 
> Signed-off-by: James Hilliard <james.hilliard1-
Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> ---
>  package/mesa3d/Config.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index ff39652508..788705544d 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -355,7 +355,9 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	  Support for Nvidia-based GPUs.
>  
>  config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
> -	bool "DRI radeon driver"
> +	bool "DRI radeon r100 driver"

ok.

> +	depends on BR2_i386 || BR2_x86_64

Ok, the build system of mesa3d limits the driver to these archs:
https://cgit.freedesktop.org/mesa/mesa/tree/meson.build?h=20.1#n141

> +	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC

ok.

Reviewed-by: Bernd Kuhls <bernd.kuhls@t-online.de>

Regards, Bernd
Yann E. MORIN Oct. 6, 2020, 8:19 p.m. UTC | #2
James, All,

On 2020-02-09 11:34 -0700, James Hilliard spake thusly:
> Propagate libdrm dependencies.
> 
> Add r100 to menu name to differentiate from r200 dri driver.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/mesa3d/Config.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index ff39652508..788705544d 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -355,7 +355,9 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	  Support for Nvidia-based GPUs.
>  
>  config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
> -	bool "DRI radeon driver"
> +	bool "DRI radeon r100 driver"
> +	depends on BR2_i386 || BR2_x86_64
> +	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER
>  	select BR2_PACKAGE_LIBDRM_RADEON
>  	help
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Yann E. MORIN Oct. 6, 2020, 9:05 p.m. UTC | #3
James, All,

On 2020-02-09 11:34 -0700, James Hilliard spake thusly:
> Propagate libdrm dependencies.
> 
> Add r100 to menu name to differentiate from r200 dri driver.
> 
> Signed-off-by: James Hilliard <james.hilliard1@gmail.com>
> ---
>  package/mesa3d/Config.in | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
> index ff39652508..788705544d 100644
> --- a/package/mesa3d/Config.in
> +++ b/package/mesa3d/Config.in
> @@ -355,7 +355,9 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
>  	  Support for Nvidia-based GPUs.
>  
>  config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
> -	bool "DRI radeon driver"
> +	bool "DRI radeon r100 driver"
> +	depends on BR2_i386 || BR2_x86_64
> +	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC

This was causing a circular dependency, as noticed by Thomas:

    package/gstreamer1/gstreamer1/Config.in:5:error: recursive dependency detected!
    package/gstreamer1/gstreamer1/Config.in:5:symbo l BR2_PACKAGE_GSTREAMER1 is selected by BR2_PACKAGE_WEBKITGTK_MULTIMEDIA
    package/webkitgtk/Config.in:86:symbol BR2_PACKAGE_WEBKITGTK_MULTIMEDI   A depends on BR2_PACKAGE_WEBKITGTK
    package/webkitgtk/Config.in:23:symb ol BR2_PACKAGE_WEBKITGTK is selected by BR2_PACKAGE_MIDORI
    package/midori/Config.in:9:symbol BR2_PACKAGE_MIDORI depends on BR2_PACKAGE_LIBGTK3 
    package/libgtk3/Config.in:15:symbol BR2_PACKAGE_LIBGTK3 is selected b   y BR2_PACKAGE_VTE
    package/vte/Config.in:1:symbol BR2_PACKAGE_VTE depen    ds on BR2_PACKAGE_HAS_LIBEGL_WAYLAND
    package/opengl/libegl/Config.in:4:symbol BR2_PACKAGE_HAS_LIBEGL_WAYLAND is selected by BR2_PACKAGE_MESA3D_OPENGL_   EGL
    package/mesa3d/Config.in:436:symbol BR2_PACKAGE_MESA3D_OPENGL_EGL   depends on BR2_PACKAGE_MESA3D_DRIVER
    package/mesa3d/Config.in:75:symbo   l BR2_PACKAGE_MESA3D_DRIVER is selected by BR2_PACKAGE_MESA3D_DRI_DRIVER
    package/mesa3d/Config.in:61:symbol BR2_PACKAGE_MESA3D_DRI_DRIVER is s   elected by BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
    package/mesa3d/Config.in:372:symbol BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON depends on BR2_PACKAGE_LIBDRM_HAS  _ATOMIC
    package/libdrm/Config.in:12:symbol BR2_PACKAGE_LIBDRM_HAS_ATOM  IC depends on BR2_PACKAGE_LIBDRM
    package/libdrm/Config.in:1:symbol BR2   _PACKAGE_LIBDRM is selected by BR2_PACKAGE_GST1_VAAPI
    package/gstreamer1/gst1-vaapi/Config.in:1:symbol BR2_PACKAGE_GST1_VAAPI depends on BR2_PAC  KAGE_GSTREAMER1

So, I dropped the dependency, like you already did in 00c1a8c34f7, and
pushed that fix to master.

Regards,
Yann E. MORIN.

>  	select BR2_PACKAGE_MESA3D_DRI_DRIVER
>  	select BR2_PACKAGE_LIBDRM_RADEON
>  	help
> -- 
> 2.20.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
diff mbox series

Patch

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index ff39652508..788705544d 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -355,7 +355,9 @@  config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU
 	  Support for Nvidia-based GPUs.
 
 config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
-	bool "DRI radeon driver"
+	bool "DRI radeon r100 driver"
+	depends on BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_LIBDRM_HAS_ATOMIC
 	select BR2_PACKAGE_MESA3D_DRI_DRIVER
 	select BR2_PACKAGE_LIBDRM_RADEON
 	help