* [Buildroot] [PATCH 01/14] package/libdrm: radeon does not depend on x86
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 02/14] package/xdriver_xf86-video-ati: only select libdrm if the DRI driver is enabled Yann E. MORIN
` (13 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Thomas reported that the libdrm-radeon dependency on x86 (32- or 64-bit)
dates back to the time where it also depended on libpciaccess.
Now that the libpciacess dependency has been dropped, Thomas managed to
build a libdrm-radeon on something else than an x86 (an ARM for example).
Make libdrm-radeon no longer depend on x86
As a side effect, this fixes some potential "unmet direct dependencies"
from the xdriver_xf86-video-ati package (which was the initial problem
I was trying to solve.)
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/libdrm/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/libdrm/Config.in b/package/libdrm/Config.in
index 7192e94..72cf5f8 100644
--- a/package/libdrm/Config.in
+++ b/package/libdrm/Config.in
@@ -22,7 +22,6 @@ config BR2_PACKAGE_LIBDRM_INTEL
config BR2_PACKAGE_LIBDRM_RADEON
bool "radeon"
- depends on BR2_i386 || BR2_x86_64
help
install AMD/ATI graphics driver
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 02/14] package/xdriver_xf86-video-ati: only select libdrm if the DRI driver is enabled
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 01/14] package/libdrm: radeon does not depend on x86 Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 03/14] package/x11-video-drivers: do not select, but depends on mesa3d Yann E. MORIN
` (12 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
The xf86 radeon driver does not need libdrm, unless DRI is enabled too.
Reported-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/x11r7/xdriver_xf86-video-ati/Config.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index 3c0cac3..d8bb029 100644
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
bool "xf86-video-ati"
- select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_LIBDRM_RADEON
+ select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
+ select BR2_PACKAGE_LIBDRM_RADEON if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 03/14] package/x11-video-drivers: do not select, but depends on mesa3d
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 01/14] package/libdrm: radeon does not depend on x86 Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 02/14] package/xdriver_xf86-video-ati: only select libdrm if the DRI driver is enabled Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 21:04 ` Thomas Petazzoni
2014-04-17 16:04 ` [Buildroot] [PATCH 04/14] package/mesa3d: re-arrange menu items Yann E. MORIN
` (11 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Currently, X.Org drivers that need mesa3d forcibly select it.
We'll soon switch mesa3d to being a provider of the full OpenGL virtual
package, to come in a later patch.
It is bad practice to select a provider, as it can generate configuration
inconsistencies.
So, switch all X.Org video driver that need mesa3d to actually depend on
it, rather than forcibly select it.
To be noted: xf86-video-mach64 already used a 'depends on' rather
than a 'select'.
At the same time, move the intel drivers dependencies to the top.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
Cc: Paul Cercueil <paul@crapouillou.net>
---
Changes v2 -> v3:
- only show comment for intel driver when arch is an x86
---
package/x11r7/xdriver_xf86-video-ati/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-glint/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-intel/Config.in | 8 ++++++--
package/x11r7/xdriver_xf86-video-mach64/Config.in | 3 +++
package/x11r7/xdriver_xf86-video-mga/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-openchrome/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-r128/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-savage/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-sis/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-tdfx/Config.in | 5 ++++-
package/x11r7/xdriver_xf86-video-vmware/Config.in | 5 ++++-
11 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in
index d8bb029..a555fa3 100644
--- a/package/x11r7/xdriver_xf86-video-ati/Config.in
+++ b/package/x11r7/xdriver_xf86-video-ati/Config.in
@@ -1,8 +1,8 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
bool "xf86-video-ati"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
select BR2_PACKAGE_LIBDRM_RADEON if BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI
select BR2_PACKAGE_XPROTO_XPROTO
help
ATI video driver
+
+comment "xf86-video-ati needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-glint/Config.in b/package/x11r7/xdriver_xf86-video-glint/Config.in
index bd92788..acae30b 100644
--- a/package/x11r7/xdriver_xf86-video-glint/Config.in
+++ b/package/x11r7/xdriver_xf86-video-glint/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
bool "xf86-video-glint"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT
select BR2_PACKAGE_XPROTO_XPROTO
help
GLINT/Permedia video driver
+
+comment "xf86-video-glint needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-intel/Config.in b/package/x11r7/xdriver_xf86-video-intel/Config.in
index 83b714a..69a9e78 100644
--- a/package/x11r7/xdriver_xf86-video-intel/Config.in
+++ b/package/x11r7/xdriver_xf86-video-intel/Config.in
@@ -1,5 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
bool "xf86-video-intel"
+ depends on (BR2_i386 || BR2_x86_64)
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -7,7 +9,9 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_INTEL
select BR2_PACKAGE_XLIB_LIBPCIACCESS
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_LIBDRM_INTEL
- select BR2_PACKAGE_MESA3D
- depends on (BR2_i386 || BR2_x86_64)
help
Intel video driver
+
+comment "xf86-video-intel needs mesa3d"
+ depends on (BR2_i386 || BR2_x86_64)
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-mach64/Config.in b/package/x11r7/xdriver_xf86-video-mach64/Config.in
index 674071c..42535e4 100644
--- a/package/x11r7/xdriver_xf86-video-mach64/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mach64/Config.in
@@ -9,3 +9,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MACH64
select BR2_PACKAGE_XPROTO_XPROTO
help
mach64 video driver
+
+comment "xf86-video-mach64 needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in
index 2fc3837..a504ec0 100644
--- a/package/x11r7/xdriver_xf86-video-mga/Config.in
+++ b/package/x11r7/xdriver_xf86-video-mga/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
bool "xf86-video-mga"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_GLPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -12,3 +12,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA
select BR2_PACKAGE_XPROTO_XPROTO
help
Matrox video driver
+
+comment "xf86-video-mga needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
index 24b74bc..db27eef 100644
--- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in
+++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
bool "xf86-video-openchrome"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XLIB_LIBXCOMPOSITE
select BR2_PACKAGE_XLIB_LIBXVMC
@@ -14,3 +14,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME
help
Openchrome, A free and Open Source video driver for the VIA/S3G
UniChrome and UniChrome Pro graphics chipsets.
+
+comment "xf86-video-openchrome needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-r128/Config.in b/package/x11r7/xdriver_xf86-video-r128/Config.in
index 07e3142..647156f 100644
--- a/package/x11r7/xdriver_xf86-video-r128/Config.in
+++ b/package/x11r7/xdriver_xf86-video-r128/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
bool "xf86-video-r128"
- select BR2_PACKAGE_MESA3D
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -8,3 +8,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128
select BR2_PACKAGE_XPROTO_XPROTO
help
R128 video driver
+
+comment "xf86-video-r128 needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in
index 93a731e..77dde87 100644
--- a/package/x11r7/xdriver_xf86-video-savage/Config.in
+++ b/package/x11r7/xdriver_xf86-video-savage/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
bool "xf86-video-savage"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE
select BR2_PACKAGE_XPROTO_XPROTO
help
S3 Savage video driver
+
+comment "xf86-video-savage needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in
index e184505..3c86bd4 100644
--- a/package/x11r7/xdriver_xf86-video-sis/Config.in
+++ b/package/x11r7/xdriver_xf86-video-sis/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
bool "xf86-video-sis"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -13,3 +13,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS
select BR2_PACKAGE_XPROTO_XPROTO
help
SiS and XGI video driver
+
+comment "xf86-video-sis needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
index 811eba2..96a69ba 100644
--- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in
+++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in
@@ -1,7 +1,7 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
bool "xf86-video-tdfx"
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_LIBDRM
- select BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
select BR2_PACKAGE_XPROTO_RENDERPROTO
@@ -11,3 +11,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX
select BR2_PACKAGE_XPROTO_XPROTO
help
3Dfx video driver
+
+comment "xf86-video-tdfx needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
diff --git a/package/x11r7/xdriver_xf86-video-vmware/Config.in b/package/x11r7/xdriver_xf86-video-vmware/Config.in
index a4d2052..2e6b24d 100644
--- a/package/x11r7/xdriver_xf86-video-vmware/Config.in
+++ b/package/x11r7/xdriver_xf86-video-vmware/Config.in
@@ -1,6 +1,6 @@
config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
bool "xf86-video-vmware"
- select BR2_PACKAGE_MESA3D
+ depends on BR2_PACKAGE_MESA3D
select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SVGA
select BR2_PACKAGE_XPROTO_FONTSPROTO
select BR2_PACKAGE_XPROTO_RANDRPROTO
@@ -10,3 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE
select BR2_PACKAGE_XPROTO_XPROTO
help
VMware SVGA video driver
+
+comment "xf86-video-vmware needs mesa3d"
+ depends on !BR2_PACKAGE_MESA3D
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 03/14] package/x11-video-drivers: do not select, but depends on mesa3d
2014-04-17 16:04 ` [Buildroot] [PATCH 03/14] package/x11-video-drivers: do not select, but depends on mesa3d Yann E. MORIN
@ 2014-04-17 21:04 ` Thomas Petazzoni
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2014-04-17 21:04 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Thu, 17 Apr 2014 18:04:15 +0200, Yann E. MORIN wrote:
> Currently, X.Org drivers that need mesa3d forcibly select it.
[...]
> package/x11r7/xdriver_xf86-video-ati/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-glint/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-intel/Config.in | 8 ++++++--
> package/x11r7/xdriver_xf86-video-mach64/Config.in | 3 +++
> package/x11r7/xdriver_xf86-video-mga/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-openchrome/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-r128/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-savage/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-sis/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-tdfx/Config.in | 5 ++++-
> package/x11r7/xdriver_xf86-video-vmware/Config.in | 5 ++++-
> 11 files changed, 45 insertions(+), 11 deletions(-)
I know the dependency on mesa3d is not something added by your patch,
but I'm wondering: do all these drivers actually *require* mesa3d ?
Isn't it possible to build for example, the Intel X.org driver, for
just 2D acceleration purposes? Or does even 2D acceleration relies on
an OpenGL implementation being available, these days?
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 04/14] package/mesa3d: re-arrange menu items
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (2 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 03/14] package/x11-video-drivers: do not select, but depends on mesa3d Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 05/14] package/mesa3d: DRI drivers depend on X.org Yann E. MORIN
` (10 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Make mesa3d a menuconfig, ie. a sub-menu on the boolean option.
Move drivers and additional API selections out of their own submenus,
add a comment as separator.
This will make it easier to further re-arrange the config items in
the following patches, to fix-enhance the packaging to handle the
full-openGL provider stuff.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
---
package/mesa3d/Config.in | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 81f2272..801a203 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -1,4 +1,4 @@
-config BR2_PACKAGE_MESA3D
+menuconfig BR2_PACKAGE_MESA3D
bool "Mesa 3D Graphics Library"
select BR2_PACKAGE_LIBDRM
select BR2_PACKAGE_EXPAT
@@ -31,7 +31,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER
config BR2_PACKAGE_MESA3D_DRIVER
bool
-menu "Drivers"
+comment "Gallium drivers"
config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU
bool "Gallium nouveau driver"
@@ -61,6 +61,8 @@ comment "DRI drivers needs a toolchain w/ dynamic library"
if !BR2_PREFER_STATIC_LIB
+comment "DRI drivers"
+
config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
bool "DRI swrast driver"
select BR2_PACKAGE_MESA3D_DRI_DRIVER
@@ -87,10 +89,9 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
endif # !BR2_PREFER_STATIC_LIB
-endmenu
+if BR2_PACKAGE_MESA3D_DRIVER
-menu "Additional API Support"
-depends on BR2_PACKAGE_MESA3D_DRIVER
+comment "Additional API Support"
config BR2_PACKAGE_MESA3D_OPENGL_EGL
bool "EGL"
@@ -107,7 +108,7 @@ config BR2_PACKAGE_MESA3D_OPENGL_ES
Use the Khronos OpenGL ES APIs. This is commonly used on embedded
systems and represents a subset of the OpenGL API.
-endmenu
+endif # BR2_PACKAGE_MESA3D_DRIVER
config BR2_PACKAGE_PROVIDES_LIBEGL
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_EGL
@@ -115,7 +116,7 @@ config BR2_PACKAGE_PROVIDES_LIBEGL
config BR2_PACKAGE_PROVIDES_LIBGLES
default "mesa3d" if BR2_PACKAGE_MESA3D_OPENGL_ES
-endif
+endif # BR2_PACKAGE_MESA3D
comment "mesa3d needs a toolchain w/ C++, largefile"
depends on !BR2_LARGEFILE || !BR2_INSTALL_LIBSTDCPP
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 05/14] package/mesa3d: DRI drivers depend on X.org
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (3 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 04/14] package/mesa3d: re-arrange menu items Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 21:05 ` Thomas Petazzoni
2014-04-17 16:04 ` [Buildroot] [PATCH 06/14] package/mesa3d: add comment for when OpenGL EGL is not available Yann E. MORIN
` (9 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
It does not make sense to build DRI drivers without X.org.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
---
package/mesa3d/Config.in | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 801a203..3a2766b 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -56,10 +56,10 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST
This is a software opengl implementation using the Gallium3D
infrastructure.
-comment "DRI drivers needs a toolchain w/ dynamic library"
- depends on BR2_PREFER_STATIC_LIB
+comment "DRI drivers needs an X.Org server and a toolchain w/ dynamic library"
+ depends on BR2_PREFER_STATIC_LIB || !BR2_PACKAGE_XSERVER_XORG_SERVER
-if !BR2_PREFER_STATIC_LIB
+if !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER
comment "DRI drivers"
@@ -73,7 +73,6 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST
config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965
bool "DRI i965 driver"
depends on BR2_i386 || BR2_x86_64
- depends on BR2_PACKAGE_XORG7
select BR2_PACKAGE_MESA3D_DRI_DRIVER
select BR2_PACKAGE_LIBDRM_INTEL
help
@@ -87,7 +86,7 @@ config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON
help
Legacy Radeon driver for R100 series GPUs.
-endif # !BR2_PREFER_STATIC_LIB
+endif # !BR2_PREFER_STATIC_LIB && BR2_PACKAGE_XSERVER_XORG_SERVER
if BR2_PACKAGE_MESA3D_DRIVER
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 06/14] package/mesa3d: add comment for when OpenGL EGL is not available
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (4 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 05/14] package/mesa3d: DRI drivers depend on X.org Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 07/14] package/mesa3d: simplify the code enabling full-OpenGL Yann E. MORIN
` (8 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
OpenGL EGL needs udev support, so add a comment stating so.
Also, reword the OpenGL EGL prompt to be in the same format as the
OpenGL ES prompt (and like the full OpenGL prompt that will shortly
be added, too.)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
---
package/mesa3d/Config.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index 3a2766b..bd7a853 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -92,8 +92,11 @@ if BR2_PACKAGE_MESA3D_DRIVER
comment "Additional API Support"
+comment "OpenGL EGL needs udev /dev management"
+ depends on !BR2_PACKAGE_HAS_UDEV
+
config BR2_PACKAGE_MESA3D_OPENGL_EGL
- bool "EGL"
+ bool "OpenGL EGL"
depends on BR2_PACKAGE_HAS_UDEV
select BR2_PACKAGE_HAS_LIBEGL
help
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 07/14] package/mesa3d: simplify the code enabling full-OpenGL
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (5 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 06/14] package/mesa3d: add comment for when OpenGL EGL is not available Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 08/14] package/mesa3d: only enable full OpenGL when a DRI driver is enabled Yann E. MORIN
` (7 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Currently, full-OpenGL is enabled by checking that at least one driver
is enabled. This is done by checking that the just-constructed lists of
drivers are not empty.
But we already have a variable that is set to 'y' as soon as a driver
is selected:
- DRI drivers select BR2_PACKAGE_MESA3D_DRI_DRIVER
- Gallium drivers select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
- both BR2_PACKAGE_MESA3D_DRI_DRIVER and BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
So, BR2_PACKAGE_MESA3D_DRIVER is set to 'y' as soon as at least one
driver is selected. We can use that variable rather than comparing the
lists of drivers.
Also, rearrange the code in a more logical way, by moving the code that
enables OpenGL nearer to the code enabling EGL and GLES.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
---
package/mesa3d/mesa3d.mk | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 1e2cc53..0d41efa 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -58,16 +58,6 @@ MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_SWRAST) += swrast
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965
MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += radeon
-# at least one API is required, for buildroot enable OpenGL API by default
-# other APIs (EGL, EGL_ES) are optional
-ifeq ($(MESA3D_GALLIUM_DRIVERS-y)$(MESA3D_DRI_DRIVERS-y),)
-MESA3D_CONF_OPT += \
- --disable-opengl
-else
-MESA3D_CONF_OPT += \
- --enable-opengl
-endif
-
ifeq ($(MESA3D_GALLIUM_DRIVERS-y),)
MESA3D_CONF_OPT += \
--without-gallium-drivers
@@ -90,6 +80,14 @@ endif
# APIs
+# At least one API is required, for buildroot enable OpenGL API by default.
+# Other APIs (EGL, EGL_ES) are optional
+ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y)
+MESA3D_CONF_OPT += --enable-opengl
+else
+MESA3D_CONF_OPT += --disable-opengl
+endif
+
ifeq ($(BR2_PACKAGE_MESA3D_OPENGL_EGL),y)
# egl depends on gbm, gbm depends on udev
MESA3D_DEPENDENCIES += udev
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 08/14] package/mesa3d: only enable full OpenGL when a DRI driver is enabled
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (6 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 07/14] package/mesa3d: simplify the code enabling full-OpenGL Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 09/14] package/xorg-server: do not force-select xf86driproto for mesa3d Yann E. MORIN
` (6 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Full OpenGL is only provided when:
- a DRI driver is enabled,
- and X.Org is enabled
Since DRI driver depend on X.Org being selected, this means that we
can (have to) enable full OpenGL as soon as a DRI driver is enabled.
On the other hand, Gallium drivers, which currently do enable full
OpenGL, only really provide OpenGL EGL and GLES, not full OpenGL.
So we exclude Gallium drivers when checking whether to enable full
OpenGL in mesa3d.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
---
package/mesa3d/mesa3d.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk
index 0d41efa..db166f8 100644
--- a/package/mesa3d/mesa3d.mk
+++ b/package/mesa3d/mesa3d.mk
@@ -80,9 +80,9 @@ endif
# APIs
-# At least one API is required, for buildroot enable OpenGL API by default.
-# Other APIs (EGL, EGL_ES) are optional
-ifeq ($(BR2_PACKAGE_MESA3D_DRIVER),y)
+# Full OpenGL is provided by DRI drivers with X.Org; DRI drivers are only
+# enabled when X.Org is enabled anyway, so no need to check for X.Org here.
+ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y)
MESA3D_CONF_OPT += --enable-opengl
else
MESA3D_CONF_OPT += --disable-opengl
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 09/14] package/xorg-server: do not force-select xf86driproto for mesa3d
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (7 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 08/14] package/mesa3d: only enable full OpenGL when a DRI driver is enabled Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 10/14] package/libgl: introduce as a new virtual package for full-openGL providers Yann E. MORIN
` (5 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
This is already handled by mesa3d itself.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Paul Cercueil <paul@crapouillou.net>
Cc: Bernd Kuhls <bernd.kuhls@t-online.de>
---
package/x11r7/xserver_xorg-server/Config.in | 1 -
1 file changed, 1 deletion(-)
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in
index dfa7d10..e191dce 100644
--- a/package/x11r7/xserver_xorg-server/Config.in
+++ b/package/x11r7/xserver_xorg-server/Config.in
@@ -45,7 +45,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XEXTPROTO
select BR2_PACKAGE_XPROTO_XF86BIGFONTPROTO
select BR2_PACKAGE_XPROTO_XF86DGAPROTO
- select BR2_PACKAGE_XPROTO_XF86DRIPROTO if BR2_PACKAGE_MESA3D
select BR2_PACKAGE_XPROTO_XF86VIDMODEPROTO
select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 10/14] package/libgl: introduce as a new virtual package for full-openGL providers
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (8 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 09/14] package/xorg-server: do not force-select xf86driproto for mesa3d Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 11/14] package/mesa3d: with a DRI driver, is a full OpenGL provider Yann E. MORIN
` (4 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Currently, only mesa3d is such a full-openGL provider.
But it is easy to see a few more cropping up at the door:
- NVidia's binary blob
- ATI's fglrx binary blob
Having this virtual full-openGL package will help when those are getting in.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
---
package/opengl/Config.in | 1 +
package/opengl/libgl/Config.in | 6 ++++++
package/opengl/libgl/libgl.mk | 7 +++++++
3 files changed, 14 insertions(+)
create mode 100644 package/opengl/libgl/Config.in
create mode 100644 package/opengl/libgl/libgl.mk
diff --git a/package/opengl/Config.in b/package/opengl/Config.in
index ed81835..20ee28b 100644
--- a/package/opengl/Config.in
+++ b/package/opengl/Config.in
@@ -1,3 +1,4 @@
+source "package/opengl/libgl/Config.in"
source "package/opengl/libegl/Config.in"
source "package/opengl/libgles/Config.in"
source "package/opengl/libopenvg/Config.in"
diff --git a/package/opengl/libgl/Config.in b/package/opengl/libgl/Config.in
new file mode 100644
index 0000000..8b99e5b
--- /dev/null
+++ b/package/opengl/libgl/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_HAS_LIBGL
+ bool
+
+config BR2_PACKAGE_PROVIDES_LIBGL
+ depends on BR2_PACKAGE_HAS_LIBGL
+ string
diff --git a/package/opengl/libgl/libgl.mk b/package/opengl/libgl/libgl.mk
new file mode 100644
index 0000000..7abc13d
--- /dev/null
+++ b/package/opengl/libgl/libgl.mk
@@ -0,0 +1,7 @@
+################################################################################
+#
+# libgl
+#
+################################################################################
+
+$(eval $(virtual-package))
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 11/14] package/mesa3d: with a DRI driver, is a full OpenGL provider
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (9 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 10/14] package/libgl: introduce as a new virtual package for full-openGL providers Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 21:07 ` Thomas Petazzoni
2014-04-17 16:04 ` [Buildroot] [PATCH 12/14] package/libevas: switch dependency from mesa3d to _HAS_LIBGL Yann E. MORIN
` (3 subsequent siblings)
14 siblings, 1 reply; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Make mesa3d a provider for full OpenGL, as soon as a DRI driver is enabled.
Full OpenGL is only possible when:
- a DRI driver is enabled,
- and X.Org is enabled
Since DRI driver in fact depend on X.Org being enabled in the first place,
we can safely declare mesa3d as a full openGL provider as soon as at least
one DRI driver is enabled.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
---
package/mesa3d/Config.in | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in
index bd7a853..0793b48 100644
--- a/package/mesa3d/Config.in
+++ b/package/mesa3d/Config.in
@@ -26,8 +26,12 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER
config BR2_PACKAGE_MESA3D_DRI_DRIVER
select BR2_PACKAGE_MESA3D_DRIVER
+ select BR2_PACKAGE_HAS_LIBGL
bool
+config BR2_PACKAGE_PROVIDES_LIBGL
+ default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER
+
config BR2_PACKAGE_MESA3D_DRIVER
bool
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 11/14] package/mesa3d: with a DRI driver, is a full OpenGL provider
2014-04-17 16:04 ` [Buildroot] [PATCH 11/14] package/mesa3d: with a DRI driver, is a full OpenGL provider Yann E. MORIN
@ 2014-04-17 21:07 ` Thomas Petazzoni
0 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2014-04-17 21:07 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Thu, 17 Apr 2014 18:04:23 +0200, Yann E. MORIN wrote:
> config BR2_PACKAGE_MESA3D_DRI_DRIVER
> select BR2_PACKAGE_MESA3D_DRIVER
> + select BR2_PACKAGE_HAS_LIBGL
> bool
>
> +config BR2_PACKAGE_PROVIDES_LIBGL
> + default "mesa3d" if BR2_PACKAGE_MESA3D_DRI_DRIVER
I find this a little bit confusing. Wouldn't it make more sense to have
a BR2_PACKAGE_MESA3D_GL option, that gets automatically defined when
mesa3d provides a full OpenGL implementation? I know it appears to
technically be the same as Mesa3D having a DRI driver, but it would
look more logical.
In fact, the Mesa3D situation is so complex that a good fat comment on
top of its Config.in file may be useful to have :)
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread
* [Buildroot] [PATCH 12/14] package/libevas: switch dependency from mesa3d to _HAS_LIBGL
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (10 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 11/14] package/mesa3d: with a DRI driver, is a full OpenGL provider Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 13/14] package/vlc: depends on the virtual package libgl Yann E. MORIN
` (2 subsequent siblings)
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
We now have a virtual package that represents availability of
full OpenGL.
This should be the end of this dependency hell epic, now. :-)
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
---
package/efl/libevas/Config.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/efl/libevas/Config.in b/package/efl/libevas/Config.in
index 8eea23d..febc115 100644
--- a/package/efl/libevas/Config.in
+++ b/package/efl/libevas/Config.in
@@ -148,7 +148,7 @@ choice
config BR2_PACKAGE_LIBEVAS_GL
bool "generic OpenGL"
- depends on BR2_PACKAGE_MESA3D
+ depends on BR2_PACKAGE_HAS_LIBGL
select BR2_PACKAGE_LIBEET
config BR2_PACKAGE_LIBEVAS_GLES_SGX
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 13/14] package/vlc: depends on the virtual package libgl
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (11 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 12/14] package/libevas: switch dependency from mesa3d to _HAS_LIBGL Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 16:04 ` [Buildroot] [PATCH 14/14] xapp_xdriinfo: " Yann E. MORIN
2014-04-17 21:02 ` [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Thomas Petazzoni
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: "Yann E. MORIN" <yann.morin.1998@free.fr>
Currently, vlc depends on mesa3d to provide the openGL support.
We now have a virtual package, libgl, which ensures openGL is available.
This is support for full OpenGL, which is only available when X.Org is
enabled, which is anyway a dependency of full OpenGL.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Bernd Kuhls <berndkuhls@hotmail.com>
Cc: Paul Cercueil <paul@crapouillou.net>
---
package/vlc/vlc.mk | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/package/vlc/vlc.mk b/package/vlc/vlc.mk
index bcb592c..e14c9c3 100644
--- a/package/vlc/vlc.mk
+++ b/package/vlc/vlc.mk
@@ -118,9 +118,9 @@ else
VLC_CONF_OPT += --disable-flac
endif
-ifeq ($(BR2_PACKAGE_MESA3D),y)
+ifeq ($(BR2_PACKAGE_HAS_LIBGL),y)
VLC_CONF_OPT += --enable-glx
-VLC_DEPENDENCIES += mesa3d
+VLC_DEPENDENCIES += libgl
else
VLC_CONF_OPT += --disable-glx
endif
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 14/14] xapp_xdriinfo: depends on the virtual package libgl
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (12 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 13/14] package/vlc: depends on the virtual package libgl Yann E. MORIN
@ 2014-04-17 16:04 ` Yann E. MORIN
2014-04-17 21:02 ` [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Thomas Petazzoni
14 siblings, 0 replies; 19+ messages in thread
From: Yann E. MORIN @ 2014-04-17 16:04 UTC (permalink / raw)
To: buildroot
From: Bernd Kuhls <bernd.kuhls@t-online.de>
Fixes http://autobuild.buildroot.net/results/90a/90a8226a8a2978eb13d02645cb9e3d95d9b95757/
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
[yann.morin.1998 at free.fr: fix comment, trim the commit log from unneeded info]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
---
package/x11r7/xapp_xdriinfo/Config.in | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/package/x11r7/xapp_xdriinfo/Config.in b/package/x11r7/xapp_xdriinfo/Config.in
index 970bff5..36dc577 100644
--- a/package/x11r7/xapp_xdriinfo/Config.in
+++ b/package/x11r7/xapp_xdriinfo/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_XAPP_XDRIINFO
bool "xdriinfo"
select BR2_PACKAGE_XLIB_LIBX11
select BR2_PACKAGE_XPROTO_GLPROTO
- depends on BR2_PACKAGE_MESA3D
+ depends on BR2_PACKAGE_HAS_LIBGL
help
query configuration information of DRI drivers
+
+comment "xdriinfo needs an OpenGL backend"
+ depends on !BR2_PACKAGE_HAS_LIBGL
--
1.8.3.2
^ permalink raw reply related [flat|nested] 19+ messages in thread* [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl)
2014-04-17 16:04 [Buildroot] [PATCH 0/14 v3] Add virtual package for full-openGL (branch yem/opengl) Yann E. MORIN
` (13 preceding siblings ...)
2014-04-17 16:04 ` [Buildroot] [PATCH 14/14] xapp_xdriinfo: " Yann E. MORIN
@ 2014-04-17 21:02 ` Thomas Petazzoni
14 siblings, 0 replies; 19+ messages in thread
From: Thomas Petazzoni @ 2014-04-17 21:02 UTC (permalink / raw)
To: buildroot
Dear Yann E. MORIN,
On Thu, 17 Apr 2014 18:04:21 +0200, Yann E. MORIN wrote:
> Yann E. MORIN (13):
> package/libdrm: radeon does not depend on x86
> package/xdriver_xf86-video-ati: only select libdrm if the DRI driver is enabled
> package/x11-video-drivers: do not select, but depends on mesa3d
> package/mesa3d: re-arrange menu items
> package/mesa3d: DRI drivers depend on X.org
> package/mesa3d: add comment for when OpenGL EGL is not available
> package/mesa3d: simplify the code enabling full-OpenGL
> package/mesa3d: only enable full OpenGL when a DRI driver is enabled
> package/xorg-server: do not force-select xf86driproto for mesa3d
> package/libgl: introduce as a new virtual package for full-openGL providers
> package/mesa3d: with a DRI driver, is a full OpenGL provider
> package/libevas: switch dependency from mesa3d to _HAS_LIBGL
> package/vlc: depends on the virtual package libgl
Series applied, thanks. I'll make a few comments on some of the
patches, as there might be some additional followup patches needed.
Thomas
--
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
^ permalink raw reply [flat|nested] 19+ messages in thread