[Buildroot] [PATCH 1/6] package/mesa3d: reorder select/depends

[Buildroot] [PATCH 1/6] package/mesa3d: reorder select/depends

[Romain Naour]

From [1]:
"Even though the ordering has absolutely no consequences in Kconfig, it
is not logical (when reading). It is more logical and far easier to
understand when depends come first, followed by the selects."

Also, the Config.in exemple in the manual suggest to use this coding
style [2].

[1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
[2] http://buildroot.uclibc.org/downloads/manual/manual.html#writing-rules-config-in

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/mesa3d/Config.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 6e16f9d..fd7e7f8 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -1,5 +1,10 @@
 menuconfig BR2_PACKAGE_MESA3D
 	bool "mesa3d"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
+	# Triggers the _gp link issue in nios2
+	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
 	select BR2_PACKAGE_LIBDRM
 	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_XORG7
@@ -10,11 +15,6 @@ menuconfig BR2_PACKAGE_MESA3D
 	select BR2_PACKAGE_XLIB_LIBXDAMAGE if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXFIXES if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7
-	depends on BR2_INSTALL_LIBSTDCPP
-	depends on !BR2_STATIC_LIBS
-	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL
-	# Triggers the _gp link issue in nios2
-	depends on !BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_NIOSII
 	help
 	  Mesa 3D, an open-source implementation of the OpenGL specification.
 
-- 
2.4.3

[Buildroot] [PATCH 2/6] package/mesa3d: select packages required by dri3proto support dependencies

[Romain Naour]

When BR2_PACKAGE_MESA3D_DRI_DRIVER and BR2_PACKAGE_XPROTO_DRI3PROTO
are selected, xlib_libxshmfence and xproto_presentproto packages
build are trigged at Makefile level.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build
stop if a package build is trigged at Makefile level without
being selected at Config.in level.

Fixes:
http://autobuild.buildroot.net/results/6a4/6a471d2873ff7e645b0f0962d1719632e290993c

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/mesa3d/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index fd7e7f8..8c72a3d 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -30,6 +30,8 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
 config BR2_PACKAGE_MESA3D_DRI_DRIVER
 	select BR2_PACKAGE_MESA3D_DRIVER
 	select BR2_PACKAGE_HAS_LIBGL
+	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
+	select BR2_PACKAGE_XPROTO_PRESENTPROTO if BR2_PACKAGE_XPROTO_DRI3PROTO
 	bool
 
 config BR2_PACKAGE_PROVIDES_LIBGL
-- 
2.4.3

[Buildroot] [PATCH 3/6] package/x11r7/xserver_xorg-server: reorder select/depends

[Romain Naour]

From [1]:
"Even though the ordering has absolutely no consequences in Kconfig, it
is not logical (when reading). It is more logical and far easier to
understand when depends come first, followed by the selects."

Also, the Config.in exemple in the manual suggest to use this coding
style [2].

[1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
[2] http://buildroot.uclibc.org/downloads/manual/manual.html#writing-rules-config-in

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/x11r7/xserver_xorg-server/Config.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 2bc3f75..71697ef 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
+	depends on BR2_USE_MMU # fork()
 	select BR2_PACKAGE_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	# We need a SHA1 implementation. If either openssl or
 	# libgcrypt are already part of the build, we'll use one of
@@ -48,7 +49,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
 	select BR2_PACKAGE_XPROTO_XPROTO
 	select BR2_PACKAGE_XUTIL_UTIL_MACROS
 	select BR2_PACKAGE_XKEYBOARD_CONFIG
-	depends on BR2_USE_MMU # fork()
 	help
 	  X.Org X server
 
@@ -93,9 +93,9 @@ choice
 
 config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	bool "Modular X.org"
+	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
 		BR2_PACKAGE_XPROTO_DRI2PROTO)
-	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  This variant of the X.org server is the full-blown variant,
 	  as used by desktop GNU/Linux distributions. The drivers (for
-- 
2.4.3

[Buildroot] [PATCH 4/6] package/x11r7/xserver_xorg-server: select xlib_libxshmfence required by dri3proto support dependencies

[Romain Naour]

When BR2_PACKAGE_XPROTO_DRI3PROTO and
BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR are selected, xlib_libxshmfence
package build is triggered at Makefile level.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build
stop if a package build is trigged at Makefile level without
being selected at Config.in level.

Fixes:
http://autobuild.buildroot.net/results/a25/a253d19191dbc8bcc54f9e9d7fddae03d6695b4b/

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/x11r7/xserver_xorg-server/Config.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index 71697ef..f407d34 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -96,6 +96,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
 		BR2_PACKAGE_XPROTO_DRI2PROTO)
+	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
 	help
 	  This variant of the X.org server is the full-blown variant,
 	  as used by desktop GNU/Linux distributions. The drivers (for
-- 
2.4.3

[Buildroot] [PATCH 5/6] package/x11r7/xserver_xorg-server: move libpciaccess selection

[Romain Naour]

Move libpciaccess selection under BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
to simplify.

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/x11r7/xserver_xorg-server/Config.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index f407d34..ac1369e 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -1,7 +1,6 @@
 config BR2_PACKAGE_XSERVER_XORG_SERVER
 	bool "xorg-server"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_LIBPCIACCESS if BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	# We need a SHA1 implementation. If either openssl or
 	# libgcrypt are already part of the build, we'll use one of
 	# them, otherwise, use the small libsha1 library.
@@ -96,6 +95,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR
 	depends on BR2_INSTALL_LIBSTDCPP
 	select BR2_PACKAGE_LIBDRM if (BR2_PACKAGE_XPROTO_XF86DRIPROTO || \
 		BR2_PACKAGE_XPROTO_DRI2PROTO)
+	select BR2_PACKAGE_LIBPCIACCESS
 	select BR2_PACKAGE_XLIB_LIBXSHMFENCE if BR2_PACKAGE_XPROTO_DRI3PROTO
 	help
 	  This variant of the X.org server is the full-blown variant,
-- 
2.4.3

[Buildroot] [PATCH 6/6] package/x11r7/xapp_xbacklight: select xcb-util package.

[Romain Naour]

xapp_xbacklight depends on xcb-util but doesn't select it
in Config.in. so the build is trigged at Makefile level.

Since 28f67899e54f15c6e48484ea2976c3e431756bcb, the build
stop if a package build is trigged at Makefile level without
being selected at Config.in level.

Also select libxcb to avoid an unmet dependency.

Fixes:
http://autobuild.buildroot.net/results/b78/b7817fe2dd39334578a45bd6029a360fdf528aca

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/x11r7/xapp_xbacklight/Config.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/package/x11r7/xapp_xbacklight/Config.in b/package/x11r7/xapp_xbacklight/Config.in
index 9756235..ce62c9b 100644
--- a/package/x11r7/xapp_xbacklight/Config.in
+++ b/package/x11r7/xapp_xbacklight/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_XAPP_XBACKLIGHT
 	bool "xbacklight"
+	select BR2_PACKAGE_LIBXCB # xcb-util
+	select BR2_PACKAGE_XCB_UTIL
 	select BR2_PACKAGE_XLIB_LIBX11
 	select BR2_PACKAGE_XLIB_LIBXRANDR
 	select BR2_PACKAGE_XLIB_LIBXRENDER
-- 
2.4.3

[Buildroot] [PATCH 1/6] package/mesa3d: reorder select/depends

[Peter Korsgaard]

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 >> From [1]:
 > "Even though the ordering has absolutely no consequences in Kconfig, it
 > is not logical (when reading). It is more logical and far easier to
 > understand when depends come first, followed by the selects."

 > Also, the Config.in exemple in the manual suggest to use this coding
 > style [2].

 > [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
 > [2] http://buildroot.uclibc.org/downloads/manual/manual.html#writing-rules-config-in

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed patch 1-5, thanks. I had already applied a similar patch from
Gustavoz for xapp_xbacklight. That one didn't select libxcb though, but
I guess it doesn't really matter as libX11 pulls it in.

(xcb-util should arguably select libxcb as it is a library instead of
using depends on).

-- 
Bye, Peter Korsgaard

[Buildroot] [PATCH 1/6] package/mesa3d: reorder select/depends

[Romain Naour]

Hi Peter,

Le 05/01/2016 00:22, Peter Korsgaard a ?crit :
>>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:
> 
>  >> From [1]:
>  > "Even though the ordering has absolutely no consequences in Kconfig, it
>  > is not logical (when reading). It is more logical and far easier to
>  > understand when depends come first, followed by the selects."
> 
>  > Also, the Config.in exemple in the manual suggest to use this coding
>  > style [2].
> 
>  > [1] http://lists.busybox.net/pipermail/buildroot/2015-October/142955.html
>  > [2] http://buildroot.uclibc.org/downloads/manual/manual.html#writing-rules-config-in
> 
>  > Signed-off-by: Romain Naour <romain.naour@gmail.com>
> 
> Committed patch 1-5, thanks. I had already applied a similar patch from
> Gustavoz for xapp_xbacklight. That one didn't select libxcb though, but
> I guess it doesn't really matter as libX11 pulls it in.

No problem, I'll remove patch 6 from the patchwork.

> 
> (xcb-util should arguably select libxcb as it is a library instead of
> using depends on).
> 

Yes probably. Using "depends on" would help if libxcb would have several
dependencies (like for the efl package) but there is none.

Best regards,
Romain