[PATCH 1/2] xserver-xorg: remove glx-use-tls again

[PATCH 1/2] xserver-xorg: remove glx-use-tls again

[Martin Jansa]

* khem confirmed that uclibc does support it now

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/glx-use-tls.inc         |    7 -------
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    3 +--
 2 files changed, 1 insertions(+), 9 deletions(-)
 delete mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc

diff --git a/meta/recipes-graphics/mesa/glx-use-tls.inc b/meta/recipes-graphics/mesa/glx-use-tls.inc
deleted file mode 100644
index 7530872..0000000
--- a/meta/recipes-graphics/mesa/glx-use-tls.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-def get_tls_setting(bb, d):
-    # until we have no prober TLS support in uclibc disable it
-    if bb.data.getVar('TARGET_OS', d, 1).find('uclibc') >= 0 :
-        return ""
-    return "--enable-glx-tls"
-
-EXTRA_OECONF += "${@get_tls_setting(bb, d)}"
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
index 01cdd68..9246b06 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
@@ -3,11 +3,10 @@ require xserver-xorg-common.inc
 PROTO_DEPS += "xf86driproto dri2proto"
 LIB_DEPS += "virtual/libgl"
 
-require ../mesa/glx-use-tls.inc
-
 EXTRA_OECONF += "\
                  --enable-dri \
                  --enable-dri2 \
+                 --enable-glx-tls \
                  --with-pic \
                  --with-int10=x86emu \
 "
-- 
1.7.7

[PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

* this way we can use
  EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
  EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
  of other modules in other layers in stack

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-dri.inc |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 795144a..4557bf8 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -4,9 +4,11 @@ LIB_DEPS += "libdrm expat"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
+EXTRA_DRIDRIVERS = ""
+EXTRA_DRIDRIVERS_x86 = ",i915,i965"
+EXTRA_DRIDRIVERS_x86-64 = ",i915,i965"
 DRIDRIVERS = "swrast"
-DRIDRIVERS_x86 = "swrast,i915,i965"
-DRIDRIVERS_x86-64 = "swrast,i915,i965"
+DRIDRIVERS += "${EXTRA_DRIDRIVERS}"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
 
-- 
1.7.7

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Koen Kooi]

Op 15 okt. 2011, om 12:24 heeft Martin Jansa het volgende geschreven:

> * this way we can use
>  EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
>  EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
>  of other modules in other layers in stack

The above talks about 'MODULES', the actual patch about 'DRIVERS' :)

> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
> meta/recipes-graphics/mesa/mesa-dri.inc |    6 ++++--
> 1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> index 795144a..4557bf8 100644
> --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> @@ -4,9 +4,11 @@ LIB_DEPS += "libdrm expat"
> # most of our targets do not have DRI so will use mesa-xlib
> DEFAULT_PREFERENCE = "-1"
> 
> +EXTRA_DRIDRIVERS = ""
> +EXTRA_DRIDRIVERS_x86 = ",i915,i965"
> +EXTRA_DRIDRIVERS_x86-64 = ",i915,i965"
> DRIDRIVERS = "swrast"
> -DRIDRIVERS_x86 = "swrast,i915,i965"
> -DRIDRIVERS_x86-64 = "swrast,i915,i965"
> +DRIDRIVERS += "${EXTRA_DRIDRIVERS}"
> 
> EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
> 
> -- 
> 1.7.7
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

[PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

* this way we can use
  EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
  EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
  of other modules in other layers in stack
* actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
  to indicate that it should be used for architecture not machine

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-dri.inc |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 795144a..ef0e8cf 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -4,11 +4,11 @@ LIB_DEPS += "libdrm expat"
 # most of our targets do not have DRI so will use mesa-xlib
 DEFAULT_PREFERENCE = "-1"
 
-DRIDRIVERS = "swrast"
-DRIDRIVERS_x86 = "swrast,i915,i965"
-DRIDRIVERS_x86-64 = "swrast,i915,i965"
+EXTRA_DRIDRIVERS = ""
+EXTRA_DRIDRIVERS_x86 = "i915,i965"
+EXTRA_DRIDRIVERS_x86-64 = "i915,i965"
 
-EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
+EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=swrast,${EXTRA_DRIDRIVERS}"
 
 python populate_packages_prepend() {
 	import os.path
-- 
1.7.7

Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Richard Purdie]

On Sat, 2011-10-15 at 12:38 +0200, Martin Jansa wrote:
> * this way we can use
>   EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
>   EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
>   of other modules in other layers in stack
> * actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
>   to indicate that it should be used for architecture not machine

This is way overcomplicated. Just do:

DRIDRIVERS_append_armv4t = ",glamo"

With the other approach you should be using .= to avoid spaces anyway.

Cheers,

Richard

Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

On Sat, Oct 15, 2011 at 7:02 PM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Sat, 2011-10-15 at 12:38 +0200, Martin Jansa wrote:
>> * this way we can use
>>   EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
>>   EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
>>   of other modules in other layers in stack
>> * actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
>>   to indicate that it should be used for architecture not machine
>
> This is way overcomplicated. Just do:
>
> DRIDRIVERS_append_armv4t = ",glamo"

Ah, is it expected that armv4t is no longer valid OVERRIDE?

OVERRIDES="linux-gnueabi:arm:build-linux:pn-libdrm:om-gta02::shr:forcevariable:thumb:libc-glibc"

# OVERRIDES=${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES",
"thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES",
"no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc

So I've to change it to
DRIDRIVERS_append_arm
or is it TRANSLATED_TARGET_ARCH fault?

Regards,

Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Koen Kooi]

Op 21 okt. 2011, om 09:34 heeft Martin Jansa het volgende geschreven:

> On Sat, Oct 15, 2011 at 7:02 PM, Richard Purdie
> <richard.purdie@linuxfoundation.org> wrote:
>> On Sat, 2011-10-15 at 12:38 +0200, Martin Jansa wrote:
>>> * this way we can use
>>>   EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
>>>   EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
>>>   of other modules in other layers in stack
>>> * actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
>>>   to indicate that it should be used for architecture not machine
>> 
>> This is way overcomplicated. Just do:
>> 
>> DRIDRIVERS_append_armv4t = ",glamo"
> 
> Ah, is it expected that armv4t is no longer valid OVERRIDE?

It is valid for angstrom:

koen@dominion:/OE/tentacle/sources/meta-ti$ MACHINE=om-gta01 bitbake -e | grep OVERRIDES
# DISTROOVERRIDES=${DISTRO}
DISTROOVERRIDES="angstrom"
# MACHINEOVERRIDES=${MACHINE}:${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch')}:${SOC_FAMILY}
MACHINEOVERRIDES="om-gta01:armv4t:Unknown"
# OVERRIDES=${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc:libc-glibc

regards,

Koen

> 
> OVERRIDES="linux-gnueabi:arm:build-linux:pn-libdrm:om-gta02::shr:forcevariable:thumb:libc-glibc"
> 
> # OVERRIDES=${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES",
> "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES",
> "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc
> 
> So I've to change it to
> DRIDRIVERS_append_arm
> or is it TRANSLATED_TARGET_ARCH fault?
> 
> Regards,
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2851 bytes --]

On Fri, Oct 21, 2011 at 09:54:21AM +0200, Koen Kooi wrote:
> 
> Op 21 okt. 2011, om 09:34 heeft Martin Jansa het volgende geschreven:
> 
> > On Sat, Oct 15, 2011 at 7:02 PM, Richard Purdie
> > <richard.purdie@linuxfoundation.org> wrote:
> >> On Sat, 2011-10-15 at 12:38 +0200, Martin Jansa wrote:
> >>> * this way we can use
> >>>   EXTRA_DRIDRIVERS_armv4t += ",glamo" in meta-openmoko layer and
> >>>   EXTRA_DRIDRIVERS_armv4t += ",foo" in meta-bar layer without knowledge
> >>>   of other modules in other layers in stack
> >>> * actually it's like old MACHINE_DRI_MODULES from OE-classic but renamed
> >>>   to indicate that it should be used for architecture not machine
> >> 
> >> This is way overcomplicated. Just do:
> >> 
> >> DRIDRIVERS_append_armv4t = ",glamo"
> > 
> > Ah, is it expected that armv4t is no longer valid OVERRIDE?
> 
> It is valid for angstrom:

I was thinking about adding the same to shr config.. but can I expect
that everybody who wants to use meta-openmoko will read README so
carefully that it will be enough to say
This layer depends on FEED_ARCH OVERRIDE?

Regards,

> koen@dominion:/OE/tentacle/sources/meta-ti$ MACHINE=om-gta01 bitbake -e | grep OVERRIDES
> # DISTROOVERRIDES=${DISTRO}
> DISTROOVERRIDES="angstrom"
> # MACHINEOVERRIDES=${MACHINE}:${@bb.data.getVar('FEED_ARCH', d,1).replace('all','noarch')}:${SOC_FAMILY}
> MACHINEOVERRIDES="om-gta01:armv4t:Unknown"
> # OVERRIDES=${OVERRIDE_THUMB}${OVERRIDE_INTERWORK}${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES", "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES", "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc:libc-glibc
> 
> regards,
> 
> Koen
> 
> > 
> > OVERRIDES="linux-gnueabi:arm:build-linux:pn-libdrm:om-gta02::shr:forcevariable:thumb:libc-glibc"
> > 
> > # OVERRIDES=${TARGET_OS}:${TRANSLATED_TARGET_ARCH}:build-${BUILD_OS}:pn-${PN}:${MACHINEOVERRIDES}:${DISTROOVERRIDES}:forcevariable${@bb.utils.contains("TUNE_FEATURES",
> > "thumb", ":thumb", "", d)}${@bb.utils.contains("TUNE_FEATURES",
> > "no-thumb-interwork", ":thumb-interwork", "", d)}:libc-glibc
> > 
> > So I've to change it to
> > DRIDRIVERS_append_arm
> > or is it TRANSLATED_TARGET_ARCH fault?
> > 
> > Regards,
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Khem Raj]

On Fri, Oct 21, 2011 at 12:34 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> So I've to change it to
> DRIDRIVERS_append_arm
> or is it TRANSLATED_TARGET_ARCH fault?
>

Yes I think that's what changed it. I think it makes sense to have arm
subfamily in overrides from oe-core

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2141 bytes --]

On Sat, Oct 15, 2011 at 12:29:52PM +0200, Koen Kooi wrote:
> 
> Op 15 okt. 2011, om 12:24 heeft Martin Jansa het volgende geschreven:
> 
> > * this way we can use
> >  EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> >  EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> >  of other modules in other layers in stack
> 
> The above talks about 'MODULES', the actual patch about 'DRIVERS' :)

thanks for catching this.. I had it in meta-openmoko layer too :/

send new version simplified a bit more as nobody wants to disable swrast
and extra trailing ',' seems to be ignored fine

> 
> > Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> > ---
> > meta/recipes-graphics/mesa/mesa-dri.inc |    6 ++++--
> > 1 files changed, 4 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
> > index 795144a..4557bf8 100644
> > --- a/meta/recipes-graphics/mesa/mesa-dri.inc
> > +++ b/meta/recipes-graphics/mesa/mesa-dri.inc
> > @@ -4,9 +4,11 @@ LIB_DEPS += "libdrm expat"
> > # most of our targets do not have DRI so will use mesa-xlib
> > DEFAULT_PREFERENCE = "-1"
> > 
> > +EXTRA_DRIDRIVERS = ""
> > +EXTRA_DRIDRIVERS_x86 = ",i915,i965"
> > +EXTRA_DRIDRIVERS_x86-64 = ",i915,i965"
> > DRIDRIVERS = "swrast"
> > -DRIDRIVERS_x86 = "swrast,i915,i965"
> > -DRIDRIVERS_x86-64 = "swrast,i915,i965"
> > +DRIDRIVERS += "${EXTRA_DRIDRIVERS}"
> > 
> > EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
> > 
> > -- 
> > 1.7.7
> > 
> > 
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Phil Blundell]

On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> * this way we can use
>   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
>   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
>   of other modules in other layers in stack

Is this really better than using "DRIMODULES_append_armv4t = ..."?  

It's not really true that you can do it without any knowledge of what
other layers are doing since if you end up with two competing
EXTRA_DRIMODULES_foo overrides then one of them will get lost.

p.

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 845 bytes --]

On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > * this way we can use
> >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> >   of other modules in other layers in stack
> 
> Is this really better than using "DRIMODULES_append_armv4t = ..."?  

the point is that you don't need to know who is setting swrast there for
armv4t...

> 
> It's not really true that you can do it without any knowledge of what
> other layers are doing since if you end up with two competing
> EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> 

so EXTRA_DRIMODULES_append_armv4t should be fine, right?

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Phil Blundell]

On Sat, 2011-10-15 at 16:34 +0200, Martin Jansa wrote:
> On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> > On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > > * this way we can use
> > >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> > >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> > >   of other modules in other layers in stack
> > 
> > Is this really better than using "DRIMODULES_append_armv4t = ..."?  
> 
> the point is that you don't need to know who is setting swrast there for
> armv4t...

I'm not sure I understand what you're saying there.  Can you be more
concrete?

> > 
> > It's not really true that you can do it without any knowledge of what
> > other layers are doing since if you end up with two competing
> > EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> > 
> 
> so EXTRA_DRIMODULES_append_armv4t should be fine, right?

Well, yes, but in that case it doesn't seem as though the EXTRA_ bit
(and this patch) buys anything.

p.

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1659 bytes --]

On Sat, Oct 15, 2011 at 03:40:10PM +0100, Phil Blundell wrote:
> On Sat, 2011-10-15 at 16:34 +0200, Martin Jansa wrote:
> > On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> > > On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > > > * this way we can use
> > > >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> > > >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> > > >   of other modules in other layers in stack
> > > 
> > > Is this really better than using "DRIMODULES_append_armv4t = ..."?  
> > 
> > the point is that you don't need to know who is setting swrast there for
> > armv4t...
> 
> I'm not sure I understand what you're saying there.  Can you be more
> concrete?
> 
> > > 
> > > It's not really true that you can do it without any knowledge of what
> > > other layers are doing since if you end up with two competing
> > > EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> > > 
> > 
> > so EXTRA_DRIMODULES_append_armv4t should be fine, right?
> 
> Well, yes, but in that case it doesn't seem as though the EXTRA_ bit
> (and this patch) buys anything.

OK, forget this patch.. I've forgot this behavior of _append_armv4t
syntax.. and I've changed meta-openmoko to use this too.

can we change x86 and x86-64 examples in mesa-dri.inc to
DRIDRIVERS_append_x86 = ",i915,i965"
DRIDRIVERS_append_x86-64 = ",i915,i965"
so it will work as example for BSP layer maintainers that thay don't
need to care about setting
DRIDRIVERS = "swrast"
for their arch?

Regards,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: [PATCH 2/2] mesa-dri: move extra DRIMODULES to EXTRA_DRIMODULES

[Richard Purdie]

On Mon, 2011-10-17 at 11:50 +0200, Martin Jansa wrote:
> On Sat, Oct 15, 2011 at 03:40:10PM +0100, Phil Blundell wrote:
> > On Sat, 2011-10-15 at 16:34 +0200, Martin Jansa wrote:
> > > On Sat, Oct 15, 2011 at 03:30:13PM +0100, Phil Blundell wrote:
> > > > On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> > > > > * this way we can use
> > > > >   EXTRA_DRIMODULES_armv4t += ",glamo" in meta-openmoko layer and
> > > > >   EXTRA_DRIMODULES_armv4t += ",foo" in meta-bar layer without knowledge
> > > > >   of other modules in other layers in stack
> > > > 
> > > > Is this really better than using "DRIMODULES_append_armv4t = ..."?  
> > > 
> > > the point is that you don't need to know who is setting swrast there for
> > > armv4t...
> > 
> > I'm not sure I understand what you're saying there.  Can you be more
> > concrete?
> > 
> > > > 
> > > > It's not really true that you can do it without any knowledge of what
> > > > other layers are doing since if you end up with two competing
> > > > EXTRA_DRIMODULES_foo overrides then one of them will get lost.
> > > > 
> > > 
> > > so EXTRA_DRIMODULES_append_armv4t should be fine, right?
> > 
> > Well, yes, but in that case it doesn't seem as though the EXTRA_ bit
> > (and this patch) buys anything.
> 
> OK, forget this patch.. I've forgot this behavior of _append_armv4t
> syntax.. and I've changed meta-openmoko to use this too.
> 
> can we change x86 and x86-64 examples in mesa-dri.inc to
> DRIDRIVERS_append_x86 = ",i915,i965"
> DRIDRIVERS_append_x86-64 = ",i915,i965"
> so it will work as example for BSP layer maintainers that thay don't
> need to care about setting
> DRIDRIVERS = "swrast"
> for their arch?

I'll take that patch...

Cheers,

Richard

[PATCH] mesa-dri: use DRIDRIVERS_append_arch to promote right usage for BSP layer maintainers

[Martin Jansa]

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/mesa/mesa-dri.inc |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc b/meta/recipes-graphics/mesa/mesa-dri.inc
index 795144a..fcce259 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -5,8 +5,8 @@ LIB_DEPS += "libdrm expat"
 DEFAULT_PREFERENCE = "-1"
 
 DRIDRIVERS = "swrast"
-DRIDRIVERS_x86 = "swrast,i915,i965"
-DRIDRIVERS_x86-64 = "swrast,i915,i965"
+DRIDRIVERS_append_x86 = ",i915,i965"
+DRIDRIVERS_append_x86-64 = ",i915,i965"
 
 EXTRA_OECONF += "--with-driver=dri --disable-egl --disable-gallium --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS}"
 
-- 
1.7.7

Re: [PATCH] mesa-dri: use DRIDRIVERS_append_arch to promote right usage for BSP layer maintainers

[Richard Purdie]

On Mon, 2011-10-17 at 14:18 +0200, Martin Jansa wrote:
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-graphics/mesa/mesa-dri.inc |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)

Merged to master, thanks.

Richard

Re: [PATCH 1/2] xserver-xorg: remove glx-use-tls again

[Richard Purdie]

On Sat, 2011-10-15 at 12:24 +0200, Martin Jansa wrote:
> * khem confirmed that uclibc does support it now
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  meta/recipes-graphics/mesa/glx-use-tls.inc         |    7 -------
>  .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    3 +--
>  2 files changed, 1 insertions(+), 9 deletions(-)
>  delete mode 100644 meta/recipes-graphics/mesa/glx-use-tls.inc

Merged to master, thanks.

Richard