On Fri, Oct 14, 2011 at 12:26:30PM +0100, Richard Purdie wrote:
> On Thu, 2011-10-13 at 13:30 +0200, Martin Jansa wrote:
> > Mostly cleanup in mesa directory.
> > 
> > Most controversial is 
> > mesa-dri: introduce MACHINE_DRI_MODULES
> > but maybe we can use it as distro variable and keep it with default arch.
> > But then we cannot just add ie glamo dri module from meta-openmoko like this:
> > http://git.shr-project.org/git/?p=meta-smartphone.git;a=commit;h=b50c8d00cf764c276b0792c0623b8eda3d18d343
> > without distro (setting MACHINE_DRI_MODULES) depending on such bsp layer.
> > 
> > The following changes since commit 5ad1ca59dea6d5045f252ed7b786ad193faced64:
> > 
> >   xf86-video-intel: Update 2.15.0 -> 2.16.0 (2011-10-12 22:59:14 +0100)
> > 
> > are available in the git repository at:
> >   git://git.openembedded.org/openembedded-core-contrib jansa/x11-v4
> >   http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=jansa/x11-v4
> > 
> > Martin Jansa (20):
> >   xserver-xorg: drop xorg-minimal-fonts from RDEPENDS
> >   xserver-xorg: move PE to xserver-xorg-common and bump it
> >   xorg-driver-common: bump PE for upgrade path for meta-oe users
> >   mesa-dri-glsl-native: fix LICENSE
> >   mesa: move common patches which could be used in both mesa-dri and
> >     mesa-xlib from mesa-dri to mesa
> >   mesa-common: add common LIC_FILES_CHKSUM for newer mesa versions
> >   mesa-common: MesaDemos is now separate recipes, bump PE, introduce
> >     INC_PR
> >   mesa-common: use glx-use-tls.inc instead of enabling glx-tls every
> >     time
> >   mesa-7.11: move shared DEPENDS, SRC_URI, checksums and
> >     do_configure_prepend to shared .inc file
> >   mesa: move shared PROTO_DEPS, LIB_DEPS and DEPENDS to common .inc
> >   mesa: package gl/egl/osmesa to separate packages
> >   mesa-xlib: move shared options to .inc
> >   mesa-dri: move shared options to mesa-dri.inc
> >   mesa-dri: introduce MACHINE_DRI_MODULES
> >   mesa-dri: LEAD_SONAME shouldn't be needed now, when we're packaging
> >     each lib in separate package
> >   mesa-dri: drop COMPATIBLE_HOST, swrast should work for everybody
> >   mesa-git: move shared parts from mesa-dri_git to mesa-git.inc and add
> >     mesa-xlib_git
> >   mesa-git: lower D_P a bit more then all mesa-dri
> >   mesa-git: upgrade from 7.7+git to 7.11+git
> >   mesa-git: fix LIC_FILES_CHKSUM
> 
> I merged most of this. The pieces I didn't take:
> 
> * MACHINE_DRI_MODULES piece
> * Drop COMPATIBLE_HOST (due to above)
> * glx-tls piece
> * FILES changes (due to do_install_append)

I've just pushed rebased jansa/x11-v4 with this last 4 patches

> This was *much* easier to review and I'm grateful for that, thanks!

good, you're welcome

> I think the actions are now:
> 
> a) Resolve the MACHINE_DRI_MODULES discussion. Short term we can make
> the i915/965 pieces ia32 only and then remove the COMPATIBLE_MACHINES

OK

> b) Drop the glx/tls piece

I'll send patch dropping also the file and from xserver-xorg after mesa
is dropped in meta-oe so we don't introduce parsing issues

> c) Drop the do_install_append

resolved in 1/4 which is 
mesa: package gl/egl/osmesa to separate packages
without do_install_append (that is moved to 3/4)

> and then we should have this all resolved :)

Regards,

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