On Sun, Apr 18, 2010 at 11:52:16PM +0200, Juergen Lock wrote:
> On Sun, Apr 18, 2010 at 11:38:34PM +0200, Aurelien Jarno wrote:
> > On Sun, Apr 18, 2010 at 11:16:46PM +0200, Juergen Lock wrote:
> > > On Sun, Apr 18, 2010 at 10:52:22PM +0200, Aurelien Jarno wrote:
> > > > On Sun, Apr 11, 2010 at 06:17:32PM +0200, Juergen Lock wrote:
> > > > > As suggested by Andreas Färber, here is a cumulative patch that syncs
> > > > > OSS_GETVERSION handling with head by merging the following commits:
> > > > >
> > > > > 1. oss: issue OSS_GETVERSION ioctl only when needed
> > > > > 6d246526ce3c145b2831285def6983f5de6190d3
> > > > >
> > > > > 2. oss: fix fragment setting
> > > > > 3d709fe73a77c40e263b3af6e650fd4b519c3562
> > > > >
> > > > > 3. Workaround for broken OSS_GETVERSION on FreeBSD, part two
> > > > > 72ff25e4e98d6dba9286d032b9ff5432553bbad5
> > > > >
> > > > > Signed-off-by: Juergen Lock <n...@jelal.kn-bremen.de>
> > > >
> > > > I would actually prefer a patch series instead of a cumulative patch, so
> > > > that we can match commits between HEAD and stable-0.12.
> > > >
> > > Oh, I only did what was suggested... If you want to merge those as
> > > individual commits I think you can just cherry-pick them from head?
> > >
> >
> > They doesn't apply directly, and fixing them doesn't seems that
> > trivial.
>
> Oh, I must have completely forgot about that then. :( I'll see what
> I can do over the next few days...
Ok found the reason cherry-picking didn't work: There were two commits
missing at the beginning of the above list (doh!), the correct list is:
1. oss: workaround for cases when OSS_GETVERSION is not defined
e726fe7d60d46636c74c1c4a8fac7e4a05efb163
2. oss: refactor code around policy setting
78d9356d3caad95a74bc9cd65eea5fc7e050c35d
3. oss: issue OSS_GETVERSION ioctl only when needed
6d246526ce3c145b2831285def6983f5de6190d3
4. oss: fix fragment setting
3d709fe73a77c40e263b3af6e650fd4b519c3562
5. Workaround for broken OSS_GETVERSION on FreeBSD, part two
72ff25e4e98d6dba9286d032b9ff5432553bbad5
So with this list you should be able to sync audio/ossaudio.c correctly,
and sorry again about the confusion...
Juergen
