Hi Colin, On Fri, Mar 18, 2011 at 10:16 AM, Colin Guthrie <gmane at colin.guthr.ie> wrote: > 'Twas brillig, and Luiz Augusto von Dentz at 14/03/11 21:58 did gyre and > gimble: > >>> Should this either/both your master or bluetooth trees be pulled into >>> upstream master? >> >> Yep, I just rebase my tree it should be fine to be pulled. > > Great. I just pulled the tree. > > There were a couple issues with building afterwards but I've fixed them > the following commit: > > http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff;h=c66a1ba352860eb265171d6c48ebd01ce82a5083 > > I also tidied up the source definitions generally in here: > http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff;h=e908a4d43e8bc90d91dc9e339b87f81c3917acbc > > The above doesn't really change anything but I did add a couple extra > header files into libbluetooth_sbc_la_SOURCES that were missing before. > > I then fixed the update-sbc Make rule here: > http://git.0pointer.de/?p=pulseaudio.git;a=commitdiff;h=9a27b0c413980cb04179139b6a0b4347b2d83ac5 Great, I didn't know there was such a thing, nice catch. > to fix the paths. > > I also ran update-sbc and it did pull in a couple changes - mostly > copyright header changes, but a few code things too. It all looked quite > trivial but didn't want to do it ad-hoc without your ACK :) ACK > Let me know if it's OK to run it and commit the results (or feel free to > do it in your tree and an I can pull again). Please go ahead. > All the best > > Col > > -- > > Colin Guthrie > gmane(at)colin.guthr.ie > http://colin.guthr.ie/ > > Day Job: > ?Tribalogic Limited [http://www.tribalogic.net/] > Open Source: > ?Mageia Contributor [http://www.mageia.org/] > ?PulseAudio Hacker [http://www.pulseaudio.org/] > ?Trac Hacker [http://trac.edgewall.org/] > -- Luiz Augusto von Dentz Computer Engineer
