Public SourceMage Discussion List

[Sukneet Basuta <sukneet AT gmail.com>]

I think we are all well aware that devel-xorg-modular needs a lot of work.

I'm surprised you haven't asked for commit access given the amount of
bug reports you've posted and supplied fixes for. I'm sure you have
your reasons though or perhaps you already have.

In your first e-mail you mentioned that you checked out the branch
"origin/devel-xorg-modular". Did you try "devel-xorg-modular" instead?
I get the same error with orgin/dev..., but using just the branch name
works for me. I believe dl_git has changed since that wiki entry,
which is why you no longer have include origin/ in the branch name, as
it is automatically added.

On Wed, Jan 2, 2013 at 9:55 PM, Javier Vasquez <j.e.vasquez.v AT gmail.com> 
wrote:
> On Wed, Jan 2, 2013 at 8:35 PM, Sukneet Basuta <sukneet AT gmail.com> wrote:
>> scribe add xorg-modular from
>> git_http://scm.sourcemage.org/smgl/grimoire.git:xorg-modular:devel-xorg-modular
>>
>> should work. git:// should work as well.
>>
>> FYI, updating to devel-xorg-modular from test is going to break a
>> bunch of things that (IME) won't be caught by cleanse --fix, mostly
>> because libpthread-stubs is missing a bunch of triggers. I'm somewhat
>> working on finding them all, but I haven't had the time the past 4
>> months or so. I already have a decent list of spells that need to be
>> triggered that I should probably push to git though.
>
> Found it out the hard way.  Actually using devel-xorg-modular leads to
> a loop of dependencies broken, pretty hard to fix.  I considered the
> effort not worth.  I had spent a lot of time reverting to test, since
> then test was also broken, and again, cleanse doesn't help...
>
> BTW, even devel-xorg-modular is pretty old.  The mesalib there is
> 8.0.* which doesn't still support nouveau.  9.0.1, does come with it,
> but I couldn't make mesalib work correctly on 9.0.1 (well I did it,
> but without the patch to copy the stuff where Xorg and company would
> be able to find it)...  So at the end the purpose of using
> devel-xorg-modular vanished, if at the end I would end up with similar
> stuff I currently have...
>
> Also the mesalib package is broken, cause though you can specify a
> list of gallium drivers through $MESALIB_GALLIUM, build treats them as
> just one.  For what it's worth, I changed a bit to:
>
> for gal_dr in $MESALIB_GALLIUM
> do
>    case $gal_dr in
>      llvm)    OPTS="${OPTS} --enable-gallium-llvm" ;;
>      svga)    OPTS="${OPTS} --enable-gallium-svga" ;;
>      intel)   OPTS="${OPTS} --enable-gallium-intel" ;;
>      i915)    OPTS="${OPTS} --enable-gallium-i915" ;;
>      i965)    OPTS="${OPTS} --enable-gallium-i965" ;;
>      radeon)  OPTS="${OPTS} --enable-gallium-radeon --disable-gallium-intel"
>         LDFLAGS="${LDFLAGS/-s/}" ;;
>      r600)    OPTS="${OPTS} --enable-gallium-r600" ;;
>      nouveau) OPTS="${OPTS} --enable-gallium-nouveau 
> --disable-gallium-intel" ;;
>      swrast)  OPTS="${OPTS} --enable-gallium-swrast" ;;
>      none)    OPTS="${OPTS} --disable-gallium" ;;
>    esac
> done &&
>
> Instead of the simple case...  Also I added configurable support for
> vdpau on depends:
>
> optional_depends libvdpau               \
>             "--enable-vdpau"            \
>                 ""                          \
>                 "To enable vdpau (nouveau)" &&
>
> Which makes sense pretty much mostly on nouveau (nvidia)...  And
> finally but not least I changed to support nouveau as driver as well
> on configure:
>
> AVAILABLE_DRIVERS="i915 i965 intel r200 radeon nouveau swrast"
>
> But again, I dropped it, since I can't spend more time than what I
> already did, and I still have several other smgl tasks pending besides
> devel-xorg-modular...
>
> And getting to the question.  I tried what you mentioned through
> scribe.  I sent what happened already in the prior e-mail.  Somehow it
> shows errors.  And whether they are to be ignored, or by attempting to
> fix them the local branch gets broken (modified without ability to
> pull)...
>
> So as the local repo was OK from the 1st place, what I did was not to
> fix the grimoire, and do git pull any time wanted to then scribe
> reindex.
>
> Someone suggested using "localize xorg-modular", which marks it as
> local, and then scribe won't update the branch ever, but one could do
> it manually with git pull...
>
> So that was my short experience (leading to broken state and pretty
> hard to revert as well to test) with devel-xorg-modular...
>
> Thanks,
>
> --
> Javier.