[MPlayer-dev-eng] [PATCH] Fix libdvdcss on OS/2

[Ivan Kalvachev]

On 1/24/13, Diego Biurrun <diego at biurrun.de> wrote:
> On Wed, Jan 23, 2013 at 02:39:32PM -0800, Dave Yeo wrote:
>> On 01/23/13 08:06 am, Diego Biurrun wrote:
>> >>>>[more errors]
>> >>>>>  >>
>> >>>>>>  >>>  And does upstream libdvdcss work?
>> >>>>>  >>
>> >>>>>  >>  Yes, the direct_h test includes win.h
>> >>>>>  >>
>> >>>>>>  >>>  In any case patches to libdvdcss should be submitted
>> >>>>>> upstream.
>> >>>>>  >>
>> >>>>>  >>  Or don't unconditionally include direct.h. It is only used in
>> >>>>>  >>  dvdcss.c and libavformat/os_support.h where it is wrapped in a
>> >>>>>  >>  #ifdef _WIN32.
>> >>>>>  >>  I'll look into it more after work
>> >>>>  >
>> >>>>  >  Please look into upstream libdvdcss and patch that, MPlayer can
>> >>>> later
>> >>>>  >  pick up the fix from there.
>> >>>>  >
>> >>>
>> >>>  I've confirmed that the upstream has no problem.
>> >>>
>> >>>  This is a problem of MPlayer configure.
>> >>>
>> >>>  I attach a patch.
>> >Fixed differently.
>>
>> Configure still finds direct.h on OS/2 and therefore defines
>> HAVE_DIRECT_H and fails on the Windows function in libdvdcss.c
>> Dave
>> http://svn.netlabs.org/libc/browser/branches/libc-0.6/src/emx/include/direct.h
>
> That needs to be fixed in libdvdcss.  You sent a patch to them
> already, just be a little bit patient for the response.

It's been almost 2 and half months and MPlayer dvdcss have not been fixed since.

Dave, I have committed the patch you have sent to libdvdcss.

It should hold until Diego merges the new libdvdcss.