* [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature
@ 2012-09-04 20:44 Ross Burton
2012-09-10 15:37 ` Saul Wold
0 siblings, 1 reply; 3+ messages in thread
From: Ross Burton @ 2012-09-04 20:44 UTC (permalink / raw)
To: openembedded-core
If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +--
meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 5 ++++-
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 ------
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b588c11..b4a348c 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r5"
-
+PR = "r6"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
index 404c488..94e83ea 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
@@ -119,8 +119,11 @@ EXTRA_OECONF += "--with-fop=no \
ac_cv_file__usr_share_sgml_X11_defs_ent=no \
"
-PACKAGECONFIG ??= "udev"
+PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
+PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
+ --disable-dri --disable-glx,\
+ xf86driproto dri2proto mesa-dri"
do_install_append () {
# Its assumed base-files creates this for us
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index ca7d33a..1322cfc 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -1,12 +1,6 @@
require xserver-xorg-common.inc
-PROTO_DEPS += "xf86driproto dri2proto"
-LIB_DEPS += "mesa-dri"
-
EXTRA_OECONF += "\
- --enable-dri \
- --enable-dri2 \
- --enable-glx-tls \
--with-pic \
--with-int10=x86emu \
--without-xmlto \
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature
2012-09-04 20:44 [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature Ross Burton
@ 2012-09-10 15:37 ` Saul Wold
0 siblings, 0 replies; 3+ messages in thread
From: Saul Wold @ 2012-09-10 15:37 UTC (permalink / raw)
To: Ross Burton; +Cc: openembedded-core
On 09/04/2012 01:44 PM, Ross Burton wrote:
> If the distro doesn't have the opengl feature there's no point building the DRI
> or GLX support, making the mesa-dri build dependency optional.
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
> meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 3 +--
> meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc | 5 ++++-
> meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 6 ------
> 3 files changed, 5 insertions(+), 9 deletions(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> index b588c11..b4a348c 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
> @@ -8,5 +8,4 @@ SRC_URI += "file://crosscompile.patch \
> SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
> SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
>
> -PR = "r5"
> -
> +PR = "r6"
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> index 404c488..94e83ea 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-common.inc
> @@ -119,8 +119,11 @@ EXTRA_OECONF += "--with-fop=no \
> ac_cv_file__usr_share_sgml_X11_defs_ent=no \
> "
>
> -PACKAGECONFIG ??= "udev"
> +PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}"
> PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
> +PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
> + --disable-dri --disable-glx,\
> + xf86driproto dri2proto mesa-dri"
>
> do_install_append () {
> # Its assumed base-files creates this for us
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index ca7d33a..1322cfc 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -1,12 +1,6 @@
> require xserver-xorg-common.inc
>
> -PROTO_DEPS += "xf86driproto dri2proto"
> -LIB_DEPS += "mesa-dri"
> -
> EXTRA_OECONF += "\
> - --enable-dri \
> - --enable-dri2 \
> - --enable-glx-tls \
> --with-pic \
> --with-int10=x86emu \
> --without-xmlto \
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature
@ 2012-09-07 10:49 Ross Burton
0 siblings, 0 replies; 3+ messages in thread
From: Ross Burton @ 2012-09-07 10:49 UTC (permalink / raw)
To: openembedded-core
If the distro doesn't have the opengl feature there's no point building the DRI
or GLX support, making the mesa-dri build dependency optional.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
.../xorg-xserver/xserver-xorg-1.11.2.inc | 2 +-
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 16 ++++------------
2 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index b4a348c..c71896a 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r6"
+PR = "r7"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index a0309aa..210abad 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -123,21 +123,13 @@ EXTRA_OECONF += "--with-fop=no \
ac_cv_file__usr_share_sgml_X11_defs_ent=no \
"
-PACKAGECONFIG ??= "udev"
+PACKAGECONFIG ??= "udev ${@base_contains('DISTRO_FEATURES', 'opengl', 'glx', '', d)}"
PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev"
+PACKAGECONFIG[glx] = "--enable-dri --enable-dri2 --enable-glx --enable-glx-tls,\
+ --disable-dri --disable-glx,\
+ xf86driproto dri2proto mesa-dri"
do_install_append () {
# Its assumed base-files creates this for us
rmdir ${D}${localstatedir}/log/
}
-
-
-# Mesa/GLX/DRI
-PROTO_DEPS += "xf86driproto dri2proto"
-LIB_DEPS += "mesa-dri"
-
-EXTRA_OECONF += "\
- --enable-dri \
- --enable-dri2 \
- --enable-glx-tls \
-"
--
1.7.10
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-09-10 15:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-04 20:44 [PATCH] xserver-xorg: make DRI/GLX options respect opengl distro feature Ross Burton
2012-09-10 15:37 ` Saul Wold
2012-09-07 10:49 Ross Burton
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.